-
-
- ; ?>/images/ampache.png "<?php echo Config::get('site_title'); ?>")
-
-
-
-
-
- :
- -
+ - :
- -
+
+
+
+
+
+
+
+
+ :
+ +
+ :
+ +
';
+ echo '
";
- self::$include_override = false;
+ self::$include_override = false;
- } // end_container
+ } // end_container
} // end Ajax class
?>
diff --git a/lib/class/album.class.php b/lib/class/album.class.php
index c7b88dcf04..56e458e85b 100644
--- a/lib/class/album.class.php
+++ b/lib/class/album.class.php
@@ -1,5 +1,5 @@
get_info($id);
-
- // Foreach what we've got
- foreach ($info as $key=>$value) {
- $this->$key = $value;
- }
-
- // Little bit of formatting here
- $this->full_name = trim(trim($info['prefix']) . ' ' . trim($info['name']));
-
- return true;
-
- } // constructor
-
- /**
- * construct_from_array
- * This is often used by the metadata class, it fills out an album object from a
- * named array, _fake is set to true
- */
- public static function construct_from_array($data) {
-
- $album = new Album(0);
- foreach ($data as $key=>$value) {
- $album->$key = $value;
- }
-
- // Make sure that we tell em it's fake
- $album->_fake = true;
-
- return $album;
-
- } // construct_from_array
-
- /**
- * gc
- *
- * Cleans out unused albums
- */
- public static function gc() {
- Dba::write('DELETE FROM `album` USING `album` LEFT JOIN `song` ON `song`.`album` = `album`.`id` WHERE `song`.`id` IS NULL');
- }
-
- /**
- * build_cache
- * This takes an array of object ids and caches all of their information
- * with a single query
- */
- public static function build_cache($ids,$extra=false) {
-
- // Nothing to do if they pass us nothing
- if (!is_array($ids) OR !count($ids)) { return false; }
-
- $idlist = '(' . implode(',', $ids) . ')';
-
- $sql = "SELECT * FROM `album` WHERE `id` IN $idlist";
- $db_results = Dba::read($sql);
-
- while ($row = Dba::fetch_assoc($db_results)) {
- parent::add_to_cache('album',$row['id'],$row);
- }
-
- // If we're extra'ing cache the extra info as well
- if ($extra) {
- $sql = "SELECT COUNT(DISTINCT(`song`.`artist`)) AS `artist_count`, " .
- "COUNT(`song`.`id`) AS `song_count`, " .
- "`artist`.`name` AS `artist_name`, " .
- "`artist`.`prefix` AS `artist_prefix`, " .
- "`artist`.`id` AS `artist_id`, `song`.`album`" .
- "FROM `song` " .
- "INNER JOIN `artist` ON `artist`.`id`=`song`.`artist` " .
- "WHERE `song`.`album` IN $idlist GROUP BY `song`.`album`";
-
- $db_results = Dba::read($sql);
-
- while ($row = Dba::fetch_assoc($db_results)) {
- $art = new Art($row['album'], 'album');
- $art->get_db();
- $row['has_art'] = make_bool($art->raw);
- $row['has_thumb'] = make_bool($art->thumb);
- parent::add_to_cache('album_extra',$row['album'],$row);
- } // while rows
- } // if extra
-
- return true;
-
- } // build_cache
-
- /**
- * _get_extra_info
- * This pulls the extra information from our tables, this is a 3 table join, which is why we don't normally
- * do it
- */
- private function _get_extra_info() {
-
- if (parent::is_cached('album_extra',$this->id)) {
- return parent::get_from_cache('album_extra',$this->id);
- }
-
- $sql = "SELECT " .
- "COUNT(DISTINCT(`song`.`artist`)) AS `artist_count`, " .
- "COUNT(`song`.`id`) AS `song_count`, " .
- "`artist`.`name` AS `artist_name`, " .
- "`artist`.`prefix` AS `artist_prefix`, " .
- "`artist`.`id` AS `artist_id` " .
- "FROM `song` INNER JOIN `artist` " .
- "ON `artist`.`id`=`song`.`artist` " .
- "WHERE `song`.`album`='$this->id' " .
- "GROUP BY `song`.`album`";
- $db_results = Dba::read($sql);
-
- $results = Dba::fetch_assoc($db_results);
-
- $art = new Art($this->id, 'album');
- $art->get_db();
- $results['has_art'] = make_bool($art->raw);
- $results['has_thumb'] = make_bool($art->thumb);
-
- parent::add_to_cache('album_extra',$this->id,$results);
-
- return $results;
-
- } // _get_extra_info
-
- /**
- * get_songs
- * gets the songs for this album takes an optional limit
- * and an optional artist, if artist is passed it only gets
- * songs with this album + specified artist
- */
- public function get_songs($limit = 0,$artist='') {
-
- $results = array();
-
- $artist = Dba::escape($artist);
-
- $sql = "SELECT `id` FROM `song` WHERE `album`='$this->id' ";
- if ($artist) {
- $sql .= "AND `artist`='$artist'";
- }
- $sql .= "ORDER BY `track`, `title`";
- if ($limit) {
- $sql .= " LIMIT $limit";
- }
- $db_results = Dba::read($sql);
-
- while ($r = Dba::fetch_assoc($db_results)) {
- $results[] = $r['id'];
- }
-
- return $results;
-
- } // get_songs
-
- /**
- * has_track
- * This checks to see if this album has a track of the specified title
- */
- public function has_track($title) {
-
- $title = Dba::escape($title);
-
- $sql = "SELECT `id` FROM `song` WHERE `album`='$this->id' AND `title`='$title'";
- $db_results = Dba::read($sql);
-
- $data = Dba::fetch_assoc($db_results);
-
- return $data;
-
- } // has_track
-
- /**
- * format
- * This is the format function for this object. It sets cleaned up
- * album information with the base required
- * f_link, f_name
- */
- public function format() {
-
- $web_path = Config::get('web_path');
-
- /* Pull the advanced information */
- $data = $this->_get_extra_info();
- foreach ($data as $key=>$value) { $this->$key = $value; }
-
- /* Truncate the string if it's to long */
- $this->f_name = UI::truncate($this->full_name,Config::get('ellipse_threshold_album'));
-
- $this->f_name_link = "id) . "\" title=\"" . scrub_out($this->full_name) . "\">" . scrub_out($this->f_name);
- // If we've got a disk append it
- if ($this->disk) {
- $this->f_name_link .= " disk. "\">[" . T_('Disk') . " " . $this->disk . "]";
- }
- $this->f_name_link .="";
-
- $this->f_link = $this->f_name_link;
- $this->f_title = $this->full_name; // FIXME: Legacy?
- if ($this->artist_count == '1') {
- $artist = trim(trim($this->artist_prefix) . ' ' . trim($this->artist_name));
- $this->f_artist_name = $artist;
- $artist = scrub_out(UI::truncate($artist), Config::get('ellipse_threshold_artist'));
- $this->f_artist_link = "artist_id . "\" title=\"" . scrub_out($this->artist_name) . "\">" . $artist . "";
- $this->f_artist = $artist;
- }
- else {
- $this->f_artist_link = "artist_count " . T_('Artists') . "\">" . T_('Various') . "";
- $this->f_artist = T_('Various');
- $this->f_artist_name = $this->f_artist;
- }
-
- if ($this->year == '0') {
- $this->year = "N/A";
- }
-
- $tags = Tag::get_top_tags('album',$this->id);
- $this->tags = $tags;
-
- $this->f_tags = Tag::get_display($tags,$this->id,'album');
-
- } // format
-
- /**
- * get_random_songs
- * gets a random number, and a random assortment of songs from this album
- */
- function get_random_songs() {
-
- $sql = "SELECT `id` FROM `song` WHERE `album`='$this->id' ORDER BY RAND()";
- $db_results = Dba::read($sql);
-
- while ($r = Dba::fetch_row($db_results)) {
- $results[] = $r['0'];
- }
-
- return $results;
-
- } // get_random_songs
-
- /**
- * update
- * This function takes a key'd array of data and updates this object
- * as needed, and then throws down with a flag
- */
- public function update($data) {
-
- $year = $data['year'];
- $artist = $data['artist'];
- $name = $data['name'];
- $disk = $data['disk'];
- $mbid = $data['mbid'];
-
- $current_id = $this->id;
-
- if ($artist != $this->artist_id AND $artist) {
- // Update every song
- $songs = $this->get_songs();
- foreach ($songs as $song_id) {
- Song::update_artist($artist,$song_id);
- }
- $updated = 1;
- Artist::gc();
- }
-
- $album_id = Catalog::check_album($name,$year,$disk,$mbid);
- if ($album_id != $this->id) {
- if (!is_array($songs)) { $songs = $this->get_songs(); }
- foreach ($songs as $song_id) {
- Song::update_album($album_id,$song_id);
- Song::update_year($year,$song_id);
- }
- $current_id = $album_id;
- $updated = 1;
- self::gc();
- }
-
- if ($updated) {
- // Flag all songs
- foreach ($songs as $song_id) {
- Flag::add($song_id,'song','retag','Interface Album Update');
- Song::update_utime($song_id);
- } // foreach song of album
- Stats::gc();
- Rating::gc();
- } // if updated
-
-
- return $current_id;
-
- } // update
-
- /**
- * get_random_albums
- * This returns a random number of albums from the catalogs
- * this is used by the index to return some 'potential' albums to play
- */
- public static function get_random_albums($count=6) {
-
- $sql = 'SELECT `id` FROM `album` ORDER BY RAND() LIMIT ' . ($count*2);
- $db_results = Dba::read($sql);
-
- while ($row = Dba::fetch_assoc($db_results)) {
- $art = new Art($row['id'], 'album');
- $art->get_db();
- if ($art->raw) {
- $results[] = $row['id'];
- }
- }
-
- if (count($results) < $count) { return false; }
-
- $results = array_slice($results, 0, $count);
-
- return $results;
-
- } // get_random_albums
+ /* Variables from DB */
+ public $id;
+ public $name;
+ public $disk;
+ public $year;
+ public $prefix;
+ public $mbid; // MusicBrainz ID
+
+ public $full_name; // Prefix + Name, generated
+
+ // cached information
+ public $_songs=array();
+
+ /**
+ * __construct
+ * Album constructor it loads everything relating
+ * to this album from the database it does not
+ * pull the album or thumb art by default or
+ * get any of the counts.
+ */
+ public function __construct($id='') {
+
+ if (!$id) { return false; }
+
+ /* Get the information from the db */
+ $info = $this->get_info($id);
+
+ // Foreach what we've got
+ foreach ($info as $key=>$value) {
+ $this->$key = $value;
+ }
+
+ // Little bit of formatting here
+ $this->full_name = trim(trim($info['prefix']) . ' ' . trim($info['name']));
+
+ return true;
+
+ } // constructor
+
+ /**
+ * construct_from_array
+ * This is often used by the metadata class, it fills out an album object from a
+ * named array, _fake is set to true
+ */
+ public static function construct_from_array($data) {
+
+ $album = new Album(0);
+ foreach ($data as $key=>$value) {
+ $album->$key = $value;
+ }
+
+ // Make sure that we tell em it's fake
+ $album->_fake = true;
+
+ return $album;
+
+ } // construct_from_array
+
+ /**
+ * gc
+ *
+ * Cleans out unused albums
+ */
+ public static function gc() {
+ Dba::write('DELETE FROM `album` USING `album` LEFT JOIN `song` ON `song`.`album` = `album`.`id` WHERE `song`.`id` IS NULL');
+ }
+
+ /**
+ * build_cache
+ * This takes an array of object ids and caches all of their information
+ * with a single query
+ */
+ public static function build_cache($ids,$extra=false) {
+
+ // Nothing to do if they pass us nothing
+ if (!is_array($ids) OR !count($ids)) { return false; }
+
+ $idlist = '(' . implode(',', $ids) . ')';
+
+ $sql = "SELECT * FROM `album` WHERE `id` IN $idlist";
+ $db_results = Dba::read($sql);
+
+ while ($row = Dba::fetch_assoc($db_results)) {
+ parent::add_to_cache('album',$row['id'],$row);
+ }
+
+ // If we're extra'ing cache the extra info as well
+ if ($extra) {
+ $sql = "SELECT COUNT(DISTINCT(`song`.`artist`)) AS `artist_count`, " .
+ "COUNT(`song`.`id`) AS `song_count`, " .
+ "`artist`.`name` AS `artist_name`, " .
+ "`artist`.`prefix` AS `artist_prefix`, " .
+ "`artist`.`id` AS `artist_id`, `song`.`album`" .
+ "FROM `song` " .
+ "INNER JOIN `artist` ON `artist`.`id`=`song`.`artist` " .
+ "WHERE `song`.`album` IN $idlist GROUP BY `song`.`album`";
+
+ $db_results = Dba::read($sql);
+
+ while ($row = Dba::fetch_assoc($db_results)) {
+ $art = new Art($row['album'], 'album');
+ $art->get_db();
+ $row['has_art'] = make_bool($art->raw);
+ $row['has_thumb'] = make_bool($art->thumb);
+ parent::add_to_cache('album_extra',$row['album'],$row);
+ } // while rows
+ } // if extra
+
+ return true;
+
+ } // build_cache
+
+ /**
+ * _get_extra_info
+ * This pulls the extra information from our tables, this is a 3 table join, which is why we don't normally
+ * do it
+ */
+ private function _get_extra_info() {
+
+ if (parent::is_cached('album_extra',$this->id)) {
+ return parent::get_from_cache('album_extra',$this->id);
+ }
+
+ $sql = "SELECT " .
+ "COUNT(DISTINCT(`song`.`artist`)) AS `artist_count`, " .
+ "COUNT(`song`.`id`) AS `song_count`, " .
+ "`artist`.`name` AS `artist_name`, " .
+ "`artist`.`prefix` AS `artist_prefix`, " .
+ "`artist`.`id` AS `artist_id` " .
+ "FROM `song` INNER JOIN `artist` " .
+ "ON `artist`.`id`=`song`.`artist` " .
+ "WHERE `song`.`album`='$this->id' " .
+ "GROUP BY `song`.`album`";
+ $db_results = Dba::read($sql);
+
+ $results = Dba::fetch_assoc($db_results);
+
+ $art = new Art($this->id, 'album');
+ $art->get_db();
+ $results['has_art'] = make_bool($art->raw);
+ $results['has_thumb'] = make_bool($art->thumb);
+
+ parent::add_to_cache('album_extra',$this->id,$results);
+
+ return $results;
+
+ } // _get_extra_info
+
+ /**
+ * get_songs
+ * gets the songs for this album takes an optional limit
+ * and an optional artist, if artist is passed it only gets
+ * songs with this album + specified artist
+ */
+ public function get_songs($limit = 0,$artist='') {
+
+ $results = array();
+
+ $artist = Dba::escape($artist);
+
+ $sql = "SELECT `id` FROM `song` WHERE `album`='$this->id' ";
+ if ($artist) {
+ $sql .= "AND `artist`='$artist'";
+ }
+ $sql .= "ORDER BY `track`, `title`";
+ if ($limit) {
+ $sql .= " LIMIT $limit";
+ }
+ $db_results = Dba::read($sql);
+
+ while ($r = Dba::fetch_assoc($db_results)) {
+ $results[] = $r['id'];
+ }
+
+ return $results;
+
+ } // get_songs
+
+ /**
+ * has_track
+ * This checks to see if this album has a track of the specified title
+ */
+ public function has_track($title) {
+
+ $title = Dba::escape($title);
+
+ $sql = "SELECT `id` FROM `song` WHERE `album`='$this->id' AND `title`='$title'";
+ $db_results = Dba::read($sql);
+
+ $data = Dba::fetch_assoc($db_results);
+
+ return $data;
+
+ } // has_track
+
+ /**
+ * format
+ * This is the format function for this object. It sets cleaned up
+ * album information with the base required
+ * f_link, f_name
+ */
+ public function format() {
+
+ $web_path = Config::get('web_path');
+
+ /* Pull the advanced information */
+ $data = $this->_get_extra_info();
+ foreach ($data as $key=>$value) { $this->$key = $value; }
+
+ /* Truncate the string if it's to long */
+ $this->f_name = UI::truncate($this->full_name,Config::get('ellipse_threshold_album'));
+
+ $this->f_name_link = "id) . "\" title=\"" . scrub_out($this->full_name) . "\">" . scrub_out($this->f_name);
+ // If we've got a disk append it
+ if ($this->disk) {
+ $this->f_name_link .= " disk. "\">[" . T_('Disk') . " " . $this->disk . "]";
+ }
+ $this->f_name_link .="";
+
+ $this->f_link = $this->f_name_link;
+ $this->f_title = $this->full_name; // FIXME: Legacy?
+ if ($this->artist_count == '1') {
+ $artist = trim(trim($this->artist_prefix) . ' ' . trim($this->artist_name));
+ $this->f_artist_name = $artist;
+ $artist = scrub_out(UI::truncate($artist), Config::get('ellipse_threshold_artist'));
+ $this->f_artist_link = "artist_id . "\" title=\"" . scrub_out($this->artist_name) . "\">" . $artist . "";
+ $this->f_artist = $artist;
+ }
+ else {
+ $this->f_artist_link = "artist_count " . T_('Artists') . "\">" . T_('Various') . "";
+ $this->f_artist = T_('Various');
+ $this->f_artist_name = $this->f_artist;
+ }
+
+ if ($this->year == '0') {
+ $this->year = "N/A";
+ }
+
+ $tags = Tag::get_top_tags('album',$this->id);
+ $this->tags = $tags;
+
+ $this->f_tags = Tag::get_display($tags,$this->id,'album');
+
+ } // format
+
+ /**
+ * get_random_songs
+ * gets a random number, and a random assortment of songs from this album
+ */
+ function get_random_songs() {
+
+ $sql = "SELECT `id` FROM `song` WHERE `album`='$this->id' ORDER BY RAND()";
+ $db_results = Dba::read($sql);
+
+ while ($r = Dba::fetch_row($db_results)) {
+ $results[] = $r['0'];
+ }
+
+ return $results;
+
+ } // get_random_songs
+
+ /**
+ * update
+ * This function takes a key'd array of data and updates this object
+ * as needed, and then throws down with a flag
+ */
+ public function update($data) {
+
+ $year = $data['year'];
+ $artist = $data['artist'];
+ $name = $data['name'];
+ $disk = $data['disk'];
+ $mbid = $data['mbid'];
+
+ $current_id = $this->id;
+
+ if ($artist != $this->artist_id AND $artist) {
+ // Update every song
+ $songs = $this->get_songs();
+ foreach ($songs as $song_id) {
+ Song::update_artist($artist,$song_id);
+ }
+ $updated = 1;
+ Artist::gc();
+ }
+
+ $album_id = Catalog::check_album($name,$year,$disk,$mbid);
+ if ($album_id != $this->id) {
+ if (!is_array($songs)) { $songs = $this->get_songs(); }
+ foreach ($songs as $song_id) {
+ Song::update_album($album_id,$song_id);
+ Song::update_year($year,$song_id);
+ }
+ $current_id = $album_id;
+ $updated = 1;
+ self::gc();
+ }
+
+ if ($updated) {
+ // Flag all songs
+ foreach ($songs as $song_id) {
+ Flag::add($song_id,'song','retag','Interface Album Update');
+ Song::update_utime($song_id);
+ } // foreach song of album
+ Stats::gc();
+ Rating::gc();
+ } // if updated
+
+
+ return $current_id;
+
+ } // update
+
+ /**
+ * get_random_albums
+ * This returns a random number of albums from the catalogs
+ * this is used by the index to return some 'potential' albums to play
+ */
+ public static function get_random_albums($count=6) {
+
+ $sql = 'SELECT `id` FROM `album` ORDER BY RAND() LIMIT ' . ($count*2);
+ $db_results = Dba::read($sql);
+
+ while ($row = Dba::fetch_assoc($db_results)) {
+ $art = new Art($row['id'], 'album');
+ $art->get_db();
+ if ($art->raw) {
+ $results[] = $row['id'];
+ }
+ }
+
+ if (count($results) < $count) { return false; }
+
+ $results = array_slice($results, 0, $count);
+
+ return $results;
+
+ } // get_random_albums
} //end of album class
diff --git a/lib/class/ampache_mail.class.php b/lib/class/ampache_mail.class.php
index 8c1d363b28..6b8bc20f52 100644
--- a/lib/class/ampache_mail.class.php
+++ b/lib/class/ampache_mail.class.php
@@ -1,5 +1,5 @@
sender = $user . '@' . $domain;
- $this->sender_name = $fromname;
- } // set_default_sender
-
- /**
- * get_users
- * This returns an array of userids for people who have e-mail
- * addresses based on the passed filter
- */
- public static function get_users($filter) {
-
- switch ($filter) {
- default:
- case 'all':
- $sql = "SELECT * FROM `user` WHERE `email` IS NOT NULL";
- break;
- case 'users':
- $sql = "SELECT * FROM `user` WHERE `access`='25' AND `email` IS NOT NULL";
- break;
- case 'admins':
- $sql = "SELECT * FROM `user` WHERE `access`='100' AND `email` IS NOT NULL";
- break ;
- case 'inactive':
- $inactive = time() - (30*86400);
- $sql = "SELECT * FROM `user` WHERE `last_seen` <= '$inactive' AND `email` IS NOT NULL";
- break;
- } // end filter switch
-
- $db_results = Dba::read($sql);
-
- $results = array();
-
- while ($row = Dba::fetch_assoc($db_results)) {
- $results[] = array('id'=>$row['id'],'fullname'=>$row['fullname'],'email'=>$row['email']);
- }
-
- return $results;
-
- } // get_users
-
- /**
- * add_statistics
- * This should be run if we want to add some statistics to this e-mail,
- * appends to self::$message
- */
- public function add_statistics($methods) {
-
-
-
- } // add_statistics
-
- /**
- * send
- * This actually sends the mail, how amazing
- */
- public function send($phpmailer = null) {
-
- $mailtype = Config::get('mail_type');
-
- if ($phpmailer == null) {
- $mail = new PHPMailer();
-
- $recipient_name = $this->recipient_name;
- if(function_exists('mb_encode_mimeheader')) {
- $recipient_name = mb_encode_mimeheader($recipient_name);
- }
- $mail->AddAddress($this->recipient, $recipient_name);
- }
- else {
- $mail = $phpmailer;
- }
-
- $mail->CharSet = Config::get('site_charset');
- $mail->Encoding = 'base64';
- $mail->From = $this->sender;
- $mail->Sender = $this->sender;
- $mail->FromName = $this->sender_name;
- $mail->Subject = $this->subject;
-
- if(function_exists('mb_eregi_replace')) {
- $this->message = mb_eregi_replace("\r\n", "\n", $this->message);
- }
- $mail->Body = $this->message;
-
- $sendmail = Config::get('sendmail_path');
- $sendmail = $sendmail ? $sendmail : '/usr/sbin/sendmail';
- $mailhost = Config::get('mail_host');
- $mailhost = $mailhost ? $mailhost : 'localhost';
- $mailport = Config::get('mail_port');
- $mailport = $mailport ? $mailport : 25;
- $mailauth = Config::get('mail_auth');
- $mailuser = Config::get('mail_auth_user');
- $mailuser = $mailuser ? $mailuser : '';
- $mailpass = Config::get('mail_auth_pass');
- $mailpass = $mailpass ? $mailpass : '';
-
- switch($mailtype) {
- case 'smtp':
- $mail->IsSMTP();
- $mail->Host = $mailhost;
- $mail->Port = $mailport;
- if($mailauth == true) {
- $mail->SMTPAuth = true;
- $mail->Username = $mailuser;
- $mail->Password = $mailpass;
- }
- if ($mailsecure = Config::get('mail_secure_smtp')) {
- $mail->SMTPSecure = ($mailsecure == 'ssl') ? 'ssl' : 'tls';
- }
- break;
- case 'sendmail':
- $mail->IsSendmail();
- $mail->Sendmail = $sendmail;
- break;
- case 'php':
- default:
- $mail->IsMail();
- break;
- }
-
- $retval = $mail->send();
- if( $retval == true ) {
- return true;
- } else {
- return false;
- }
- } // send
-
- public function send_to_group($group_name) {
- $mail = new PHPMailer();
-
- foreach(self::get_users($group_name) as $member) {
- if(function_exists('mb_encode_mimeheader')) {
- $member['fullname'] = mb_encode_mimeheader($member['fullname']);
- }
- $mail->AddBCC($member['email'], $member['fullname']);
- }
-
- return $this->send($mail);
- }
+ // The message, recipient and from
+ public $message;
+ public $subject;
+ public $recipient;
+ public $recipient_name;
+ public $sender;
+ public $sender_name;
+
+ /**
+ * Constructor
+ *
+ * This does nothing. Much like goggles.
+ */
+ public function __construct() {
+
+ // Eh bien.
+
+ } // Constructor
+
+ /**
+ * set_default_sender
+ *
+ * Does the config magic to figure out the "system" email sender and
+ * sets it as the sender.
+ */
+ public function set_default_sender() {
+ $user = Config::get('mail_user');
+ if (!$user) {
+ $user = 'info';
+ }
+
+ $domain = Config::get('mail_domain');
+ if (!$domain) {
+ $domain = 'example.com';
+ }
+
+ $fromname = Config::get('mail_name');
+ if (!$fromname) {
+ $fromname = 'Ampache';
+ }
+
+ $this->sender = $user . '@' . $domain;
+ $this->sender_name = $fromname;
+ } // set_default_sender
+
+ /**
+ * get_users
+ * This returns an array of userids for people who have e-mail
+ * addresses based on the passed filter
+ */
+ public static function get_users($filter) {
+
+ switch ($filter) {
+ default:
+ case 'all':
+ $sql = "SELECT * FROM `user` WHERE `email` IS NOT NULL";
+ break;
+ case 'users':
+ $sql = "SELECT * FROM `user` WHERE `access`='25' AND `email` IS NOT NULL";
+ break;
+ case 'admins':
+ $sql = "SELECT * FROM `user` WHERE `access`='100' AND `email` IS NOT NULL";
+ break ;
+ case 'inactive':
+ $inactive = time() - (30*86400);
+ $sql = "SELECT * FROM `user` WHERE `last_seen` <= '$inactive' AND `email` IS NOT NULL";
+ break;
+ } // end filter switch
+
+ $db_results = Dba::read($sql);
+
+ $results = array();
+
+ while ($row = Dba::fetch_assoc($db_results)) {
+ $results[] = array('id'=>$row['id'],'fullname'=>$row['fullname'],'email'=>$row['email']);
+ }
+
+ return $results;
+
+ } // get_users
+
+ /**
+ * add_statistics
+ * This should be run if we want to add some statistics to this e-mail,
+ * appends to self::$message
+ */
+ public function add_statistics($methods) {
+
+
+
+ } // add_statistics
+
+ /**
+ * send
+ * This actually sends the mail, how amazing
+ */
+ public function send($phpmailer = null) {
+
+ $mailtype = Config::get('mail_type');
+
+ if ($phpmailer == null) {
+ $mail = new PHPMailer();
+
+ $recipient_name = $this->recipient_name;
+ if(function_exists('mb_encode_mimeheader')) {
+ $recipient_name = mb_encode_mimeheader($recipient_name);
+ }
+ $mail->AddAddress($this->recipient, $recipient_name);
+ }
+ else {
+ $mail = $phpmailer;
+ }
+
+ $mail->CharSet = Config::get('site_charset');
+ $mail->Encoding = 'base64';
+ $mail->From = $this->sender;
+ $mail->Sender = $this->sender;
+ $mail->FromName = $this->sender_name;
+ $mail->Subject = $this->subject;
+
+ if(function_exists('mb_eregi_replace')) {
+ $this->message = mb_eregi_replace("\r\n", "\n", $this->message);
+ }
+ $mail->Body = $this->message;
+
+ $sendmail = Config::get('sendmail_path');
+ $sendmail = $sendmail ? $sendmail : '/usr/sbin/sendmail';
+ $mailhost = Config::get('mail_host');
+ $mailhost = $mailhost ? $mailhost : 'localhost';
+ $mailport = Config::get('mail_port');
+ $mailport = $mailport ? $mailport : 25;
+ $mailauth = Config::get('mail_auth');
+ $mailuser = Config::get('mail_auth_user');
+ $mailuser = $mailuser ? $mailuser : '';
+ $mailpass = Config::get('mail_auth_pass');
+ $mailpass = $mailpass ? $mailpass : '';
+
+ switch($mailtype) {
+ case 'smtp':
+ $mail->IsSMTP();
+ $mail->Host = $mailhost;
+ $mail->Port = $mailport;
+ if($mailauth == true) {
+ $mail->SMTPAuth = true;
+ $mail->Username = $mailuser;
+ $mail->Password = $mailpass;
+ }
+ if ($mailsecure = Config::get('mail_secure_smtp')) {
+ $mail->SMTPSecure = ($mailsecure == 'ssl') ? 'ssl' : 'tls';
+ }
+ break;
+ case 'sendmail':
+ $mail->IsSendmail();
+ $mail->Sendmail = $sendmail;
+ break;
+ case 'php':
+ default:
+ $mail->IsMail();
+ break;
+ }
+
+ $retval = $mail->send();
+ if( $retval == true ) {
+ return true;
+ } else {
+ return false;
+ }
+ } // send
+
+ public function send_to_group($group_name) {
+ $mail = new PHPMailer();
+
+ foreach(self::get_users($group_name) as $member) {
+ if(function_exists('mb_encode_mimeheader')) {
+ $member['fullname'] = mb_encode_mimeheader($member['fullname']);
+ }
+ $mail->AddBCC($member['email'], $member['fullname']);
+ }
+
+ return $this->send($mail);
+ }
} // Ampache_Mail class
?>
diff --git a/lib/class/ampache_rss.class.php b/lib/class/ampache_rss.class.php
index 3056e9cf73..8006d8be99 100644
--- a/lib/class/ampache_rss.class.php
+++ b/lib/class/ampache_rss.class.php
@@ -1,5 +1,5 @@
type = self::validate_type($type);
+ $this->type = self::validate_type($type);
- } // constructor
+ } // constructor
- /**
- * get_xml
- * This returns the xmldocument for the current rss type, it calls a sub function that gathers the data
- * and then uses the xmlDATA class to build the document
- */
- public function get_xml() {
+ /**
+ * get_xml
+ * This returns the xmldocument for the current rss type, it calls a sub function that gathers the data
+ * and then uses the xmlDATA class to build the document
+ */
+ public function get_xml() {
- // Function call name
- $data_function = 'load_' . $this->type;
- $pub_date_function = 'pubdate_' . $this->type;
+ // Function call name
+ $data_function = 'load_' . $this->type;
+ $pub_date_function = 'pubdate_' . $this->type;
- $data = call_user_func(array('Ampache_RSS',$data_function));
- $pub_date = call_user_func(array('Ampache_RSS',$pub_date_function));
-
- XML_Data::set_type('rss');
- $xml_document = XML_Data::rss_feed($data,$this->get_title(),$this->get_description(),$pub_date);
-
- return $xml_document;
-
- } // get_xml
+ $data = call_user_func(array('Ampache_RSS',$data_function));
+ $pub_date = call_user_func(array('Ampache_RSS',$pub_date_function));
+
+ XML_Data::set_type('rss');
+ $xml_document = XML_Data::rss_feed($data,$this->get_title(),$this->get_description(),$pub_date);
+
+ return $xml_document;
+
+ } // get_xml
- /**
- * get_title
- * This returns the standardized title for the rss feed based on this->type
- */
- public function get_title() {
-
- $titles = array('now_playing' => T_('Now Playing'),
- 'recently_played' => T_('Recently Played'),
- 'latest_album' => T_('Newest Albums'),
- 'latest_artist' => T_('Newest Artists'));
+ /**
+ * get_title
+ * This returns the standardized title for the rss feed based on this->type
+ */
+ public function get_title() {
+
+ $titles = array('now_playing' => T_('Now Playing'),
+ 'recently_played' => T_('Recently Played'),
+ 'latest_album' => T_('Newest Albums'),
+ 'latest_artist' => T_('Newest Artists'));
- return scrub_out(Config::get('site_title')) . ' - ' . $titles[$this->type];
+ return scrub_out(Config::get('site_title')) . ' - ' . $titles[$this->type];
- } // get_title
+ } // get_title
- /**
- * get_description
- * This returns the standardized description for the rss feed based on this->type
- */
- public function get_description() {
+ /**
+ * get_description
+ * This returns the standardized description for the rss feed based on this->type
+ */
+ public function get_description() {
- //FIXME: For now don't do any kind of translating
- return 'Ampache RSS Feeds';
+ //FIXME: For now don't do any kind of translating
+ return 'Ampache RSS Feeds';
- } // get_description
+ } // get_description
- /**
- * validate_type
- * this returns a valid type for an rss feed, if the specified type is invalid it returns a default value
- */
- public static function validate_type($type) {
+ /**
+ * validate_type
+ * this returns a valid type for an rss feed, if the specified type is invalid it returns a default value
+ */
+ public static function validate_type($type) {
- $valid_types = array('now_playing','recently_played','latest_album','latest_artist','latest_song',
- 'popular_song','popular_album','popular_artist');
+ $valid_types = array('now_playing','recently_played','latest_album','latest_artist','latest_song',
+ 'popular_song','popular_album','popular_artist');
- if (!in_array($type,$valid_types)) {
- return 'now_playing';
- }
+ if (!in_array($type,$valid_types)) {
+ return 'now_playing';
+ }
- return $type;
-
- } // validate_type
-
- /**
- * get_display
- * This dumps out some html and an icon for the type of rss that we specify
- */
- public static function get_display($type='now_playing') {
-
- // Default to now playing
- $type = self::validate_type($type);
-
- $string = '' . UI::get_icon('feed', T_('RSS Feed')) . '';
-
- return $string;
-
- } // get_display
-
- // type specific functions below, these are called semi-dynamically based on the current type //
-
- /**
- * load_now_playing
- * This loads in the now playing information. This is just the raw data with key=>value pairs that could be turned
- * into an xml document if we so wished
- */
- public static function load_now_playing() {
-
- $data = Stream::get_now_playing();
-
- $results = array();
- $format = Config::get('rss_format') ?: '%t - %a - %A';
- $string_map = array(
- '%t' => 'title',
- '%a' => 'artist',
- '%A' => 'album'
- );
- foreach ($data as $element) {
- $song = $element['media'];
- $client = $element['user'];
- $title = $format;
- $description = $format;
- foreach($string_map as $search => $replace) {
- $trep = 'f_' . $replace;
- $drep = 'f_' . $replace . '_full';
- $title = str_replace($search, $song->$trep, $title);
- $description = str_replace($search, $song->$drep, $description);
- }
- $xml_array = array(
- 'title' => $title,
- 'link' => $song->link,
- 'description' => $description,
- 'comments' => $client->fullname . ' - ' . $element['agent'],
- 'pubDate' => date('r', $element['expire'])
- );
- $results[] = $xml_array;
- } // end foreach
-
- return $results;
-
- } // load_now_playing
-
- /**
- * pubdate_now_playing
- * this is the pub date we should use for the now playing information,
- * this is a little specific as it uses the 'newest' expire we can find
- */
- public static function pubdate_now_playing() {
-
- // Little redundent, should be fixed by an improvement in the get_now_playing stuff
- $data = Stream::get_now_playing();
-
- $element = array_shift($data);
-
- return $element['expire'];
-
- } // pubdate_now_playing
-
- /**
- * load_recently_played
- * This loads in the recently played information and formats it up real nice like
- */
- public static function load_recently_played() {
-
- //FIXME: The time stuff should be centralized, it's currently in two places, lame
-
- $time_unit = array('', T_('seconds ago'), T_('minutes ago'), T_('hours ago'), T_('days ago'), T_('weeks ago'), T_('months ago'), T_('years ago'));
- $data = Song::get_recently_played();
-
- $results = array();
-
- foreach ($data as $item) {
- $client = new User($item['user']);
- $song = new Song($item['object_id']);
- $song->format();
- $amount = intval(time() - $item['date']+2);
- $time_place = '0';
- while ($amount >= 1) {
- $final = $amount;
- $time_place++;
- if ($time_place <= 2) {
- $amount = floor($amount/60);
- }
- if ($time_place == '3') {
- $amount = floor($amount/24);
- }
- if ($time_place == '4') {
- $amount = floor($amount/7);
- }
- if ($time_place == '5') {
- $amount = floor($amount/4);
- }
- if ($time_place == '6') {
- $amount = floor ($amount/12);
- }
- if ($time_place > '6') {
- $final = $amount . '+';
- break;
- }
- } // end while
-
- $time_string = $final . ' ' . $time_unit[$time_place];
-
- $xml_array = array('title'=>$song->f_title . ' - ' . $song->f_artist . ' - ' . $song->f_album,
- 'link'=>str_replace('&', '&', $song->link),
- 'description'=>$song->title . ' - ' . $song->f_artist_full . ' - ' . $song->f_album_full . ' - ' . $time_string,
- 'comments'=>$client->username,
- 'pubDate'=>date("r",$item['date']));
- $results[] = $xml_array;
-
- } // end foreach
-
- return $results;
-
- } // load_recently_played
-
- /**
- * pubdate_recently_played
- * This just returns the 'newest' recently played entry
- */
- public static function pubdate_recently_played() {
-
- $data = Song::get_recently_played();
-
- $element = array_shift($data);
-
- return $element['date'];
-
- } // pubdate_recently_played
+ return $type;
+
+ } // validate_type
+
+ /**
+ * get_display
+ * This dumps out some html and an icon for the type of rss that we specify
+ */
+ public static function get_display($type='now_playing') {
+
+ // Default to now playing
+ $type = self::validate_type($type);
+
+ $string = '' . UI::get_icon('feed', T_('RSS Feed')) . '';
+
+ return $string;
+
+ } // get_display
+
+ // type specific functions below, these are called semi-dynamically based on the current type //
+
+ /**
+ * load_now_playing
+ * This loads in the now playing information. This is just the raw data with key=>value pairs that could be turned
+ * into an xml document if we so wished
+ */
+ public static function load_now_playing() {
+
+ $data = Stream::get_now_playing();
+
+ $results = array();
+ $format = Config::get('rss_format') ?: '%t - %a - %A';
+ $string_map = array(
+ '%t' => 'title',
+ '%a' => 'artist',
+ '%A' => 'album'
+ );
+ foreach ($data as $element) {
+ $song = $element['media'];
+ $client = $element['user'];
+ $title = $format;
+ $description = $format;
+ foreach($string_map as $search => $replace) {
+ $trep = 'f_' . $replace;
+ $drep = 'f_' . $replace . '_full';
+ $title = str_replace($search, $song->$trep, $title);
+ $description = str_replace($search, $song->$drep, $description);
+ }
+ $xml_array = array(
+ 'title' => $title,
+ 'link' => $song->link,
+ 'description' => $description,
+ 'comments' => $client->fullname . ' - ' . $element['agent'],
+ 'pubDate' => date('r', $element['expire'])
+ );
+ $results[] = $xml_array;
+ } // end foreach
+
+ return $results;
+
+ } // load_now_playing
+
+ /**
+ * pubdate_now_playing
+ * this is the pub date we should use for the now playing information,
+ * this is a little specific as it uses the 'newest' expire we can find
+ */
+ public static function pubdate_now_playing() {
+
+ // Little redundent, should be fixed by an improvement in the get_now_playing stuff
+ $data = Stream::get_now_playing();
+
+ $element = array_shift($data);
+
+ return $element['expire'];
+
+ } // pubdate_now_playing
+
+ /**
+ * load_recently_played
+ * This loads in the recently played information and formats it up real nice like
+ */
+ public static function load_recently_played() {
+
+ //FIXME: The time stuff should be centralized, it's currently in two places, lame
+
+ $time_unit = array('', T_('seconds ago'), T_('minutes ago'), T_('hours ago'), T_('days ago'), T_('weeks ago'), T_('months ago'), T_('years ago'));
+ $data = Song::get_recently_played();
+
+ $results = array();
+
+ foreach ($data as $item) {
+ $client = new User($item['user']);
+ $song = new Song($item['object_id']);
+ $song->format();
+ $amount = intval(time() - $item['date']+2);
+ $time_place = '0';
+ while ($amount >= 1) {
+ $final = $amount;
+ $time_place++;
+ if ($time_place <= 2) {
+ $amount = floor($amount/60);
+ }
+ if ($time_place == '3') {
+ $amount = floor($amount/24);
+ }
+ if ($time_place == '4') {
+ $amount = floor($amount/7);
+ }
+ if ($time_place == '5') {
+ $amount = floor($amount/4);
+ }
+ if ($time_place == '6') {
+ $amount = floor ($amount/12);
+ }
+ if ($time_place > '6') {
+ $final = $amount . '+';
+ break;
+ }
+ } // end while
+
+ $time_string = $final . ' ' . $time_unit[$time_place];
+
+ $xml_array = array('title'=>$song->f_title . ' - ' . $song->f_artist . ' - ' . $song->f_album,
+ 'link'=>str_replace('&', '&', $song->link),
+ 'description'=>$song->title . ' - ' . $song->f_artist_full . ' - ' . $song->f_album_full . ' - ' . $time_string,
+ 'comments'=>$client->username,
+ 'pubDate'=>date("r",$item['date']));
+ $results[] = $xml_array;
+
+ } // end foreach
+
+ return $results;
+
+ } // load_recently_played
+
+ /**
+ * pubdate_recently_played
+ * This just returns the 'newest' recently played entry
+ */
+ public static function pubdate_recently_played() {
+
+ $data = Song::get_recently_played();
+
+ $element = array_shift($data);
+
+ return $element['date'];
+
+ } // pubdate_recently_played
} // end Ampache_RSS class
diff --git a/lib/class/api.class.php b/lib/class/api.class.php
index 841d353404..f289e98ba3 100644
--- a/lib/class/api.class.php
+++ b/lib/class/api.class.php
@@ -1,5 +1,5 @@
set_filter('add_lt',strtotime($elements['1']));
- self::$browse->set_filter('add_gt',strtotime($elements['0']));
- }
- else {
- self::$browse->set_filter('add_gt',strtotime($value));
- }
- break;
- case 'update':
- // Check for a range, if no range default to gt
- if (strpos($value,'/')) {
- $elements = explode('/',$value);
- self::$browse->set_filter('update_lt',strtotime($elements['1']));
- self::$browse->set_filter('update_gt',strtotime($elements['0']));
- }
- else {
- self::$browse->set_filter('update_gt',strtotime($value));
- }
- break;
- case 'alpha_match':
- self::$browse->set_filter('alpha_match',$value);
- break;
- case 'exact_match':
- self::$browse->set_filter('exact_match',$value);
- break;
- default:
- // Rien a faire
- break;
- } // end filter
-
- return true;
-
- } // set_filter
-
- /**
- * handshake
- *
- * This is the function that handles verifying a new handshake
- * Takes a timestamp, auth key, and username.
- */
- public static function handshake($input) {
-
- $timestamp = preg_replace('/[^0-9]/', '', $input['timestamp']);
- $passphrase = $input['auth'];
- $ip = $_SERVER['REMOTE_ADDR'];
- $username = $input['user'];
- $version = $input['version'];
-
- // Log the attempt
- debug_event('API', "Handshake Attempt, IP:$ip User:$username Version:$version", 5);
-
- if (intval($version) < self::$version) {
- debug_event('API', 'Login Failed: version too old', 1);
- Error::add('api', T_('Login Failed: version too old'));
- return false;
- }
-
- // If the timestamp isn't within 30 minutes sucks to be them
- if (($timestamp < (time() - 1800)) ||
- ($timestamp > (time() + 1800))) {
- debug_event('API', 'Login Failed: timestamp out of range', 1);
- Error::add('api', T_('Login Failed: timestamp out of range'));
- return false;
- }
-
- // Grab the correct userid
- // FIXME: Does this if/else make sense with the new ACLs?
- if (!trim($username)) {
- $user_id = '-1';
- }
- else {
- $client = User::get_from_username($username);
- $user_id = $client->id;
- }
- $user_id = Dba::escape($user_id);
-
- // Log this attempt
- debug_event('API', "Login Attempt, IP:$ip Time: $timestamp User:$username ($user_id) Auth:$passphrase", 1);
-
- if (Access::check_network('api', $user_id, 5, $ip)) {
- // Now we're sure that there is an ACL line that matches
- // this user or ALL USERS, pull the user's password and
- // then see what we come out with
- $sql = "SELECT * FROM `user` WHERE `id`='$user_id'";
- $db_results = Dba::read($sql);
-
- $row = Dba::fetch_assoc($db_results);
-
- if (!$row['password']) {
- debug_event('API', 'Unable to find user with userid of ' . $user_id, 1);
- Error::add('api', T_('Invalid Username/Password'));
- return false;
- }
-
- $sha1pass = hash('sha256', $timestamp . $row['password']);
-
- if ($sha1pass === $passphrase) {
- // Create the session
- // FIXME: needs to be moved to the correct class
- $data['username'] = $client->username;
- $data['type'] = 'api';
- $data['value'] = $timestamp;
- $token = vauth::session_create($data);
-
- // Insert the token into the streamer
- Stream::insert_session($token,$client->id);
- debug_event('API', 'Login Success, passphrase matched', 1);
-
- // We need to also get the 'last update' of the
- // catalog information in an RFC 2822 Format
- $sql = "SELECT MAX(`last_update`) AS `update`,MAX(`last_add`) AS `add`, MAX(`last_clean`) AS `clean` FROM `catalog`";
- $db_results = Dba::read($sql);
- $row = Dba::fetch_assoc($db_results);
-
- // Now we need to quickly get the song totals
- $sql = 'SELECT COUNT(`id`) AS `song`, ' .
- 'COUNT(DISTINCT(`album`)) AS `album`, '.
- 'COUNT(DISTINCT(`artist`)) AS `artist` ' .
- 'FROM `song`';
- $db_results = Dba::read($sql);
- $counts = Dba::fetch_assoc($db_results);
-
- // Next the video counts
- $sql = "SELECT COUNT(`id`) AS `video` FROM `video`";
- $db_results = Dba::read($sql);
- $vcounts = Dba::fetch_assoc($db_results);
-
- $sql = "SELECT COUNT(`id`) AS `playlist` FROM `playlist`";
- $db_results = Dba::read($sql);
- $playlist = Dba::fetch_assoc($db_results);
-
- $sql = "SELECT COUNT(`id`) AS `catalog` FROM `catalog` WHERE `catalog_type`='local'";
- $db_results = Dba::read($sql);
- $catalog = Dba::fetch_assoc($db_results);
-
- echo XML_Data::keyed_array(array('auth'=>$token,
- 'api'=>self::$version,
- 'session_expire'=>date("c",time()+Config::get('session_length')-60),
- 'update'=>date("c",$row['update']),
- 'add'=>date("c",$row['add']),
- 'clean'=>date("c",$row['clean']),
- 'songs'=>$counts['song'],
- 'albums'=>$counts['album'],
- 'artists'=>$counts['artist'],
- 'playlists'=>$playlist['playlist'],
- 'videos'=>$vcounts['video'],
- 'catalogs'=>$catalog['catalog']));
- return true;
- } // match
-
- } // end while
-
- debug_event('API','Login Failed, unable to match passphrase','1');
- XML_Data::error('401', T_('Error Invalid Handshake - ') . T_('Invalid Username/Password'));
-
- } // handshake
-
- /**
- * ping
- * This can be called without being authenticated, it is useful for determining if what the status
- * of the server is, and what version it is running/compatible with
- */
- public static function ping($input) {
-
- $xmldata = array('server'=>Config::get('version'),'version'=>Api::$version,'compatible'=>'350001');
-
- // Check and see if we should extend the api sessions (done if valid sess is passed)
- if (vauth::session_exists('api', $input['auth'])) {
- vauth::session_extend($input['auth']);
- $xmldata = array_merge(array('session_expire'=>date("c",time()+Config::get('session_length')-60)),$xmldata);
- }
-
- debug_event('API','Ping Received from ' . $_SERVER['REMOTE_ADDR'] . ' :: ' . $input['auth'],'5');
-
- ob_end_clean();
- echo XML_Data::keyed_array($xmldata);
-
- } // ping
-
- /**
- * artists
- * This takes a collection of inputs and returns
- * artist objects. This function is deprecated!
- * //DEPRECATED
- */
- public static function artists($input) {
-
- self::$browse->reset_filters();
- self::$browse->set_type('artist');
- self::$browse->set_sort('name','ASC');
-
- $method = $input['exact'] ? 'exact_match' : 'alpha_match';
- Api::set_filter($method,$input['filter']);
- Api::set_filter('add',$input['add']);
- Api::set_filter('update',$input['update']);
-
- // Set the offset
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
-
- $artists = self::$browse->get_objects();
- // echo out the resulting xml document
- ob_end_clean();
- echo XML_Data::artists($artists);
-
- } // artists
-
- /**
- * artist
- * This returns a single artist based on the UID of said artist
- * //DEPRECATED
- */
- public static function artist($input) {
-
- $uid = scrub_in($input['filter']);
- echo XML_Data::artists(array($uid));
-
- } // artist
-
- /**
- * artist_albums
- * This returns the albums of an artist
- */
- public static function artist_albums($input) {
-
- $artist = new Artist($input['filter']);
-
- $albums = $artist->get_albums();
-
- // Set the offset
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
- ob_end_clean();
- echo XML_Data::albums($albums);
-
- } // artist_albums
-
- /**
- * artist_songs
- * This returns the songs of the specified artist
- */
- public static function artist_songs($input) {
+ public static $version = '350001';
+
+ private static $browse = null;
+
+ /**
+ * constructor
+ * This really isn't anything to do here, so it's private
+ */
+ private function __construct() {
+
+ // Rien a faire
+
+ } // constructor
+
+ /**
+ * _auto_init
+ * Automatically called when this class is loaded.
+ */
+ public static function _auto_init() {
+ if (is_null(self::$browse)) {
+ self::$browse = new Browse();
+ }
+ }
+
+ /**
+ * set_filter
+ * This is a play on the browse function, it's different as we expose
+ * the filters in a slightly different and vastly simpler way to the
+ * end users--so we have to do a little extra work to make them work
+ * internally.
+ */
+ public static function set_filter($filter,$value) {
+
+ if (!strlen($value)) { return false; }
+
+ switch ($filter) {
+ case 'add':
+ // Check for a range, if no range default to gt
+ if (strpos($value,'/')) {
+ $elements = explode('/',$value);
+ self::$browse->set_filter('add_lt',strtotime($elements['1']));
+ self::$browse->set_filter('add_gt',strtotime($elements['0']));
+ }
+ else {
+ self::$browse->set_filter('add_gt',strtotime($value));
+ }
+ break;
+ case 'update':
+ // Check for a range, if no range default to gt
+ if (strpos($value,'/')) {
+ $elements = explode('/',$value);
+ self::$browse->set_filter('update_lt',strtotime($elements['1']));
+ self::$browse->set_filter('update_gt',strtotime($elements['0']));
+ }
+ else {
+ self::$browse->set_filter('update_gt',strtotime($value));
+ }
+ break;
+ case 'alpha_match':
+ self::$browse->set_filter('alpha_match',$value);
+ break;
+ case 'exact_match':
+ self::$browse->set_filter('exact_match',$value);
+ break;
+ default:
+ // Rien a faire
+ break;
+ } // end filter
+
+ return true;
+
+ } // set_filter
+
+ /**
+ * handshake
+ *
+ * This is the function that handles verifying a new handshake
+ * Takes a timestamp, auth key, and username.
+ */
+ public static function handshake($input) {
+
+ $timestamp = preg_replace('/[^0-9]/', '', $input['timestamp']);
+ $passphrase = $input['auth'];
+ $ip = $_SERVER['REMOTE_ADDR'];
+ $username = $input['user'];
+ $version = $input['version'];
+
+ // Log the attempt
+ debug_event('API', "Handshake Attempt, IP:$ip User:$username Version:$version", 5);
+
+ if (intval($version) < self::$version) {
+ debug_event('API', 'Login Failed: version too old', 1);
+ Error::add('api', T_('Login Failed: version too old'));
+ return false;
+ }
+
+ // If the timestamp isn't within 30 minutes sucks to be them
+ if (($timestamp < (time() - 1800)) ||
+ ($timestamp > (time() + 1800))) {
+ debug_event('API', 'Login Failed: timestamp out of range', 1);
+ Error::add('api', T_('Login Failed: timestamp out of range'));
+ return false;
+ }
+
+ // Grab the correct userid
+ // FIXME: Does this if/else make sense with the new ACLs?
+ if (!trim($username)) {
+ $user_id = '-1';
+ }
+ else {
+ $client = User::get_from_username($username);
+ $user_id = $client->id;
+ }
+ $user_id = Dba::escape($user_id);
+
+ // Log this attempt
+ debug_event('API', "Login Attempt, IP:$ip Time: $timestamp User:$username ($user_id) Auth:$passphrase", 1);
+
+ if (Access::check_network('api', $user_id, 5, $ip)) {
+ // Now we're sure that there is an ACL line that matches
+ // this user or ALL USERS, pull the user's password and
+ // then see what we come out with
+ $sql = "SELECT * FROM `user` WHERE `id`='$user_id'";
+ $db_results = Dba::read($sql);
+
+ $row = Dba::fetch_assoc($db_results);
+
+ if (!$row['password']) {
+ debug_event('API', 'Unable to find user with userid of ' . $user_id, 1);
+ Error::add('api', T_('Invalid Username/Password'));
+ return false;
+ }
+
+ $sha1pass = hash('sha256', $timestamp . $row['password']);
+
+ if ($sha1pass === $passphrase) {
+ // Create the session
+ // FIXME: needs to be moved to the correct class
+ $data['username'] = $client->username;
+ $data['type'] = 'api';
+ $data['value'] = $timestamp;
+ $token = vauth::session_create($data);
+
+ // Insert the token into the streamer
+ Stream::insert_session($token,$client->id);
+ debug_event('API', 'Login Success, passphrase matched', 1);
+
+ // We need to also get the 'last update' of the
+ // catalog information in an RFC 2822 Format
+ $sql = "SELECT MAX(`last_update`) AS `update`,MAX(`last_add`) AS `add`, MAX(`last_clean`) AS `clean` FROM `catalog`";
+ $db_results = Dba::read($sql);
+ $row = Dba::fetch_assoc($db_results);
+
+ // Now we need to quickly get the song totals
+ $sql = 'SELECT COUNT(`id`) AS `song`, ' .
+ 'COUNT(DISTINCT(`album`)) AS `album`, '.
+ 'COUNT(DISTINCT(`artist`)) AS `artist` ' .
+ 'FROM `song`';
+ $db_results = Dba::read($sql);
+ $counts = Dba::fetch_assoc($db_results);
+
+ // Next the video counts
+ $sql = "SELECT COUNT(`id`) AS `video` FROM `video`";
+ $db_results = Dba::read($sql);
+ $vcounts = Dba::fetch_assoc($db_results);
+
+ $sql = "SELECT COUNT(`id`) AS `playlist` FROM `playlist`";
+ $db_results = Dba::read($sql);
+ $playlist = Dba::fetch_assoc($db_results);
+
+ $sql = "SELECT COUNT(`id`) AS `catalog` FROM `catalog` WHERE `catalog_type`='local'";
+ $db_results = Dba::read($sql);
+ $catalog = Dba::fetch_assoc($db_results);
+
+ echo XML_Data::keyed_array(array('auth'=>$token,
+ 'api'=>self::$version,
+ 'session_expire'=>date("c",time()+Config::get('session_length')-60),
+ 'update'=>date("c",$row['update']),
+ 'add'=>date("c",$row['add']),
+ 'clean'=>date("c",$row['clean']),
+ 'songs'=>$counts['song'],
+ 'albums'=>$counts['album'],
+ 'artists'=>$counts['artist'],
+ 'playlists'=>$playlist['playlist'],
+ 'videos'=>$vcounts['video'],
+ 'catalogs'=>$catalog['catalog']));
+ return true;
+ } // match
+
+ } // end while
+
+ debug_event('API','Login Failed, unable to match passphrase','1');
+ XML_Data::error('401', T_('Error Invalid Handshake - ') . T_('Invalid Username/Password'));
+
+ } // handshake
+
+ /**
+ * ping
+ * This can be called without being authenticated, it is useful for determining if what the status
+ * of the server is, and what version it is running/compatible with
+ */
+ public static function ping($input) {
+
+ $xmldata = array('server'=>Config::get('version'),'version'=>Api::$version,'compatible'=>'350001');
+
+ // Check and see if we should extend the api sessions (done if valid sess is passed)
+ if (vauth::session_exists('api', $input['auth'])) {
+ vauth::session_extend($input['auth']);
+ $xmldata = array_merge(array('session_expire'=>date("c",time()+Config::get('session_length')-60)),$xmldata);
+ }
+
+ debug_event('API','Ping Received from ' . $_SERVER['REMOTE_ADDR'] . ' :: ' . $input['auth'],'5');
+
+ ob_end_clean();
+ echo XML_Data::keyed_array($xmldata);
+
+ } // ping
+
+ /**
+ * artists
+ * This takes a collection of inputs and returns
+ * artist objects. This function is deprecated!
+ * //DEPRECATED
+ */
+ public static function artists($input) {
+
+ self::$browse->reset_filters();
+ self::$browse->set_type('artist');
+ self::$browse->set_sort('name','ASC');
+
+ $method = $input['exact'] ? 'exact_match' : 'alpha_match';
+ Api::set_filter($method,$input['filter']);
+ Api::set_filter('add',$input['add']);
+ Api::set_filter('update',$input['update']);
+
+ // Set the offset
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
+
+ $artists = self::$browse->get_objects();
+ // echo out the resulting xml document
+ ob_end_clean();
+ echo XML_Data::artists($artists);
+
+ } // artists
+
+ /**
+ * artist
+ * This returns a single artist based on the UID of said artist
+ * //DEPRECATED
+ */
+ public static function artist($input) {
+
+ $uid = scrub_in($input['filter']);
+ echo XML_Data::artists(array($uid));
+
+ } // artist
+
+ /**
+ * artist_albums
+ * This returns the albums of an artist
+ */
+ public static function artist_albums($input) {
+
+ $artist = new Artist($input['filter']);
+
+ $albums = $artist->get_albums();
+
+ // Set the offset
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
+ ob_end_clean();
+ echo XML_Data::albums($albums);
+
+ } // artist_albums
+
+ /**
+ * artist_songs
+ * This returns the songs of the specified artist
+ */
+ public static function artist_songs($input) {
- $artist = new Artist($input['filter']);
- $songs = $artist->get_songs();
+ $artist = new Artist($input['filter']);
+ $songs = $artist->get_songs();
- // Set the offset
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
- ob_end_clean();
- echo XML_Data::songs($songs);
+ // Set the offset
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
+ ob_end_clean();
+ echo XML_Data::songs($songs);
- } // artist_songs
+ } // artist_songs
- /**
- * albums
- * This returns albums based on the provided search filters
- */
- public static function albums($input) {
+ /**
+ * albums
+ * This returns albums based on the provided search filters
+ */
+ public static function albums($input) {
- self::$browse->reset_filters();
- self::$browse->set_type('album');
- self::$browse->set_sort('name','ASC');
- $method = $input['exact'] ? 'exact_match' : 'alpha_match';
- Api::set_filter($method,$input['filter']);
- Api::set_filter('add',$input['add']);
- Api::set_filter('update',$input['update']);
+ self::$browse->reset_filters();
+ self::$browse->set_type('album');
+ self::$browse->set_sort('name','ASC');
+ $method = $input['exact'] ? 'exact_match' : 'alpha_match';
+ Api::set_filter($method,$input['filter']);
+ Api::set_filter('add',$input['add']);
+ Api::set_filter('update',$input['update']);
- $albums = self::$browse->get_objects();
+ $albums = self::$browse->get_objects();
- // Set the offset
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
- ob_end_clean();
- echo XML_Data::albums($albums);
+ // Set the offset
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
+ ob_end_clean();
+ echo XML_Data::albums($albums);
- } // albums
+ } // albums
- /**
- * album
- * This returns a single album based on the UID provided
- */
- public static function album($input) {
+ /**
+ * album
+ * This returns a single album based on the UID provided
+ */
+ public static function album($input) {
- $uid = scrub_in($input['filter']);
- echo XML_Data::albums(array($uid));
+ $uid = scrub_in($input['filter']);
+ echo XML_Data::albums(array($uid));
- } // album
+ } // album
- /**
- * album_songs
- * This returns the songs of a specified album
- */
- public static function album_songs($input) {
+ /**
+ * album_songs
+ * This returns the songs of a specified album
+ */
+ public static function album_songs($input) {
- $album = new Album($input['filter']);
- $songs = $album->get_songs();
+ $album = new Album($input['filter']);
+ $songs = $album->get_songs();
- // Set the offset
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
+ // Set the offset
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
- ob_end_clean();
- echo XML_Data::songs($songs);
+ ob_end_clean();
+ echo XML_Data::songs($songs);
- } // album_songs
+ } // album_songs
- /**
- * tags
- * This returns the tags based on the specified filter
- */
- public static function tags($input) {
+ /**
+ * tags
+ * This returns the tags based on the specified filter
+ */
+ public static function tags($input) {
- self::$browse->reset_filters();
- self::$browse->set_type('tag');
- self::$browse->set_sort('name','ASC');
+ self::$browse->reset_filters();
+ self::$browse->set_type('tag');
+ self::$browse->set_sort('name','ASC');
- $method = $input['exact'] ? 'exact_match' : 'alpha_match';
- Api::set_filter($method,$input['filter']);
- $tags = self::$browse->get_objects();
+ $method = $input['exact'] ? 'exact_match' : 'alpha_match';
+ Api::set_filter($method,$input['filter']);
+ $tags = self::$browse->get_objects();
- // Set the offset
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
+ // Set the offset
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
- ob_end_clean();
- echo XML_Data::tags($tags);
+ ob_end_clean();
+ echo XML_Data::tags($tags);
- } // tags
+ } // tags
- /**
- * tag
- * This returns a single tag based on UID
- */
- public static function tag($input) {
+ /**
+ * tag
+ * This returns a single tag based on UID
+ */
+ public static function tag($input) {
- $uid = scrub_in($input['filter']);
- ob_end_clean();
- echo XML_Data::tags(array($uid));
+ $uid = scrub_in($input['filter']);
+ ob_end_clean();
+ echo XML_Data::tags(array($uid));
- } // tag
+ } // tag
- /**
- * tag_artists
- * This returns the artists associated with the tag in question as defined by the UID
- */
- public static function tag_artists($input) {
+ /**
+ * tag_artists
+ * This returns the artists associated with the tag in question as defined by the UID
+ */
+ public static function tag_artists($input) {
- $artists = Tag::get_tag_objects('artist',$input['filter']);
+ $artists = Tag::get_tag_objects('artist',$input['filter']);
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
- ob_end_clean();
- echo XML_Data::artists($artists);
+ ob_end_clean();
+ echo XML_Data::artists($artists);
- } // tag_artists
+ } // tag_artists
- /**
- * tag_albums
- * This returns the albums associated with the tag in question
- */
- public static function tag_albums($input) {
+ /**
+ * tag_albums
+ * This returns the albums associated with the tag in question
+ */
+ public static function tag_albums($input) {
- $albums = Tag::get_tag_objects('album',$input['filter']);
+ $albums = Tag::get_tag_objects('album',$input['filter']);
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
- ob_end_clean();
- echo XML_Data::albums($albums);
+ ob_end_clean();
+ echo XML_Data::albums($albums);
- } // tag_albums
+ } // tag_albums
- /**
- * tag_songs
- * returns the songs for this tag
- */
- public static function tag_songs($input) {
+ /**
+ * tag_songs
+ * returns the songs for this tag
+ */
+ public static function tag_songs($input) {
- $songs = Tag::get_tag_objects('song',$input['filter']);
+ $songs = Tag::get_tag_objects('song',$input['filter']);
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
- ob_end_clean();
- echo XML_Data::songs($songs);
+ ob_end_clean();
+ echo XML_Data::songs($songs);
- } // tag_songs
+ } // tag_songs
- /**
- * songs
- * Returns songs based on the specified filter
- */
- public static function songs($input) {
+ /**
+ * songs
+ * Returns songs based on the specified filter
+ */
+ public static function songs($input) {
- self::$browse->reset_filters();
- self::$browse->set_type('song');
- self::$browse->set_sort('title','ASC');
+ self::$browse->reset_filters();
+ self::$browse->set_type('song');
+ self::$browse->set_sort('title','ASC');
- $method = $input['exact'] ? 'exact_match' : 'alpha_match';
- Api::set_filter($method,$input['filter']);
- Api::set_filter('add',$input['add']);
- Api::set_filter('update',$input['update']);
+ $method = $input['exact'] ? 'exact_match' : 'alpha_match';
+ Api::set_filter($method,$input['filter']);
+ Api::set_filter('add',$input['add']);
+ Api::set_filter('update',$input['update']);
- $songs = self::$browse->get_objects();
+ $songs = self::$browse->get_objects();
- // Set the offset
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
+ // Set the offset
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
- ob_end_clean();
- echo XML_Data::songs($songs);
+ ob_end_clean();
+ echo XML_Data::songs($songs);
- } // songs
+ } // songs
- /**
- * song
- * returns a single song
- */
- public static function song($input) {
+ /**
+ * song
+ * returns a single song
+ */
+ public static function song($input) {
- $uid = scrub_in($input['filter']);
+ $uid = scrub_in($input['filter']);
- ob_end_clean();
- echo XML_Data::songs(array($uid));
+ ob_end_clean();
+ echo XML_Data::songs(array($uid));
- } // song
+ } // song
- /**
- * url_to_song
- * This takes a url and returns the song object in question
- */
- public static function url_to_song($input) {
+ /**
+ * url_to_song
+ * This takes a url and returns the song object in question
+ */
+ public static function url_to_song($input) {
- // Don't scrub, the function needs her raw and juicy
- $song_id = Song::parse_song_url($input['url']);
+ // Don't scrub, the function needs her raw and juicy
+ $song_id = Song::parse_song_url($input['url']);
- ob_end_clean();
- echo XML_Data::songs(array($song_id));
+ ob_end_clean();
+ echo XML_Data::songs(array($song_id));
- } // url_to_song
+ } // url_to_song
- /**
- * playlists
- * This returns playlists based on the specified filter
- */
- public static function playlists($input) {
+ /**
+ * playlists
+ * This returns playlists based on the specified filter
+ */
+ public static function playlists($input) {
- self::$browse->reset_filters();
- self::$browse->set_type('playlist');
- self::$browse->set_sort('name','ASC');
+ self::$browse->reset_filters();
+ self::$browse->set_type('playlist');
+ self::$browse->set_sort('name','ASC');
- $method = $input['exact'] ? 'exact_match' : 'alpha_match';
- Api::set_filter($method,$input['filter']);
+ $method = $input['exact'] ? 'exact_match' : 'alpha_match';
+ Api::set_filter($method,$input['filter']);
- $playlist_ids = self::$browse->get_objects();
+ $playlist_ids = self::$browse->get_objects();
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
- ob_end_clean();
- echo XML_Data::playlists($playlist_ids);
+ ob_end_clean();
+ echo XML_Data::playlists($playlist_ids);
- } // playlists
+ } // playlists
- /**
- * playlist
- * This returns a single playlist
- */
- public static function playlist($input) {
+ /**
+ * playlist
+ * This returns a single playlist
+ */
+ public static function playlist($input) {
- $uid = scrub_in($input['filter']);
+ $uid = scrub_in($input['filter']);
- ob_end_clean();
- echo XML_Data::playlists(array($uid));
+ ob_end_clean();
+ echo XML_Data::playlists(array($uid));
- } // playlist
+ } // playlist
- /**
- * playlist_songs
- * This returns the songs for a playlist
- */
- public static function playlist_songs($input) {
+ /**
+ * playlist_songs
+ * This returns the songs for a playlist
+ */
+ public static function playlist_songs($input) {
- $playlist = new Playlist($input['filter']);
- $items = $playlist->get_items();
+ $playlist = new Playlist($input['filter']);
+ $items = $playlist->get_items();
- foreach ($items as $object) {
- if ($object['object_type'] == 'song') {
- $songs[] = $object['object_id'];
- }
- } // end foreach
+ foreach ($items as $object) {
+ if ($object['object_type'] == 'song') {
+ $songs[] = $object['object_id'];
+ }
+ } // end foreach
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
- ob_end_clean();
- echo XML_Data::songs($songs);
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
+ ob_end_clean();
+ echo XML_Data::songs($songs);
- } // playlist_songs
+ } // playlist_songs
- /**
- * search_songs
- * This searches the songs and returns... songs
- */
- public static function search_songs($input) {
- $array['type'] = 'song';
- $array['rule_1'] = 'anywhere';
- $array['rule_1_input'] = $input['filter'];
- $array['rule_1_operator'] = 0;
+ /**
+ * search_songs
+ * This searches the songs and returns... songs
+ */
+ public static function search_songs($input) {
+ $array['type'] = 'song';
+ $array['rule_1'] = 'anywhere';
+ $array['rule_1_input'] = $input['filter'];
+ $array['rule_1_operator'] = 0;
- ob_end_clean();
+ ob_end_clean();
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
- $results = Search::run($array);
-
- echo XML_Data::songs($results);
+ $results = Search::run($array);
+
+ echo XML_Data::songs($results);
- } // search_songs
+ } // search_songs
- /**
- * videos
- * This returns video objects!
- */
- public static function videos($input) {
-
- self::$browse->reset_filters();
- self::$browse->set_type('video');
- self::$browse->set_sort('title','ASC');
-
- $method = $input['exact'] ? 'exact_match' : 'alpha_match';
- Api::set_filter($method,$input['filter']);
-
- $video_ids = self::$browse->get_objects();
-
- XML_Data::set_offset($input['offset']);
- XML_Data::set_limit($input['limit']);
-
- echo XML_Data::videos($video_ids);
-
- } // videos
-
- /**
- * video
- * This returns a single video
- */
- public static function video($input) {
-
- $video_id = scrub_in($input['filter']);
-
- echo XML_Data::videos(array($video_id));
-
-
- } // video
-
- /**
- * localplay
- * This is for controling localplay
- */
- public static function localplay($input) {
-
- // Load their localplay instance
- $localplay = new Localplay(Config::get('localplay_controller'));
- $localplay->connect();
-
- switch ($input['command']) {
- case 'next':
- case 'prev':
- case 'play':
- case 'stop':
- $result_status = $localplay->$input['command']();
- $xml_array = array('localplay'=>array('command'=>array($input['command']=>make_bool($result_status))));
- echo XML_Data::keyed_array($xml_array);
- break;
- default:
- // They are doing it wrong
- echo XML_Data::error('405', T_('Invalid Request'));
- break;
- } // end switch on command
-
- } // localplay
-
- /**
- * democratic
- * This is for controlling democratic play
- */
- public static function democratic($input) {
-
- // Load up democratic information
- $democratic = Democratic::get_current_playlist();
- $democratic->set_parent();
-
- switch ($input['method']) {
- case 'vote':
- $type = 'song';
- $media = new $type($input['oid']);
- if (!$media->id) {
- echo XML_Data::error('400', T_('Media Object Invalid or Not Specified'));
- break;
- }
- $democratic->add_vote(array(
- array(
- 'object_type' => 'song',
- 'object_id' => $media->id
- )
- ));
-
- // If everything was ok
- $xml_array = array('action'=>$input['action'],'method'=>$input['method'],'result'=>true);
- echo XML_Data::keyed_array($xml_array);
- break;
- case 'devote':
- $type = 'song';
- $media = new $type($input['oid']);
- if (!$media->id) {
- echo XML_Data::error('400', T_('Media Object Invalid or Not Specified'));
- }
-
- $uid = $democratic->get_uid_from_object_id($media->id,$type);
- $democratic->remove_vote($uid);
-
- // Everything was ok
- $xml_array = array('action'=>$input['action'],'method'=>$input['method'],'result'=>true);
- echo XML_Data::keyed_array($xml_array);
- break;
- case 'playlist':
- $objects = $democratic->get_items();
- Song::build_cache($democratic->object_ids);
- Democratic::build_vote_cache($democratic->vote_ids);
- XML_Data::democratic($objects);
- break;
- case 'play':
- $url = $democratic->play_url();
- $xml_array = array('url'=>$url);
- echo XML_Data::keyed_array($xml_array);
- break;
- default:
- echo XML_Data::error('405', T_('Invalid Request'));
- break;
- } // switch on method
-
- } // democratic
+ /**
+ * videos
+ * This returns video objects!
+ */
+ public static function videos($input) {
+
+ self::$browse->reset_filters();
+ self::$browse->set_type('video');
+ self::$browse->set_sort('title','ASC');
+
+ $method = $input['exact'] ? 'exact_match' : 'alpha_match';
+ Api::set_filter($method,$input['filter']);
+
+ $video_ids = self::$browse->get_objects();
+
+ XML_Data::set_offset($input['offset']);
+ XML_Data::set_limit($input['limit']);
+
+ echo XML_Data::videos($video_ids);
+
+ } // videos
+
+ /**
+ * video
+ * This returns a single video
+ */
+ public static function video($input) {
+
+ $video_id = scrub_in($input['filter']);
+
+ echo XML_Data::videos(array($video_id));
+
+
+ } // video
+
+ /**
+ * localplay
+ * This is for controling localplay
+ */
+ public static function localplay($input) {
+
+ // Load their localplay instance
+ $localplay = new Localplay(Config::get('localplay_controller'));
+ $localplay->connect();
+
+ switch ($input['command']) {
+ case 'next':
+ case 'prev':
+ case 'play':
+ case 'stop':
+ $result_status = $localplay->$input['command']();
+ $xml_array = array('localplay'=>array('command'=>array($input['command']=>make_bool($result_status))));
+ echo XML_Data::keyed_array($xml_array);
+ break;
+ default:
+ // They are doing it wrong
+ echo XML_Data::error('405', T_('Invalid Request'));
+ break;
+ } // end switch on command
+
+ } // localplay
+
+ /**
+ * democratic
+ * This is for controlling democratic play
+ */
+ public static function democratic($input) {
+
+ // Load up democratic information
+ $democratic = Democratic::get_current_playlist();
+ $democratic->set_parent();
+
+ switch ($input['method']) {
+ case 'vote':
+ $type = 'song';
+ $media = new $type($input['oid']);
+ if (!$media->id) {
+ echo XML_Data::error('400', T_('Media Object Invalid or Not Specified'));
+ break;
+ }
+ $democratic->add_vote(array(
+ array(
+ 'object_type' => 'song',
+ 'object_id' => $media->id
+ )
+ ));
+
+ // If everything was ok
+ $xml_array = array('action'=>$input['action'],'method'=>$input['method'],'result'=>true);
+ echo XML_Data::keyed_array($xml_array);
+ break;
+ case 'devote':
+ $type = 'song';
+ $media = new $type($input['oid']);
+ if (!$media->id) {
+ echo XML_Data::error('400', T_('Media Object Invalid or Not Specified'));
+ }
+
+ $uid = $democratic->get_uid_from_object_id($media->id,$type);
+ $democratic->remove_vote($uid);
+
+ // Everything was ok
+ $xml_array = array('action'=>$input['action'],'method'=>$input['method'],'result'=>true);
+ echo XML_Data::keyed_array($xml_array);
+ break;
+ case 'playlist':
+ $objects = $democratic->get_items();
+ Song::build_cache($democratic->object_ids);
+ Democratic::build_vote_cache($democratic->vote_ids);
+ XML_Data::democratic($objects);
+ break;
+ case 'play':
+ $url = $democratic->play_url();
+ $xml_array = array('url'=>$url);
+ echo XML_Data::keyed_array($xml_array);
+ break;
+ default:
+ echo XML_Data::error('405', T_('Invalid Request'));
+ break;
+ } // switch on method
+
+ } // democratic
} // API class
?>
diff --git a/lib/class/art.class.php b/lib/class/art.class.php
index 0e23463f58..4b896e7f82 100644
--- a/lib/class/art.class.php
+++ b/lib/class/art.class.php
@@ -1,5 +1,5 @@
type = Art::validate_type($type);
- $this->uid = $uid;
-
- } // constructor
-
- /**
- * build_cache
- * This attempts to reduce # of queries by asking for everything in the
- * browse all at once and storing it in the cache, this can help if the
- * db connection is the slow point
- */
- public static function build_cache($object_ids) {
-
- if (!is_array($object_ids) || !count($object_ids)) { return false; }
- $uidlist = '(' . implode(',', $object_ids) . ')';
- $sql = "SELECT `object_type`, `object_id`, `mime`, `size` FROM `image` WHERE `object_id` IN $uidlist";
- $db_results = Dba::read($sql);
-
- while ($row = Dba::fetch_assoc($db_results)) {
- parent::add_to_cache('art', $row['object_type'] .
- $row['object_id'] . $row['size'], $row);
- }
-
- return true;
- } // build_cache
-
-
- /**
- * _auto_init
- * Called on creation of the class
- */
- public static function _auto_init() {
- if (!isset($_SESSION['art_enabled'])) {
- $_SESSION['art_enabled'] = (Config::get('bandwidth') > 25);
- }
- self::$enabled = make_bool($_SESSION['art_enabled']);
- }
-
- /**
- * is_enabled
- * Checks whether the user currently wants art
- */
- public static function is_enabled() {
- if (self::$enabled) {
- return true;
- }
-
- return false;
- }
-
- /**
- * set_enabled
- * Changes the value of enabled
- */
- public static function set_enabled($value = null) {
- if (is_null($value)) {
- self::$enabled = self::$enabled ? false : true;
- }
- else {
- self::$enabled = make_bool($value);
- }
-
- $_SESSION['art_enabled'] = self::$enabled;
- }
-
- /**
- * validate_type
- * This validates the type
- */
- public static function validate_type($type) {
-
- switch ($type) {
- case 'album':
- case 'artist':
- case 'video':
- return $type;
- break;
- default:
- return 'album';
- break;
- }
-
- } // validate_type
-
- /**
- * extension
- * This returns the file extension for the currently loaded art
- */
- public static function extension($mime) {
-
- $data = explode("/", $mime);
- $extension = $data['1'];
-
- if ($extension == 'jpeg') { $extension = 'jpg'; }
-
- return $extension;
-
- } // extension
-
- /**
- * test_image
- * Runs some sanity checks on the putative image
- */
- public static function test_image($source) {
- if (strlen($source) < 10) {
- debug_event('Art', 'Invalid image passed', 1);
- return false;
- }
-
- // Check to make sure PHP:GD exists. If so, we can sanity check
- // the image.
- if (function_exists('ImageCreateFromString')) {
- $image = ImageCreateFromString($source);
- if (!$image || imagesx($image) < 5 || imagesy($image) < 5) {
- debug_event('Art', 'Image failed PHP-GD test',1);
- return false;
- }
- }
-
- return true;
- } //test_image
-
- /**
- * get
- * This returns the art for our current object, this can
- * look in the database and will return the thumb if it
- * exists, if it doesn't depending on settings it will try
- * to create it.
- */
- public function get($raw=false) {
-
- // Get the data either way
- if (!$this->get_db()) {
- return false;
- }
-
- if ($raw || !$this->thumb) {
- return $this->raw;
- }
- else {
- return $this->thumb;
- }
-
- } // get
-
-
- /**
- * get_db
- * This pulls the information out from the database, depending
- * on if we want to resize and if there is not a thumbnail go
- * ahead and try to resize
- */
- public function get_db() {
-
- $type = Dba::escape($this->type);
- $id = Dba::escape($this->uid);
-
- $sql = "SELECT `image`, `mime`, `size` FROM `image` WHERE `object_type`='$type' AND `object_id`='$id'";
- $db_results = Dba::read($sql);
-
- while ($results = Dba::fetch_assoc($db_results)) {
- if ($results['size'] == 'original') {
- $this->raw = $results['image'];
- $this->raw_mime = $results['mime'];
- }
- else if (Config::get('resize_images') &&
- $results['size'] == '275x275') {
- $this->thumb = $results['image'];
- $this->raw_mime = $results['mime'];
- }
- }
- // If we get nothing return false
- if (!$this->raw) { return false; }
-
- // If there is no thumb and we want thumbs
- if (!$this->thumb && Config::get('resize_images')) {
- $data = $this->generate_thumb($this->raw, array('width' => 275, 'height' => 275), $this->raw_mime);
- // If it works save it!
- if ($data) {
- $this->save_thumb($data['thumb'], $data['thumb_mime'], '275x275');
- $this->thumb = $data['thumb'];
- $this->thumb_mime = $data['thumb_mime'];
- }
- else {
- debug_event('Art','Unable to retrieve or generate thumbnail for ' . $type . '::' . $id,1);
- }
- } // if no thumb, but art and we want to resize
-
- return true;
-
- } // get_db
-
- /**
- * insert
- * This takes the string representation of an image and inserts it into
- * the database. You must also pass the mime type.
- */
- public function insert($source, $mime) {
-
- // Disabled in demo mode cause people suck and upload porn
- if (Config::get('demo_mode')) { return false; }
-
- // Check to make sure we like this image
- if (!self::test_image($source)) {
- debug_event('Art', 'Not inserting image, invalid data passed', 1);
- return false;
- }
-
- // Default to image/jpeg if they don't pass anything
- $mime = $mime ? $mime : 'image/jpeg';
-
- $image = Dba::escape($source);
- $mime = Dba::escape($mime);
- $uid = Dba::escape($this->uid);
- $type = Dba::escape($this->type);
-
- // Blow it away!
- $this->reset();
-
- // Insert it!
- $sql = "INSERT INTO `image` (`image`, `mime`, `size`, `object_type`, `object_id`) VALUES('$image', '$mime', 'original', '$type', '$uid')";
- $db_results = Dba::write($sql);
-
- return true;
-
- } // insert
-
- /**
- * reset
- * This resets the art in the database
- */
- public function reset() {
-
- $type = Dba::escape($this->type);
- $uid = Dba::escape($this->uid);
-
- $sql = "DELETE FROM `image` WHERE `object_id`='$uid' AND `object_type`='$type'";
- $db_results = Dba::write($sql);
-
- } // reset
-
- /**
- * save_thumb
- * This saves the thumbnail that we're passed
- */
- public function save_thumb($source, $mime, $size) {
-
- // Quick sanity check
- if (!self::test_image($source)) {
- debug_event('Art', 'Not inserting thumbnail, invalid data passed', 1);
- return false;
- }
-
- $source = Dba::escape($source);
- $mime = Dba::escape($mime);
- $size = Dba::escape($size);
- $uid = Dba::escape($this->uid);
- $type = Dba::escape($this->type);
-
- $sql = "DELETE FROM `image` WHERE `object_id`='$uid' AND `object_type`='$type' AND `size`='$size'";
- $db_results = Dba::write($sql);
-
- $sql = "INSERT INTO `image` (`image`, `mime`, `size`, `object_type`, `object_id`) VALUES('$source', '$mime', '$size', '$type', '$uid')";
- $db_results = Dba::write($sql);
-
- } // save_thumb
-
- /**
- * get_thumb
- * Returns the specified resized image. If the requested size doesn't
- * already exist, create and cache it.
- */
- public function get_thumb($size) {
- $sizetext = $size['width'] . 'x' . $size['height'];
- $sizetext = Dba::escape($sizetext);
- $type = Dba::escape($this->type);
- $uid = Dba::escape($this->uid);
-
- $sql = "SELECT `image`, `mime` FROM `image` WHERE `size`='$sizetext' AND `object_type`='$type' AND `object_id`='$uid'";
- $db_results = Dba::read($sql);
-
- $results = Dba::fetch_assoc($db_results);
- if (count($results)) {
- return array('thumb' => $results['image'],
- 'thumb_mime' => $results['mime']);
- }
-
- // If we didn't get a result
- $results = $this->generate_thumb($this->raw, $size, $this->raw_mime);
- if ($results) {
- $this->save_thumb($results['thumb'], $results['thumb_mime'], $sizetext);
- }
-
- return $results;
- } // get_thumb
-
- /**
- * generate_thumb
- * Automatically resizes the image for thumbnail viewing.
- * Only works on gif/jpg/png/bmp. Fails if PHP-GD isn't available
- * or lacks support for the requested image type.
- */
- public function generate_thumb($image,$size,$mime) {
-
- $data = explode("/",$mime);
- $type = strtolower($data['1']);
-
- if (!self::test_image($image)) {
- debug_event('Art', 'Not trying to generate thumbnail, invalid data passed', 1);
- return false;
- }
-
- if (!function_exists('gd_info')) {
- debug_event('Art','PHP-GD Not found - unable to resize art',1);
- return false;
- }
-
- // Check and make sure we can resize what you've asked us to
- if (($type == 'jpg' OR $type == 'jpeg') AND !(imagetypes() & IMG_JPG)) {
- debug_event('Art','PHP-GD Does not support JPGs - unable to resize',1);
- return false;
- }
- if ($type == 'png' AND !imagetypes() & IMG_PNG) {
- debug_event('Art','PHP-GD Does not support PNGs - unable to resize',1);
- return false;
- }
- if ($type == 'gif' AND !imagetypes() & IMG_GIF) {
- debug_event('Art','PHP-GD Does not support GIFs - unable to resize',1);
- return false;
- }
- if ($type == 'bmp' AND !imagetypes() & IMG_WBMP) {
- debug_event('Art','PHP-GD Does not support BMPs - unable to resize',1);
- return false;
- }
-
- $source = imagecreatefromstring($image);
-
- if (!$source) {
- debug_event('Art','Failed to create Image from string - Source Image is damaged / malformed',1);
- return false;
- }
-
- $source_size = array('height' => imagesy($source), 'width' => imagesx($source));
-
- // Create a new blank image of the correct size
- $thumbnail = imagecreatetruecolor($size['width'], $size['height']);
-
- if (!imagecopyresampled($thumbnail, $source, 0, 0, 0, 0, $size['width'], $size['height'], $source_size['width'], $source_size['height'])) {
- debug_event('Art','Unable to create resized image',1);
- return false;
- }
-
- // Start output buffer
- ob_start();
-
- // Generate the image to our OB
- switch ($type) {
- case 'jpg':
- case 'jpeg':
- imagejpeg($thumbnail, null, 75);
- $mime_type = image_type_to_mime_type(IMAGETYPE_JPEG);
- break;
- case 'gif':
- imagegif($thumbnail);
- $mime_type = image_type_to_mime_type(IMAGETYPE_GIF);
- break;
- // Turn bmps into pngs
- case 'bmp':
- $type = 'png';
- case 'png':
- imagepng($thumbnail);
- $mime_type = image_type_to_mime_type(IMAGETYPE_PNG);
- break;
- } // resized
-
- $data = ob_get_contents();
- ob_end_clean();
-
- if (!strlen($data)) {
- debug_event('Art', 'Unknown Error resizing art', 1);
- return false;
- }
-
- return array('thumb' => $data, 'thumb_mime' => $mime_type);
-
- } // generate_thumb
-
- /**
- * get_from_source
- * This gets an image for the album art from a source as
- * defined in the passed array. Because we don't know where
- * it's coming from we are a passed an array that can look like
- * ['url'] = URL *** OPTIONAL ***
- * ['file'] = FILENAME *** OPTIONAL ***
- * ['raw'] = Actual Image data, already captured
- */
- public static function get_from_source($data, $type = 'album') {
-
- // Already have the data, this often comes from id3tags
- if (isset($data['raw'])) {
- return $data['raw'];
- }
-
- // If it came from the database
- if (isset($data['db'])) {
- // Repull it
- $uid = Dba::escape($data['db']);
- $type = Dba::escape($type);
-
- $sql = "SELECT * FROM `image` WHERE `object_type`='$type' AND `object_id`='$uid' AND `size`='original'";
- $db_results = Dba::read($sql);
- $row = Dba::fetch_assoc($db_results);
- return $row['art'];
- } // came from the db
-
- // Check to see if it's a URL
- if (isset($data['url'])) {
- $snoopy = new Snoopy();
- if(Config::get('proxy_host') AND Config::get('proxy_port')) {
- $snoopy->proxy_user = Config::get('proxy_host');
- $snoopy->proxy_port = Config::get('proxy_port');
- $snoopy->proxy_user = Config::get('proxy_user');
- $snoopy->proxy_pass = Config::get('proxy_pass');
- }
- $snoopy->fetch($data['url']);
- return $snoopy->results;
- }
-
- // Check to see if it's a FILE
- if (isset($data['file'])) {
- $handle = fopen($data['file'],'rb');
- $image_data = fread($handle,filesize($data['file']));
- fclose($handle);
- return $image_data;
- }
-
- // Check to see if it is embedded in id3 of a song
- if (isset($data['song'])) {
- // If we find a good one, stop looking
- $getID3 = new getID3();
- $id3 = $getID3->analyze($data['song']);
-
- if ($id3['format_name'] == "WMA") {
- return $id3['asf']['extended_content_description_object']['content_descriptors']['13']['data'];
- }
- elseif (isset($id3['id3v2']['APIC'])) {
- // Foreach in case they have more then one
- foreach ($id3['id3v2']['APIC'] as $image) {
- return $image['data'];
- }
- }
- } // if data song
-
- return false;
-
- } // get_from_source
-
- /**
- * url
- * This returns the constructed URL for the art in question
- */
- public static function url($uid,$type,$sid=false) {
-
- $sid = $sid ? scrub_out($sid) : scrub_out(session_id());
- $type = self::validate_type($type);
-
- $key = $type . $uid;
- if (parent::is_cached('art', $key . '275x275') && Config::get('resize_images')) {
- $row = parent::get_from_cache('art', $key . '275x275');
- $mime = $row['mime'];
- }
- if (parent::is_cached('art', $key . 'original')) {
- $row = parent::get_from_cache('art', $key . 'original');
- $thumb_mime = $row['mime'];
- }
- if (!$mime && !$thumb_mime) {
-
- $type = Dba::escape($type);
- $uid = Dba::escape($uid);
-
- $sql = "SELECT `object_type`, `object_id`, `mime`, `size` FROM `image` WHERE `object_type`='$type' AND `object_id`='$uid'";
- $db_results = Dba::read($sql);
-
- while ($row = Dba::fetch_assoc($db_results)) {
- parent::add_to_cache('art', $key . $row['size'], $row);
- if ($row['size'] == 'original') {
- $mime = $row['mime'];
- }
- else if ($row['size'] == '275x275' && Config::get('resize_images')) {
- $thumb_mime = $row['mime'];
- }
- }
- }
-
- $mime = $thumb_mime ? $thumb_mime : $mime;
- $extension = self::extension($mime);
-
- $name = 'art.' . $extension;
- $url = Config::get('web_path') . '/image.php?id=' . scrub_out($uid) . '&object_type=' . scrub_out($type) . '&auth=' . $sid . '&name=' . $name;
-
- return $url;
-
- } // url
-
-
- /**
- * gc
- * This cleans up art that no longer has a corresponding object
- */
- public static function gc() {
- // iterate over our types and delete the images
- foreach (array('album', 'artist') as $type) {
- $sql = "DELETE FROM `image` USING `image` LEFT JOIN `" .
- $type . "` ON `" . $type . "`.`id`=" .
- "`image`.`object_id` WHERE `object_type`='" .
- $type . "' AND `" . $type . "`.`id` IS NULL";
- $db_results = Dba::write($sql);
- } // foreach
- }
-
- /**
- * gather
- * This tries to get the art in question
- */
- public function gather($options = array(), $limit = false) {
-
- // Define vars
- $results = array();
-
- switch ($this->type) {
- case 'album':
- $allowed_methods = array('db','lastfm','folder','amazon','google','musicbrainz','tags');
- break;
- case 'artist':
- $allowed_methods = array();
- break;
- case 'video':
- $allowed_methods = array();
- break;
- }
-
- $config = Config::get('art_order');
- $methods = get_class_methods('Art');
-
- /* If it's not set */
- if (empty($config)) {
- // They don't want art!
- debug_event('Art', 'art_order is empty, skipping art gathering', 3);
- return array();
- }
- elseif (!is_array($config)) {
- $config = array($config);
- }
-
- debug_event('Art','Searching using:' . json_encode($config), 3);
-
- foreach ($config as $method) {
-
- $data = array();
-
- if (!in_array($method, $allowed_methods)) {
- debug_event('Art', "$method not in allowed_methods, skipping", 3);
- continue;
- }
-
- $method_name = "gather_" . $method;
-
- if (in_array($method_name, $methods)) {
- debug_event('Art', "Method used: $method_name", 3);
- // Some of these take options!
- switch ($method_name) {
- case 'gather_amazon':
- $data = $this->{$method_name}($limit, $options['keyword']);
- break;
- case 'gather_lastfm':
- $data = $this->{$method_name}($limit, $options);
- break;
- default:
- $data = $this->{$method_name}($limit);
- break;
- }
-
- // Add the results we got to the current set
- $results = array_merge($results, (array)$data);
-
- if ($limit && count($results) >= $limit) {
- return array_slice($results, 0, $limit);
- }
-
- } // if the method exists
- else {
- debug_event("Art", "$method_name not defined", 1);
- }
-
- } // end foreach
-
- return $results;
-
- } // gather
-
-
- ///////////////////////////////////////////////////////////////////////
- // Art Methods
- ///////////////////////////////////////////////////////////////////////
-
- /**
- * gather_db
- * This function retrieves art that's already in the database
- */
- public function gather_db($limit = null) {
- if ($this->get_db()) {
- return array('db' => true);
- }
- return array();
- }
-
- /**
- * gather_musicbrainz
- * This function retrieves art based on MusicBrainz' Advanced
- * Relationships
- */
- public function gather_musicbrainz($limit = 5) {
- $images = array();
- $num_found = 0;
-
- if ($this->type == 'album') {
- $album = new Album($this->uid);
- }
- else {
- return $images;
- }
-
- if ($album->mbid) {
- debug_event('mbz-gatherart', "Album MBID: " . $album->mbid, '5');
- }
- else {
- return $images;
- }
-
- $mbquery = new MusicBrainzQuery();
- $includes = new mbReleaseIncludes();
- try {
- $release = $mbquery->getReleaseByID($album->mbid, $includes->urlRelations());
- } catch (Exception $e) {
- return $images;
- }
-
- $asin = $release->getAsin();
-
- if ($asin) {
- debug_event('mbz-gatherart', "Found ASIN: " . $asin, '5');
- $base_urls = array(
- "01" => "ec1.images-amazon.com",
- "02" => "ec1.images-amazon.com",
- "03" => "ec2.images-amazon.com",
- "08" => "ec1.images-amazon.com",
- "09" => "ec1.images-amazon.com",
- );
- foreach ($base_urls as $server_num => $base_url) {
- // to avoid complicating things even further, we only look for large cover art
- $url = 'http://' . $base_url . '/images/P/' . $asin . '.' . $server_num . '.LZZZZZZZ.jpg';
- debug_event('mbz-gatherart', "Evaluating Amazon URL: " . $url, '5');
- $snoopy = new Snoopy();
- if(Config::get('proxy_host') AND Config::get('proxy_port')) {
- $snoopy->proxy_user = Config::get('proxy_host');
- $snoopy->proxy_port = Config::get('proxy_port');
- $snoopy->proxy_user = Config::get('proxy_user');
- $snoopy->proxy_pass = Config::get('proxy_pass');
- }
- if ($snoopy->fetch($url)) {
- $num_found++;
- debug_event('mbz-gatherart', "Amazon URL added: " . $url, '5');
- $images[] = array(
- 'url' => $url,
- 'mime' => 'image/jpeg',
- );
- if ($num_found >= $limit) {
- return $images;
- }
- }
- }
- }
- // The next bit is based directly on the MusicBrainz server code
- // that displays cover art.
- // I'm leaving in the releaseuri info for the moment, though
- // it's not going to be used.
- $coverartsites[] = array(
- 'name' => "CD Baby",
- 'domain' => "cdbaby.com",
- 'regexp' => '@http://cdbaby\.com/cd/(\w)(\w)(\w*)@',
- 'imguri' => 'http://cdbaby.name/$matches[1]/$matches[2]/$matches[1]$matches[2]$matches[3].jpg',
- 'releaseuri' => 'http://cdbaby.com/cd/$matches[1]$matches[2]$matches[3]/from/musicbrainz',
- );
- $coverartsites[] = array(
- 'name' => "CD Baby",
- 'domain' => "cdbaby.name",
- 'regexp' => "@http://cdbaby\.name/([a-z0-9])/([a-z0-9])/([A-Za-z0-9]*).jpg@",
- 'imguri' => 'http://cdbaby.name/$matches[1]/$matches[2]/$matches[3].jpg',
- 'releaseuri' => 'http://cdbaby.com/cd/$matches[3]/from/musicbrainz',
- );
- $coverartsites[] = array(
- 'name' => 'archive.org',
- 'domain' => 'archive.org',
- 'regexp' => '/^(.*\.(jpg|jpeg|png|gif))$/',
- 'imguri' => '$matches[1]',
- 'releaseuri' => '',
- );
- $coverartsites[] = array(
- 'name' => "Jamendo",
- 'domain' => "www.jamendo.com",
- 'regexp' => '/http://www\.jamendo\.com/(\w\w/)?album/(\d+)/',
- 'imguri' => 'http://img.jamendo.com/albums/$matches[2]/covers/1.200.jpg',
- 'releaseuri' => 'http://www.jamendo.com/album/$matches[2]',
- );
- $coverartsites[] = array(
- 'name' => '8bitpeoples.com',
- 'domain' => '8bitpeoples.com',
- 'regexp' => '/^(.*)$/',
- 'imguri' => '$matches[1]',
- 'releaseuri' => '',
- );
- $coverartsites[] = array(
- 'name' => 'Encyclopédisque',
- 'domain' => 'encyclopedisque.fr',
- 'regexp' => '/http://www.encyclopedisque.fr/images/imgdb/(thumb250|main)/(\d+).jpg/',
- 'imguri' => 'http://www.encyclopedisque.fr/images/imgdb/thumb250/$matches[2].jpg',
- 'releaseuri' => 'http://www.encyclopedisque.fr/',
- );
- $coverartsites[] = array(
- 'name' => 'Thastrom',
- 'domain' => 'www.thastrom.se',
- 'regexp' => '/^(.*)$/',
- 'imguri' => '$matches[1]',
- 'releaseuri' => '',
- );
- $coverartsites[] = array(
- 'name' => 'Universal Poplab',
- 'domain' => 'www.universalpoplab.com',
- 'regexp' => '/^(.*)$/',
- 'imguri' => '$matches[1]',
- 'releaseuri' => '',
- );
- foreach ($release->getRelations(mbRelation::TO_URL) as $ar) {
- $arurl = $ar->getTargetId();
- debug_event('mbz-gatherart', "Found URL AR: " . $arurl , '5');
- foreach ($coverartsites as $casite) {
- if (strpos($arurl, $casite['domain']) !== false) {
- debug_event('mbz-gatherart', "Matched coverart site: " . $casite['name'], '5');
- if (preg_match($casite['regexp'], $arurl, $matches)) {
- $num_found++;
- eval("\$url = \"$casite[imguri]\";");
- debug_event('mbz-gatherart', "Generated URL added: " . $url, '5');
- $images[] = array(
- 'url' => $url,
- 'mime' => 'image/jpeg',
- );
- if ($num_found >= $limit) {
- return $images;
- }
- }
- }
- } // end foreach coverart sites
- } // end foreach
-
- return $images;
-
- } // gather_musicbrainz
-
- /**
- * gather_amazon
- * This takes keywords and performs a search of the Amazon website
- * for the art. It returns an array of found objects with mime/url keys
- */
- public function gather_amazon($limit = 5, $keywords = '') {
-
- $images = array();
- $final_results = array();
- $possible_keys = array(
- 'LargeImage',
- 'MediumImage',
- 'SmallImage'
- );
-
- // Prevent the script from timing out
- set_time_limit(0);
-
- if (empty($keywords)) {
- $keywords = $this->full_name;
- /* If this isn't a various album combine with artist name */
- if ($this->artist_count == '1') { $keywords .= ' ' . $this->artist_name; }
- }
-
- /* Attempt to retrieve the album art order */
- $amazon_base_urls = Config::get('amazon_base_urls');
-
- /* If it's not set */
- if (!count($amazon_base_urls)) {
- $amazon_base_urls = array('http://webservices.amazon.com');
- }
-
- /* Foreach through the base urls that we should check */
- foreach ($amazon_base_urls as $amazon_base) {
-
- // Create the Search Object
- $amazon = new AmazonSearch(Config::get('amazon_developer_public_key'), Config::get('amazon_developer_private_key'), $amazon_base);
- if(Config::get('proxy_host') AND Config::get('proxy_port')) {
- $proxyhost = Config::get('proxy_host');
- $proxyport = Config::get('proxy_port');
- $proxyuser = Config::get('proxy_user');
- $proxypass = Config::get('proxy_pass');
- debug_event('amazon', 'setProxy', 5);
- $amazon->setProxy($proxyhost, $proxyport, $proxyuser, $proxypass);
- }
-
- $search_results = array();
-
- /* Set up the needed variables */
- $max_pages_to_search = max(Config::get('max_amazon_results_pages'),$amazon->_default_results_pages);
- $pages_to_search = $max_pages_to_search; //init to max until we know better.
- // while we have pages to search
- do {
- $raw_results = $amazon->search(array('artist'=>$artist,'album'=>$albumname,'keywords'=>$keywords));
-
- $total = count($raw_results) + count($search_results);
-
- // If we've gotten more then we wanted
- if ($limit && $total > $limit) {
- $raw_results = array_slice($raw_results, 0, -($total - $limit), true);
-
- debug_event('amazon-xml', "Found $total, limit $limit; reducing and breaking from loop", 5);
- // Merge the results and BREAK!
- $search_results = array_merge($search_results,$raw_results);
- break;
- } // if limit defined
-
- $search_results = array_merge($search_results,$raw_results);
- $pages_to_search = min($max_pages_to_search, $amazon->_maxPage);
- debug_event('amazon-xml', "Searched results page " . ($amazon->_currentPage+1) . "/" . $pages_to_search,'5');
- $amazon->_currentPage++;
-
- } while ($amazon->_currentPage < $pages_to_search);
-
-
- // Only do the second search if the first actually returns something
- if (count($search_results)) {
- $final_results = $amazon->lookup($search_results);
- }
-
- /* Log this if we're doin debug */
- debug_event('amazon-xml',"Searched using $keywords with " . Config::get('amazon_developer_key') . " as key, results: " . count($final_results), 5);
-
- // If we've hit our limit
- if (!empty($limit) && count($final_results) >= $limit) {
- break;
- }
-
- } // end foreach
-
- /* Foreach through what we've found */
- foreach ($final_results as $result) {
-
- /* Recurse through the images found */
- foreach ($possible_keys as $key) {
- if (strlen($result[$key])) {
- break;
- }
- } // foreach
-
- // Rudimentary image type detection, only JPG and GIF allowed.
- if (substr($result[$key], -4 == '.jpg')) {
- $mime = "image/jpeg";
- }
- elseif (substr($result[$key], -4 == '.gif')) {
- $mime = "image/gif";
- }
- elseif (substr($result[$key], -4 == '.png')) {
- $mime = "image/png";
- }
- else {
- /* Just go to the next result */
- continue;
- }
-
- $data['url'] = $result[$key];
- $data['mime'] = $mime;
-
- $images[] = $data;
-
- if (!empty($limit)) {
- if (count($images) >= $limit) {
- return $images;
- }
- }
-
- } // if we've got something
-
- return $images;
-
- } // gather_amazon
-
- /**
- * gather_folder
- * This returns the art from the folder of the files
- * If a limit is passed or the preferred filename is found the current
- * results set is returned
- */
- public function gather_folder($limit = 5) {
-
- $media = new Album($this->uid);
- $songs = $media->get_songs();
- $results = array();
- $preferred = false;
- // For storing which directories we've already done
- $processed = array();
-
- /* See if we are looking for a specific filename */
- $preferred_filename = Config::get('album_art_preferred_filename');
-
- // Array of valid extensions
- $image_extensions = array(
- 'bmp',
- 'gif',
- 'jp2',
- 'jpeg',
- 'jpg',
- 'png'
- );
-
- foreach ($songs as $song_id) {
- $data = array();
- $song = new Song($song_id);
- $dir = dirname($song->file);
-
- if (isset($processed[$dir])) {
- continue;
- }
-
- debug_event('folder_art', "Opening $dir and checking for Album Art", 3);
-
- /* Open up the directory */
- $handle = opendir($dir);
-
- if (!$handle) {
- Error::add('general', T_('Error: Unable to open') . ' ' . $dir);
- debug_event('folder_art', "Error: Unable to open $dir for album art read", 2);
- continue;
- }
-
- $processed[$dir] = true;
-
- // Recurse through this dir and create the files array
- while ($file = readdir($handle)) {
- $extension = pathinfo($file);
- $extension = $extension['extension'];
-
- // Make sure it looks like an image file
- if (!in_array($extension, $image_extensions)) {
- continue;
- }
-
- $full_filename = $dir . '/' . $file;
-
- // Make sure it's got something in it
- if (!filesize($full_filename)) {
- debug_event('folder_art', "Empty file, rejecting $file", 5);
- continue;
- }
-
- // Regularise for mime type
- if ($extension == 'jpg') {
- $extension = 'jpeg';
- }
-
- // Take an md5sum so we don't show duplicate
- // files.
- $index = md5($full_filename);
-
- if ($file == $preferred_filename) {
- // We found the preferred filename and
- // so we're done.
- debug_event('folder_art', "Found preferred image file: $file", 5);
- $preferred[$index] = array(
- 'file' => $full_filename,
- 'mime' => 'image/' . $extension
- );
- break;
- }
-
- debug_event('folder_art', "Found image file: $file", 5);
- $results[$index] = array(
- 'file' => $full_filename,
- 'mime' => 'image/' . $extension
- );
-
- } // end while reading dir
- closedir($handle);
-
- } // end foreach songs
-
- if (is_array($preferred)) {
- // We found our favourite filename somewhere, so we need
- // to dump the other, less sexy ones.
- $results = $preferred;
- }
-
- debug_event('folder_art', 'Results: ' . json_encode($results), 5);
- if ($limit && count($results) > $limit) {
- $results = array_slice($results, 0, $limit);
- }
-
- return array_values($results);
-
- } // gather_folder
-
- /**
- * gather_tags
- * This looks for the art in the meta-tags of the file
- * itself
- */
- public function gather_tags($limit = 5) {
-
- // We need the filenames
- $album = new Album($this->uid);
-
- // grab the songs and define our results
- $songs = $album->get_songs();
- $data = array();
-
- // Foreach songs in this album
- foreach ($songs as $song_id) {
- $song = new Song($song_id);
- // If we find a good one, stop looking
- $getID3 = new getID3();
- try { $id3 = $getID3->analyze($song->file); }
- catch (Exception $error) {
- debug_event('getid3', $error->message, 1);
- }
-
- if (isset($id3['asf']['extended_content_description_object']['content_descriptors']['13'])) {
- $image = $id3['asf']['extended_content_description_object']['content_descriptors']['13'];
- $data[] = array(
- 'song' => $song->file,
- 'raw' => $image['data'],
- 'mime' => $image['mime']);
- }
-
- if (isset($id3['id3v2']['APIC'])) {
- // Foreach in case they have more then one
- foreach ($id3['id3v2']['APIC'] as $image) {
- $data[] = array(
- 'song' => $song->file,
- 'raw' => $image['data'],
- 'mime' => $image['mime']);
- }
- }
-
- if ($limit && count($data) >= $limit) {
- return array_slice($data, 0, $limit);
- }
-
- } // end foreach
-
- return $data;
-
- } // gather_tags
-
- /**
- * gather_google
- * Raw google search to retrieve the art, not very reliable
- */
- public function gather_google($limit = 5) {
-
- $images = array();
- $media = new $this->type($this->uid);
- $media->format();
-
- $search = $media->full_name;
-
- if ($media->artist_count == '1')
- $search = $media->artist_name . ', ' . $search;
-
- $search = rawurlencode($search);
-
- $size = '&imgsz=m'; // Medium
- //$size = '&imgsz=l'; // Large
-
- $html = file_get_contents("http://images.google.com/images?source=hp&q=$search&oq=&um=1&ie=UTF-8&sa=N&tab=wi&start=0&tbo=1$size");
-
- if(preg_match_all("|\ssrc\=\"(http.+?)\"|", $html, $matches, PREG_PATTERN_ORDER))
- foreach ($matches[1] as $match) {
- $extension = "image/jpeg";
-
- if (strrpos($extension, '.') !== false) $extension = substr($extension, strrpos($extension, '.') + 1);
-
- $images[] = array('url' => $match, 'mime' => $extension);
- }
-
- return $images;
-
- } // gather_google
-
- /**
- * gather_lastfm
- * This returns the art from lastfm. It doesn't currently require an
- * account but may in the future.
- */
- public function gather_lastfm($limit, $options = false) {
-
- // Create the parser object
- $lastfm = new LastFMSearch();
-
- switch ($this->type) {
- case 'album':
- if (is_array($options)) {
- $artist = $options['artist'];
- $album = $options['album_name'];
- }
- else {
- $media = new Album($this->uid);
- $media->format();
- $artist = $media->artist_name;
- $album = $media->full_name;
- }
- break;
- }
-
- if(Config::get('proxy_host') AND Config::get('proxy_port')) {
- $proxyhost = Config::get('proxy_host');
- $proxyport = Config::get('proxy_port');
- $proxyuser = Config::get('proxy_user');
- $proxypass = Config::get('proxy_pass');
- debug_event('LastFM', 'proxy set', 5);
- $lastfm->setProxy($proxyhost, $proxyport, $proxyuser, $proxypass);
- }
-
- $raw_data = $lastfm->album_search($artist, $album);
-
- if (!count($raw_data)) { return array(); }
-
- $coverart = $raw_data['coverart'];
- if (!is_array($coverart)) { return array(); }
-
- ksort($coverart);
- foreach ($coverart as $url) {
- // We need to check the URL for the /noimage/ stuff
- if (strpos($url, '/noimage/') !== false) {
- debug_event('LastFM', 'Detected as noimage, skipped ' . $url, 3);
- continue;
- }
-
- // HACK: we shouldn't rely on the extension to determine file type
- $results = pathinfo($url);
- $mime = 'image/' . $results['extension'];
- $data[] = array('url' => $url, 'mime' => $mime);
- if ($limit && count($data) >= $limit) {
- return $data;
- }
- } // end foreach
-
- return $data;
-
- } // gather_lastfm
+ public $type;
+ public $uid; // UID of the object not ID because it's not the ART.ID
+ public $raw; // Raw art data
+ public $raw_mime;
+
+ public $thumb;
+ public $thumb_mime;
+
+ private static $enabled;
+
+ /**
+ * Constructor
+ * Art constructor, takes the UID of the object and the
+ * object type.
+ */
+ public function __construct($uid, $type = 'album') {
+
+ $this->type = Art::validate_type($type);
+ $this->uid = $uid;
+
+ } // constructor
+
+ /**
+ * build_cache
+ * This attempts to reduce # of queries by asking for everything in the
+ * browse all at once and storing it in the cache, this can help if the
+ * db connection is the slow point
+ */
+ public static function build_cache($object_ids) {
+
+ if (!is_array($object_ids) || !count($object_ids)) { return false; }
+ $uidlist = '(' . implode(',', $object_ids) . ')';
+ $sql = "SELECT `object_type`, `object_id`, `mime`, `size` FROM `image` WHERE `object_id` IN $uidlist";
+ $db_results = Dba::read($sql);
+
+ while ($row = Dba::fetch_assoc($db_results)) {
+ parent::add_to_cache('art', $row['object_type'] .
+ $row['object_id'] . $row['size'], $row);
+ }
+
+ return true;
+ } // build_cache
+
+
+ /**
+ * _auto_init
+ * Called on creation of the class
+ */
+ public static function _auto_init() {
+ if (!isset($_SESSION['art_enabled'])) {
+ $_SESSION['art_enabled'] = (Config::get('bandwidth') > 25);
+ }
+ self::$enabled = make_bool($_SESSION['art_enabled']);
+ }
+
+ /**
+ * is_enabled
+ * Checks whether the user currently wants art
+ */
+ public static function is_enabled() {
+ if (self::$enabled) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * set_enabled
+ * Changes the value of enabled
+ */
+ public static function set_enabled($value = null) {
+ if (is_null($value)) {
+ self::$enabled = self::$enabled ? false : true;
+ }
+ else {
+ self::$enabled = make_bool($value);
+ }
+
+ $_SESSION['art_enabled'] = self::$enabled;
+ }
+
+ /**
+ * validate_type
+ * This validates the type
+ */
+ public static function validate_type($type) {
+
+ switch ($type) {
+ case 'album':
+ case 'artist':
+ case 'video':
+ return $type;
+ break;
+ default:
+ return 'album';
+ break;
+ }
+
+ } // validate_type
+
+ /**
+ * extension
+ * This returns the file extension for the currently loaded art
+ */
+ public static function extension($mime) {
+
+ $data = explode("/", $mime);
+ $extension = $data['1'];
+
+ if ($extension == 'jpeg') { $extension = 'jpg'; }
+
+ return $extension;
+
+ } // extension
+
+ /**
+ * test_image
+ * Runs some sanity checks on the putative image
+ */
+ public static function test_image($source) {
+ if (strlen($source) < 10) {
+ debug_event('Art', 'Invalid image passed', 1);
+ return false;
+ }
+
+ // Check to make sure PHP:GD exists. If so, we can sanity check
+ // the image.
+ if (function_exists('ImageCreateFromString')) {
+ $image = ImageCreateFromString($source);
+ if (!$image || imagesx($image) < 5 || imagesy($image) < 5) {
+ debug_event('Art', 'Image failed PHP-GD test',1);
+ return false;
+ }
+ }
+
+ return true;
+ } //test_image
+
+ /**
+ * get
+ * This returns the art for our current object, this can
+ * look in the database and will return the thumb if it
+ * exists, if it doesn't depending on settings it will try
+ * to create it.
+ */
+ public function get($raw=false) {
+
+ // Get the data either way
+ if (!$this->get_db()) {
+ return false;
+ }
+
+ if ($raw || !$this->thumb) {
+ return $this->raw;
+ }
+ else {
+ return $this->thumb;
+ }
+
+ } // get
+
+
+ /**
+ * get_db
+ * This pulls the information out from the database, depending
+ * on if we want to resize and if there is not a thumbnail go
+ * ahead and try to resize
+ */
+ public function get_db() {
+
+ $type = Dba::escape($this->type);
+ $id = Dba::escape($this->uid);
+
+ $sql = "SELECT `image`, `mime`, `size` FROM `image` WHERE `object_type`='$type' AND `object_id`='$id'";
+ $db_results = Dba::read($sql);
+
+ while ($results = Dba::fetch_assoc($db_results)) {
+ if ($results['size'] == 'original') {
+ $this->raw = $results['image'];
+ $this->raw_mime = $results['mime'];
+ }
+ else if (Config::get('resize_images') &&
+ $results['size'] == '275x275') {
+ $this->thumb = $results['image'];
+ $this->raw_mime = $results['mime'];
+ }
+ }
+ // If we get nothing return false
+ if (!$this->raw) { return false; }
+
+ // If there is no thumb and we want thumbs
+ if (!$this->thumb && Config::get('resize_images')) {
+ $data = $this->generate_thumb($this->raw, array('width' => 275, 'height' => 275), $this->raw_mime);
+ // If it works save it!
+ if ($data) {
+ $this->save_thumb($data['thumb'], $data['thumb_mime'], '275x275');
+ $this->thumb = $data['thumb'];
+ $this->thumb_mime = $data['thumb_mime'];
+ }
+ else {
+ debug_event('Art','Unable to retrieve or generate thumbnail for ' . $type . '::' . $id,1);
+ }
+ } // if no thumb, but art and we want to resize
+
+ return true;
+
+ } // get_db
+
+ /**
+ * insert
+ * This takes the string representation of an image and inserts it into
+ * the database. You must also pass the mime type.
+ */
+ public function insert($source, $mime) {
+
+ // Disabled in demo mode cause people suck and upload porn
+ if (Config::get('demo_mode')) { return false; }
+
+ // Check to make sure we like this image
+ if (!self::test_image($source)) {
+ debug_event('Art', 'Not inserting image, invalid data passed', 1);
+ return false;
+ }
+
+ // Default to image/jpeg if they don't pass anything
+ $mime = $mime ? $mime : 'image/jpeg';
+
+ $image = Dba::escape($source);
+ $mime = Dba::escape($mime);
+ $uid = Dba::escape($this->uid);
+ $type = Dba::escape($this->type);
+
+ // Blow it away!
+ $this->reset();
+
+ // Insert it!
+ $sql = "INSERT INTO `image` (`image`, `mime`, `size`, `object_type`, `object_id`) VALUES('$image', '$mime', 'original', '$type', '$uid')";
+ $db_results = Dba::write($sql);
+
+ return true;
+
+ } // insert
+
+ /**
+ * reset
+ * This resets the art in the database
+ */
+ public function reset() {
+
+ $type = Dba::escape($this->type);
+ $uid = Dba::escape($this->uid);
+
+ $sql = "DELETE FROM `image` WHERE `object_id`='$uid' AND `object_type`='$type'";
+ $db_results = Dba::write($sql);
+
+ } // reset
+
+ /**
+ * save_thumb
+ * This saves the thumbnail that we're passed
+ */
+ public function save_thumb($source, $mime, $size) {
+
+ // Quick sanity check
+ if (!self::test_image($source)) {
+ debug_event('Art', 'Not inserting thumbnail, invalid data passed', 1);
+ return false;
+ }
+
+ $source = Dba::escape($source);
+ $mime = Dba::escape($mime);
+ $size = Dba::escape($size);
+ $uid = Dba::escape($this->uid);
+ $type = Dba::escape($this->type);
+
+ $sql = "DELETE FROM `image` WHERE `object_id`='$uid' AND `object_type`='$type' AND `size`='$size'";
+ $db_results = Dba::write($sql);
+
+ $sql = "INSERT INTO `image` (`image`, `mime`, `size`, `object_type`, `object_id`) VALUES('$source', '$mime', '$size', '$type', '$uid')";
+ $db_results = Dba::write($sql);
+
+ } // save_thumb
+
+ /**
+ * get_thumb
+ * Returns the specified resized image. If the requested size doesn't
+ * already exist, create and cache it.
+ */
+ public function get_thumb($size) {
+ $sizetext = $size['width'] . 'x' . $size['height'];
+ $sizetext = Dba::escape($sizetext);
+ $type = Dba::escape($this->type);
+ $uid = Dba::escape($this->uid);
+
+ $sql = "SELECT `image`, `mime` FROM `image` WHERE `size`='$sizetext' AND `object_type`='$type' AND `object_id`='$uid'";
+ $db_results = Dba::read($sql);
+
+ $results = Dba::fetch_assoc($db_results);
+ if (count($results)) {
+ return array('thumb' => $results['image'],
+ 'thumb_mime' => $results['mime']);
+ }
+
+ // If we didn't get a result
+ $results = $this->generate_thumb($this->raw, $size, $this->raw_mime);
+ if ($results) {
+ $this->save_thumb($results['thumb'], $results['thumb_mime'], $sizetext);
+ }
+
+ return $results;
+ } // get_thumb
+
+ /**
+ * generate_thumb
+ * Automatically resizes the image for thumbnail viewing.
+ * Only works on gif/jpg/png/bmp. Fails if PHP-GD isn't available
+ * or lacks support for the requested image type.
+ */
+ public function generate_thumb($image,$size,$mime) {
+
+ $data = explode("/",$mime);
+ $type = strtolower($data['1']);
+
+ if (!self::test_image($image)) {
+ debug_event('Art', 'Not trying to generate thumbnail, invalid data passed', 1);
+ return false;
+ }
+
+ if (!function_exists('gd_info')) {
+ debug_event('Art','PHP-GD Not found - unable to resize art',1);
+ return false;
+ }
+
+ // Check and make sure we can resize what you've asked us to
+ if (($type == 'jpg' OR $type == 'jpeg') AND !(imagetypes() & IMG_JPG)) {
+ debug_event('Art','PHP-GD Does not support JPGs - unable to resize',1);
+ return false;
+ }
+ if ($type == 'png' AND !imagetypes() & IMG_PNG) {
+ debug_event('Art','PHP-GD Does not support PNGs - unable to resize',1);
+ return false;
+ }
+ if ($type == 'gif' AND !imagetypes() & IMG_GIF) {
+ debug_event('Art','PHP-GD Does not support GIFs - unable to resize',1);
+ return false;
+ }
+ if ($type == 'bmp' AND !imagetypes() & IMG_WBMP) {
+ debug_event('Art','PHP-GD Does not support BMPs - unable to resize',1);
+ return false;
+ }
+
+ $source = imagecreatefromstring($image);
+
+ if (!$source) {
+ debug_event('Art','Failed to create Image from string - Source Image is damaged / malformed',1);
+ return false;
+ }
+
+ $source_size = array('height' => imagesy($source), 'width' => imagesx($source));
+
+ // Create a new blank image of the correct size
+ $thumbnail = imagecreatetruecolor($size['width'], $size['height']);
+
+ if (!imagecopyresampled($thumbnail, $source, 0, 0, 0, 0, $size['width'], $size['height'], $source_size['width'], $source_size['height'])) {
+ debug_event('Art','Unable to create resized image',1);
+ return false;
+ }
+
+ // Start output buffer
+ ob_start();
+
+ // Generate the image to our OB
+ switch ($type) {
+ case 'jpg':
+ case 'jpeg':
+ imagejpeg($thumbnail, null, 75);
+ $mime_type = image_type_to_mime_type(IMAGETYPE_JPEG);
+ break;
+ case 'gif':
+ imagegif($thumbnail);
+ $mime_type = image_type_to_mime_type(IMAGETYPE_GIF);
+ break;
+ // Turn bmps into pngs
+ case 'bmp':
+ $type = 'png';
+ case 'png':
+ imagepng($thumbnail);
+ $mime_type = image_type_to_mime_type(IMAGETYPE_PNG);
+ break;
+ } // resized
+
+ $data = ob_get_contents();
+ ob_end_clean();
+
+ if (!strlen($data)) {
+ debug_event('Art', 'Unknown Error resizing art', 1);
+ return false;
+ }
+
+ return array('thumb' => $data, 'thumb_mime' => $mime_type);
+
+ } // generate_thumb
+
+ /**
+ * get_from_source
+ * This gets an image for the album art from a source as
+ * defined in the passed array. Because we don't know where
+ * it's coming from we are a passed an array that can look like
+ * ['url'] = URL *** OPTIONAL ***
+ * ['file'] = FILENAME *** OPTIONAL ***
+ * ['raw'] = Actual Image data, already captured
+ */
+ public static function get_from_source($data, $type = 'album') {
+
+ // Already have the data, this often comes from id3tags
+ if (isset($data['raw'])) {
+ return $data['raw'];
+ }
+
+ // If it came from the database
+ if (isset($data['db'])) {
+ // Repull it
+ $uid = Dba::escape($data['db']);
+ $type = Dba::escape($type);
+
+ $sql = "SELECT * FROM `image` WHERE `object_type`='$type' AND `object_id`='$uid' AND `size`='original'";
+ $db_results = Dba::read($sql);
+ $row = Dba::fetch_assoc($db_results);
+ return $row['art'];
+ } // came from the db
+
+ // Check to see if it's a URL
+ if (isset($data['url'])) {
+ $snoopy = new Snoopy();
+ if(Config::get('proxy_host') AND Config::get('proxy_port')) {
+ $snoopy->proxy_user = Config::get('proxy_host');
+ $snoopy->proxy_port = Config::get('proxy_port');
+ $snoopy->proxy_user = Config::get('proxy_user');
+ $snoopy->proxy_pass = Config::get('proxy_pass');
+ }
+ $snoopy->fetch($data['url']);
+ return $snoopy->results;
+ }
+
+ // Check to see if it's a FILE
+ if (isset($data['file'])) {
+ $handle = fopen($data['file'],'rb');
+ $image_data = fread($handle,filesize($data['file']));
+ fclose($handle);
+ return $image_data;
+ }
+
+ // Check to see if it is embedded in id3 of a song
+ if (isset($data['song'])) {
+ // If we find a good one, stop looking
+ $getID3 = new getID3();
+ $id3 = $getID3->analyze($data['song']);
+
+ if ($id3['format_name'] == "WMA") {
+ return $id3['asf']['extended_content_description_object']['content_descriptors']['13']['data'];
+ }
+ elseif (isset($id3['id3v2']['APIC'])) {
+ // Foreach in case they have more then one
+ foreach ($id3['id3v2']['APIC'] as $image) {
+ return $image['data'];
+ }
+ }
+ } // if data song
+
+ return false;
+
+ } // get_from_source
+
+ /**
+ * url
+ * This returns the constructed URL for the art in question
+ */
+ public static function url($uid,$type,$sid=false) {
+
+ $sid = $sid ? scrub_out($sid) : scrub_out(session_id());
+ $type = self::validate_type($type);
+
+ $key = $type . $uid;
+ if (parent::is_cached('art', $key . '275x275') && Config::get('resize_images')) {
+ $row = parent::get_from_cache('art', $key . '275x275');
+ $mime = $row['mime'];
+ }
+ if (parent::is_cached('art', $key . 'original')) {
+ $row = parent::get_from_cache('art', $key . 'original');
+ $thumb_mime = $row['mime'];
+ }
+ if (!$mime && !$thumb_mime) {
+
+ $type = Dba::escape($type);
+ $uid = Dba::escape($uid);
+
+ $sql = "SELECT `object_type`, `object_id`, `mime`, `size` FROM `image` WHERE `object_type`='$type' AND `object_id`='$uid'";
+ $db_results = Dba::read($sql);
+
+ while ($row = Dba::fetch_assoc($db_results)) {
+ parent::add_to_cache('art', $key . $row['size'], $row);
+ if ($row['size'] == 'original') {
+ $mime = $row['mime'];
+ }
+ else if ($row['size'] == '275x275' && Config::get('resize_images')) {
+ $thumb_mime = $row['mime'];
+ }
+ }
+ }
+
+ $mime = $thumb_mime ? $thumb_mime : $mime;
+ $extension = self::extension($mime);
+
+ $name = 'art.' . $extension;
+ $url = Config::get('web_path') . '/image.php?id=' . scrub_out($uid) . '&object_type=' . scrub_out($type) . '&auth=' . $sid . '&name=' . $name;
+
+ return $url;
+
+ } // url
+
+
+ /**
+ * gc
+ * This cleans up art that no longer has a corresponding object
+ */
+ public static function gc() {
+ // iterate over our types and delete the images
+ foreach (array('album', 'artist') as $type) {
+ $sql = "DELETE FROM `image` USING `image` LEFT JOIN `" .
+ $type . "` ON `" . $type . "`.`id`=" .
+ "`image`.`object_id` WHERE `object_type`='" .
+ $type . "' AND `" . $type . "`.`id` IS NULL";
+ $db_results = Dba::write($sql);
+ } // foreach
+ }
+
+ /**
+ * gather
+ * This tries to get the art in question
+ */
+ public function gather($options = array(), $limit = false) {
+
+ // Define vars
+ $results = array();
+
+ switch ($this->type) {
+ case 'album':
+ $allowed_methods = array('db','lastfm','folder','amazon','google','musicbrainz','tags');
+ break;
+ case 'artist':
+ $allowed_methods = array();
+ break;
+ case 'video':
+ $allowed_methods = array();
+ break;
+ }
+
+ $config = Config::get('art_order');
+ $methods = get_class_methods('Art');
+
+ /* If it's not set */
+ if (empty($config)) {
+ // They don't want art!
+ debug_event('Art', 'art_order is empty, skipping art gathering', 3);
+ return array();
+ }
+ elseif (!is_array($config)) {
+ $config = array($config);
+ }
+
+ debug_event('Art','Searching using:' . json_encode($config), 3);
+
+ foreach ($config as $method) {
+
+ $data = array();
+
+ if (!in_array($method, $allowed_methods)) {
+ debug_event('Art', "$method not in allowed_methods, skipping", 3);
+ continue;
+ }
+
+ $method_name = "gather_" . $method;
+
+ if (in_array($method_name, $methods)) {
+ debug_event('Art', "Method used: $method_name", 3);
+ // Some of these take options!
+ switch ($method_name) {
+ case 'gather_amazon':
+ $data = $this->{$method_name}($limit, $options['keyword']);
+ break;
+ case 'gather_lastfm':
+ $data = $this->{$method_name}($limit, $options);
+ break;
+ default:
+ $data = $this->{$method_name}($limit);
+ break;
+ }
+
+ // Add the results we got to the current set
+ $results = array_merge($results, (array)$data);
+
+ if ($limit && count($results) >= $limit) {
+ return array_slice($results, 0, $limit);
+ }
+
+ } // if the method exists
+ else {
+ debug_event("Art", "$method_name not defined", 1);
+ }
+
+ } // end foreach
+
+ return $results;
+
+ } // gather
+
+
+ ///////////////////////////////////////////////////////////////////////
+ // Art Methods
+ ///////////////////////////////////////////////////////////////////////
+
+ /**
+ * gather_db
+ * This function retrieves art that's already in the database
+ */
+ public function gather_db($limit = null) {
+ if ($this->get_db()) {
+ return array('db' => true);
+ }
+ return array();
+ }
+
+ /**
+ * gather_musicbrainz
+ * This function retrieves art based on MusicBrainz' Advanced
+ * Relationships
+ */
+ public function gather_musicbrainz($limit = 5) {
+ $images = array();
+ $num_found = 0;
+
+ if ($this->type == 'album') {
+ $album = new Album($this->uid);
+ }
+ else {
+ return $images;
+ }
+
+ if ($album->mbid) {
+ debug_event('mbz-gatherart', "Album MBID: " . $album->mbid, '5');
+ }
+ else {
+ return $images;
+ }
+
+ $mbquery = new MusicBrainzQuery();
+ $includes = new mbReleaseIncludes();
+ try {
+ $release = $mbquery->getReleaseByID($album->mbid, $includes->urlRelations());
+ } catch (Exception $e) {
+ return $images;
+ }
+
+ $asin = $release->getAsin();
+
+ if ($asin) {
+ debug_event('mbz-gatherart', "Found ASIN: " . $asin, '5');
+ $base_urls = array(
+ "01" => "ec1.images-amazon.com",
+ "02" => "ec1.images-amazon.com",
+ "03" => "ec2.images-amazon.com",
+ "08" => "ec1.images-amazon.com",
+ "09" => "ec1.images-amazon.com",
+ );
+ foreach ($base_urls as $server_num => $base_url) {
+ // to avoid complicating things even further, we only look for large cover art
+ $url = 'http://' . $base_url . '/images/P/' . $asin . '.' . $server_num . '.LZZZZZZZ.jpg';
+ debug_event('mbz-gatherart', "Evaluating Amazon URL: " . $url, '5');
+ $snoopy = new Snoopy();
+ if(Config::get('proxy_host') AND Config::get('proxy_port')) {
+ $snoopy->proxy_user = Config::get('proxy_host');
+ $snoopy->proxy_port = Config::get('proxy_port');
+ $snoopy->proxy_user = Config::get('proxy_user');
+ $snoopy->proxy_pass = Config::get('proxy_pass');
+ }
+ if ($snoopy->fetch($url)) {
+ $num_found++;
+ debug_event('mbz-gatherart', "Amazon URL added: " . $url, '5');
+ $images[] = array(
+ 'url' => $url,
+ 'mime' => 'image/jpeg',
+ );
+ if ($num_found >= $limit) {
+ return $images;
+ }
+ }
+ }
+ }
+ // The next bit is based directly on the MusicBrainz server code
+ // that displays cover art.
+ // I'm leaving in the releaseuri info for the moment, though
+ // it's not going to be used.
+ $coverartsites[] = array(
+ 'name' => "CD Baby",
+ 'domain' => "cdbaby.com",
+ 'regexp' => '@http://cdbaby\.com/cd/(\w)(\w)(\w*)@',
+ 'imguri' => 'http://cdbaby.name/$matches[1]/$matches[2]/$matches[1]$matches[2]$matches[3].jpg',
+ 'releaseuri' => 'http://cdbaby.com/cd/$matches[1]$matches[2]$matches[3]/from/musicbrainz',
+ );
+ $coverartsites[] = array(
+ 'name' => "CD Baby",
+ 'domain' => "cdbaby.name",
+ 'regexp' => "@http://cdbaby\.name/([a-z0-9])/([a-z0-9])/([A-Za-z0-9]*).jpg@",
+ 'imguri' => 'http://cdbaby.name/$matches[1]/$matches[2]/$matches[3].jpg',
+ 'releaseuri' => 'http://cdbaby.com/cd/$matches[3]/from/musicbrainz',
+ );
+ $coverartsites[] = array(
+ 'name' => 'archive.org',
+ 'domain' => 'archive.org',
+ 'regexp' => '/^(.*\.(jpg|jpeg|png|gif))$/',
+ 'imguri' => '$matches[1]',
+ 'releaseuri' => '',
+ );
+ $coverartsites[] = array(
+ 'name' => "Jamendo",
+ 'domain' => "www.jamendo.com",
+ 'regexp' => '/http://www\.jamendo\.com/(\w\w/)?album/(\d+)/',
+ 'imguri' => 'http://img.jamendo.com/albums/$matches[2]/covers/1.200.jpg',
+ 'releaseuri' => 'http://www.jamendo.com/album/$matches[2]',
+ );
+ $coverartsites[] = array(
+ 'name' => '8bitpeoples.com',
+ 'domain' => '8bitpeoples.com',
+ 'regexp' => '/^(.*)$/',
+ 'imguri' => '$matches[1]',
+ 'releaseuri' => '',
+ );
+ $coverartsites[] = array(
+ 'name' => 'Encyclopédisque',
+ 'domain' => 'encyclopedisque.fr',
+ 'regexp' => '/http://www.encyclopedisque.fr/images/imgdb/(thumb250|main)/(\d+).jpg/',
+ 'imguri' => 'http://www.encyclopedisque.fr/images/imgdb/thumb250/$matches[2].jpg',
+ 'releaseuri' => 'http://www.encyclopedisque.fr/',
+ );
+ $coverartsites[] = array(
+ 'name' => 'Thastrom',
+ 'domain' => 'www.thastrom.se',
+ 'regexp' => '/^(.*)$/',
+ 'imguri' => '$matches[1]',
+ 'releaseuri' => '',
+ );
+ $coverartsites[] = array(
+ 'name' => 'Universal Poplab',
+ 'domain' => 'www.universalpoplab.com',
+ 'regexp' => '/^(.*)$/',
+ 'imguri' => '$matches[1]',
+ 'releaseuri' => '',
+ );
+ foreach ($release->getRelations(mbRelation::TO_URL) as $ar) {
+ $arurl = $ar->getTargetId();
+ debug_event('mbz-gatherart', "Found URL AR: " . $arurl , '5');
+ foreach ($coverartsites as $casite) {
+ if (strpos($arurl, $casite['domain']) !== false) {
+ debug_event('mbz-gatherart', "Matched coverart site: " . $casite['name'], '5');
+ if (preg_match($casite['regexp'], $arurl, $matches)) {
+ $num_found++;
+ eval("\$url = \"$casite[imguri]\";");
+ debug_event('mbz-gatherart', "Generated URL added: " . $url, '5');
+ $images[] = array(
+ 'url' => $url,
+ 'mime' => 'image/jpeg',
+ );
+ if ($num_found >= $limit) {
+ return $images;
+ }
+ }
+ }
+ } // end foreach coverart sites
+ } // end foreach
+
+ return $images;
+
+ } // gather_musicbrainz
+
+ /**
+ * gather_amazon
+ * This takes keywords and performs a search of the Amazon website
+ * for the art. It returns an array of found objects with mime/url keys
+ */
+ public function gather_amazon($limit = 5, $keywords = '') {
+
+ $images = array();
+ $final_results = array();
+ $possible_keys = array(
+ 'LargeImage',
+ 'MediumImage',
+ 'SmallImage'
+ );
+
+ // Prevent the script from timing out
+ set_time_limit(0);
+
+ if (empty($keywords)) {
+ $keywords = $this->full_name;
+ /* If this isn't a various album combine with artist name */
+ if ($this->artist_count == '1') { $keywords .= ' ' . $this->artist_name; }
+ }
+
+ /* Attempt to retrieve the album art order */
+ $amazon_base_urls = Config::get('amazon_base_urls');
+
+ /* If it's not set */
+ if (!count($amazon_base_urls)) {
+ $amazon_base_urls = array('http://webservices.amazon.com');
+ }
+
+ /* Foreach through the base urls that we should check */
+ foreach ($amazon_base_urls as $amazon_base) {
+
+ // Create the Search Object
+ $amazon = new AmazonSearch(Config::get('amazon_developer_public_key'), Config::get('amazon_developer_private_key'), $amazon_base);
+ if(Config::get('proxy_host') AND Config::get('proxy_port')) {
+ $proxyhost = Config::get('proxy_host');
+ $proxyport = Config::get('proxy_port');
+ $proxyuser = Config::get('proxy_user');
+ $proxypass = Config::get('proxy_pass');
+ debug_event('amazon', 'setProxy', 5);
+ $amazon->setProxy($proxyhost, $proxyport, $proxyuser, $proxypass);
+ }
+
+ $search_results = array();
+
+ /* Set up the needed variables */
+ $max_pages_to_search = max(Config::get('max_amazon_results_pages'),$amazon->_default_results_pages);
+ $pages_to_search = $max_pages_to_search; //init to max until we know better.
+ // while we have pages to search
+ do {
+ $raw_results = $amazon->search(array('artist'=>$artist,'album'=>$albumname,'keywords'=>$keywords));
+
+ $total = count($raw_results) + count($search_results);
+
+ // If we've gotten more then we wanted
+ if ($limit && $total > $limit) {
+ $raw_results = array_slice($raw_results, 0, -($total - $limit), true);
+
+ debug_event('amazon-xml', "Found $total, limit $limit; reducing and breaking from loop", 5);
+ // Merge the results and BREAK!
+ $search_results = array_merge($search_results,$raw_results);
+ break;
+ } // if limit defined
+
+ $search_results = array_merge($search_results,$raw_results);
+ $pages_to_search = min($max_pages_to_search, $amazon->_maxPage);
+ debug_event('amazon-xml', "Searched results page " . ($amazon->_currentPage+1) . "/" . $pages_to_search,'5');
+ $amazon->_currentPage++;
+
+ } while ($amazon->_currentPage < $pages_to_search);
+
+
+ // Only do the second search if the first actually returns something
+ if (count($search_results)) {
+ $final_results = $amazon->lookup($search_results);
+ }
+
+ /* Log this if we're doin debug */
+ debug_event('amazon-xml',"Searched using $keywords with " . Config::get('amazon_developer_key') . " as key, results: " . count($final_results), 5);
+
+ // If we've hit our limit
+ if (!empty($limit) && count($final_results) >= $limit) {
+ break;
+ }
+
+ } // end foreach
+
+ /* Foreach through what we've found */
+ foreach ($final_results as $result) {
+
+ /* Recurse through the images found */
+ foreach ($possible_keys as $key) {
+ if (strlen($result[$key])) {
+ break;
+ }
+ } // foreach
+
+ // Rudimentary image type detection, only JPG and GIF allowed.
+ if (substr($result[$key], -4 == '.jpg')) {
+ $mime = "image/jpeg";
+ }
+ elseif (substr($result[$key], -4 == '.gif')) {
+ $mime = "image/gif";
+ }
+ elseif (substr($result[$key], -4 == '.png')) {
+ $mime = "image/png";
+ }
+ else {
+ /* Just go to the next result */
+ continue;
+ }
+
+ $data['url'] = $result[$key];
+ $data['mime'] = $mime;
+
+ $images[] = $data;
+
+ if (!empty($limit)) {
+ if (count($images) >= $limit) {
+ return $images;
+ }
+ }
+
+ } // if we've got something
+
+ return $images;
+
+ } // gather_amazon
+
+ /**
+ * gather_folder
+ * This returns the art from the folder of the files
+ * If a limit is passed or the preferred filename is found the current
+ * results set is returned
+ */
+ public function gather_folder($limit = 5) {
+
+ $media = new Album($this->uid);
+ $songs = $media->get_songs();
+ $results = array();
+ $preferred = false;
+ // For storing which directories we've already done
+ $processed = array();
+
+ /* See if we are looking for a specific filename */
+ $preferred_filename = Config::get('album_art_preferred_filename');
+
+ // Array of valid extensions
+ $image_extensions = array(
+ 'bmp',
+ 'gif',
+ 'jp2',
+ 'jpeg',
+ 'jpg',
+ 'png'
+ );
+
+ foreach ($songs as $song_id) {
+ $data = array();
+ $song = new Song($song_id);
+ $dir = dirname($song->file);
+
+ if (isset($processed[$dir])) {
+ continue;
+ }
+
+ debug_event('folder_art', "Opening $dir and checking for Album Art", 3);
+
+ /* Open up the directory */
+ $handle = opendir($dir);
+
+ if (!$handle) {
+ Error::add('general', T_('Error: Unable to open') . ' ' . $dir);
+ debug_event('folder_art', "Error: Unable to open $dir for album art read", 2);
+ continue;
+ }
+
+ $processed[$dir] = true;
+
+ // Recurse through this dir and create the files array
+ while ($file = readdir($handle)) {
+ $extension = pathinfo($file);
+ $extension = $extension['extension'];
+
+ // Make sure it looks like an image file
+ if (!in_array($extension, $image_extensions)) {
+ continue;
+ }
+
+ $full_filename = $dir . '/' . $file;
+
+ // Make sure it's got something in it
+ if (!filesize($full_filename)) {
+ debug_event('folder_art', "Empty file, rejecting $file", 5);
+ continue;
+ }
+
+ // Regularise for mime type
+ if ($extension == 'jpg') {
+ $extension = 'jpeg';
+ }
+
+ // Take an md5sum so we don't show duplicate
+ // files.
+ $index = md5($full_filename);
+
+ if ($file == $preferred_filename) {
+ // We found the preferred filename and
+ // so we're done.
+ debug_event('folder_art', "Found preferred image file: $file", 5);
+ $preferred[$index] = array(
+ 'file' => $full_filename,
+ 'mime' => 'image/' . $extension
+ );
+ break;
+ }
+
+ debug_event('folder_art', "Found image file: $file", 5);
+ $results[$index] = array(
+ 'file' => $full_filename,
+ 'mime' => 'image/' . $extension
+ );
+
+ } // end while reading dir
+ closedir($handle);
+
+ } // end foreach songs
+
+ if (is_array($preferred)) {
+ // We found our favourite filename somewhere, so we need
+ // to dump the other, less sexy ones.
+ $results = $preferred;
+ }
+
+ debug_event('folder_art', 'Results: ' . json_encode($results), 5);
+ if ($limit && count($results) > $limit) {
+ $results = array_slice($results, 0, $limit);
+ }
+
+ return array_values($results);
+
+ } // gather_folder
+
+ /**
+ * gather_tags
+ * This looks for the art in the meta-tags of the file
+ * itself
+ */
+ public function gather_tags($limit = 5) {
+
+ // We need the filenames
+ $album = new Album($this->uid);
+
+ // grab the songs and define our results
+ $songs = $album->get_songs();
+ $data = array();
+
+ // Foreach songs in this album
+ foreach ($songs as $song_id) {
+ $song = new Song($song_id);
+ // If we find a good one, stop looking
+ $getID3 = new getID3();
+ try { $id3 = $getID3->analyze($song->file); }
+ catch (Exception $error) {
+ debug_event('getid3', $error->message, 1);
+ }
+
+ if (isset($id3['asf']['extended_content_description_object']['content_descriptors']['13'])) {
+ $image = $id3['asf']['extended_content_description_object']['content_descriptors']['13'];
+ $data[] = array(
+ 'song' => $song->file,
+ 'raw' => $image['data'],
+ 'mime' => $image['mime']);
+ }
+
+ if (isset($id3['id3v2']['APIC'])) {
+ // Foreach in case they have more then one
+ foreach ($id3['id3v2']['APIC'] as $image) {
+ $data[] = array(
+ 'song' => $song->file,
+ 'raw' => $image['data'],
+ 'mime' => $image['mime']);
+ }
+ }
+
+ if ($limit && count($data) >= $limit) {
+ return array_slice($data, 0, $limit);
+ }
+
+ } // end foreach
+
+ return $data;
+
+ } // gather_tags
+
+ /**
+ * gather_google
+ * Raw google search to retrieve the art, not very reliable
+ */
+ public function gather_google($limit = 5) {
+
+ $images = array();
+ $media = new $this->type($this->uid);
+ $media->format();
+
+ $search = $media->full_name;
+
+ if ($media->artist_count == '1')
+ $search = $media->artist_name . ', ' . $search;
+
+ $search = rawurlencode($search);
+
+ $size = '&imgsz=m'; // Medium
+ //$size = '&imgsz=l'; // Large
+
+ $html = file_get_contents("http://images.google.com/images?source=hp&q=$search&oq=&um=1&ie=UTF-8&sa=N&tab=wi&start=0&tbo=1$size");
+
+ if(preg_match_all("|\ssrc\=\"(http.+?)\"|", $html, $matches, PREG_PATTERN_ORDER))
+ foreach ($matches[1] as $match) {
+ $extension = "image/jpeg";
+
+ if (strrpos($extension, '.') !== false) $extension = substr($extension, strrpos($extension, '.') + 1);
+
+ $images[] = array('url' => $match, 'mime' => $extension);
+ }
+
+ return $images;
+
+ } // gather_google
+
+ /**
+ * gather_lastfm
+ * This returns the art from lastfm. It doesn't currently require an
+ * account but may in the future.
+ */
+ public function gather_lastfm($limit, $options = false) {
+
+ // Create the parser object
+ $lastfm = new LastFMSearch();
+
+ switch ($this->type) {
+ case 'album':
+ if (is_array($options)) {
+ $artist = $options['artist'];
+ $album = $options['album_name'];
+ }
+ else {
+ $media = new Album($this->uid);
+ $media->format();
+ $artist = $media->artist_name;
+ $album = $media->full_name;
+ }
+ break;
+ }
+
+ if(Config::get('proxy_host') AND Config::get('proxy_port')) {
+ $proxyhost = Config::get('proxy_host');
+ $proxyport = Config::get('proxy_port');
+ $proxyuser = Config::get('proxy_user');
+ $proxypass = Config::get('proxy_pass');
+ debug_event('LastFM', 'proxy set', 5);
+ $lastfm->setProxy($proxyhost, $proxyport, $proxyuser, $proxypass);
+ }
+
+ $raw_data = $lastfm->album_search($artist, $album);
+
+ if (!count($raw_data)) { return array(); }
+
+ $coverart = $raw_data['coverart'];
+ if (!is_array($coverart)) { return array(); }
+
+ ksort($coverart);
+ foreach ($coverart as $url) {
+ // We need to check the URL for the /noimage/ stuff
+ if (strpos($url, '/noimage/') !== false) {
+ debug_event('LastFM', 'Detected as noimage, skipped ' . $url, 3);
+ continue;
+ }
+
+ // HACK: we shouldn't rely on the extension to determine file type
+ $results = pathinfo($url);
+ $mime = 'image/' . $results['extension'];
+ $data[] = array('url' => $url, 'mime' => $mime);
+ if ($limit && count($data) >= $limit) {
+ return $data;
+ }
+ } // end foreach
+
+ return $data;
+
+ } // gather_lastfm
} // Art
diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php
index d971e33a49..caf243357a 100644
--- a/lib/class/artist.class.php
+++ b/lib/class/artist.class.php
@@ -1,5 +1,5 @@
catalog_id = $catalog_init;
- /* Get the information from the db */
- $info = $this->get_info($id);
+ $this->catalog_id = $catalog_init;
+ /* Get the information from the db */
+ $info = $this->get_info($id);
- foreach ($info as $key=>$value) {
- $this->$key = $value;
- } // foreach info
+ foreach ($info as $key=>$value) {
+ $this->$key = $value;
+ } // foreach info
- return true;
+ return true;
- } //constructor
+ } //constructor
- /**
- * construct_from_array
- * This is used by the metadata class specifically but fills out a Artist object
- * based on a key'd array, it sets $_fake to true
- */
- public static function construct_from_array($data) {
+ /**
+ * construct_from_array
+ * This is used by the metadata class specifically but fills out a Artist object
+ * based on a key'd array, it sets $_fake to true
+ */
+ public static function construct_from_array($data) {
- $artist = new Artist(0);
- foreach ($data as $key=>$value) {
- $artist->$key = $value;
- }
+ $artist = new Artist(0);
+ foreach ($data as $key=>$value) {
+ $artist->$key = $value;
+ }
- //Ack that this is not a real object from the DB
- $artist->_fake = true;
+ //Ack that this is not a real object from the DB
+ $artist->_fake = true;
- return $artist;
+ return $artist;
- } // construct_from_array
+ } // construct_from_array
- /**
- * gc
- *
- * This cleans out unused artists
- */
- public static function gc() {
- Dba::write('DELETE FROM `artist` USING `artist` LEFT JOIN `song` ON `song`.`artist` = `artist`.`id` WHERE `song`.`id` IS NULL');
- }
+ /**
+ * gc
+ *
+ * This cleans out unused artists
+ */
+ public static function gc() {
+ Dba::write('DELETE FROM `artist` USING `artist` LEFT JOIN `song` ON `song`.`artist` = `artist`.`id` WHERE `song`.`id` IS NULL');
+ }
- /**
- * this attempts to build a cache of the data from the passed albums all in one query
- */
- public static function build_cache($ids,$extra=false) {
- if(!is_array($ids) OR !count($ids)) { return false; }
+ /**
+ * this attempts to build a cache of the data from the passed albums all in one query
+ */
+ public static function build_cache($ids,$extra=false) {
+ if(!is_array($ids) OR !count($ids)) { return false; }
- $idlist = '(' . implode(',', $ids) . ')';
+ $idlist = '(' . implode(',', $ids) . ')';
- $sql = "SELECT * FROM `artist` WHERE `id` IN $idlist";
- $db_results = Dba::read($sql);
+ $sql = "SELECT * FROM `artist` WHERE `id` IN $idlist";
+ $db_results = Dba::read($sql);
- while ($row = Dba::fetch_assoc($db_results)) {
- parent::add_to_cache('artist',$row['id'],$row);
- }
+ while ($row = Dba::fetch_assoc($db_results)) {
+ parent::add_to_cache('artist',$row['id'],$row);
+ }
- // If we need to also pull the extra information, this is normally only used when we are doing the human display
- if ($extra) {
- $sql = "SELECT `song`.`artist`, COUNT(`song`.`id`) AS `song_count`, COUNT(DISTINCT `song`.`album`) AS `album_count`, SUM(`song`.`time`) AS `time` FROM `song` WHERE `song`.`artist` IN $idlist GROUP BY `song`.`artist`";
-
- debug_event("Artist", "build_cache sql: " . $sql, "6");
- $db_results = Dba::read($sql);
+ // If we need to also pull the extra information, this is normally only used when we are doing the human display
+ if ($extra) {
+ $sql = "SELECT `song`.`artist`, COUNT(`song`.`id`) AS `song_count`, COUNT(DISTINCT `song`.`album`) AS `album_count`, SUM(`song`.`time`) AS `time` FROM `song` WHERE `song`.`artist` IN $idlist GROUP BY `song`.`artist`";
+
+ debug_event("Artist", "build_cache sql: " . $sql, "6");
+ $db_results = Dba::read($sql);
- while ($row = Dba::fetch_assoc($db_results)) {
- parent::add_to_cache('artist_extra',$row['artist'],$row);
- }
+ while ($row = Dba::fetch_assoc($db_results)) {
+ parent::add_to_cache('artist_extra',$row['artist'],$row);
+ }
- } // end if extra
+ } // end if extra
- return true;
+ return true;
- } // build_cache
+ } // build_cache
- /**
- * get_from_name
- * This gets an artist object based on the artist name
- */
- public static function get_from_name($name) {
+ /**
+ * get_from_name
+ * This gets an artist object based on the artist name
+ */
+ public static function get_from_name($name) {
- $name = Dba::escape($name);
- $sql = "SELECT `id` FROM `artist` WHERE `name`='$name'";
- $db_results = Dba::write($sql);
+ $name = Dba::escape($name);
+ $sql = "SELECT `id` FROM `artist` WHERE `name`='$name'";
+ $db_results = Dba::write($sql);
- $row = Dba::fetch_assoc($db_results);
+ $row = Dba::fetch_assoc($db_results);
- $object = new Artist($row['id']);
+ $object = new Artist($row['id']);
- return $object;
+ return $object;
- } // get_from_name
+ } // get_from_name
- /**
- * get_albums
- * gets the album ids that this artist is a part
- * of
- */
- public function get_albums($catalog = null) {
+ /**
+ * get_albums
+ * gets the album ids that this artist is a part
+ * of
+ */
+ public function get_albums($catalog = null) {
- if($catalog) {
- $catalog_join = "LEFT JOIN `catalog` ON `catalog`.`id` = `song`.`catalog`";
- $catalog_where = "AND `catalog`.`id` = '$catalog'";
- }
+ if($catalog) {
+ $catalog_join = "LEFT JOIN `catalog` ON `catalog`.`id` = `song`.`catalog`";
+ $catalog_where = "AND `catalog`.`id` = '$catalog'";
+ }
- $results = array();
+ $results = array();
- $sql = "SELECT `album`.`id` FROM album LEFT JOIN `song` ON `song`.`album`=`album`.`id` $catalog_join " .
- "WHERE `song`.`artist`='$this->id' $catalog_where GROUP BY `album`.`id` ORDER BY `album`.`name`,`album`.`disk`,`album`.`year`";
+ $sql = "SELECT `album`.`id` FROM album LEFT JOIN `song` ON `song`.`album`=`album`.`id` $catalog_join " .
+ "WHERE `song`.`artist`='$this->id' $catalog_where GROUP BY `album`.`id` ORDER BY `album`.`name`,`album`.`disk`,`album`.`year`";
- debug_event("Artist", "$sql", "6");
- $db_results = Dba::read($sql);
+ debug_event("Artist", "$sql", "6");
+ $db_results = Dba::read($sql);
- while ($r = Dba::fetch_assoc($db_results)) {
- $results[] = $r['id'];
- }
+ while ($r = Dba::fetch_assoc($db_results)) {
+ $results[] = $r['id'];
+ }
- return $results;
+ return $results;
- } // get_albums
+ } // get_albums
- /**
- * get_songs
- * gets the songs for this artist
- */
- public function get_songs() {
+ /**
+ * get_songs
+ * gets the songs for this artist
+ */
+ public function get_songs() {
- $sql = "SELECT `song`.`id` FROM `song` WHERE `song`.`artist`='" . Dba::escape($this->id) . "' ORDER BY album, track";
- $db_results = Dba::read($sql);
+ $sql = "SELECT `song`.`id` FROM `song` WHERE `song`.`artist`='" . Dba::escape($this->id) . "' ORDER BY album, track";
+ $db_results = Dba::read($sql);
- while ($r = Dba::fetch_assoc($db_results)) {
- $results[] = $r['id'];
- }
+ while ($r = Dba::fetch_assoc($db_results)) {
+ $results[] = $r['id'];
+ }
- return $results;
+ return $results;
- } // get_songs
+ } // get_songs
- /**
- * get_random_songs
- * Gets the songs from this artist in a random order
- */
- public function get_random_songs() {
+ /**
+ * get_random_songs
+ * Gets the songs from this artist in a random order
+ */
+ public function get_random_songs() {
- $results = array();
+ $results = array();
- $sql = "SELECT `id` FROM `song` WHERE `artist`='$this->id' ORDER BY RAND()";
- $db_results = Dba::read($sql);
+ $sql = "SELECT `id` FROM `song` WHERE `artist`='$this->id' ORDER BY RAND()";
+ $db_results = Dba::read($sql);
- while ($r = Dba::fetch_assoc($db_results)) {
- $results[] = $r['id'];
- }
+ while ($r = Dba::fetch_assoc($db_results)) {
+ $results[] = $r['id'];
+ }
- return $results;
+ return $results;
- } // get_random_songs
+ } // get_random_songs
- /**
- * _get_extra info
- * This returns the extra information for the artist, this means totals etc
- */
- private function _get_extra_info($catalog=FALSE) {
+ /**
+ * _get_extra info
+ * This returns the extra information for the artist, this means totals etc
+ */
+ private function _get_extra_info($catalog=FALSE) {
- // Try to find it in the cache and save ourselves the trouble
- if (parent::is_cached('artist_extra',$this->id) ) {
- $row = parent::get_from_cache('artist_extra',$this->id);
- }
- else {
- $uid = Dba::escape($this->id);
- $sql = "SELECT `song`.`artist`,COUNT(`song`.`id`) AS `song_count`, COUNT(DISTINCT `song`.`album`) AS `album_count`, SUM(`song`.`time`) AS `time` FROM `song` WHERE `song`.`artist`='$uid' ";
- if ($catalog) {
- $sql .= "AND (`song`.`catalog` = '$catalog') ";
- }
+ // Try to find it in the cache and save ourselves the trouble
+ if (parent::is_cached('artist_extra',$this->id) ) {
+ $row = parent::get_from_cache('artist_extra',$this->id);
+ }
+ else {
+ $uid = Dba::escape($this->id);
+ $sql = "SELECT `song`.`artist`,COUNT(`song`.`id`) AS `song_count`, COUNT(DISTINCT `song`.`album`) AS `album_count`, SUM(`song`.`time`) AS `time` FROM `song` WHERE `song`.`artist`='$uid' ";
+ if ($catalog) {
+ $sql .= "AND (`song`.`catalog` = '$catalog') ";
+ }
- $sql .= "GROUP BY `song`.`artist`";
-
- $db_results = Dba::read($sql);
- $row = Dba::fetch_assoc($db_results);
- parent::add_to_cache('artist_extra',$row['artist'],$row);
- }
+ $sql .= "GROUP BY `song`.`artist`";
+
+ $db_results = Dba::read($sql);
+ $row = Dba::fetch_assoc($db_results);
+ parent::add_to_cache('artist_extra',$row['artist'],$row);
+ }
- /* Set Object Vars */
- $this->songs = $row['song_count'];
- $this->albums = $row['album_count'];
- $this->time = $row['time'];
+ /* Set Object Vars */
+ $this->songs = $row['song_count'];
+ $this->albums = $row['album_count'];
+ $this->time = $row['time'];
- return $row;
+ return $row;
- } // _get_extra_info
+ } // _get_extra_info
- /**
- * format
- * this function takes an array of artist
- * information and reformats the relevent values
- * so they can be displayed in a table for example
- * it changes the title into a full link.
- */
- public function format() {
+ /**
+ * format
+ * this function takes an array of artist
+ * information and reformats the relevent values
+ * so they can be displayed in a table for example
+ * it changes the title into a full link.
+ */
+ public function format() {
- /* Combine prefix and name, trim then add ... if needed */
- $name = UI::truncate(trim($this->prefix . " " . $this->name),Config::get('ellipse_threshold_artist'));
- $this->f_name = $name;
- $this->f_full_name = trim(trim($this->prefix) . ' ' . trim($this->name));
+ /* Combine prefix and name, trim then add ... if needed */
+ $name = UI::truncate(trim($this->prefix . " " . $this->name),Config::get('ellipse_threshold_artist'));
+ $this->f_name = $name;
+ $this->f_full_name = trim(trim($this->prefix) . ' ' . trim($this->name));
- // If this is a fake object, we're done here
- if ($this->_fake) { return true; }
+ // If this is a fake object, we're done here
+ if ($this->_fake) { return true; }
- if ($this->catalog_id) {
- $this->f_name_link = "catalog_id . "&artist=" . $this->id . "\" title=\"" . $this->f_full_name . "\">" . $name . "";
- $this->f_link = Config::get('web_path') . '/artists.php?action=show&catalog=' . $this->catalog_id . '&artist=' . $this->id;
- } else {
- $this->f_name_link = "id . "\" title=\"" . $this->f_full_name . "\">" . $name . "";
- $this->f_link = Config::get('web_path') . '/artists.php?action=show&artist=' . $this->id;
- }
- // Get the counts
- $extra_info = $this->_get_extra_info($this->catalog_id);
-
- //Format the new time thingy that we just got
- $min = sprintf("%02d",(floor($extra_info['time']/60)%60));
-
- $sec = sprintf("%02d",($extra_info['time']%60));
- $hours = floor($extra_info['time']/3600);
-
- $this->f_time = ltrim($hours . ':' . $min . ':' . $sec,'0:');
-
- $this->tags = Tag::get_top_tags('artist',$this->id);
-
- $this->f_tags = Tag::get_display($this->tags,$this->id,'artist');
-
- return true;
-
- } // format
-
- /**
- * update
- * This takes a key'd array of data and updates the current artist
- * it will flag songs as neeed
- */
- public function update($data) {
-
- // Save our current ID
- $current_id = $this->id;
-
- $artist_id = Catalog::check_artist($data['name'], $this->mbid);
-
- // If it's changed we need to update
- if ($artist_id != $this->id) {
- $songs = $this->get_songs();
- foreach ($songs as $song_id) {
- Song::update_artist($artist_id,$song_id);
- }
- $updated = 1;
- $current_id = $artist_id;
- self::gc();
- } // end if it changed
-
- if ($updated) {
- foreach ($songs as $song_id) {
- Flag::add($song_id,'song','retag','Interface Artist Update');
- Song::update_utime($song_id);
- }
- Stats::gc();
- Rating::gc();
- } // if updated
-
- return $current_id;
-
- } // update
+ if ($this->catalog_id) {
+ $this->f_name_link = "catalog_id . "&artist=" . $this->id . "\" title=\"" . $this->f_full_name . "\">" . $name . "";
+ $this->f_link = Config::get('web_path') . '/artists.php?action=show&catalog=' . $this->catalog_id . '&artist=' . $this->id;
+ } else {
+ $this->f_name_link = "id . "\" title=\"" . $this->f_full_name . "\">" . $name . "";
+ $this->f_link = Config::get('web_path') . '/artists.php?action=show&artist=' . $this->id;
+ }
+ // Get the counts
+ $extra_info = $this->_get_extra_info($this->catalog_id);
+
+ //Format the new time thingy that we just got
+ $min = sprintf("%02d",(floor($extra_info['time']/60)%60));
+
+ $sec = sprintf("%02d",($extra_info['time']%60));
+ $hours = floor($extra_info['time']/3600);
+
+ $this->f_time = ltrim($hours . ':' . $min . ':' . $sec,'0:');
+
+ $this->tags = Tag::get_top_tags('artist',$this->id);
+
+ $this->f_tags = Tag::get_display($this->tags,$this->id,'artist');
+
+ return true;
+
+ } // format
+
+ /**
+ * update
+ * This takes a key'd array of data and updates the current artist
+ * it will flag songs as neeed
+ */
+ public function update($data) {
+
+ // Save our current ID
+ $current_id = $this->id;
+
+ $artist_id = Catalog::check_artist($data['name'], $this->mbid);
+
+ // If it's changed we need to update
+ if ($artist_id != $this->id) {
+ $songs = $this->get_songs();
+ foreach ($songs as $song_id) {
+ Song::update_artist($artist_id,$song_id);
+ }
+ $updated = 1;
+ $current_id = $artist_id;
+ self::gc();
+ } // end if it changed
+
+ if ($updated) {
+ foreach ($songs as $song_id) {
+ Flag::add($song_id,'song','retag','Interface Artist Update');
+ Song::update_utime($song_id);
+ }
+ Stats::gc();
+ Rating::gc();
+ } // if updated
+
+ return $current_id;
+
+ } // update
} // end of artist class
?>
diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php
index ce22728efb..e747430a63 100644
--- a/lib/class/browse.class.php
+++ b/lib/class/browse.class.php
@@ -1,5 +1,5 @@
set_is_simple($value);
-
- } // set_simple_browse
-
- /**
- * add_supplemental_object
- * Legacy function, need to find a better way to do that
- */
- public function add_supplemental_object($class, $uid) {
-
- $_SESSION['browse']['supplemental'][$this->id][$class] = intval($uid);
-
- return true;
-
- } // add_supplemental_object
-
- /**
- * get_supplemental_objects
- * This returns an array of 'class','id' for additional objects that
- * need to be created before we start this whole browsing thing.
- */
- public function get_supplemental_objects() {
-
- $objects = $_SESSION['browse']['supplemental'][$this->id];
-
- if (!is_array($objects)) { $objects = array(); }
-
- return $objects;
-
- } // get_supplemental_objects
-
- /**
- * show_objects
- * This takes an array of objects
- * and requires the correct template based on the
- * type that we are currently browsing
- */
- public function show_objects($object_ids = null) {
-
- if ($this->is_simple() || ! is_array($object_ids)) {
- $object_ids = $this->get_saved();
- }
- else {
- $this->save_objects($object_ids);
- }
-
- // Limit is based on the user's preferences if this is not a
- // simple browse because we've got too much here
- if ((count($object_ids) > $this->get_start()) &&
- ! $this->is_simple() &&
- ! $this->is_static_content()) {
- $object_ids = array_slice(
- $object_ids,
- $this->get_start(),
- $this->get_offset(),
- true
- );
- }
-
- // Load any additional object we need for this
- $extra_objects = $this->get_supplemental_objects();
- $browse = $this;
-
- foreach ($extra_objects as $class_name => $id) {
- ${$class_name} = new $class_name($id);
- }
-
- $match = '';
- // Format any matches we have so we can show them to the masses
- if ($filter_value = $this->get_filter('alpha_match')) {
- $match = ' (' . $filter_value . ')';
- }
- elseif ($filter_value = $this->get_filter('starts_with')) {
- $match = ' (' . $filter_value . ')';
- } elseif ($filter_value = $this->get_filter('catalog')) {
- // Get the catalog title
- $catalog = new Catalog($filter_value);
- $match = ' (' . $catalog->name . ')';
- }
-
- $type = $this->get_type();
-
- // Set the correct classes based on type
- $class = "box browse_" . $type;
-
- Ajax::start_container('browse_content');
- // Switch on the type of browsing we're doing
- switch ($type) {
- case 'song':
- UI::show_box_top(T_('Songs') . $match, $class);
- Song::build_cache($object_ids);
- require_once Config::get('prefix') . '/templates/show_songs.inc.php';
- UI::show_box_bottom();
- break;
- case 'album':
- UI::show_box_top(T_('Albums') . $match, $class);
- Album::build_cache($object_ids,'extra');
- require_once Config::get('prefix') . '/templates/show_albums.inc.php';
- UI::show_box_bottom();
- break;
- case 'user':
- UI::show_box_top(T_('Manage Users') . $match, $class);
- require_once Config::get('prefix') . '/templates/show_users.inc.php';
- UI::show_box_bottom();
- break;
- case 'artist':
- UI::show_box_top(T_('Artists') . $match, $class);
- Artist::build_cache($object_ids,'extra');
- require_once Config::get('prefix') . '/templates/show_artists.inc.php';
- UI::show_box_bottom();
- break;
- case 'live_stream':
- require_once Config::get('prefix') . '/templates/show_live_stream.inc.php';
- UI::show_box_top(T_('Radio Stations') . $match, $class);
- require_once Config::get('prefix') . '/templates/show_live_streams.inc.php';
- UI::show_box_bottom();
- break;
- case 'playlist':
- Playlist::build_cache($object_ids);
- UI::show_box_top(T_('Playlists') . $match, $class);
- require_once Config::get('prefix') . '/templates/show_playlists.inc.php';
- UI::show_box_bottom();
- break;
- case 'playlist_song':
- UI::show_box_top(T_('Playlist Songs') . $match,$class);
- require_once Config::get('prefix') . '/templates/show_playlist_songs.inc.php';
- UI::show_box_bottom();
- break;
- case 'playlist_localplay':
- UI::show_box_top(T_('Current Playlist'));
- require_once Config::get('prefix') . '/templates/show_localplay_playlist.inc.php';
- UI::show_box_bottom();
- break;
- case 'smartplaylist':
- UI::show_box_top(T_('Smart Playlists') . $match, $class);
- require_once Config::get('prefix') . '/templates/show_smartplaylists.inc.php';
- UI::show_box_bottom();
- break;
- case 'catalog':
- UI::show_box_top(T_('Catalogs'), $class);
- require_once Config::get('prefix') . '/templates/show_catalogs.inc.php';
- UI::show_box_bottom();
- break;
- case 'shoutbox':
- UI::show_box_top(T_('Shoutbox Records'),$class);
- require_once Config::get('prefix') . '/templates/show_manage_shoutbox.inc.php';
- UI::show_box_bottom();
- break;
- case 'flagged':
- UI::show_box_top(T_('Flagged Records'),$class);
- require_once Config::get('prefix') . '/templates/show_flagged.inc.php';
- UI::show_box_bottom();
- break;
- case 'tag':
- Tag::build_cache($tags);
- UI::show_box_top(T_('Tag Cloud'),$class);
- require_once Config::get('prefix') . '/templates/show_tagcloud.inc.php';
- UI::show_box_bottom();
- break;
- case 'video':
- Video::build_cache($object_ids);
- UI::show_box_top(T_('Videos'),$class);
- require_once Config::get('prefix') . '/templates/show_videos.inc.php';
- UI::show_box_bottom();
- break;
- case 'democratic':
- UI::show_box_top(T_('Democratic Playlist'),$class);
- require_once Config::get('prefix') . '/templates/show_democratic_playlist.inc.php';
- UI::show_box_bottom();
- default:
- // Rien a faire
- break;
- } // end switch on type
- echo '';
-
- Ajax::end_container();
-
- } // show_object
-
- /**
- * set_filter_from_request
- * //FIXME
- */
- public function set_filter_from_request($request) {
- foreach($request as $key => $value) {
- //reinterpret v as a list of int
- $list = explode(',', $value);
- $ok = true;
- foreach($list as $item) {
- if (!is_numeric($item)) {
- $ok = false;
- break;
- }
- }
- if ($ok) {
- if (sizeof($list) == 1) {
- $this->set_filter($key, $list[0]);
- }
- }
- else {
- $this->set_filter($key, $list);
- }
- }
- } // set_filter_from_request
+ /**
+ * set_simple_browse
+ * This sets the current browse object to a 'simple' browse method
+ * which means use the base query provided and expand from there
+ */
+ public function set_simple_browse($value) {
+
+ $this->set_is_simple($value);
+
+ } // set_simple_browse
+
+ /**
+ * add_supplemental_object
+ * Legacy function, need to find a better way to do that
+ */
+ public function add_supplemental_object($class, $uid) {
+
+ $_SESSION['browse']['supplemental'][$this->id][$class] = intval($uid);
+
+ return true;
+
+ } // add_supplemental_object
+
+ /**
+ * get_supplemental_objects
+ * This returns an array of 'class','id' for additional objects that
+ * need to be created before we start this whole browsing thing.
+ */
+ public function get_supplemental_objects() {
+
+ $objects = $_SESSION['browse']['supplemental'][$this->id];
+
+ if (!is_array($objects)) { $objects = array(); }
+
+ return $objects;
+
+ } // get_supplemental_objects
+
+ /**
+ * show_objects
+ * This takes an array of objects
+ * and requires the correct template based on the
+ * type that we are currently browsing
+ */
+ public function show_objects($object_ids = null) {
+
+ if ($this->is_simple() || ! is_array($object_ids)) {
+ $object_ids = $this->get_saved();
+ }
+ else {
+ $this->save_objects($object_ids);
+ }
+
+ // Limit is based on the user's preferences if this is not a
+ // simple browse because we've got too much here
+ if ((count($object_ids) > $this->get_start()) &&
+ ! $this->is_simple() &&
+ ! $this->is_static_content()) {
+ $object_ids = array_slice(
+ $object_ids,
+ $this->get_start(),
+ $this->get_offset(),
+ true
+ );
+ }
+
+ // Load any additional object we need for this
+ $extra_objects = $this->get_supplemental_objects();
+ $browse = $this;
+
+ foreach ($extra_objects as $class_name => $id) {
+ ${$class_name} = new $class_name($id);
+ }
+
+ $match = '';
+ // Format any matches we have so we can show them to the masses
+ if ($filter_value = $this->get_filter('alpha_match')) {
+ $match = ' (' . $filter_value . ')';
+ }
+ elseif ($filter_value = $this->get_filter('starts_with')) {
+ $match = ' (' . $filter_value . ')';
+ } elseif ($filter_value = $this->get_filter('catalog')) {
+ // Get the catalog title
+ $catalog = new Catalog($filter_value);
+ $match = ' (' . $catalog->name . ')';
+ }
+
+ $type = $this->get_type();
+
+ // Set the correct classes based on type
+ $class = "box browse_" . $type;
+
+ Ajax::start_container('browse_content');
+ // Switch on the type of browsing we're doing
+ switch ($type) {
+ case 'song':
+ UI::show_box_top(T_('Songs') . $match, $class);
+ Song::build_cache($object_ids);
+ require_once Config::get('prefix') . '/templates/show_songs.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'album':
+ UI::show_box_top(T_('Albums') . $match, $class);
+ Album::build_cache($object_ids,'extra');
+ require_once Config::get('prefix') . '/templates/show_albums.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'user':
+ UI::show_box_top(T_('Manage Users') . $match, $class);
+ require_once Config::get('prefix') . '/templates/show_users.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'artist':
+ UI::show_box_top(T_('Artists') . $match, $class);
+ Artist::build_cache($object_ids,'extra');
+ require_once Config::get('prefix') . '/templates/show_artists.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'live_stream':
+ require_once Config::get('prefix') . '/templates/show_live_stream.inc.php';
+ UI::show_box_top(T_('Radio Stations') . $match, $class);
+ require_once Config::get('prefix') . '/templates/show_live_streams.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'playlist':
+ Playlist::build_cache($object_ids);
+ UI::show_box_top(T_('Playlists') . $match, $class);
+ require_once Config::get('prefix') . '/templates/show_playlists.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'playlist_song':
+ UI::show_box_top(T_('Playlist Songs') . $match,$class);
+ require_once Config::get('prefix') . '/templates/show_playlist_songs.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'playlist_localplay':
+ UI::show_box_top(T_('Current Playlist'));
+ require_once Config::get('prefix') . '/templates/show_localplay_playlist.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'smartplaylist':
+ UI::show_box_top(T_('Smart Playlists') . $match, $class);
+ require_once Config::get('prefix') . '/templates/show_smartplaylists.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'catalog':
+ UI::show_box_top(T_('Catalogs'), $class);
+ require_once Config::get('prefix') . '/templates/show_catalogs.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'shoutbox':
+ UI::show_box_top(T_('Shoutbox Records'),$class);
+ require_once Config::get('prefix') . '/templates/show_manage_shoutbox.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'flagged':
+ UI::show_box_top(T_('Flagged Records'),$class);
+ require_once Config::get('prefix') . '/templates/show_flagged.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'tag':
+ Tag::build_cache($tags);
+ UI::show_box_top(T_('Tag Cloud'),$class);
+ require_once Config::get('prefix') . '/templates/show_tagcloud.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'video':
+ Video::build_cache($object_ids);
+ UI::show_box_top(T_('Videos'),$class);
+ require_once Config::get('prefix') . '/templates/show_videos.inc.php';
+ UI::show_box_bottom();
+ break;
+ case 'democratic':
+ UI::show_box_top(T_('Democratic Playlist'),$class);
+ require_once Config::get('prefix') . '/templates/show_democratic_playlist.inc.php';
+ UI::show_box_bottom();
+ default:
+ // Rien a faire
+ break;
+ } // end switch on type
+ echo '';
+
+ Ajax::end_container();
+
+ } // show_object
+
+ /**
+ * set_filter_from_request
+ * //FIXME
+ */
+ public function set_filter_from_request($request) {
+ foreach($request as $key => $value) {
+ //reinterpret v as a list of int
+ $list = explode(',', $value);
+ $ok = true;
+ foreach($list as $item) {
+ if (!is_numeric($item)) {
+ $ok = false;
+ break;
+ }
+ }
+ if ($ok) {
+ if (sizeof($list) == 1) {
+ $this->set_filter($key, $list[0]);
+ }
+ }
+ else {
+ $this->set_filter($key, $list);
+ }
+ }
+ } // set_filter_from_request
} // browse
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 3833d32927..df5229a4bd 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -1,5 +1,5 @@
id = intval($catalog_id);
+ /**
+ * Constructor
+ * Catalog class constructor, pulls catalog information
+ * $catalog_id The ID of the catalog you want to build information from
+ */
+ public function __construct($catalog_id = '') {
+
+ if (!$catalog_id) { return false; }
+
+ /* Assign id for use in get_info() */
+ $this->id = intval($catalog_id);
- /* Get the information from the db */
- $info = $this->get_info($catalog_id);
+ /* Get the information from the db */
+ $info = $this->get_info($catalog_id);
- foreach ($info as $key=>$value) {
- $this->$key = $value;
- }
+ foreach ($info as $key=>$value) {
+ $this->$key = $value;
+ }
- } //constructor
+ } //constructor
- /**
- * _create_filecache
- * This poplates an array (filecache) on this object from the database
- * it is used to speed up the add process
- */
- private function _create_filecache() {
+ /**
+ * _create_filecache
+ * This poplates an array (filecache) on this object from the database
+ * it is used to speed up the add process
+ */
+ private function _create_filecache() {
- if (count($this->_filecache) == 0) {
- $catalog_id = Dba::escape($this->id);
- // Get _EVERYTHING_
- $sql = "SELECT `id`,`file` FROM `song` WHERE `catalog`='$catalog_id'";
- $db_results = Dba::read($sql);
-
- // Populate the filecache
- while ($results = Dba::fetch_assoc($db_results)) {
- $this->_filecache[strtolower($results['file'])] = $results['id'];
- }
+ if (count($this->_filecache) == 0) {
+ $catalog_id = Dba::escape($this->id);
+ // Get _EVERYTHING_
+ $sql = "SELECT `id`,`file` FROM `song` WHERE `catalog`='$catalog_id'";
+ $db_results = Dba::read($sql);
+
+ // Populate the filecache
+ while ($results = Dba::fetch_assoc($db_results)) {
+ $this->_filecache[strtolower($results['file'])] = $results['id'];
+ }
- $sql = "SELECT `id`,`file` FROM `video` WHERE `catalog`='$catalog_id'";
- $db_results = Dba::read($sql);
+ $sql = "SELECT `id`,`file` FROM `video` WHERE `catalog`='$catalog_id'";
+ $db_results = Dba::read($sql);
- while ($results = Dba::fetch_assoc($db_results)) {
- $this->_filecache[strtolower($results['file'])] = 'v_' . $results['id'];
- }
- } // end if empty filecache
+ while ($results = Dba::fetch_assoc($db_results)) {
+ $this->_filecache[strtolower($results['file'])] = 'v_' . $results['id'];
+ }
+ } // end if empty filecache
- return true;
+ return true;
- } // _create_filecache
+ } // _create_filecache
- /**
- * get_from_path
- * Try to figure out which catalog path most closely resembles this one
- * This is useful when creating a new catalog to make sure we're not
- * doubling up here.
- */
- public static function get_from_path($path) {
+ /**
+ * get_from_path
+ * Try to figure out which catalog path most closely resembles this one
+ * This is useful when creating a new catalog to make sure we're not
+ * doubling up here.
+ */
+ public static function get_from_path($path) {
- // First pull a list of all of the paths for the different catalogs
- $sql = "SELECT `id`,`path` FROM `catalog` WHERE `catalog_type`='local'";
- $db_results = Dba::read($sql);
+ // First pull a list of all of the paths for the different catalogs
+ $sql = "SELECT `id`,`path` FROM `catalog` WHERE `catalog_type`='local'";
+ $db_results = Dba::read($sql);
- $catalog_paths = array();
- $component_path = $path;
+ $catalog_paths = array();
+ $component_path = $path;
- while ($row = Dba::fetch_assoc($db_results)) {
- $catalog_paths[$row['path']] = $row['id'];
- }
+ while ($row = Dba::fetch_assoc($db_results)) {
+ $catalog_paths[$row['path']] = $row['id'];
+ }
- // Break it down into its component parts and start looking for a catalog
- do {
- if ($catalog_paths[$component_path]) {
- return $catalog_paths[$component_path];
- }
+ // Break it down into its component parts and start looking for a catalog
+ do {
+ if ($catalog_paths[$component_path]) {
+ return $catalog_paths[$component_path];
+ }
- // Keep going until the path stops changing
- $old_path = $component_path;
- $component_path = realpath($component_path . '/../');
+ // Keep going until the path stops changing
+ $old_path = $component_path;
+ $component_path = realpath($component_path . '/../');
- } while (strcmp($component_path,$old_path) != 0);
+ } while (strcmp($component_path,$old_path) != 0);
- return false;
+ return false;
- } // get_from_path
+ } // get_from_path
- /**
- * format
- * This makes the object human readable
- */
- public function format() {
+ /**
+ * format
+ * This makes the object human readable
+ */
+ public function format() {
- $this->f_name = UI::truncate($this->name,Config::get('ellipse_threshold_title'));
- $this->f_name_link = '' . scrub_out($this->f_name) . '';
- $this->f_path = UI::truncate($this->path,Config::get('ellipse_threshold_title'));
- $this->f_update = $this->last_update ? date('d/m/Y h:i',$this->last_update) : T_('Never');
- $this->f_add = $this->last_add ? date('d/m/Y h:i',$this->last_add) : T_('Never');
- $this->f_clean = $this->last_clean ? date('d/m/Y h:i',$this->last_clean) : T_('Never');
+ $this->f_name = UI::truncate($this->name,Config::get('ellipse_threshold_title'));
+ $this->f_name_link = '' . scrub_out($this->f_name) . '';
+ $this->f_path = UI::truncate($this->path,Config::get('ellipse_threshold_title'));
+ $this->f_update = $this->last_update ? date('d/m/Y h:i',$this->last_update) : T_('Never');
+ $this->f_add = $this->last_add ? date('d/m/Y h:i',$this->last_add) : T_('Never');
+ $this->f_clean = $this->last_clean ? date('d/m/Y h:i',$this->last_clean) : T_('Never');
- } // format
+ } // format
- /**
- * get_catalogs
- * Pull all the current catalogs and return an array of ids
- * of what you find
- */
- public static function get_catalogs() {
+ /**
+ * get_catalogs
+ * Pull all the current catalogs and return an array of ids
+ * of what you find
+ */
+ public static function get_catalogs() {
- $sql = "SELECT `id` FROM `catalog` ORDER BY `name`";
- $db_results = Dba::read($sql);
+ $sql = "SELECT `id` FROM `catalog` ORDER BY `name`";
+ $db_results = Dba::read($sql);
- $results = array();
+ $results = array();
- while ($row = Dba::fetch_assoc($db_results)) {
- $results[] = $row['id'];
- }
+ while ($row = Dba::fetch_assoc($db_results)) {
+ $results[] = $row['id'];
+ }
- return $results;
+ return $results;
- } // get_catalogs
-
- /**
- * get_stats
- * This returns an hash with the #'s for the different
- * objects that are associated with this catalog. This is used
- * to build the stats box, it also calculates time.
- */
- public static function get_stats($catalog_id = null) {
-
- $results = self::count_songs($catalog_id);
- $results = array_merge(self::count_users($catalog_id), $results);
- $results['tags'] = self::count_tags();
- $results = array_merge(self::count_videos($catalog_id), $results);
+ } // get_catalogs
+
+ /**
+ * get_stats
+ * This returns an hash with the #'s for the different
+ * objects that are associated with this catalog. This is used
+ * to build the stats box, it also calculates time.
+ */
+ public static function get_stats($catalog_id = null) {
+
+ $results = self::count_songs($catalog_id);
+ $results = array_merge(self::count_users($catalog_id), $results);
+ $results['tags'] = self::count_tags();
+ $results = array_merge(self::count_videos($catalog_id), $results);
- $hours = floor($results['time'] / 3600);
+ $hours = floor($results['time'] / 3600);
- $results['formatted_size'] = UI::format_bytes($results['size']);
+ $results['formatted_size'] = UI::format_bytes($results['size']);
- $days = floor($hours / 24);
- $hours = $hours % 24;
+ $days = floor($hours / 24);
+ $hours = $hours % 24;
- $time_text = "$days ";
- $time_text .= T_ngettext('day','days',$days);
- $time_text .= ", $hours ";
- $time_text .= T_ngettext('hour','hours',$hours);
+ $time_text = "$days ";
+ $time_text .= T_ngettext('day','days',$days);
+ $time_text .= ", $hours ";
+ $time_text .= T_ngettext('hour','hours',$hours);
- $results['time_text'] = $time_text;
+ $results['time_text'] = $time_text;
- return $results;
+ return $results;
- } // get_stats
-
- /**
- * create
- * This creates a new catalog entry and then returns the insert id
- * it checks to make sure this path is not already used before creating
- * the catalog
- */
- public static function create($data) {
+ } // get_stats
+
+ /**
+ * create
+ * This creates a new catalog entry and then returns the insert id
+ * it checks to make sure this path is not already used before creating
+ * the catalog
+ */
+ public static function create($data) {
- // Clean up the path just in case
- $data['path'] = rtrim(rtrim(trim($data['path']),'/'),'\\');
+ // Clean up the path just in case
+ $data['path'] = rtrim(rtrim(trim($data['path']),'/'),'\\');
- $path = Dba::escape($data['path']);
+ $path = Dba::escape($data['path']);
- // Make sure the path is readable/exists
- if ($data['type'] == 'local') {
- $handle = opendir($path);
- if ($handle === false) {
- Error::add('general', sprintf(T_('Error: %s is not readable or does not exist'), scrub_out($data['path'])));
- return false;
- }
- closedir($handle);
- }
+ // Make sure the path is readable/exists
+ if ($data['type'] == 'local') {
+ $handle = opendir($path);
+ if ($handle === false) {
+ Error::add('general', sprintf(T_('Error: %s is not readable or does not exist'), scrub_out($data['path'])));
+ return false;
+ }
+ closedir($handle);
+ }
- // Make sure this path isn't already in use by an existing catalog
- $sql = "SELECT `id` FROM `catalog` WHERE `path`='$path'";
- $db_results = Dba::read($sql);
+ // Make sure this path isn't already in use by an existing catalog
+ $sql = "SELECT `id` FROM `catalog` WHERE `path`='$path'";
+ $db_results = Dba::read($sql);
- if (Dba::num_rows($db_results)) {
- Error::add('general', sprintf(T_('Error: Catalog with %s already exists'), $path));
- return false;
- }
+ if (Dba::num_rows($db_results)) {
+ Error::add('general', sprintf(T_('Error: Catalog with %s already exists'), $path));
+ return false;
+ }
- $name = Dba::escape($data['name']);
- $catalog_type = Dba::escape($data['type']);
- $rename_pattern = Dba::escape($data['rename_pattern']);
- $sort_pattern = Dba::escape($data['sort_pattern']);
- $gather_types = 'NULL';
- $remote_username = 'NULL';
- $remote_password = 'NULL';
+ $name = Dba::escape($data['name']);
+ $catalog_type = Dba::escape($data['type']);
+ $rename_pattern = Dba::escape($data['rename_pattern']);
+ $sort_pattern = Dba::escape($data['sort_pattern']);
+ $gather_types = 'NULL';
+ $remote_username = 'NULL';
+ $remote_password = 'NULL';
- // Don't save these if it isn't a remote catalog
- if ($catalog_type == 'remote') {
- $remote_username = "'" . Dba::escape($data['remote_username']) . "'";
- $remote_password = "'" . Dba::escape($data['remote_password']) . "'";
- }
+ // Don't save these if it isn't a remote catalog
+ if ($catalog_type == 'remote') {
+ $remote_username = "'" . Dba::escape($data['remote_username']) . "'";
+ $remote_password = "'" . Dba::escape($data['remote_password']) . "'";
+ }
- // Ok we're good to go ahead and insert this record
- $sql = "INSERT INTO `catalog` (`name`,`path`,`catalog_type`,`remote_username`,`remote_password`,`rename_pattern`,`sort_pattern`,`gather_types`) " .
- "VALUES ('$name','$path','$catalog_type',$remote_username,$remote_password,'$rename_pattern','$sort_pattern',$gather_types)";
- $db_results = Dba::write($sql);
+ // Ok we're good to go ahead and insert this record
+ $sql = "INSERT INTO `catalog` (`name`,`path`,`catalog_type`,`remote_username`,`remote_password`,`rename_pattern`,`sort_pattern`,`gather_types`) " .
+ "VALUES ('$name','$path','$catalog_type',$remote_username,$remote_password,'$rename_pattern','$sort_pattern',$gather_types)";
+ $db_results = Dba::write($sql);
- $insert_id = Dba::insert_id();
+ $insert_id = Dba::insert_id();
- if (!$insert_id) {
- Error::add('general', T_('Catalog Insert Failed check debug logs'));
- debug_event('catalog','SQL Failed:' . $sql,'3');
- return false;
- }
+ if (!$insert_id) {
+ Error::add('general', T_('Catalog Insert Failed check debug logs'));
+ debug_event('catalog','SQL Failed:' . $sql,'3');
+ return false;
+ }
- return $insert_id;
+ return $insert_id;
- } // create
+ } // create
- /**
- * run_add
- * This runs the add to catalog function
- * it includes the javascript refresh stuff and then starts rolling
- * throught the path for this catalog
- */
- public function run_add($options) {
-
- if ($this->catalog_type == 'remote') {
- UI::show_box_top(T_('Running Remote Sync') . '. . .');
- $this->get_remote_catalog($type=0);
- UI::show_box_bottom();
- return true;
- }
+ /**
+ * run_add
+ * This runs the add to catalog function
+ * it includes the javascript refresh stuff and then starts rolling
+ * throught the path for this catalog
+ */
+ public function run_add($options) {
+
+ if ($this->catalog_type == 'remote') {
+ UI::show_box_top(T_('Running Remote Sync') . '. . .');
+ $this->get_remote_catalog($type=0);
+ UI::show_box_bottom();
+ return true;
+ }
- // Catalog Add start
- $start_time = time();
+ // Catalog Add start
+ $start_time = time();
- require Config::get('prefix') . '/templates/show_adds_catalog.inc.php';
- flush();
-
- // Prevent the script from timing out and flush what we've got
- set_time_limit(0);
-
- $this->add_files($this->path,$options);
-
- // If they have checked the box then go ahead and gather the art
- if ($options['gather_art']) {
- $catalog_id = $this->id;
- require Config::get('prefix') . '/templates/show_gather_art.inc.php';
- flush();
- $this->get_art('',1);
- }
-
- if ($options['parse_m3u'] AND count($this->_playlists)) {
- foreach ($this->_playlists as $playlist_file) {
- $result = $this->import_m3u($playlist_file);
- }
- } // if we need to do some m3u-age
-
- return true;
-
- } // run_add
-
- /**
- * count_videos
- * This returns the current # of video files we've got in the db
- */
- public static function count_videos($catalog_id = null) {
-
- $catalog_search = $catalog_id ? "WHERE `catalog`='" . Dba::escape($catalog_id) . "'" : '';
-
- $sql = 'SELECT COUNT(`id`) AS `videos` FROM `video` ';
- if ($catalog_id) {
- $sql .= "WHERE `catalog`='" . Dba::escape($catalog_id) . "'";
- }
- $db_results = Dba::read($sql);
-
- $row = Dba::fetch_assoc($db_results);
-
- return $row;
-
- } // count_videos
-
- /**
- * count_tags
- * This returns the current # of unique tags that exist in the database
- */
- public static function count_tags($catalog_id = null) {
-
- // FIXME: Ignores catalog_id
- $sql = "SELECT COUNT(`id`) FROM `tag`";
- $db_results = Dba::read($sql);
-
- $info = Dba::fetch_row($db_results);
-
- return $info['0'];
-
- } // count_tags
-
- /**
- * count_songs
- * This returns the current # of songs, albums, artists
- * in this catalog
- */
- public static function count_songs($catalog_id = null) {
-
- $where_sql = $catalog_id ? "WHERE `catalog`='" . Dba::escape($catalog_id) . "'" : '';
-
- $sql = "SELECT COUNT(`id`),SUM(`time`),SUM(`size`) FROM `song` $where_sql";
- $db_results = Dba::read($sql);
- $data = Dba::fetch_row($db_results);
- $songs = $data['0'];
- $time = $data['1'];
- $size = $data['2'];
-
- $sql = "SELECT COUNT(DISTINCT(`album`)) FROM `song` $where_sql";
- $db_results = Dba::read($sql);
- $data = Dba::fetch_row($db_results);
- $albums = $data['0'];
-
- $sql = "SELECT COUNT(DISTINCT(`artist`)) FROM `song` $where_sql";
- $db_results = Dba::read($sql);
- $data = Dba::fetch_row($db_results);
- $artists = $data['0'];
-
- $results['songs'] = $songs;
- $results['albums'] = $albums;
- $results['artists'] = $artists;
- $results['size'] = $size;
- $results['time'] = $time;
-
- return $results;
-
- } // count_songs
-
- /**
- * count_users
- * This returns the total number of users in the ampache instance
- */
- public static function count_users($catalog_id = null) {
-
- // Count total users
- $sql = "SELECT COUNT(`id`) FROM `user`";
- $db_results = Dba::read($sql);
- $data = Dba::fetch_row($db_results);
- $results['users'] = $data['0'];
-
- // Get the connected users
- $time = time();
- $last_seen_time = $time - 1200;
- $sql = 'SELECT COUNT(DISTINCT `session`.`username`) ' .
- 'FROM `session` INNER JOIN `user` ' .
- 'ON `session`.`username` = `user`.`username` ' .
- "WHERE `session`.`expire` > '$time' " .
- "AND `user`.`last_seen` > '$last_seen_time'";
- $db_results = Dba::read($sql);
- $data = Dba::fetch_row($db_results);
-
- $results['connected'] = $data['0'];
-
- return $results;
-
- } // count_users
-
- /**
- * add_files
- * Recurses through $this->path and pulls out all mp3s and returns the
- * full path in an array. Passes gather_type to determine if we need to
- * check id3 information against the db.
- */
- public function add_files($path, $options) {
-
- // Profile the memory a bit
- debug_event('Memory', UI::format_bytes(memory_get_usage(true)), 5);
-
- // See if we want a non-root path for the add
- if (isset($options['subdirectory'])) {
- $path = $options['subdirectory'];
- unset($options['subdirectory']);
- }
-
- // Correctly detect the slash we need to use here
- if (strpos($path, '/') !== false) {
- $slash_type = '/';
- }
- else {
- $slash_type = '\\';
- }
-
- /* Open up the directory */
- $handle = opendir($path);
-
- if (!is_resource($handle)) {
- debug_event('read', "Unable to open $path", 5,'ampache-catalog');
- Error::add('catalog_add', sprintf(T_('Error: Unable to open %s'), $path));
- return false;
- }
-
- /* Change the dir so is_dir works correctly */
- if (!chdir($path)) {
- debug_event('read', "Unable to chdir $path", 2,'ampache-catalog');
- Error::add('catalog_add', sprintf(T_('Error: Unable to change to directory %s'), $path));
- return false;
- }
-
- // Ensure that we've got our cache
- $this->_create_filecache();
-
- debug_event('Memory', UI::format_bytes(memory_get_usage(true)), 5);
-
- /* Recurse through this dir and create the files array */
- while ( false !== ( $file = readdir($handle) ) ) {
-
- /* Skip to next if we've got . or .. */
- if (substr($file,0,1) == '.') { continue; }
-
- debug_event('read',"Starting work on $file inside $path",'5','ampache-catalog');
- debug_event('Memory', UI::format_bytes(memory_get_usage(true)), 5);
-
- /* Create the new path */
- $full_file = $path.$slash_type.$file;
-
- /* First thing first, check if file is already in catalog.
- * This check is very quick, so it should be performed before any other checks to save time
- */
- if (isset($this->_filecache[strtolower($full_file)])) {
- continue;
- }
-
- // Incase this is the second time through clear this variable
- // if it was set the day before
- unset($failed_check);
-
- if (Config::get('no_symlinks')) {
- if (is_link($full_file)) {
- debug_event('read',"Skipping Symbolic Link $path",'5','ampache-catalog');
- continue;
- }
- }
-
- /* If it's a dir run this function again! */
- if (is_dir($full_file)) {
- $this->add_files($full_file,$options);
-
- /* Change the dir so is_dir works correctly */
- if (!chdir($path)) {
- debug_event('read',"Unable to chdir $path",'2','ampache-catalog');
- Error::add('catalog_add', sprintf(T_('Error: Unable to change to directory %s'), $path));
- }
-
- /* Skip to the next file */
- continue;
- } //it's a directory
-
- /* If it's not a dir let's roll with it
- * next we need to build the pattern that we will use
- * to detect if it's an audio file
- */
- $pattern = "/\.(" . Config::get('catalog_file_pattern');
- if ($options['parse_m3u']) {
- $pattern .= "|m3u)$/i";
- }
- else {
- $pattern .= ")$/i";
- }
-
- $is_audio_file = preg_match($pattern,$file);
-
- // Define the Video file pattern
- if (!$is_audio_file AND Config::get('catalog_video_pattern')) {
- $video_pattern = "/\.(" . Config::get('catalog_video_pattern') . ")$/i";
- $is_video_file = preg_match($video_pattern,$file);
- }
-
- /* see if this is a valid audio file or playlist file */
- if ($is_audio_file OR $is_video_file) {
-
- /* Now that we're sure its a file get filesize */
- $file_size = filesize($full_file);
-
- if (!$file_size) {
- debug_event('read',"Unable to get filesize for $full_file",'2','ampache-catalog');
- /* HINT: FullFile */
- Error::add('catalog_add', sprintf(T_('Error: Unable to get filesize for %s'), $full_file));
- } // file_size check
-
- if (!is_readable($full_file)) {
- // not readable, warn user
- debug_event('read',"$full_file is not readable by ampache",'2','ampache-catalog');
- /* HINT: FullFile */
- Error::add('catalog_add', sprintf(T_('%s is not readable by ampache'), $full_file));
- continue;
- }
-
- // Check to make sure the filename is of the expected charset
- if (function_exists('iconv')) {
- if (strcmp($full_file,iconv(Config::get('site_charset'),Config::get('site_charset'),$full_file)) != '0') {
- debug_event('read',$full_file . ' has non-' . Config::get('site_charset') . ' characters and can not be indexed, converted filename:' . iconv(Config::get('site_charset'),Config::get('site_charset'),$full_file),'1');
- /* HINT: FullFile */
- Error::add('catalog_add', sprintf(T_('%s does not match site charset'), $full_file));
- continue;
- }
- } // end if iconv
-
- if ($options['parse_m3u'] AND substr($file,-3,3) == 'm3u') {
- $this->_playlists[] = $full_file;
- } // if it's an m3u
-
- else {
- if ($is_audio_file) { $this->insert_local_song($full_file,$file_size); }
- else { $this->insert_local_video($full_file,$file_size); }
-
- $this->count++;
- $file = str_replace(array('(',')','\''),'',$full_file);
- if(UI::check_ticker()) {
- UI::update_text('add_count_' . $this->id, $this->count);
- UI::update_text('add_dir_' . $this->id, scrub_out($file));
- } // update our current state
-
- } // if it's not an m3u
-
- } //if it matches the pattern
- else {
- debug_event('read',"$full_file ignored, non audio file or 0 bytes",'5','ampache-catalog');
- } // else not an audio file
-
- } // end while reading directory
-
- debug_event('closedir',"Finished reading $path closing handle",'5','ampache-catalog');
-
- // This should only happen on the last run
- if ($path == $this->path) {
- UI::update_text('add_count_' . $this->id, $this->count);
- UI::update_text('add_dir_' . $this->id, scrub_out($file));
- }
-
-
- /* Close the dir handle */
- @closedir($handle);
-
- } // add_files
-
- /**
- * get_album_ids
- * This returns an array of ids of albums that have songs in this
- * catalog
- */
- public function get_album_ids() {
-
- $id = Dba::escape($this->id);
- $results = array();
-
- $sql = "SELECT DISTINCT(`song`.`album`) FROM `song` WHERE `song`.`catalog`='$id'";
- $db_results = Dba::read($sql);
-
- while ($r = Dba::fetch_assoc($db_results)) {
- $results[] = $r['album'];
- }
-
- return $results;
-
- } // get_album_ids
-
- /**
- * get_art
- * This runs through all of the needs art albums and trys
- * to find the art for them from the mp3s
- */
- public function get_art($catalog_id = null, $all = false) {
-
- // Make sure they've actually got methods
- $art_order = Config::get('art_order');
- if (!count($art_order)) {
- debug_event('gather_art', 'art_order not set, Catalog::get_art aborting', 3);
- return true;
- }
-
- // Prevent the script from timing out
- set_time_limit(0);
-
- // If not passed use $this
- $catalog_id = $catalog_id ? $catalog_id : $this->id;
-
- if ($all) {
- $albums = $this->get_album_ids();
- }
- else {
- $albums = array_keys(self::$_art_albums);
- }
-
- // Run through them an get the art!
- foreach ($albums as $album_id) {
-
- // Create the object
- $art = new Art($album_id, 'album');
- $album = new Album($album_id);
- // We're going to need the name here
- $album->format();
-
- debug_event('gather_art', 'Gathering art for ' . $album->name, 5);
-
- // Define the options we want to use for the find art function
- $options = array(
- 'album_name' => $album->full_name,
- 'artist' => $album->artist_name,
- 'keyword' => $album->artist_name . ' ' . $album->full_name
- );
+ require Config::get('prefix') . '/templates/show_adds_catalog.inc.php';
+ flush();
+
+ // Prevent the script from timing out and flush what we've got
+ set_time_limit(0);
+
+ $this->add_files($this->path,$options);
+
+ // If they have checked the box then go ahead and gather the art
+ if ($options['gather_art']) {
+ $catalog_id = $this->id;
+ require Config::get('prefix') . '/templates/show_gather_art.inc.php';
+ flush();
+ $this->get_art('',1);
+ }
+
+ if ($options['parse_m3u'] AND count($this->_playlists)) {
+ foreach ($this->_playlists as $playlist_file) {
+ $result = $this->import_m3u($playlist_file);
+ }
+ } // if we need to do some m3u-age
+
+ return true;
+
+ } // run_add
+
+ /**
+ * count_videos
+ * This returns the current # of video files we've got in the db
+ */
+ public static function count_videos($catalog_id = null) {
+
+ $catalog_search = $catalog_id ? "WHERE `catalog`='" . Dba::escape($catalog_id) . "'" : '';
+
+ $sql = 'SELECT COUNT(`id`) AS `videos` FROM `video` ';
+ if ($catalog_id) {
+ $sql .= "WHERE `catalog`='" . Dba::escape($catalog_id) . "'";
+ }
+ $db_results = Dba::read($sql);
+
+ $row = Dba::fetch_assoc($db_results);
+
+ return $row;
+
+ } // count_videos
+
+ /**
+ * count_tags
+ * This returns the current # of unique tags that exist in the database
+ */
+ public static function count_tags($catalog_id = null) {
+
+ // FIXME: Ignores catalog_id
+ $sql = "SELECT COUNT(`id`) FROM `tag`";
+ $db_results = Dba::read($sql);
+
+ $info = Dba::fetch_row($db_results);
+
+ return $info['0'];
+
+ } // count_tags
+
+ /**
+ * count_songs
+ * This returns the current # of songs, albums, artists
+ * in this catalog
+ */
+ public static function count_songs($catalog_id = null) {
+
+ $where_sql = $catalog_id ? "WHERE `catalog`='" . Dba::escape($catalog_id) . "'" : '';
+
+ $sql = "SELECT COUNT(`id`),SUM(`time`),SUM(`size`) FROM `song` $where_sql";
+ $db_results = Dba::read($sql);
+ $data = Dba::fetch_row($db_results);
+ $songs = $data['0'];
+ $time = $data['1'];
+ $size = $data['2'];
+
+ $sql = "SELECT COUNT(DISTINCT(`album`)) FROM `song` $where_sql";
+ $db_results = Dba::read($sql);
+ $data = Dba::fetch_row($db_results);
+ $albums = $data['0'];
+
+ $sql = "SELECT COUNT(DISTINCT(`artist`)) FROM `song` $where_sql";
+ $db_results = Dba::read($sql);
+ $data = Dba::fetch_row($db_results);
+ $artists = $data['0'];
+
+ $results['songs'] = $songs;
+ $results['albums'] = $albums;
+ $results['artists'] = $artists;
+ $results['size'] = $size;
+ $results['time'] = $time;
+
+ return $results;
+
+ } // count_songs
+
+ /**
+ * count_users
+ * This returns the total number of users in the ampache instance
+ */
+ public static function count_users($catalog_id = null) {
+
+ // Count total users
+ $sql = "SELECT COUNT(`id`) FROM `user`";
+ $db_results = Dba::read($sql);
+ $data = Dba::fetch_row($db_results);
+ $results['users'] = $data['0'];
+
+ // Get the connected users
+ $time = time();
+ $last_seen_time = $time - 1200;
+ $sql = 'SELECT COUNT(DISTINCT `session`.`username`) ' .
+ 'FROM `session` INNER JOIN `user` ' .
+ 'ON `session`.`username` = `user`.`username` ' .
+ "WHERE `session`.`expire` > '$time' " .
+ "AND `user`.`last_seen` > '$last_seen_time'";
+ $db_results = Dba::read($sql);
+ $data = Dba::fetch_row($db_results);
+
+ $results['connected'] = $data['0'];
+
+ return $results;
+
+ } // count_users
+
+ /**
+ * add_files
+ * Recurses through $this->path and pulls out all mp3s and returns the
+ * full path in an array. Passes gather_type to determine if we need to
+ * check id3 information against the db.
+ */
+ public function add_files($path, $options) {
+
+ // Profile the memory a bit
+ debug_event('Memory', UI::format_bytes(memory_get_usage(true)), 5);
+
+ // See if we want a non-root path for the add
+ if (isset($options['subdirectory'])) {
+ $path = $options['subdirectory'];
+ unset($options['subdirectory']);
+ }
+
+ // Correctly detect the slash we need to use here
+ if (strpos($path, '/') !== false) {
+ $slash_type = '/';
+ }
+ else {
+ $slash_type = '\\';
+ }
+
+ /* Open up the directory */
+ $handle = opendir($path);
+
+ if (!is_resource($handle)) {
+ debug_event('read', "Unable to open $path", 5,'ampache-catalog');
+ Error::add('catalog_add', sprintf(T_('Error: Unable to open %s'), $path));
+ return false;
+ }
+
+ /* Change the dir so is_dir works correctly */
+ if (!chdir($path)) {
+ debug_event('read', "Unable to chdir $path", 2,'ampache-catalog');
+ Error::add('catalog_add', sprintf(T_('Error: Unable to change to directory %s'), $path));
+ return false;
+ }
+
+ // Ensure that we've got our cache
+ $this->_create_filecache();
+
+ debug_event('Memory', UI::format_bytes(memory_get_usage(true)), 5);
+
+ /* Recurse through this dir and create the files array */
+ while ( false !== ( $file = readdir($handle) ) ) {
+
+ /* Skip to next if we've got . or .. */
+ if (substr($file,0,1) == '.') { continue; }
+
+ debug_event('read',"Starting work on $file inside $path",'5','ampache-catalog');
+ debug_event('Memory', UI::format_bytes(memory_get_usage(true)), 5);
+
+ /* Create the new path */
+ $full_file = $path.$slash_type.$file;
+
+ /* First thing first, check if file is already in catalog.
+ * This check is very quick, so it should be performed before any other checks to save time
+ */
+ if (isset($this->_filecache[strtolower($full_file)])) {
+ continue;
+ }
+
+ // Incase this is the second time through clear this variable
+ // if it was set the day before
+ unset($failed_check);
+
+ if (Config::get('no_symlinks')) {
+ if (is_link($full_file)) {
+ debug_event('read',"Skipping Symbolic Link $path",'5','ampache-catalog');
+ continue;
+ }
+ }
+
+ /* If it's a dir run this function again! */
+ if (is_dir($full_file)) {
+ $this->add_files($full_file,$options);
+
+ /* Change the dir so is_dir works correctly */
+ if (!chdir($path)) {
+ debug_event('read',"Unable to chdir $path",'2','ampache-catalog');
+ Error::add('catalog_add', sprintf(T_('Error: Unable to change to directory %s'), $path));
+ }
+
+ /* Skip to the next file */
+ continue;
+ } //it's a directory
+
+ /* If it's not a dir let's roll with it
+ * next we need to build the pattern that we will use
+ * to detect if it's an audio file
+ */
+ $pattern = "/\.(" . Config::get('catalog_file_pattern');
+ if ($options['parse_m3u']) {
+ $pattern .= "|m3u)$/i";
+ }
+ else {
+ $pattern .= ")$/i";
+ }
+
+ $is_audio_file = preg_match($pattern,$file);
+
+ // Define the Video file pattern
+ if (!$is_audio_file AND Config::get('catalog_video_pattern')) {
+ $video_pattern = "/\.(" . Config::get('catalog_video_pattern') . ")$/i";
+ $is_video_file = preg_match($video_pattern,$file);
+ }
+
+ /* see if this is a valid audio file or playlist file */
+ if ($is_audio_file OR $is_video_file) {
+
+ /* Now that we're sure its a file get filesize */
+ $file_size = filesize($full_file);
+
+ if (!$file_size) {
+ debug_event('read',"Unable to get filesize for $full_file",'2','ampache-catalog');
+ /* HINT: FullFile */
+ Error::add('catalog_add', sprintf(T_('Error: Unable to get filesize for %s'), $full_file));
+ } // file_size check
+
+ if (!is_readable($full_file)) {
+ // not readable, warn user
+ debug_event('read',"$full_file is not readable by ampache",'2','ampache-catalog');
+ /* HINT: FullFile */
+ Error::add('catalog_add', sprintf(T_('%s is not readable by ampache'), $full_file));
+ continue;
+ }
+
+ // Check to make sure the filename is of the expected charset
+ if (function_exists('iconv')) {
+ if (strcmp($full_file,iconv(Config::get('site_charset'),Config::get('site_charset'),$full_file)) != '0') {
+ debug_event('read',$full_file . ' has non-' . Config::get('site_charset') . ' characters and can not be indexed, converted filename:' . iconv(Config::get('site_charset'),Config::get('site_charset'),$full_file),'1');
+ /* HINT: FullFile */
+ Error::add('catalog_add', sprintf(T_('%s does not match site charset'), $full_file));
+ continue;
+ }
+ } // end if iconv
+
+ if ($options['parse_m3u'] AND substr($file,-3,3) == 'm3u') {
+ $this->_playlists[] = $full_file;
+ } // if it's an m3u
+
+ else {
+ if ($is_audio_file) { $this->insert_local_song($full_file,$file_size); }
+ else { $this->insert_local_video($full_file,$file_size); }
+
+ $this->count++;
+ $file = str_replace(array('(',')','\''),'',$full_file);
+ if(UI::check_ticker()) {
+ UI::update_text('add_count_' . $this->id, $this->count);
+ UI::update_text('add_dir_' . $this->id, scrub_out($file));
+ } // update our current state
+
+ } // if it's not an m3u
+
+ } //if it matches the pattern
+ else {
+ debug_event('read',"$full_file ignored, non audio file or 0 bytes",'5','ampache-catalog');
+ } // else not an audio file
+
+ } // end while reading directory
+
+ debug_event('closedir',"Finished reading $path closing handle",'5','ampache-catalog');
+
+ // This should only happen on the last run
+ if ($path == $this->path) {
+ UI::update_text('add_count_' . $this->id, $this->count);
+ UI::update_text('add_dir_' . $this->id, scrub_out($file));
+ }
+
+
+ /* Close the dir handle */
+ @closedir($handle);
+
+ } // add_files
+
+ /**
+ * get_album_ids
+ * This returns an array of ids of albums that have songs in this
+ * catalog
+ */
+ public function get_album_ids() {
+
+ $id = Dba::escape($this->id);
+ $results = array();
+
+ $sql = "SELECT DISTINCT(`song`.`album`) FROM `song` WHERE `song`.`catalog`='$id'";
+ $db_results = Dba::read($sql);
+
+ while ($r = Dba::fetch_assoc($db_results)) {
+ $results[] = $r['album'];
+ }
+
+ return $results;
+
+ } // get_album_ids
+
+ /**
+ * get_art
+ * This runs through all of the needs art albums and trys
+ * to find the art for them from the mp3s
+ */
+ public function get_art($catalog_id = null, $all = false) {
+
+ // Make sure they've actually got methods
+ $art_order = Config::get('art_order');
+ if (!count($art_order)) {
+ debug_event('gather_art', 'art_order not set, Catalog::get_art aborting', 3);
+ return true;
+ }
+
+ // Prevent the script from timing out
+ set_time_limit(0);
+
+ // If not passed use $this
+ $catalog_id = $catalog_id ? $catalog_id : $this->id;
+
+ if ($all) {
+ $albums = $this->get_album_ids();
+ }
+ else {
+ $albums = array_keys(self::$_art_albums);
+ }
+
+ // Run through them an get the art!
+ foreach ($albums as $album_id) {
+
+ // Create the object
+ $art = new Art($album_id, 'album');
+ $album = new Album($album_id);
+ // We're going to need the name here
+ $album->format();
+
+ debug_event('gather_art', 'Gathering art for ' . $album->name, 5);
+
+ // Define the options we want to use for the find art function
+ $options = array(
+ 'album_name' => $album->full_name,
+ 'artist' => $album->artist_name,
+ 'keyword' => $album->artist_name . ' ' . $album->full_name
+ );
- // Return results
- $results = $art->gather($options, 1);
+ // Return results
+ $results = $art->gather($options, 1);
- if (count($results)) {
- // Pull the string representation from the source
- $image = Art::get_from_source($results['0'], 'album');
- if (strlen($image) > '5') {
- $art->insert($image, $results['0']['mime']);
- // If they've enabled resizing of images generate the thumbnail now
- if (Config::get('resize_images')) {
- $thumb = $art->generate_thumb($image,array('width'=>275,'height'=>275),$results['0']['mime']);
- if (is_array($thumb)) { $art->save_thumb($thumb['thumb'], $thumb['thumb_mime'], '275x275'); }
- }
-
- }
- else {
- debug_event('gather_art', 'Image less than 5 chars, not inserting', 3);
- }
- $art_found++;
- }
+ if (count($results)) {
+ // Pull the string representation from the source
+ $image = Art::get_from_source($results['0'], 'album');
+ if (strlen($image) > '5') {
+ $art->insert($image, $results['0']['mime']);
+ // If they've enabled resizing of images generate the thumbnail now
+ if (Config::get('resize_images')) {
+ $thumb = $art->generate_thumb($image,array('width'=>275,'height'=>275),$results['0']['mime']);
+ if (is_array($thumb)) { $art->save_thumb($thumb['thumb'], $thumb['thumb_mime'], '275x275'); }
+ }
+
+ }
+ else {
+ debug_event('gather_art', 'Image less than 5 chars, not inserting', 3);
+ }
+ $art_found++;
+ }
- /* Stupid little cutesie thing */
- $search_count++;
- if (UI::check_ticker()) {
- UI::update_text('count_art_' . $this->id, $search_count);
- UI::update_text('read_art_' . $this->id, scrub_out($album->name));
- } //echos song count
+ /* Stupid little cutesie thing */
+ $search_count++;
+ if (UI::check_ticker()) {
+ UI::update_text('count_art_' . $this->id, $search_count);
+ UI::update_text('read_art_' . $this->id, scrub_out($album->name));
+ } //echos song count
- unset($found);
- } // foreach albums
+ unset($found);
+ } // foreach albums
- // One last time for good measure
- UI::update_text('count_art_' . $this->id, $search_count);
- UI::update_text('read_art_' . $this->id, scrub_out($album->name));
-
- self::$_art_albums = array();
-
- } // get_art
+ // One last time for good measure
+ UI::update_text('count_art_' . $this->id, $search_count);
+ UI::update_text('read_art_' . $this->id, scrub_out($album->name));
+
+ self::$_art_albums = array();
+
+ } // get_art
- /**
- * generate_thumbnails
- * This generates the thumbnails from the images for object
- * of this catalog
- */
- public function generate_thumbnails() {
-
- // Albums first
- $albums = $this->get_album_ids();
-
- $thumb_count = 0;
-
- foreach ($albums as $album) {
- $art = new Art($album, 'album');
- $image = $art->get();
-
- /* Stupid little cutesie thing */
- $thumb_count++;
- if (UI::check_ticker()) {
- UI::update_text('count_thumb_' . $this->id, $search_count);
- } //echos thumb count
-
- } // end foreach albums
-
- UI::update_text('count_thumb_' . $this->id, $search_count);
-
- } // generate_thumbnails
-
- /**
- * get_catalog_albums()
- * Returns an array of the albums from a catalog
- */
- public static function get_catalog_albums($catalog_id) {
-
- $results = array();
-
- $sql = "SELECT DISTINCT(`song`.`album`) FROM `song` WHERE `song`.`catalog`='$catalog_id'";
- $db_results = Dba::read($sql);
-
- while ($row = Dba::fetch_assoc($db_results)) {
- $results[] = $row['album'];
- }
-
- return $results;
-
- } // get_catalog_albums
-
-
- /**
- * get_catalog_files
- * Returns an array of song objects from a catalog, used by sort_files script
- */
- public function get_catalog_files($catalog_id=0) {
-
- $results = array();
-
- /* Use $this->id if nothing passed */
- $catalog_id = $catalog_id ? Dba::escape($catalog_id) : Dba::escape($this->id);
-
- $sql = "SELECT `id` FROM `song` WHERE `catalog`='$catalog_id' AND `enabled`='1'";
- $db_results = Dba::read($sql);
-
- $results = array(); // return an emty array instead of nothing if no objects
- while ($r = Dba::fetch_assoc($db_results)) {
- $results[] = new Song($r['id']);
- } //end while
-
- return $results;
-
- } //get_catalog_files
-
- /**
- * dump_album_art
- * This runs through all of the albums and tries to dump the
- * art for them into the 'folder.jpg' file in the appropriate dir
- */
- public static function dump_album_art($catalog_id, $methods=array()) {
+ /**
+ * generate_thumbnails
+ * This generates the thumbnails from the images for object
+ * of this catalog
+ */
+ public function generate_thumbnails() {
+
+ // Albums first
+ $albums = $this->get_album_ids();
+
+ $thumb_count = 0;
+
+ foreach ($albums as $album) {
+ $art = new Art($album, 'album');
+ $image = $art->get();
+
+ /* Stupid little cutesie thing */
+ $thumb_count++;
+ if (UI::check_ticker()) {
+ UI::update_text('count_thumb_' . $this->id, $search_count);
+ } //echos thumb count
+
+ } // end foreach albums
+
+ UI::update_text('count_thumb_' . $this->id, $search_count);
+
+ } // generate_thumbnails
+
+ /**
+ * get_catalog_albums()
+ * Returns an array of the albums from a catalog
+ */
+ public static function get_catalog_albums($catalog_id) {
+
+ $results = array();
+
+ $sql = "SELECT DISTINCT(`song`.`album`) FROM `song` WHERE `song`.`catalog`='$catalog_id'";
+ $db_results = Dba::read($sql);
+
+ while ($row = Dba::fetch_assoc($db_results)) {
+ $results[] = $row['album'];
+ }
+
+ return $results;
+
+ } // get_catalog_albums
+
+
+ /**
+ * get_catalog_files
+ * Returns an array of song objects from a catalog, used by sort_files script
+ */
+ public function get_catalog_files($catalog_id=0) {
+
+ $results = array();
+
+ /* Use $this->id if nothing passed */
+ $catalog_id = $catalog_id ? Dba::escape($catalog_id) : Dba::escape($this->id);
+
+ $sql = "SELECT `id` FROM `song` WHERE `catalog`='$catalog_id' AND `enabled`='1'";
+ $db_results = Dba::read($sql);
+
+ $results = array(); // return an emty array instead of nothing if no objects
+ while ($r = Dba::fetch_assoc($db_results)) {
+ $results[] = new Song($r['id']);
+ } //end while
+
+ return $results;
+
+ } //get_catalog_files
+
+ /**
+ * dump_album_art
+ * This runs through all of the albums and tries to dump the
+ * art for them into the 'folder.jpg' file in the appropriate dir
+ */
+ public static function dump_album_art($catalog_id, $methods=array()) {
- // Get all of the albums in this catalog
- $albums = self::get_catalog_albums($catalog_id);
+ // Get all of the albums in this catalog
+ $albums = self::get_catalog_albums($catalog_id);
- echo "Starting Dump Album Art...\n";
+ echo "Starting Dump Album Art...\n";
- // Run through them and get the art!
- foreach ($albums as $album_id) {
+ // Run through them and get the art!
+ foreach ($albums as $album_id) {
- $album = new Album($album_id);
- $art = new Art($album_id, 'album');
-
- // If no art, skip
- if ( ! $art->get_db() ) { continue; }
+ $album = new Album($album_id);
+ $art = new Art($album_id, 'album');
+
+ // If no art, skip
+ if ( ! $art->get_db() ) { continue; }
- // Get the first song in the album
- $songs = $album->get_songs(1);
- $song = new Song($songs[0]);
- $dir = dirname($song->file);
+ // Get the first song in the album
+ $songs = $album->get_songs(1);
+ $song = new Song($songs[0]);
+ $dir = dirname($song->file);
- $extension = Art::extension($art->raw_mime);
-
- // Try the preferred filename, if that fails use folder.???
- $preferred_filename = Config::get('album_art_preferred_filename');
- if (!$preferred_filename ||
- strpos($preferred_filename, '%') !== false) {
- $preferred_filename = "folder.$extension";
- }
+ $extension = Art::extension($art->raw_mime);
+
+ // Try the preferred filename, if that fails use folder.???
+ $preferred_filename = Config::get('album_art_preferred_filename');
+ if (!$preferred_filename ||
+ strpos($preferred_filename, '%') !== false) {
+ $preferred_filename = "folder.$extension";
+ }
- $file = "$dir/$preferred_filename";
- if ($file_handle = fopen($file,"w")) {
- if (fwrite($file_handle, $art->raw)) {
+ $file = "$dir/$preferred_filename";
+ if ($file_handle = fopen($file,"w")) {
+ if (fwrite($file_handle, $art->raw)) {
- // Also check and see if we should write
- // out some metadata
- if ($methods['metadata']) {
- switch ($methods['metadata']) {
- case 'windows':
- $meta_file = $dir . '/desktop.ini';
- $string = "[.ShellClassInfo]\nIconFile=$file\nIconIndex=0\nInfoTip=$album->full_name";
- break;
- default:
- case 'linux':
- $meta_file = $dir . '/.directory';
- $string = "Name=$album->full_name\nIcon=$file";
- break;
- } // end switch
+ // Also check and see if we should write
+ // out some metadata
+ if ($methods['metadata']) {
+ switch ($methods['metadata']) {
+ case 'windows':
+ $meta_file = $dir . '/desktop.ini';
+ $string = "[.ShellClassInfo]\nIconFile=$file\nIconIndex=0\nInfoTip=$album->full_name";
+ break;
+ default:
+ case 'linux':
+ $meta_file = $dir . '/.directory';
+ $string = "Name=$album->full_name\nIcon=$file";
+ break;
+ } // end switch
- $meta_handle = fopen($meta_file,"w");
- fwrite($meta_handle,$string);
- fclose($meta_handle);
-
- } // end metadata
- $i++;
- if (!($i%100)) {
- echo "Written: $i. . .\n";
- debug_event('art_write',"$album->name Art written to $file",'5');
- }
- } // end if fopen
- else {
- debug_event('art_write',"Unable to open $file for writting",'5');
- echo "Error unable to open file for writting [$file]\n";
- }
- } // end if fopen worked
-
- fclose($file_handle);
-
-
- } // end foreach
-
- echo "Album Art Dump Complete\n";
-
- } // dump_album_art
-
- /**
- * update_last_update
- * updates the last_update of the catalog
- */
- private function update_last_update() {
-
- $date = time();
- $sql = "UPDATE `catalog` SET `last_update`='$date' WHERE `id`='$this->id'";
- $db_results = Dba::write($sql);
-
- } // update_last_update
-
- /**
- * update_last_add
- * updates the last_add of the catalog
- */
- public function update_last_add() {
-
- $date = time();
- $sql = "UPDATE `catalog` SET `last_add`='$date' WHERE `id`='$this->id'";
- $db_results = Dba::write($sql);
-
- } // update_last_add
-
- /**
- * update_last_clean
- * This updates the last clean information
- */
- public function update_last_clean() {
-
- $date = time();
- $sql = "UPDATE `catalog` SET `last_clean`='$date' WHERE `id`='$this->id'";
- $db_results = Dba::write($sql);
-
- } // update_last_clean
-
- /**
- * update_settings
- * This function updates the basic setting of the catalog
- */
- public static function update_settings($data) {
-
- $id = Dba::escape($data['catalog_id']);
- $name = Dba::escape($data['name']);
- $rename = Dba::escape($data['rename_pattern']);
- $sort = Dba::escape($data['sort_pattern']);
- $remote_username = Dba::escape($data['remote_username']);
- $remote_password = Dba::escape($data['remote_password']);
-
- $sql = "UPDATE `catalog` SET `name`='$name', `rename_pattern`='$rename', " .
- "`sort_pattern`='$sort', `remote_username`='$remote_username', `remote_password`='$remote_password' WHERE `id` = '$id'";
- $db_results = Dba::write($sql);
-
- return true;
-
- } // update_settings
-
- /**
- * update_single_item
- * updates a single album,artist,song from the tag data
- * this can be done by 75+
- */
- public static function update_single_item($type,$id) {
-
- // Because single items are large numbers of things too
- set_time_limit(0);
-
- $songs = array();
-
- switch ($type) {
- case 'album':
- $album = new Album($id);
- $songs = $album->get_songs();
- break;
- case 'artist':
- $artist = new Artist($id);
- $songs = $artist->get_songs();
- break;
- case 'song':
- $songs[] = $id;
- break;
- } // end switch type
-
- foreach($songs as $song_id) {
- $song = new Song($song_id);
- $info = self::update_media_from_tags($song,'','');
-
- if ($info['change']) {
- $file = scrub_out($song->file);
- echo "';
- } // start_container
+ } // start_container
- /**
- * end_container
- * This ends the container if we're not doing the AJAX thing
- */
- public static function end_container() {
+ /**
+ * end_container
+ * This ends the container if we're not doing the AJAX thing
+ */
+ public static function end_container() {
- if (defined('AJAX_INCLUDE') && !self::$include_override) { return true; }
+ if (defined('AJAX_INCLUDE') && !self::$include_override) { return true; }
- echo "
";
+ echo "- \n\t
- "; - echo "$file " . T_('Updated') . "\n"; - echo $info['text']; - echo "\t \n
"; - flush(); - } // if change - else { - echo"
- \n\t
- ";
- echo "" . scrub_out($song->file) . "
" . T_('No Update Needed') . "\n"; - echo "\t \n
"; - flush(); - } - } // foreach songs - - self::gc(); - - } // update_single_item - - /** - * update_media_from_tags - * This is a 'wrapper' function calls the update function for the media - * type in question - */ - public static function update_media_from_tags($media, $sort_pattern='', $rename_pattern='') { - - // Check for patterns - if (!$sort_pattern OR !$rename_pattern) { - $catalog = new Catalog($media->catalog); - $sort_pattern = $catalog->sort_pattern; - $rename_pattern = $catalog->rename_pattern; - } - - debug_event('tag-read','Reading tags from ' . $media->file,'5','ampache-catalog'); - - $vainfo = new vainfo($media->file,'','','',$sort_pattern,$rename_pattern); - $vainfo->get_info(); - - $key = vainfo::get_tag_type($vainfo->tags); - - $results = vainfo::clean_tag_info($vainfo->tags,$key,$media->file); - - // Figure out what type of object this is and call the right - // function, giving it the stuff we've figured out above - $name = (get_class($media) == 'Song') ? 'song' : 'video'; - - $function = 'update_' . $name . '_from_tags'; - - $return = call_user_func(array('Catalog',$function),$results,$media); - - return $return; - - } // update_media_from_tags - - /** - * update_video_from_tags - * Updates the video info based on tags - */ - public static function update_video_from_tags($results,$video) { - - // Pretty sweet function here - return $results; - - } // update_video_from_tags - - /** - * update_song_from_tags - * Updates the song info based on tags; this is called from a bunch of - * different places and passes in a full fledged song object, so it's a - * static function. - * FIXME: This is an ugly mess, this really needs to be consolidated and - * cleaned up. - */ - public static function update_song_from_tags($results,$song) { - - /* Setup the vars */ - $new_song = new Song(); - $new_song->file = $results['file']; - $new_song->title = $results['title']; - $new_song->year = $results['year']; - $new_song->comment = $results['comment']; - $new_song->language = $results['language']; - $new_song->lyrics = $results['lyrics']; - $new_song->bitrate = $results['bitrate']; - $new_song->rate = $results['rate']; - $new_song->mode = ($results['mode'] == 'cbr') ? 'cbr' : 'vbr'; - $new_song->size = $results['size']; - $new_song->time = $results['time']; - $new_song->mime = $results['mime']; - $new_song->track = intval($results['track']); - $new_song->mbid = $results['mb_trackid']; - $artist = $results['artist']; - $artist_mbid = $results['mb_artistid']; - $album = $results['album']; - $album_mbid = $results['mb_albumid']; - $disk = $results['disk']; - $tags = $results['genre']; // multiple genre support makes this an array - - /* - * We have the artist/genre/album name need to check it in the tables - * If found then add & return id, else return id - */ - $new_song->artist = self::check_artist($artist,$artist_mbid); - $new_song->f_artist = $artist; - $new_song->album = self::check_album($album,$new_song->year,$disk,$album_mbid); - $new_song->f_album = $album . " - " . $new_song->year; - $new_song->title = self::check_title($new_song->title,$new_song->file); - - // Nothing to assign here this is a multi-value doodly - // multiple genre support - foreach ($tags as $tag) { - $tag = trim($tag); - self::check_tag($tag,$song->id); - self::check_tag($tag,$new_song->album,'album'); - self::check_tag($tag,$new_song->artist,'artist'); - } - - /* Since we're doing a full compare make sure we fill the extended information */ - $song->fill_ext_info(); - - $info = Song::compare_song_information($song,$new_song); - - if ($info['change']) { - debug_event('update',"$song->file difference found, updating database",'5','ampache-catalog'); - $song->update_song($song->id,$new_song); - // Refine our reference - $song = $new_song; - } - else { - debug_event('update',"$song->file no difference found returning",'5','ampache-catalog'); - } - - return $info; - - } // update_song_from_tags - - /** - * add_to_catalog - * this function adds new files to an - * existing catalog - */ - public function add_to_catalog() { - - if ($this->catalog_type == 'remote') { - UI::show_box_top(T_('Running Remote Update') . '. . .'); - $this->get_remote_catalog($type=0); - UI::show_box_bottom(); - return true; - } - - require Config::get('prefix') . '/templates/show_adds_catalog.inc.php'; - flush(); - - /* Set the Start time */ - $start_time = time(); - - // Make sure the path doesn't end in a / or \ - $this->path = rtrim($this->path,'/'); - $this->path = rtrim($this->path,'\\'); - - // Prevent the script from timing out and flush what we've got - set_time_limit(0); - - /* Get the songs and then insert them into the db */ - $this->add_files($this->path,$type,0,$verbose); - - // Foreach Playlists we found - foreach ($this->_playlists as $full_file) { - $result = $this->import_m3u($full_file); - if ($result['success']) { - $file = basename($full_file); - if ($verbose) { - echo " " . T_('Added Playlist From') . " $file . . . .
\n"; - flush(); - } - } // end if import worked - } // end foreach playlist files - - /* Do a little stats mojo here */ - $current_time = time(); - - $catalog_id = $this->id; - require Config::get('prefix') . '/templates/show_gather_art.inc.php'; - flush(); - $this->get_art(); - - /* Update the Catalog last_update */ - $this->update_last_add(); - - $time_diff = ($current_time - $start_time) ?: 0; - $rate = intval($this->count / $time_diff) ?: T_('N/A'); - - UI::show_box_top(); - echo "\n
" . - printf(T_('Catalog Update Finished. Total Time: [%s] Total Songs: [%s] Songs Per Second: [%s]'), - date('i:s', $time_diff), $this->count, $rate); - echo '
'; - UI::show_box_bottom(); - - } // add_to_catalog - - /** - * get_remote_catalog - * get a remote catalog and runs update if needed this requires - * this uses the AmpacheAPI library provided, replaces legacy XMLRPC - */ - public function get_remote_catalog($type=0) { - - try { - $remote_handle = new AmpacheApi(array('username'=>$this->remote_username,'password'=>$this->remote_password,'server'=>$this->path,'debug'=>true)); - } catch (Exception $e) { - Error::add('general',$e->getMessage()); - Error::display('general'); - flush(); - return false; - } - - if ($remote_handle->state() != 'CONNECTED') { - debug_event('APICLIENT','Error Unable to make API client ready','1'); - Error::add('general', T_('Error Connecting to Remote Server')); - Error::display('general'); - return false; - } - - // Figure out how many songs, more information etc - $remote_catalog_info = $remote_handle->info(); - - // Tell em what we've found johnny! - printf(T_('%u remote catalog(s) found (%u songs)'),$remote_catalog_info['catalogs'],$remote_catalog_info['songs']); - flush(); - - // Hardcoded for now - $step = '500'; - $current = '0'; - $total = $remote_catalog_info['songs']; - - while ($total > $current) { - $start = $current; - $current += $step; - // It uses exceptions so lets try this - try { - $remote_handle->parse_response($remote_handle->send_command('songs',array('offset'=>$start,'limit'=>$step))); - $songs = $remote_handle->get_response(); - } catch (Exception $e) { - Error::add('general',$e->getMessage()); - Error::display('general'); - flush(); - } - // itterate the songs we retrieved and insert them - foreach ($songs as $data) { - if (!$this->insert_remote_song($data['song'])) { - debug_event('REMOTE_INSERT','Remote Insert failed, see previous log messages -' . $data['song']['self']['id'],'1'); - Error::add('general', T_('Unable to Insert Song - %s'),$data['song']['title']); - Error::display('general'); - flush(); - } - } // end foreach - } // end while - - echo "
" . T_('Completed updating remote catalog(s)') . ".
\n"; - flush(); - - // Update the last update value - $this->update_last_update(); - - return true; - - } // get_remote_catalog - - /** - * update_remote_catalog - * actually updates from the remote data, takes an array of songs that are base64 encoded and parses them - */ - public function update_remote_catalog($data,$root_path) { - - // Going to leave this be for now - //FIXME: Implement - - return true; - - } // update_remote_catalog - - /** - * clean_catalog - * Cleans the catalog of files that no longer exist. - */ - public function clean_catalog() { - - // We don't want to run out of time - set_time_limit(0); - - debug_event('clean', 'Starting on ' . $this->name, 5, 'ampache-catalog'); - - require_once Config::get('prefix') . '/templates/show_clean_catalog.inc.php'; - ob_flush(); - flush(); - - // Do a quick check to make sure that the root of the catalog is - // readable. This will minimize the loss of catalog data if - // mount points fail - if ($this->catalog_type == 'local' && !is_readable($this->path)) { - debug_event('catalog', 'Catalog path:' . $this->path . ' unreadable, clean failed', 1); - Error::add('general', T_('Catalog Root unreadable, stopping clean')); - Error::display('general'); - return false; - } - - - $dead_total = 0; - $stats = self::get_stats($this->id); - foreach(array('video', 'song') as $media_type) { - $total = $stats[$media_type . 's']; // UGLY - if ($total == 0) { - continue; - } - $chunks = floor($total / 10000); - $dead = array(); - foreach(range(0, $chunks) as $chunk) { - $dead = array_merge($dead, $this->_clean_chunk($media_type, $chunk, 10000)); - } - - $dead_count = count($dead); - // The AlmightyOatmeal sanity check - // Never remove everything; it might be a dead mount - if ($dead_count >= $total) { - debug_event('catalog', 'All files would be removed. Doing nothing.', 1); - Error::add('general', T_('All files would be removed. Doing nothing')); - continue; - } - if ($dead_count) { - $dead_total += $dead_count; - $sql = "DELETE FROM `$media_type` WHERE `id` IN " . - '(' . implode(',',$dead) . ')'; - $db_results = Dba::write($sql); - } - debug_event('clean', "$media_type finished, $dead_count removed from " . - $this->name, 5, 'ampache-catalog'); - } - - // Remove any orphaned artists/albums/etc. - self::gc(); - - UI::show_box_top(); - echo ""; - printf (T_ngettext('Catalog Clean Done. %d file removed.', 'Catalog Clean Done. %d files removed.', $dead_total), $dead_total); - echo "
\n"; - UI::show_box_bottom(); - ob_flush(); - flush(); - - $this->update_last_clean(); - } // clean_catalog - - - /** - * _clean_chunk - * This is the clean function, its broken into - * said chunks to try to save a little memory - */ - private function _clean_chunk($media_type, $chunk, $chunk_size) { - debug_event('clean', "Starting chunk $chunk", 5, 'ampache-catalog'); - $dead = array(); - $count = $chunk * $chunk_size; - - $sql = "SELECT `id`, `file` FROM `$media_type` " . - "WHERE `catalog`='$this->id' LIMIT $count,$chunk_size"; - $db_results = Dba::read($sql); - - while ($results = Dba::fetch_assoc($db_results)) { - debug_event('clean', 'Starting work on ' . $results['file'] . '(' . $results['id'] . ')', 5, 'ampache-catalog'); - $count++; - if (UI::check_ticker()) { - $file = str_replace(array('(',')', '\''), '', $results['file']); - UI::update_text('clean_count_' . $this->id, $count); - UI::update_text('clean_dir_' . $this->id, scrub_out($file)); - } - if($this->catalog_type == 'local') { - $file_info = filesize($results['file']); - if (!file_exists($results['file']) || $file_info < 1) { - debug_event('clean', 'File not found or empty: ' . $results['file'], 5, 'ampache-catalog'); - Error::add('general', sprintf(T_('Error File Not Found or 0 Bytes: %s'), $results['file'])); - - - // Store it in an array we'll delete it later... - $dead[] = $results['id']; - - } //if error - else if (!is_readable($results['file'])) { - debug_event('clean', $results['file'] . ' is not readable, but does exist', 1, 'ampache-catalog'); - } - } // if localtype - else { - //do remote url check - $file_info = $this->check_remote_song($results['file']); - - if ($file_info == false) { - /* Add Error */ - Error::add('general', sprintf(T_('Error Remote File Not Found or 0 Bytes: %s'), $results['file'])); - - - // Store it in an array we'll delete it later... - $dead[] = $results['id']; - - } //if error - } // remote catalog - - } //while gettings songs - return $dead; - - } //_clean_chunk - - /** - * verify_catalog - * This function compares the DB's information with the ID3 tags - */ - public function verify_catalog() { - - debug_event('verify', 'Starting on ' . $this->name, 5, 'ampache-catalog'); - set_time_limit(0); - - $stats = self::get_stats($this->id); - $number = $stats['videos'] + $stats['songs']; - $total_updated = 0; - - require_once Config::get('prefix') . '/templates/show_verify_catalog.inc.php'; - - foreach(array('video', 'song') as $media_type) { - $total = $stats[$media_type . 's']; // UGLY - if ($total == 0) { - continue; - } - $chunks = floor($total / 10000); - foreach(range(0, $chunks) as $chunk) { - // Try to be nice about memory usage - if ($chunk > 0) { - $media_type::clear_cache(); - } - $total_updated += $this->_verify_chunk($media_type, $chunk, 10000); - } - } - - debug_event('verify', "Finished, $total_updated updated in " . $this->name, 5, 'ampache-catalog'); - - self::gc(); - $this->update_last_update(); - - UI::show_box_top(); - echo ''; - printf(T_('Catalog Verify Done. %d of %d files updated.'), $total_updated, $number); - echo "
\n"; - UI::show_box_bottom(); - ob_flush(); - flush(); - - return true; - - } // verify_catalog - - /** - * _verify_chunk - * This verifies a chunk of the catalog, done to save - * memory - */ - private function _verify_chunk($media_type, $chunk, $chunk_size) { - debug_event('verify', "Starting chunk $chunk", 5, 'ampache-catalog'); - $count = $chunk * $chunk_size; - $changed = 0; - - $sql = "SELECT `id`, `file` FROM `$media_type` " . - "WHERE `catalog`='$this->id' LIMIT $count,$chunk_size"; - $db_results = Dba::read($sql); - - if (Config::get('memory_cache')) { - while ($row = Dba::fetch_assoc($db_results, false)) { - $media_ids[] = $row['id']; - } - $media_type::build_cache($media_ids); - Dba::seek($db_results, 0); - } - - while ($row = Dba::fetch_assoc($db_results)) { - $count++; - if (UI::check_ticker()) { - $file = str_replace(array('(',')','\''), '', $row['file']); - UI::update_text('verify_count_' . $this->id, $count); - UI::update_text('verify_dir_' . $this->id, scrub_out($file)); - } - - if (!is_readable($row['file'])) { - Error::add('general', sprintf(T_('%s does not exist or is not readable'), $row['file'])); - debug_event('read', $row['file'] . ' does not exist or is not readable', 5,'ampache-catalog'); - continue; - } - - $media = new $media_type($row['id']); - - if (Flag::has_flag($media->id, $type)) { - debug_event('verify', "$media->file is flagged, skipping", 5, 'ampache-catalog'); - continue; - } - - $info = self::update_media_from_tags($media, $this->sort_pattern,$this->rename_pattern); - if ($info['change']) { - $changed++; - } - unset($info); - } - - UI::update_text('verify_count_' . $this->id, $count); - return $changed; - - } // _verfiy_chunk - - /** - * gc - * - * This is a wrapper function for all of the different cleaning - * functions, it runs them in an order that resembles correct - */ - public static function gc() { - - debug_event('catalog', 'Database cleanup started', 5, 'ampache-catalog'); - Song::gc(); - Album::gc(); - Artist::gc(); - Art::gc(); - Flag::gc(); - Stats::gc(); - Rating::gc(); - Playlist::gc(); - Tmp_Playlist::gc(); - Shoutbox::gc(); - Tag::gc(); - debug_event('catalog', 'Database cleanup ended', 5, 'ampache-catalog'); - - } - - /** - * trim_prefix - * Splits the prefix from the string - */ - public static function trim_prefix($string) { - $prefix_pattern = '/^(' . implode('\\s|',explode('|',Config::get('catalog_prefix_pattern'))) . '\\s)(.*)/i'; - preg_match($prefix_pattern, $string, $matches); - - if (count($matches)) { - $string = trim($matches[2]); - $prefix = trim($matches[1]); - } - else { - $prefix = null; - } - - return array('string' => $string, 'prefix' => $prefix); - } // trim_prefix - - /** - * check_artist - * $artist checks if there then return id else insert and return id - * If readonly is passed then don't create, return false on not found - */ - public static function check_artist($artist,$mbid='',$readonly='') { - - /* Clean up the artist */ - $artist = trim($artist); - $artist = Dba::escape($artist); - - /* Ohh no the artist has lost it's mojo! */ - if (!$artist) { - $artist = T_('Unknown (Orphaned)'); - } - - // Remove the prefix so we can sort it correctly - $trimmed = Catalog::trim_prefix($artist); - $artist = $trimmed['string']; - $prefix = $trimmed['prefix']; - - // Check to see if we've seen this artist before - if (isset(self::$artists[$artist][$mbid])) { - return self::$artists[$artist][$mbid]; - } // if we've seen this artist before - - $exists = false; - - $sql = "SELECT `id` FROM `artist` WHERE `mbid`='$mbid'"; - $db_results = Dba::read($sql); - - // Check for results - if ($r = Dba::fetch_assoc($db_results)) { - $artist_id = $r['id']; - $exists = true; - } - - else { // No exact match based on MBID - $sql = "SELECT `id`, `mbid` FROM `artist` WHERE `name` LIKE '$artist'"; - $db_results = Dba::read($sql); - - - /* If we have results */ - while ($r = Dba::fetch_assoc($db_results)) { - $key = is_null($r['mbid']) ? 'null' : $r['mbid']; - $id_array[$key] = $r['id']; - } // while - - /* Choose one */ - if (isset($id_array)) { - if ($mbid == '') { // Prefer null entry, otherwise pick the first - if (isset($id_array['null'])) { - $key = 'null'; - } - else { - $keys = array_keys($id_array); - $key = array_shift($keys); - } - $artist_id = $id_array[$key]; - $exists = true; - } - elseif (isset($id_array['null'])) { - $artist_id = $id_array['null']; - $exists = true; - if (!$readonly) { - $sql = "UPDATE `artist` SET `mbid`='$mbid' WHERE `id`='$artist_id'"; - $db_results = Dba::write($sql); - if (!$db_results) { - Error::add('general', sprintf(T_('Updating Artist: %s'), $artist)); - } - } - } - unset($id_array); - } - } // fuzzy matching - - /* If not found create */ - if (!$readonly && !$exists) { - - $prefix_txt = $prefix ? "'$prefix'" : 'NULL'; - - $mbid = $mbid == '' ? 'NULL' : "'$mbid'"; - - $sql = "INSERT INTO `artist` (`name`, `prefix`, `mbid`) " . - "VALUES ('$artist',$prefix_txt,$mbid)"; - $db_results = Dba::write($sql); - $artist_id = Dba::insert_id(); - - if (!$db_results) { - Error::add('general', sprintf(T_('Inserting Artist: %s'), $artist)); - } - - } // not found - // If readonly, and not found return false - elseif (!$exists) { - return false; - } - - self::$artists[$artist][$mbid] = $artist_id; - - return $artist_id; - - } // check_artist - - /** - * check_album - * Searches for album; if found returns id else inserts and returns id - */ - public static function check_album($album, $album_year = 0, - $album_disk = 0, $mbid = '', $readonly = false) { - - /* Clean up the values */ - $album = trim($album); - $album = Dba::escape($album); - // Not even sure if these can be negative, but better safe than - // llama. - $album_year = abs(intval($album_year)); - $album_disk = abs(intval($album_disk)); - - /* Ohh no the album has lost its mojo */ - if (!$album) { - $album = T_('Unknown (Orphaned)'); - unset($album_year, $album_disk); - } - - // Remove the prefix so we can sort it correctly - $trimmed = Catalog::trim_prefix($album); - $album = $trimmed['string']; - $prefix = $trimmed['prefix']; - - // Check to see if we've seen this album before - if (isset(self::$albums[$album][$album_year][$album_disk][$mbid])) { - return self::$albums[$album][$album_year][$album_disk][$mbid]; - } - - /* Set up the Query */ - $sql = "SELECT `id` FROM `album` WHERE `name` = '$album'" . - " AND `disk`='$album_disk' AND `year`='$album_year'" . - " AND `mbid`" . ($mbid ? "='$mbid'" : ' IS NULL') . - " AND `prefix`" . ($prefix ? "='$prefix'" : ' IS NULL'); - - $db_results = Dba::read($sql); - - /* If it's found */ - if ($r = Dba::fetch_assoc($db_results)) { - $album_id = $r['id']; - - // If we don't have art put it in the 'needs me some - // art' array - $art = new Art($r['id'], 'album'); - $art->get_db(); - if (!$art->raw) { - $key = $r['id']; - self::$_art_albums[$key] = $key; - } - - } //if found - elseif (!$readonly) { // If not found, create - - $prefix = $prefix ? "'$prefix'" : 'NULL'; - $mbid = $mbid ? "'$mbid'" : 'NULL'; - - $sql = "INSERT INTO `album` (`name`, `prefix`,`year`,`disk`,`mbid`) " . - "VALUES ('$album',$prefix,'$album_year','$album_disk',$mbid)"; - $db_results = Dba::write($sql); - $album_id = Dba::insert_id(); - - if (!$db_results) { - debug_event('album',"Error Unable to insert Album:$album",'2'); - return false; - } - - // Add it to the I needs me some album art array - self::$_art_albums[$album_id] = $album_id; - - } //not found - else { - // readonly and not found - return false; - } - - // Save the cache - self::$albums[$album][$album_year][$album_disk][$mbid] = $album_id; - - return $album_id; - - } // check_album - - /** - * check_tag - * This checks the tag we've been passed (name) - * and sees if it exists, and if so if it's mapped - * to this object, this is only done for songs for now - */ - public static function check_tag($value,$object_id,$object_type='song') { - - $map_id = Tag::add($object_type,$object_id,$value,'0'); - - return $map_id; - - } // check_tag - - /** - * check_title - * this checks to make sure something is - * set on the title, if it isn't it looks at the - * filename and trys to set the title based on that - */ - public static function check_title($title,$file=0) { - - if (strlen(trim($title)) < 1) { - $title = Dba::escape($file); - } - - return $title; - - } // check_title - - /** - * insert_local_song - * Insert a song that isn't already in the database this - * function is in here so we don't have to create a song object - */ - public function insert_local_song($file,$file_info) { - - /* Create the vainfo object and get info */ - $vainfo = new vainfo($file,'','','',$this->sort_pattern,$this->rename_pattern); - $vainfo->get_info(); - - $key = vainfo::get_tag_type($vainfo->tags); - - /* Clean Up the tags */ - $results = vainfo::clean_tag_info($vainfo->tags,$key,$file); - - /* Set the vars here... so we don't have to do the '" . $blah['asd'] . "' */ - $title = Dba::escape($results['title']); - $artist = $results['artist']; - $album = $results['album']; - $bitrate = $results['bitrate']; - $rate = $results['rate']; - $mode = $results['mode']; - $size = $results['size']; - $song_time = $results['time']; - $track = $results['track']; - $track_mbid = $results['mb_trackid']; - $album_mbid = $results['mb_albumid']; - $artist_mbid= $results['mb_artistid']; - $disk = $results['disk']; - $year = $results['year']; - $comment = $results['comment']; - $tags = $results['genre']; // multiple genre support makes this an array - $current_time = time(); - $lyrics = ' '; - - /* - * We have the artist/genre/album name need to check it in the tables - * If found then add & return id, else return id - */ - $artist_id = self::check_artist($artist,$artist_mbid); - $album_id = self::check_album($album,$year,$disk,$album_mbid); - $title = self::check_title($title,$file); - $add_file = Dba::escape($file); - - $sql = "INSERT INTO `song` (file,catalog,album,artist,title,bitrate,rate,mode,size,time,track,addition_time,year,mbid)" . - " VALUES ('$add_file','$this->id','$album_id','$artist_id','$title','$bitrate','$rate','$mode','$size','$song_time','$track','$current_time','$year','$track_mbid')"; - $db_results = Dba::write($sql); - - if (!$db_results) { - debug_event('insert',"Unable to insert $file -- $sql" . Dba::error(),'5','ampache-catalog'); - Error::add('catalog_add', sprintf(T_('SQL Error Adding %s'), $file)); - } - - $song_id = Dba::insert_id(); - - // multiple genre support - foreach ($tags as $tag) { - $tag = trim($tag); - self::check_tag($tag,$song_id); - self::check_tag($tag,$album_id,'album'); - self::check_tag($tag,$artist_id,'artist'); - } - - - /* Add the EXT information */ - $sql = "INSERT INTO `song_data` (`song_id`,`comment`,`lyrics`) " . - " VALUES ('$song_id','$comment','$lyrics')"; - $db_results = Dba::write($sql); - - if (!$db_results) { - debug_event('insert',"Unable to insert EXT Info for $file -- $sql",'5','ampache-catalog'); - } - - } // insert_local_song - - /** - * insert_remote_song - * takes the information gotten from XML-RPC and - * inserts it into the local database. The filename - * ends up being the url. - */ - public function insert_remote_song($song) { - - /* Limitations: - * Missing Following Metadata - * Disk,Rate - */ - - // Strip the SSID off of the url, we will need to regenerate this every time - $url = preg_replace("/ssid=.*&/","",$song['url']); - $title = Dba::escape($song['title']); - $album = self::check_album($song['album'],$song['year'],null,$song['album_mbid']); - $artist = self::check_artist($song['artist'],$song['artist_mbid']); - $bitrate = Dba::escape($song['bitrate']); - $size = Dba::escape($song['size']); - $song_time = Dba::escape($song['time']); - $track = Dba::escape($song['track']); - $year = Dba::escape($song['year']); - $title = Dba::escape($song['title']); - $mbid = Dba::escape($song['mbid']); - $mode = Dba::escape($song['mode']); - $current_time = time(); - $catalog_id = Dba::escape($this->id); - - $sql = "INSERT INTO `song` (`file`,`catalog`,`album`,`artist`,`title`,`bitrate`,`rate`,`mode`,`size`,`time`,`track`,`addition_time`,`year`,`mbid`)" . - " VALUES ('$url','$catalog_id','$album','$artist','$title','$bitrate','$rate','$mode','$size','$song_time','$track','$current_time','$year','$mbid')"; - $db_results = Dba::write($sql); - - if (!$db_results) { - debug_event('insert',"Unable to Add Remote $url -- $sql",'5','ampache-catalog'); - return false; - } - - // Weird to do this here, but we have the information - see if the album has art, if it doesn't then use the remote - // art url - $art = new Art($album, 'album'); - // If it doesn't have art... - if (!$art->get()) { - // Get the mime out - $get_vars = parse_url($song['art']); - $extension = substr($get_vars['query'],strlen($get_vars['query'])-3,3); - // Pull the image - $raw = Art::get_from_source( - array('url' => $song['art']), 'album'); - $inserted = $art->insert($raw,'image/' . $extension); - } - - return true; - - } // insert_remote_song - - /** - * insert_local_video - * This inserts a video file into the video file table the tag - * information we can get is super sketchy so it's kind of a crap shoot - * here - */ - public function insert_local_video($file,$filesize) { - - /* Create the vainfo object and get info */ - $vainfo = new vainfo($file,'','','',$this->sort_pattern,$this->rename_pattern); - $vainfo->get_info(); - - $tag_name = vainfo::get_tag_type($vainfo->tags); - $results = vainfo::clean_tag_info($vainfo->tags,$tag_name,$file); - - - $file = Dba::escape($file); - $catalog_id = Dba::escape($this->id); - $title = Dba::escape($results['title']); - $vcodec = $results['video_codec']; - $acodec = $results['audio_codec']; - $rezx = intval($results['resolution_x']); - $rezy = intval($results['resolution_y']); - $filesize = Dba::escape($filesize); - $time = Dba::escape($results['time']); - $mime = Dba::escape($results['mime']); - // UNUSED CURRENTLY - $comment = Dba::escape($results['comment']); - $year = Dba::escape($results['year']); - $disk = Dba::escape($results['disk']); - - $sql = "INSERT INTO `video` (`file`,`catalog`,`title`,`video_codec`,`audio_codec`,`resolution_x`,`resolution_y`,`size`,`time`,`mime`) " . - " VALUES ('$file','$catalog_id','$title','$vcodec','$acodec','$rezx','$rezy','$filesize','$time','$mime')"; - $db_results = Dba::write($sql); - - return true; - - } // insert_local_video - - /** - * check_remote_song - * checks to see if a remote song exists in the database or not - * if it find a song it returns the UID - */ - public function check_remote_song($url) { - - $url = Dba::escape($url); - - $sql = "SELECT `id` FROM `song` WHERE `file`='$url'"; - $db_results = Dba::read($sql); - - if ($results = Dba::fetch_assoc($db_results)) { - return $results['id']; - } - - return false; - - } // check_remote_song - - /** - * check_local_mp3 - * Checks the song to see if it's there already returns true if found, false if not - */ - public function check_local_mp3($full_file, $gather_type='') { - - $file_date = filemtime($full_file); - if ($file_date < $this->last_add) { - debug_event('Check','Skipping ' . $full_file . ' File modify time before last add run','3'); - return true; - } - - $full_file = Dba::escape($full_file); + $meta_handle = fopen($meta_file,"w"); + fwrite($meta_handle,$string); + fclose($meta_handle); + + } // end metadata + $i++; + if (!($i%100)) { + echo "Written: $i. . .\n"; + debug_event('art_write',"$album->name Art written to $file",'5'); + } + } // end if fopen + else { + debug_event('art_write',"Unable to open $file for writting",'5'); + echo "Error unable to open file for writting [$file]\n"; + } + } // end if fopen worked + + fclose($file_handle); + + + } // end foreach + + echo "Album Art Dump Complete\n"; + + } // dump_album_art + + /** + * update_last_update + * updates the last_update of the catalog + */ + private function update_last_update() { + + $date = time(); + $sql = "UPDATE `catalog` SET `last_update`='$date' WHERE `id`='$this->id'"; + $db_results = Dba::write($sql); + + } // update_last_update + + /** + * update_last_add + * updates the last_add of the catalog + */ + public function update_last_add() { + + $date = time(); + $sql = "UPDATE `catalog` SET `last_add`='$date' WHERE `id`='$this->id'"; + $db_results = Dba::write($sql); + + } // update_last_add + + /** + * update_last_clean + * This updates the last clean information + */ + public function update_last_clean() { + + $date = time(); + $sql = "UPDATE `catalog` SET `last_clean`='$date' WHERE `id`='$this->id'"; + $db_results = Dba::write($sql); + + } // update_last_clean + + /** + * update_settings + * This function updates the basic setting of the catalog + */ + public static function update_settings($data) { + + $id = Dba::escape($data['catalog_id']); + $name = Dba::escape($data['name']); + $rename = Dba::escape($data['rename_pattern']); + $sort = Dba::escape($data['sort_pattern']); + $remote_username = Dba::escape($data['remote_username']); + $remote_password = Dba::escape($data['remote_password']); + + $sql = "UPDATE `catalog` SET `name`='$name', `rename_pattern`='$rename', " . + "`sort_pattern`='$sort', `remote_username`='$remote_username', `remote_password`='$remote_password' WHERE `id` = '$id'"; + $db_results = Dba::write($sql); + + return true; + + } // update_settings + + /** + * update_single_item + * updates a single album,artist,song from the tag data + * this can be done by 75+ + */ + public static function update_single_item($type,$id) { + + // Because single items are large numbers of things too + set_time_limit(0); + + $songs = array(); + + switch ($type) { + case 'album': + $album = new Album($id); + $songs = $album->get_songs(); + break; + case 'artist': + $artist = new Artist($id); + $songs = $artist->get_songs(); + break; + case 'song': + $songs[] = $id; + break; + } // end switch type + + foreach($songs as $song_id) { + $song = new Song($song_id); + $info = self::update_media_from_tags($song,'',''); + + if ($info['change']) { + $file = scrub_out($song->file); + echo "
- \n\t
- "; + echo "$file " . T_('Updated') . "\n"; + echo $info['text']; + echo "\t \n
"; + flush(); + } // if change + else { + echo"
- \n\t
- ";
+ echo "" . scrub_out($song->file) . "
" . T_('No Update Needed') . "\n"; + echo "\t \n
"; + flush(); + } + } // foreach songs + + self::gc(); + + } // update_single_item + + /** + * update_media_from_tags + * This is a 'wrapper' function calls the update function for the media + * type in question + */ + public static function update_media_from_tags($media, $sort_pattern='', $rename_pattern='') { + + // Check for patterns + if (!$sort_pattern OR !$rename_pattern) { + $catalog = new Catalog($media->catalog); + $sort_pattern = $catalog->sort_pattern; + $rename_pattern = $catalog->rename_pattern; + } + + debug_event('tag-read','Reading tags from ' . $media->file,'5','ampache-catalog'); + + $vainfo = new vainfo($media->file,'','','',$sort_pattern,$rename_pattern); + $vainfo->get_info(); + + $key = vainfo::get_tag_type($vainfo->tags); + + $results = vainfo::clean_tag_info($vainfo->tags,$key,$media->file); + + // Figure out what type of object this is and call the right + // function, giving it the stuff we've figured out above + $name = (get_class($media) == 'Song') ? 'song' : 'video'; + + $function = 'update_' . $name . '_from_tags'; + + $return = call_user_func(array('Catalog',$function),$results,$media); + + return $return; + + } // update_media_from_tags + + /** + * update_video_from_tags + * Updates the video info based on tags + */ + public static function update_video_from_tags($results,$video) { + + // Pretty sweet function here + return $results; + + } // update_video_from_tags + + /** + * update_song_from_tags + * Updates the song info based on tags; this is called from a bunch of + * different places and passes in a full fledged song object, so it's a + * static function. + * FIXME: This is an ugly mess, this really needs to be consolidated and + * cleaned up. + */ + public static function update_song_from_tags($results,$song) { + + /* Setup the vars */ + $new_song = new Song(); + $new_song->file = $results['file']; + $new_song->title = $results['title']; + $new_song->year = $results['year']; + $new_song->comment = $results['comment']; + $new_song->language = $results['language']; + $new_song->lyrics = $results['lyrics']; + $new_song->bitrate = $results['bitrate']; + $new_song->rate = $results['rate']; + $new_song->mode = ($results['mode'] == 'cbr') ? 'cbr' : 'vbr'; + $new_song->size = $results['size']; + $new_song->time = $results['time']; + $new_song->mime = $results['mime']; + $new_song->track = intval($results['track']); + $new_song->mbid = $results['mb_trackid']; + $artist = $results['artist']; + $artist_mbid = $results['mb_artistid']; + $album = $results['album']; + $album_mbid = $results['mb_albumid']; + $disk = $results['disk']; + $tags = $results['genre']; // multiple genre support makes this an array + + /* + * We have the artist/genre/album name need to check it in the tables + * If found then add & return id, else return id + */ + $new_song->artist = self::check_artist($artist,$artist_mbid); + $new_song->f_artist = $artist; + $new_song->album = self::check_album($album,$new_song->year,$disk,$album_mbid); + $new_song->f_album = $album . " - " . $new_song->year; + $new_song->title = self::check_title($new_song->title,$new_song->file); + + // Nothing to assign here this is a multi-value doodly + // multiple genre support + foreach ($tags as $tag) { + $tag = trim($tag); + self::check_tag($tag,$song->id); + self::check_tag($tag,$new_song->album,'album'); + self::check_tag($tag,$new_song->artist,'artist'); + } + + /* Since we're doing a full compare make sure we fill the extended information */ + $song->fill_ext_info(); + + $info = Song::compare_song_information($song,$new_song); + + if ($info['change']) { + debug_event('update',"$song->file difference found, updating database",'5','ampache-catalog'); + $song->update_song($song->id,$new_song); + // Refine our reference + $song = $new_song; + } + else { + debug_event('update',"$song->file no difference found returning",'5','ampache-catalog'); + } + + return $info; + + } // update_song_from_tags + + /** + * add_to_catalog + * this function adds new files to an + * existing catalog + */ + public function add_to_catalog() { + + if ($this->catalog_type == 'remote') { + UI::show_box_top(T_('Running Remote Update') . '. . .'); + $this->get_remote_catalog($type=0); + UI::show_box_bottom(); + return true; + } + + require Config::get('prefix') . '/templates/show_adds_catalog.inc.php'; + flush(); + + /* Set the Start time */ + $start_time = time(); + + // Make sure the path doesn't end in a / or \ + $this->path = rtrim($this->path,'/'); + $this->path = rtrim($this->path,'\\'); + + // Prevent the script from timing out and flush what we've got + set_time_limit(0); + + /* Get the songs and then insert them into the db */ + $this->add_files($this->path,$type,0,$verbose); + + // Foreach Playlists we found + foreach ($this->_playlists as $full_file) { + $result = $this->import_m3u($full_file); + if ($result['success']) { + $file = basename($full_file); + if ($verbose) { + echo " " . T_('Added Playlist From') . " $file . . . .
\n"; + flush(); + } + } // end if import worked + } // end foreach playlist files + + /* Do a little stats mojo here */ + $current_time = time(); + + $catalog_id = $this->id; + require Config::get('prefix') . '/templates/show_gather_art.inc.php'; + flush(); + $this->get_art(); + + /* Update the Catalog last_update */ + $this->update_last_add(); + + $time_diff = ($current_time - $start_time) ?: 0; + $rate = intval($this->count / $time_diff) ?: T_('N/A'); + + UI::show_box_top(); + echo "\n
" . + printf(T_('Catalog Update Finished. Total Time: [%s] Total Songs: [%s] Songs Per Second: [%s]'), + date('i:s', $time_diff), $this->count, $rate); + echo '
'; + UI::show_box_bottom(); + + } // add_to_catalog + + /** + * get_remote_catalog + * get a remote catalog and runs update if needed this requires + * this uses the AmpacheAPI library provided, replaces legacy XMLRPC + */ + public function get_remote_catalog($type=0) { + + try { + $remote_handle = new AmpacheApi(array('username'=>$this->remote_username,'password'=>$this->remote_password,'server'=>$this->path,'debug'=>true)); + } catch (Exception $e) { + Error::add('general',$e->getMessage()); + Error::display('general'); + flush(); + return false; + } + + if ($remote_handle->state() != 'CONNECTED') { + debug_event('APICLIENT','Error Unable to make API client ready','1'); + Error::add('general', T_('Error Connecting to Remote Server')); + Error::display('general'); + return false; + } + + // Figure out how many songs, more information etc + $remote_catalog_info = $remote_handle->info(); + + // Tell em what we've found johnny! + printf(T_('%u remote catalog(s) found (%u songs)'),$remote_catalog_info['catalogs'],$remote_catalog_info['songs']); + flush(); + + // Hardcoded for now + $step = '500'; + $current = '0'; + $total = $remote_catalog_info['songs']; + + while ($total > $current) { + $start = $current; + $current += $step; + // It uses exceptions so lets try this + try { + $remote_handle->parse_response($remote_handle->send_command('songs',array('offset'=>$start,'limit'=>$step))); + $songs = $remote_handle->get_response(); + } catch (Exception $e) { + Error::add('general',$e->getMessage()); + Error::display('general'); + flush(); + } + // itterate the songs we retrieved and insert them + foreach ($songs as $data) { + if (!$this->insert_remote_song($data['song'])) { + debug_event('REMOTE_INSERT','Remote Insert failed, see previous log messages -' . $data['song']['self']['id'],'1'); + Error::add('general', T_('Unable to Insert Song - %s'),$data['song']['title']); + Error::display('general'); + flush(); + } + } // end foreach + } // end while + + echo "
" . T_('Completed updating remote catalog(s)') . ".
\n"; + flush(); + + // Update the last update value + $this->update_last_update(); + + return true; + + } // get_remote_catalog + + /** + * update_remote_catalog + * actually updates from the remote data, takes an array of songs that are base64 encoded and parses them + */ + public function update_remote_catalog($data,$root_path) { + + // Going to leave this be for now + //FIXME: Implement + + return true; + + } // update_remote_catalog + + /** + * clean_catalog + * Cleans the catalog of files that no longer exist. + */ + public function clean_catalog() { + + // We don't want to run out of time + set_time_limit(0); + + debug_event('clean', 'Starting on ' . $this->name, 5, 'ampache-catalog'); + + require_once Config::get('prefix') . '/templates/show_clean_catalog.inc.php'; + ob_flush(); + flush(); + + // Do a quick check to make sure that the root of the catalog is + // readable. This will minimize the loss of catalog data if + // mount points fail + if ($this->catalog_type == 'local' && !is_readable($this->path)) { + debug_event('catalog', 'Catalog path:' . $this->path . ' unreadable, clean failed', 1); + Error::add('general', T_('Catalog Root unreadable, stopping clean')); + Error::display('general'); + return false; + } + + + $dead_total = 0; + $stats = self::get_stats($this->id); + foreach(array('video', 'song') as $media_type) { + $total = $stats[$media_type . 's']; // UGLY + if ($total == 0) { + continue; + } + $chunks = floor($total / 10000); + $dead = array(); + foreach(range(0, $chunks) as $chunk) { + $dead = array_merge($dead, $this->_clean_chunk($media_type, $chunk, 10000)); + } + + $dead_count = count($dead); + // The AlmightyOatmeal sanity check + // Never remove everything; it might be a dead mount + if ($dead_count >= $total) { + debug_event('catalog', 'All files would be removed. Doing nothing.', 1); + Error::add('general', T_('All files would be removed. Doing nothing')); + continue; + } + if ($dead_count) { + $dead_total += $dead_count; + $sql = "DELETE FROM `$media_type` WHERE `id` IN " . + '(' . implode(',',$dead) . ')'; + $db_results = Dba::write($sql); + } + debug_event('clean', "$media_type finished, $dead_count removed from " . + $this->name, 5, 'ampache-catalog'); + } + + // Remove any orphaned artists/albums/etc. + self::gc(); + + UI::show_box_top(); + echo ""; + printf (T_ngettext('Catalog Clean Done. %d file removed.', 'Catalog Clean Done. %d files removed.', $dead_total), $dead_total); + echo "
\n"; + UI::show_box_bottom(); + ob_flush(); + flush(); + + $this->update_last_clean(); + } // clean_catalog + + + /** + * _clean_chunk + * This is the clean function, its broken into + * said chunks to try to save a little memory + */ + private function _clean_chunk($media_type, $chunk, $chunk_size) { + debug_event('clean', "Starting chunk $chunk", 5, 'ampache-catalog'); + $dead = array(); + $count = $chunk * $chunk_size; + + $sql = "SELECT `id`, `file` FROM `$media_type` " . + "WHERE `catalog`='$this->id' LIMIT $count,$chunk_size"; + $db_results = Dba::read($sql); + + while ($results = Dba::fetch_assoc($db_results)) { + debug_event('clean', 'Starting work on ' . $results['file'] . '(' . $results['id'] . ')', 5, 'ampache-catalog'); + $count++; + if (UI::check_ticker()) { + $file = str_replace(array('(',')', '\''), '', $results['file']); + UI::update_text('clean_count_' . $this->id, $count); + UI::update_text('clean_dir_' . $this->id, scrub_out($file)); + } + if($this->catalog_type == 'local') { + $file_info = filesize($results['file']); + if (!file_exists($results['file']) || $file_info < 1) { + debug_event('clean', 'File not found or empty: ' . $results['file'], 5, 'ampache-catalog'); + Error::add('general', sprintf(T_('Error File Not Found or 0 Bytes: %s'), $results['file'])); + + + // Store it in an array we'll delete it later... + $dead[] = $results['id']; + + } //if error + else if (!is_readable($results['file'])) { + debug_event('clean', $results['file'] . ' is not readable, but does exist', 1, 'ampache-catalog'); + } + } // if localtype + else { + //do remote url check + $file_info = $this->check_remote_song($results['file']); + + if ($file_info == false) { + /* Add Error */ + Error::add('general', sprintf(T_('Error Remote File Not Found or 0 Bytes: %s'), $results['file'])); + + + // Store it in an array we'll delete it later... + $dead[] = $results['id']; + + } //if error + } // remote catalog + + } //while gettings songs + return $dead; + + } //_clean_chunk + + /** + * verify_catalog + * This function compares the DB's information with the ID3 tags + */ + public function verify_catalog() { + + debug_event('verify', 'Starting on ' . $this->name, 5, 'ampache-catalog'); + set_time_limit(0); + + $stats = self::get_stats($this->id); + $number = $stats['videos'] + $stats['songs']; + $total_updated = 0; + + require_once Config::get('prefix') . '/templates/show_verify_catalog.inc.php'; + + foreach(array('video', 'song') as $media_type) { + $total = $stats[$media_type . 's']; // UGLY + if ($total == 0) { + continue; + } + $chunks = floor($total / 10000); + foreach(range(0, $chunks) as $chunk) { + // Try to be nice about memory usage + if ($chunk > 0) { + $media_type::clear_cache(); + } + $total_updated += $this->_verify_chunk($media_type, $chunk, 10000); + } + } + + debug_event('verify', "Finished, $total_updated updated in " . $this->name, 5, 'ampache-catalog'); + + self::gc(); + $this->update_last_update(); + + UI::show_box_top(); + echo ''; + printf(T_('Catalog Verify Done. %d of %d files updated.'), $total_updated, $number); + echo "
\n"; + UI::show_box_bottom(); + ob_flush(); + flush(); + + return true; + + } // verify_catalog + + /** + * _verify_chunk + * This verifies a chunk of the catalog, done to save + * memory + */ + private function _verify_chunk($media_type, $chunk, $chunk_size) { + debug_event('verify', "Starting chunk $chunk", 5, 'ampache-catalog'); + $count = $chunk * $chunk_size; + $changed = 0; + + $sql = "SELECT `id`, `file` FROM `$media_type` " . + "WHERE `catalog`='$this->id' LIMIT $count,$chunk_size"; + $db_results = Dba::read($sql); + + if (Config::get('memory_cache')) { + while ($row = Dba::fetch_assoc($db_results, false)) { + $media_ids[] = $row['id']; + } + $media_type::build_cache($media_ids); + Dba::seek($db_results, 0); + } + + while ($row = Dba::fetch_assoc($db_results)) { + $count++; + if (UI::check_ticker()) { + $file = str_replace(array('(',')','\''), '', $row['file']); + UI::update_text('verify_count_' . $this->id, $count); + UI::update_text('verify_dir_' . $this->id, scrub_out($file)); + } + + if (!is_readable($row['file'])) { + Error::add('general', sprintf(T_('%s does not exist or is not readable'), $row['file'])); + debug_event('read', $row['file'] . ' does not exist or is not readable', 5,'ampache-catalog'); + continue; + } + + $media = new $media_type($row['id']); + + if (Flag::has_flag($media->id, $type)) { + debug_event('verify', "$media->file is flagged, skipping", 5, 'ampache-catalog'); + continue; + } + + $info = self::update_media_from_tags($media, $this->sort_pattern,$this->rename_pattern); + if ($info['change']) { + $changed++; + } + unset($info); + } + + UI::update_text('verify_count_' . $this->id, $count); + return $changed; + + } // _verfiy_chunk + + /** + * gc + * + * This is a wrapper function for all of the different cleaning + * functions, it runs them in an order that resembles correct + */ + public static function gc() { + + debug_event('catalog', 'Database cleanup started', 5, 'ampache-catalog'); + Song::gc(); + Album::gc(); + Artist::gc(); + Art::gc(); + Flag::gc(); + Stats::gc(); + Rating::gc(); + Playlist::gc(); + Tmp_Playlist::gc(); + Shoutbox::gc(); + Tag::gc(); + debug_event('catalog', 'Database cleanup ended', 5, 'ampache-catalog'); + + } + + /** + * trim_prefix + * Splits the prefix from the string + */ + public static function trim_prefix($string) { + $prefix_pattern = '/^(' . implode('\\s|',explode('|',Config::get('catalog_prefix_pattern'))) . '\\s)(.*)/i'; + preg_match($prefix_pattern, $string, $matches); + + if (count($matches)) { + $string = trim($matches[2]); + $prefix = trim($matches[1]); + } + else { + $prefix = null; + } + + return array('string' => $string, 'prefix' => $prefix); + } // trim_prefix + + /** + * check_artist + * $artist checks if there then return id else insert and return id + * If readonly is passed then don't create, return false on not found + */ + public static function check_artist($artist,$mbid='',$readonly='') { + + /* Clean up the artist */ + $artist = trim($artist); + $artist = Dba::escape($artist); + + /* Ohh no the artist has lost it's mojo! */ + if (!$artist) { + $artist = T_('Unknown (Orphaned)'); + } + + // Remove the prefix so we can sort it correctly + $trimmed = Catalog::trim_prefix($artist); + $artist = $trimmed['string']; + $prefix = $trimmed['prefix']; + + // Check to see if we've seen this artist before + if (isset(self::$artists[$artist][$mbid])) { + return self::$artists[$artist][$mbid]; + } // if we've seen this artist before + + $exists = false; + + $sql = "SELECT `id` FROM `artist` WHERE `mbid`='$mbid'"; + $db_results = Dba::read($sql); + + // Check for results + if ($r = Dba::fetch_assoc($db_results)) { + $artist_id = $r['id']; + $exists = true; + } + + else { // No exact match based on MBID + $sql = "SELECT `id`, `mbid` FROM `artist` WHERE `name` LIKE '$artist'"; + $db_results = Dba::read($sql); + + + /* If we have results */ + while ($r = Dba::fetch_assoc($db_results)) { + $key = is_null($r['mbid']) ? 'null' : $r['mbid']; + $id_array[$key] = $r['id']; + } // while + + /* Choose one */ + if (isset($id_array)) { + if ($mbid == '') { // Prefer null entry, otherwise pick the first + if (isset($id_array['null'])) { + $key = 'null'; + } + else { + $keys = array_keys($id_array); + $key = array_shift($keys); + } + $artist_id = $id_array[$key]; + $exists = true; + } + elseif (isset($id_array['null'])) { + $artist_id = $id_array['null']; + $exists = true; + if (!$readonly) { + $sql = "UPDATE `artist` SET `mbid`='$mbid' WHERE `id`='$artist_id'"; + $db_results = Dba::write($sql); + if (!$db_results) { + Error::add('general', sprintf(T_('Updating Artist: %s'), $artist)); + } + } + } + unset($id_array); + } + } // fuzzy matching + + /* If not found create */ + if (!$readonly && !$exists) { + + $prefix_txt = $prefix ? "'$prefix'" : 'NULL'; + + $mbid = $mbid == '' ? 'NULL' : "'$mbid'"; + + $sql = "INSERT INTO `artist` (`name`, `prefix`, `mbid`) " . + "VALUES ('$artist',$prefix_txt,$mbid)"; + $db_results = Dba::write($sql); + $artist_id = Dba::insert_id(); + + if (!$db_results) { + Error::add('general', sprintf(T_('Inserting Artist: %s'), $artist)); + } + + } // not found + // If readonly, and not found return false + elseif (!$exists) { + return false; + } + + self::$artists[$artist][$mbid] = $artist_id; + + return $artist_id; + + } // check_artist + + /** + * check_album + * Searches for album; if found returns id else inserts and returns id + */ + public static function check_album($album, $album_year = 0, + $album_disk = 0, $mbid = '', $readonly = false) { + + /* Clean up the values */ + $album = trim($album); + $album = Dba::escape($album); + // Not even sure if these can be negative, but better safe than + // llama. + $album_year = abs(intval($album_year)); + $album_disk = abs(intval($album_disk)); + + /* Ohh no the album has lost its mojo */ + if (!$album) { + $album = T_('Unknown (Orphaned)'); + unset($album_year, $album_disk); + } + + // Remove the prefix so we can sort it correctly + $trimmed = Catalog::trim_prefix($album); + $album = $trimmed['string']; + $prefix = $trimmed['prefix']; + + // Check to see if we've seen this album before + if (isset(self::$albums[$album][$album_year][$album_disk][$mbid])) { + return self::$albums[$album][$album_year][$album_disk][$mbid]; + } + + /* Set up the Query */ + $sql = "SELECT `id` FROM `album` WHERE `name` = '$album'" . + " AND `disk`='$album_disk' AND `year`='$album_year'" . + " AND `mbid`" . ($mbid ? "='$mbid'" : ' IS NULL') . + " AND `prefix`" . ($prefix ? "='$prefix'" : ' IS NULL'); + + $db_results = Dba::read($sql); + + /* If it's found */ + if ($r = Dba::fetch_assoc($db_results)) { + $album_id = $r['id']; + + // If we don't have art put it in the 'needs me some + // art' array + $art = new Art($r['id'], 'album'); + $art->get_db(); + if (!$art->raw) { + $key = $r['id']; + self::$_art_albums[$key] = $key; + } + + } //if found + elseif (!$readonly) { // If not found, create + + $prefix = $prefix ? "'$prefix'" : 'NULL'; + $mbid = $mbid ? "'$mbid'" : 'NULL'; + + $sql = "INSERT INTO `album` (`name`, `prefix`,`year`,`disk`,`mbid`) " . + "VALUES ('$album',$prefix,'$album_year','$album_disk',$mbid)"; + $db_results = Dba::write($sql); + $album_id = Dba::insert_id(); + + if (!$db_results) { + debug_event('album',"Error Unable to insert Album:$album",'2'); + return false; + } + + // Add it to the I needs me some album art array + self::$_art_albums[$album_id] = $album_id; + + } //not found + else { + // readonly and not found + return false; + } + + // Save the cache + self::$albums[$album][$album_year][$album_disk][$mbid] = $album_id; + + return $album_id; + + } // check_album + + /** + * check_tag + * This checks the tag we've been passed (name) + * and sees if it exists, and if so if it's mapped + * to this object, this is only done for songs for now + */ + public static function check_tag($value,$object_id,$object_type='song') { + + $map_id = Tag::add($object_type,$object_id,$value,'0'); + + return $map_id; + + } // check_tag + + /** + * check_title + * this checks to make sure something is + * set on the title, if it isn't it looks at the + * filename and trys to set the title based on that + */ + public static function check_title($title,$file=0) { + + if (strlen(trim($title)) < 1) { + $title = Dba::escape($file); + } + + return $title; + + } // check_title + + /** + * insert_local_song + * Insert a song that isn't already in the database this + * function is in here so we don't have to create a song object + */ + public function insert_local_song($file,$file_info) { + + /* Create the vainfo object and get info */ + $vainfo = new vainfo($file,'','','',$this->sort_pattern,$this->rename_pattern); + $vainfo->get_info(); + + $key = vainfo::get_tag_type($vainfo->tags); + + /* Clean Up the tags */ + $results = vainfo::clean_tag_info($vainfo->tags,$key,$file); + + /* Set the vars here... so we don't have to do the '" . $blah['asd'] . "' */ + $title = Dba::escape($results['title']); + $artist = $results['artist']; + $album = $results['album']; + $bitrate = $results['bitrate']; + $rate = $results['rate']; + $mode = $results['mode']; + $size = $results['size']; + $song_time = $results['time']; + $track = $results['track']; + $track_mbid = $results['mb_trackid']; + $album_mbid = $results['mb_albumid']; + $artist_mbid= $results['mb_artistid']; + $disk = $results['disk']; + $year = $results['year']; + $comment = $results['comment']; + $tags = $results['genre']; // multiple genre support makes this an array + $current_time = time(); + $lyrics = ' '; + + /* + * We have the artist/genre/album name need to check it in the tables + * If found then add & return id, else return id + */ + $artist_id = self::check_artist($artist,$artist_mbid); + $album_id = self::check_album($album,$year,$disk,$album_mbid); + $title = self::check_title($title,$file); + $add_file = Dba::escape($file); + + $sql = "INSERT INTO `song` (file,catalog,album,artist,title,bitrate,rate,mode,size,time,track,addition_time,year,mbid)" . + " VALUES ('$add_file','$this->id','$album_id','$artist_id','$title','$bitrate','$rate','$mode','$size','$song_time','$track','$current_time','$year','$track_mbid')"; + $db_results = Dba::write($sql); + + if (!$db_results) { + debug_event('insert',"Unable to insert $file -- $sql" . Dba::error(),'5','ampache-catalog'); + Error::add('catalog_add', sprintf(T_('SQL Error Adding %s'), $file)); + } + + $song_id = Dba::insert_id(); + + // multiple genre support + foreach ($tags as $tag) { + $tag = trim($tag); + self::check_tag($tag,$song_id); + self::check_tag($tag,$album_id,'album'); + self::check_tag($tag,$artist_id,'artist'); + } + + + /* Add the EXT information */ + $sql = "INSERT INTO `song_data` (`song_id`,`comment`,`lyrics`) " . + " VALUES ('$song_id','$comment','$lyrics')"; + $db_results = Dba::write($sql); + + if (!$db_results) { + debug_event('insert',"Unable to insert EXT Info for $file -- $sql",'5','ampache-catalog'); + } + + } // insert_local_song + + /** + * insert_remote_song + * takes the information gotten from XML-RPC and + * inserts it into the local database. The filename + * ends up being the url. + */ + public function insert_remote_song($song) { + + /* Limitations: + * Missing Following Metadata + * Disk,Rate + */ + + // Strip the SSID off of the url, we will need to regenerate this every time + $url = preg_replace("/ssid=.*&/","",$song['url']); + $title = Dba::escape($song['title']); + $album = self::check_album($song['album'],$song['year'],null,$song['album_mbid']); + $artist = self::check_artist($song['artist'],$song['artist_mbid']); + $bitrate = Dba::escape($song['bitrate']); + $size = Dba::escape($song['size']); + $song_time = Dba::escape($song['time']); + $track = Dba::escape($song['track']); + $year = Dba::escape($song['year']); + $title = Dba::escape($song['title']); + $mbid = Dba::escape($song['mbid']); + $mode = Dba::escape($song['mode']); + $current_time = time(); + $catalog_id = Dba::escape($this->id); + + $sql = "INSERT INTO `song` (`file`,`catalog`,`album`,`artist`,`title`,`bitrate`,`rate`,`mode`,`size`,`time`,`track`,`addition_time`,`year`,`mbid`)" . + " VALUES ('$url','$catalog_id','$album','$artist','$title','$bitrate','$rate','$mode','$size','$song_time','$track','$current_time','$year','$mbid')"; + $db_results = Dba::write($sql); + + if (!$db_results) { + debug_event('insert',"Unable to Add Remote $url -- $sql",'5','ampache-catalog'); + return false; + } + + // Weird to do this here, but we have the information - see if the album has art, if it doesn't then use the remote + // art url + $art = new Art($album, 'album'); + // If it doesn't have art... + if (!$art->get()) { + // Get the mime out + $get_vars = parse_url($song['art']); + $extension = substr($get_vars['query'],strlen($get_vars['query'])-3,3); + // Pull the image + $raw = Art::get_from_source( + array('url' => $song['art']), 'album'); + $inserted = $art->insert($raw,'image/' . $extension); + } + + return true; + + } // insert_remote_song + + /** + * insert_local_video + * This inserts a video file into the video file table the tag + * information we can get is super sketchy so it's kind of a crap shoot + * here + */ + public function insert_local_video($file,$filesize) { + + /* Create the vainfo object and get info */ + $vainfo = new vainfo($file,'','','',$this->sort_pattern,$this->rename_pattern); + $vainfo->get_info(); + + $tag_name = vainfo::get_tag_type($vainfo->tags); + $results = vainfo::clean_tag_info($vainfo->tags,$tag_name,$file); + + + $file = Dba::escape($file); + $catalog_id = Dba::escape($this->id); + $title = Dba::escape($results['title']); + $vcodec = $results['video_codec']; + $acodec = $results['audio_codec']; + $rezx = intval($results['resolution_x']); + $rezy = intval($results['resolution_y']); + $filesize = Dba::escape($filesize); + $time = Dba::escape($results['time']); + $mime = Dba::escape($results['mime']); + // UNUSED CURRENTLY + $comment = Dba::escape($results['comment']); + $year = Dba::escape($results['year']); + $disk = Dba::escape($results['disk']); + + $sql = "INSERT INTO `video` (`file`,`catalog`,`title`,`video_codec`,`audio_codec`,`resolution_x`,`resolution_y`,`size`,`time`,`mime`) " . + " VALUES ('$file','$catalog_id','$title','$vcodec','$acodec','$rezx','$rezy','$filesize','$time','$mime')"; + $db_results = Dba::write($sql); + + return true; + + } // insert_local_video + + /** + * check_remote_song + * checks to see if a remote song exists in the database or not + * if it find a song it returns the UID + */ + public function check_remote_song($url) { + + $url = Dba::escape($url); + + $sql = "SELECT `id` FROM `song` WHERE `file`='$url'"; + $db_results = Dba::read($sql); + + if ($results = Dba::fetch_assoc($db_results)) { + return $results['id']; + } + + return false; + + } // check_remote_song + + /** + * check_local_mp3 + * Checks the song to see if it's there already returns true if found, false if not + */ + public function check_local_mp3($full_file, $gather_type='') { + + $file_date = filemtime($full_file); + if ($file_date < $this->last_add) { + debug_event('Check','Skipping ' . $full_file . ' File modify time before last add run','3'); + return true; + } + + $full_file = Dba::escape($full_file); - $sql = "SELECT `id` FROM `song` WHERE `file` = '$full_file'"; - $db_results = Dba::read($sql); + $sql = "SELECT `id` FROM `song` WHERE `file` = '$full_file'"; + $db_results = Dba::read($sql); - //If it's found then return true - if (Dba::fetch_row($db_results)) { - return true; - } + //If it's found then return true + if (Dba::fetch_row($db_results)) { + return true; + } - return false; + return false; - } //check_local_mp3 + } //check_local_mp3 - /** - * import_m3u - * this takes m3u filename and then attempts to create a Public Playlist based on the filenames - * listed in the m3u - */ - public function import_m3u($filename) { + /** + * import_m3u + * this takes m3u filename and then attempts to create a Public Playlist based on the filenames + * listed in the m3u + */ + public function import_m3u($filename) { - $m3u_handle = fopen($filename,'r'); + $m3u_handle = fopen($filename,'r'); - $data = fread($m3u_handle,filesize($filename)); + $data = fread($m3u_handle,filesize($filename)); - $results = explode("\n",$data); + $results = explode("\n",$data); - $pattern = '/\.(' . Config::get('catalog_file_pattern') . ')$/i'; + $pattern = '/\.(' . Config::get('catalog_file_pattern') . ')$/i'; - // Foreach what we're able to pull out from the file - foreach ($results as $value) { + // Foreach what we're able to pull out from the file + foreach ($results as $value) { - // Remove extra whitespace - $value = trim($value); - if (preg_match($pattern,$value)) { + // Remove extra whitespace + $value = trim($value); + if (preg_match($pattern,$value)) { - /* Translate from \ to / so basename works */ - $value = str_replace("\\","/",$value); - $file = basename($value); + /* Translate from \ to / so basename works */ + $value = str_replace("\\","/",$value); + $file = basename($value); - /* Search for this filename, cause it's a audio file */ - $sql = "SELECT `id` FROM `song` WHERE `file` LIKE '%" . Dba::escape($file) . "'"; - $db_results = Dba::read($sql); - $results = Dba::fetch_assoc($db_results); + /* Search for this filename, cause it's a audio file */ + $sql = "SELECT `id` FROM `song` WHERE `file` LIKE '%" . Dba::escape($file) . "'"; + $db_results = Dba::read($sql); + $results = Dba::fetch_assoc($db_results); - if (isset($results['id'])) { $songs[] = $results['id']; } + if (isset($results['id'])) { $songs[] = $results['id']; } - } // if it's a file - // Check to see if it's a url from this ampache instance - elseif (substr($value,0,strlen(Config::get('web_path'))) == Config::get('web_path')) { - $song_id = intval(Song::parse_song_url($value)); + } // if it's a file + // Check to see if it's a url from this ampache instance + elseif (substr($value,0,strlen(Config::get('web_path'))) == Config::get('web_path')) { + $song_id = intval(Song::parse_song_url($value)); - $sql = "SELECT COUNT(*) FROM `song` WHERE `id`='$song_id'"; - $db_results = Dba::read($sql); + $sql = "SELECT COUNT(*) FROM `song` WHERE `id`='$song_id'"; + $db_results = Dba::read($sql); - if (Dba::num_rows($db_results)) { - $songs[] = $song_id; - } + if (Dba::num_rows($db_results)) { + $songs[] = $song_id; + } - } // end if it's an http url + } // end if it's an http url - } // end foreach line + } // end foreach line - debug_event('m3u_parse', "Parsed $filename, found " . count($songs) . " songs", 5); - - if (count($songs)) { - $name = "M3U - " . basename($filename,'.m3u'); - $playlist_id = Playlist::create($name,'public'); - - if (!$playlist_id) { - return array( - 'success' => false, - 'error' => 'Failed to create playlist.', - ); - } - - /* Recreate the Playlist */ - $playlist = new Playlist($playlist_id); - $playlist->add_songs($songs, true); - - return array( - 'success' => true, - 'id' => $playlist_id, - 'count' => count($songs) - ); - } - - return array( - 'success' => false, - 'error' => 'No valid songs found in M3U.' - ); - - } // import_m3u - - /** - * delete - * Deletes the catalog and everything associated with it - * it takes the catalog id - */ - public static function delete($catalog_id) { - - $catalog_id = Dba::escape($catalog_id); - - // First remove the songs in this catalog - $sql = "DELETE FROM `song` WHERE `catalog` = '$catalog_id'"; - $db_results = Dba::write($sql); - - // Only if the previous one works do we go on - if (!$db_results) { return false; } - - $sql = "DELETE FROM `video` WHERE `catalog` = '$catalog_id'"; - $db_results = Dba::write($sql); - - if (!$db_results) { return false; } - - // Next Remove the Catalog Entry it's self - $sql = "DELETE FROM `catalog` WHERE `id` = '$catalog_id'"; - $db_results = Dba::write($sql); - - // Run the cleaners... - self::gc(); - - } // delete - - /** - * exports the catalog - * it exports all songs in the database to the given export type. - */ - public function export($type) { - - // Select all songs in catalog - if($this->id) { - $sql = 'SELECT `id` FROM `song` ' . - "WHERE `catalog`='$this->id' " . - 'ORDER BY `album`, `track`'; - } - else { - $sql = 'SELECT `id` FROM `song` ORDER BY `album`, `track`'; - } - $db_results = Dba::read($sql); - - switch ($type) { - case 'itunes': - echo xml_get_header('itunes'); - while ($results = Dba::fetch_assoc($db_results)) { - $song = new Song($results['id']); - $song->format(); - - $xml = array(); - $xml['key']= $results['id']; - $xml['dict']['Track ID']= intval($results['id']); - $xml['dict']['Name'] = $song->title; - $xml['dict']['Artist'] = $song->f_artist_full; - $xml['dict']['Album'] = $song->f_album_full; - $xml['dict']['Total Time'] = intval($song->time) * 1000; // iTunes uses milliseconds - $xml['dict']['Track Number'] = intval($song->track); - $xml['dict']['Year'] = intval($song->year); - $xml['dict']['Date Added'] = date("Y-m-d\TH:i:s\Z",$song->addition_time); - $xml['dict']['Bit Rate'] = intval($song->bitrate/1000); - $xml['dict']['Sample Rate'] = intval($song->rate); - $xml['dict']['Play Count'] = intval($song->played); - $xml['dict']['Track Type'] = "URL"; - $xml['dict']['Location'] = Song::play_url($song->id); - echo xml_from_array($xml, 1, 'itunes'); - // flush output buffer - } // while result - echo xml_get_footer('itunes'); - - break; - case 'csv': - echo "ID,Title,Artist,Album,Length,Track,Year,Date Added,Bitrate,Played,File\n"; - while ($results = Dba::fetch_assoc($db_results)) { - $song = new Song($results['id']); - $song->format(); - echo '"' . $song->id . '","' . - $song->title . '","' . - $song->f_artist_full . '","' . - $song->f_album_full .'","' . - $song->f_time . '","' . - $song->f_track . '","' . - $song->year .'","' . - date("Y-m-d\TH:i:s\Z", $song->addition_time) . '","' . - $song->f_bitrate .'","' . - $song->played . '","' . - $song->file . "\n"; - } - break; - } // end switch - - } // export + debug_event('m3u_parse', "Parsed $filename, found " . count($songs) . " songs", 5); + + if (count($songs)) { + $name = "M3U - " . basename($filename,'.m3u'); + $playlist_id = Playlist::create($name,'public'); + + if (!$playlist_id) { + return array( + 'success' => false, + 'error' => 'Failed to create playlist.', + ); + } + + /* Recreate the Playlist */ + $playlist = new Playlist($playlist_id); + $playlist->add_songs($songs, true); + + return array( + 'success' => true, + 'id' => $playlist_id, + 'count' => count($songs) + ); + } + + return array( + 'success' => false, + 'error' => 'No valid songs found in M3U.' + ); + + } // import_m3u + + /** + * delete + * Deletes the catalog and everything associated with it + * it takes the catalog id + */ + public static function delete($catalog_id) { + + $catalog_id = Dba::escape($catalog_id); + + // First remove the songs in this catalog + $sql = "DELETE FROM `song` WHERE `catalog` = '$catalog_id'"; + $db_results = Dba::write($sql); + + // Only if the previous one works do we go on + if (!$db_results) { return false; } + + $sql = "DELETE FROM `video` WHERE `catalog` = '$catalog_id'"; + $db_results = Dba::write($sql); + + if (!$db_results) { return false; } + + // Next Remove the Catalog Entry it's self + $sql = "DELETE FROM `catalog` WHERE `id` = '$catalog_id'"; + $db_results = Dba::write($sql); + + // Run the cleaners... + self::gc(); + + } // delete + + /** + * exports the catalog + * it exports all songs in the database to the given export type. + */ + public function export($type) { + + // Select all songs in catalog + if($this->id) { + $sql = 'SELECT `id` FROM `song` ' . + "WHERE `catalog`='$this->id' " . + 'ORDER BY `album`, `track`'; + } + else { + $sql = 'SELECT `id` FROM `song` ORDER BY `album`, `track`'; + } + $db_results = Dba::read($sql); + + switch ($type) { + case 'itunes': + echo xml_get_header('itunes'); + while ($results = Dba::fetch_assoc($db_results)) { + $song = new Song($results['id']); + $song->format(); + + $xml = array(); + $xml['key']= $results['id']; + $xml['dict']['Track ID']= intval($results['id']); + $xml['dict']['Name'] = $song->title; + $xml['dict']['Artist'] = $song->f_artist_full; + $xml['dict']['Album'] = $song->f_album_full; + $xml['dict']['Total Time'] = intval($song->time) * 1000; // iTunes uses milliseconds + $xml['dict']['Track Number'] = intval($song->track); + $xml['dict']['Year'] = intval($song->year); + $xml['dict']['Date Added'] = date("Y-m-d\TH:i:s\Z",$song->addition_time); + $xml['dict']['Bit Rate'] = intval($song->bitrate/1000); + $xml['dict']['Sample Rate'] = intval($song->rate); + $xml['dict']['Play Count'] = intval($song->played); + $xml['dict']['Track Type'] = "URL"; + $xml['dict']['Location'] = Song::play_url($song->id); + echo xml_from_array($xml, 1, 'itunes'); + // flush output buffer + } // while result + echo xml_get_footer('itunes'); + + break; + case 'csv': + echo "ID,Title,Artist,Album,Length,Track,Year,Date Added,Bitrate,Played,File\n"; + while ($results = Dba::fetch_assoc($db_results)) { + $song = new Song($results['id']); + $song->format(); + echo '"' . $song->id . '","' . + $song->title . '","' . + $song->f_artist_full . '","' . + $song->f_album_full .'","' . + $song->f_time . '","' . + $song->f_track . '","' . + $song->year .'","' . + date("Y-m-d\TH:i:s\Z", $song->addition_time) . '","' . + $song->f_bitrate .'","' . + $song->played . '","' . + $song->file . "\n"; + } + break; + } // end switch + + } // export } // end of catalog class diff --git a/lib/class/config.class.php b/lib/class/config.class.php index 5b325ff430..8412976030 100644 --- a/lib/class/config.class.php +++ b/lib/class/config.class.php @@ -1,5 +1,5 @@ $value) { - self::set($name,$value,$clobber); - } - - } // set_by_array + /** + * These are the settings for this specific class + * + * @var array + */ + private $_local = array(); + + /** + * These are the global settings they go where it goes + * + * @var array + */ + private static $_global = array(); + + /** + * constructor + * This is what is called when the class is loaded + */ + public function __construct() { + + // Rien a faire + + } // constructor + + /** + * get + * This checks to see if this is an instance or procedure + * call, procedure == global, instance == local + * + * @param string $name + * @return mixed array or null + */ + public static function get($name) { + + if (isset(self::$_global[$name])) { return self::$_global[$name]; } + else { return null; } + + } // get + + /** + * get_all + * This returns all of the current config variables as an array + * + * @return array + */ + public static function get_all() { + + return self::$_global; + + } // get_all + + /** + * set + * + * This sets config values. + * + * @param string $name Key name + * @param string $value Value name + * @param boolean $clobber Clobber flag true or false + * @return void + */ + public static function set($name, $value, $clobber = false) { + + if (isset(self::$_global[$name]) && !$clobber) { + debug_event('Config', "Tried to overwrite existing key $name without setting clobber", 5); + Error::add('Config Global', sprintf(T_('Trying to clobber \'%s\' without setting clobber'), $name)); + return false; + } + + self::$_global[$name] = $value; + + } // set + + /** + * set_by_array + * + * This is the same as the set function except it takes an array as + * input. + * + * @param array $array Array + * @param boolean $clobber Clobber flag true or false + */ + public static function set_by_array($array, $clobber = false) { + + foreach ($array as $name => $value) { + self::set($name,$value,$clobber); + } + + } // set_by_array } // end Config class ?> diff --git a/lib/class/core.class.php b/lib/class/core.class.php index b60339755d..55e594d5f1 100644 --- a/lib/class/core.class.php +++ b/lib/class/core.class.php @@ -1,5 +1,5 @@ $name, 'expire' => $expire); - debug_event('Core', "Registered $type form $name with SID $sid and expiration $expire ($window seconds from now)", 5); - - switch ($type) { - default: - case 'post': - $string = ''; - break; - case 'get': - $string = $sid; - break; - } // end switch on type - - return $string; - - } // form_register - - /** - * form_verify - * - * This takes a form name and then compares it with the posted sid, if - * they don't match then it returns false and doesn't let the person - * continue - */ - public static function form_verify($name, $type = 'post') { - switch ($type) { - case 'post': - $sid = $_POST['form_validation']; - break; - case 'get': - $sid = $_GET['form_validation']; - break; - case 'cookie': - $sid = $_COOKIE['form_validation']; - break; - case 'request': - $sid = $_REQUEST['form_validation']; - break; - } - - if (!isset($_SESSION['forms'][$sid])) { - debug_event('Core', "Form $sid not found in session, rejecting request", 2); - return false; - } - - $form = $_SESSION['forms'][$sid]; - unset($_SESSION['forms'][$sid]); - - if ($form['name'] == $name) { - debug_event('Core', "Verified SID $sid for $type form $name", 5); - if ($form['expire'] < time()) { - debug_event('Core', "Form $sid is expired, rejecting request", 2); - return false; - } - - return true; - } - - // OMG HAX0RZ - debug_event('Core', "$type form $sid failed consistency check, rejecting request", 2); - return false; - - } // form_verify - - /** - * image_dimensions - * This returns the dimensions of the passed song of the passed type - * returns an empty array if PHP-GD is not currently installed, returns - * false on error - */ - public static function image_dimensions($image_data) { - - if (!function_exists('ImageCreateFromString')) { return false; } - - $image = ImageCreateFromString($image_data); - - if (!$image) { return false; } - - $width = imagesx($image); - $height = imagesy($image); - - if (!$width || !$height) { return false; } - - return array('width'=>$width,'height'=>$height); - - } // image_dimensions + /** + * constructor + * This doesn't do anything + */ + private function __construct() { + + return false; + + } // construction + + /** + * autoload + * This function automatically loads any missing classes as they are + * needed so that we don't use a million include statements which load + * more than we need. + */ + public static function autoload($class) { + // Lowercase the class + $class = strtolower($class); + + $file = Config::get('prefix') . "/lib/class/$class.class.php"; + + // See if it exists + if (is_readable($file)) { + require $file; + if (is_callable($class . '::_auto_init')) { + $class::_auto_init(); + } + } + // Else log this as a fatal error + else { + debug_event('autoload', "'$class' not found!", 1); + } + } // autoload + + /** + * form_register + * This registers a form with a SID, inserts it into the session + * variables and then returns a string for use in the HTML form + */ + public static function form_register($name, $type = 'post') { + + // Make ourselves a nice little sid + $sid = md5(uniqid(rand(), true)); + $window = Config::get('session_length'); + $expire = time() + $window; + + // Register it + $_SESSION['forms'][$sid] = array('name' => $name, 'expire' => $expire); + debug_event('Core', "Registered $type form $name with SID $sid and expiration $expire ($window seconds from now)", 5); + + switch ($type) { + default: + case 'post': + $string = ''; + break; + case 'get': + $string = $sid; + break; + } // end switch on type + + return $string; + + } // form_register + + /** + * form_verify + * + * This takes a form name and then compares it with the posted sid, if + * they don't match then it returns false and doesn't let the person + * continue + */ + public static function form_verify($name, $type = 'post') { + switch ($type) { + case 'post': + $sid = $_POST['form_validation']; + break; + case 'get': + $sid = $_GET['form_validation']; + break; + case 'cookie': + $sid = $_COOKIE['form_validation']; + break; + case 'request': + $sid = $_REQUEST['form_validation']; + break; + } + + if (!isset($_SESSION['forms'][$sid])) { + debug_event('Core', "Form $sid not found in session, rejecting request", 2); + return false; + } + + $form = $_SESSION['forms'][$sid]; + unset($_SESSION['forms'][$sid]); + + if ($form['name'] == $name) { + debug_event('Core', "Verified SID $sid for $type form $name", 5); + if ($form['expire'] < time()) { + debug_event('Core', "Form $sid is expired, rejecting request", 2); + return false; + } + + return true; + } + + // OMG HAX0RZ + debug_event('Core', "$type form $sid failed consistency check, rejecting request", 2); + return false; + + } // form_verify + + /** + * image_dimensions + * This returns the dimensions of the passed song of the passed type + * returns an empty array if PHP-GD is not currently installed, returns + * false on error + */ + public static function image_dimensions($image_data) { + + if (!function_exists('ImageCreateFromString')) { return false; } + + $image = ImageCreateFromString($image_data); + + if (!$image) { return false; } + + $width = imagesx($image); + $height = imagesy($image); + + if (!$width || !$height) { return false; } + + return array('width'=>$width,'height'=>$height); + + } // image_dimensions } // Core ?> diff --git a/lib/class/database_object.abstract.php b/lib/class/database_object.abstract.php index 535a83d1d6..dc9872cba8 100644 --- a/lib/class/database_object.abstract.php +++ b/lib/class/database_object.abstract.php @@ -1,5 +1,5 @@ 0); - - private static $_sql; - private static $config; - - /** - * constructor - * This does nothing with the DBA class - */ - private function __construct() { - - // Rien a faire - - } // construct - - /** - * query - * This is the meat of the class this does a query, it emulates - * The mysql_query function - */ - public static function query($sql) { - - // Run the query - $resource = mysql_query($sql,self::dbh()); - debug_event('Query',$sql,'6'); - - // Save the query, to make debug easier - self::$_sql = $sql; - self::$stats['query']++; + public static $stats = array('query'=>0); + + private static $_sql; + private static $config; + + /** + * constructor + * This does nothing with the DBA class + */ + private function __construct() { + + // Rien a faire + + } // construct + + /** + * query + * This is the meat of the class this does a query, it emulates + * The mysql_query function + */ + public static function query($sql) { + + // Run the query + $resource = mysql_query($sql,self::dbh()); + debug_event('Query',$sql,'6'); + + // Save the query, to make debug easier + self::$_sql = $sql; + self::$stats['query']++; - // Do a little error checking here and try to recover from some forms of failure - if (!$resource) { - switch (mysql_errno(self::dbh())) { - case '2006': - case '2013': - case '2055': - debug_event('DBH','Lost connection to database server, trying to re-connect and hope nobody noticed','1'); - self::disconnect(); - // Try again - $resource = mysql_query($sql,self::dbh()); - break; - default: - debug_event('DBH',mysql_error(self::dbh()) . ' ['. mysql_errno(self::dbh()) . ']','1'); - break; - } // end switch on error # - } // if failed query - - return $resource; - - } // query - - /** - * read - * This is a wrapper for query, it's so that in the future if we ever wanted - * to split reads and writes we could - */ - public static function read($sql) { - - return self::query($sql); - - } // read - - /** - * write - * This is a wrapper for a write query, it is so that we can split out reads and - * writes if we want to - */ - public static function write($sql) { - - return self::query($sql); - - } // write - - /** - * escape - * This runs a escape on a variable so that it can be safely inserted - * into the sql - */ - public static function escape($var) { - - $string = mysql_real_escape_string($var,self::dbh()); - - return $string; - - } // escape - - /** - * fetch_assoc - * This emulates the mysql_fetch_assoc and takes a resource result - * we force it to always return an array, albeit an empty one - * The optional finish parameter affects whether we automatically clean - * up the result set after the last row is read. - */ - public static function fetch_assoc($resource, $finish = true) { - - $result = mysql_fetch_assoc($resource); - - if (!$result) { - if ($finish) { - self::finish($resource); - } - return array(); - } - - return $result; - - } // fetch_assoc - - /** - * fetch_row - * This emulates the mysql_fetch_row and takes a resource result - * we force it to always return an array, albeit an empty one - * The optional finish parameter affects whether we automatically clean - * up the result set after the last row is read. - */ - public static function fetch_row($resource, $finish = true) { - - $result = mysql_fetch_row($resource); - - if (!$result) { - if ($finish) { - self::finish($resource); - } - return array(); - } - - return $result; - - } // fetch_row - - /** - * num_rows - * This emulates the mysql_num_rows function which is really - * just a count of rows returned by our select statement, this - * doesn't work for updates or inserts - */ - public static function num_rows($resource) { - if ($resource) { - $result = mysql_num_rows($resource); - if ($result) { - return $result; - } - } - - return 0; - } // num_rows - - /** - * seek - * This resets the row pointer to the specified position - */ - public static function seek($resource, $row) { - return mysql_data_seek($resource, $row); - } - - /** - * finish - * This closes a result handle and clears the memory associated with it - */ - public static function finish($resource) { - - // Clear the result memory - mysql_free_result($resource); - - } // finish - - /** - * affected_rows - * This emulates the mysql_affected_rows function - */ - public static function affected_rows($resource) { - - $result = mysql_affected_rows($resource); - - if (!$result) { - return '0'; - } - - return $result; - - } // affected_rows - - /** - * _connect - * This connects to the database, used by the DBH function - */ - private static function _connect() { - - $username = Config::get('database_username'); - $hostname = Config::get('database_hostname'); - $password = Config::get('database_password'); - - $dbh = mysql_connect($hostname, $username, $password); - if (!$dbh) { - debug_event('Database', 'Unable to connect to database: ' . mysql_error(), 1); - return null; - } - - return $dbh; - } // _connect - - private static function _setup_dbh($dbh, $database) { - $data = self::translate_to_mysqlcharset(Config::get('site_charset')); - - if (function_exists('mysql_set_charset')) { - if (!$charset = mysql_set_charset($data['charset'], $dbh)) { - debug_event('Database', 'Unable to set MySQL connection charset to ' . $data['charset'] . ', this may cause issues...', 1); - } - } - else { - $sql = "SET NAMES " . mysql_real_escape_string($data['charset']); - $charset = mysql_query($sql,$dbh); - if ($error = mysql_error($dbh)) { - debug_event('Database', 'Unable to set MySQL connection charset to ' . $data['charset'] . ' using SET NAMES, this may cause issues: ' . $error, 1); - } - - } - - $select_db = mysql_select_db($database, $dbh); - if (!$select_db) { - debug_event('Database', 'Unable to select database ' . $database . ': ' . mysql_error(), 1); - } - - if (Config::get('sql_profiling')) { - mysql_query('set profiling=1', $dbh); - mysql_query('set profiling_history_size=50', $dbh); - mysql_query('set query_cache_type=0', $dbh); - } - } // _select_db - - /** - * check_database - * - * Make sure that we can connect to the database - */ - public static function check_database() { - - $dbh = self::_connect(); - - if (!is_resource($dbh)) { - return false; - } - - mysql_close($dbh); - return true; - - } // check_database - - public static function check_database_exists() { - $dbh = self::_connect(); - $select = mysql_select_db(Config::get('database_name'), $dbh); - mysql_close($dbh); - return $select; - } - - /** - * check_database_inserted - * checks to make sure that you have inserted the database - * and that the user you are using has access to it - */ - public static function check_database_inserted() { - - $sql = "DESCRIBE session"; - $db_results = Dba::read($sql); - - if (!$db_results) { - return false; - } - - // Make sure the whole table is there - if (Dba::num_rows($db_results) != '7') { - return false; - } - - return true; - - } // check_database_inserted - - public static function get_client_info() { - return mysql_get_client_info(); - } - - /** - * show_profile - * This function is used for debug, helps with profiling - */ - public static function show_profile() { - - if (Config::get('sql_profiling')) { - print '
Profiling data:
'; - $res = Dba::read('show profiles'); - print '
| ' . implode(' | ', $r) . ' |
Profiling data:
'; + $res = Dba::read('show profiles'); + print '
| ' . implode(' | ', $r) . ' |
\n" . $message; - $_SESSION['errors'][$name] .= "
\n" . $message; - } + // Make sure its set first + if (!isset(Error::$errors[$name])) { + Error::$errors[$name] = $message; + Error::$state = 1; + $_SESSION['errors'][$name] = $message; + } + // They want us to clobber it + elseif ($clobber) { + Error::$state = 1; + Error::$errors[$name] = $message; + $_SESSION['errors'][$name] = $message; + } + // They want us to append the error, add a BR\n and then the message + else { + Error::$state = 1; + Error::$errors[$name] .= "
\n" . $message; + $_SESSION['errors'][$name] .= "
\n" . $message; + } - } // add + } // add - /** - * occurred - * This returns true / false if an error has occured anywhere - */ - public static function occurred() { + /** + * occurred + * This returns true / false if an error has occured anywhere + */ + public static function occurred() { - if (self::$state == '1') { return true; } + if (self::$state == '1') { return true; } - return false; + return false; - } // occurred + } // occurred - /** - * get - * This returns an error by name - */ - public static function get($name) { + /** + * get + * This returns an error by name + */ + public static function get($name) { - if (!isset(Error::$errors[$name])) { return ''; } + if (!isset(Error::$errors[$name])) { return ''; } - return Error::$errors[$name]; + return Error::$errors[$name]; - } // get + } // get - /** - * display - * This prints the error out with a standard Error class span - * Ben Goska: Renamed from print to display, print is reserved - */ - public static function display($name) { + /** + * display + * This prints the error out with a standard Error class span + * Ben Goska: Renamed from print to display, print is reserved + */ + public static function display($name) { - // Be smart about this, if no error don't print - if (!isset(Error::$errors[$name])) { return ''; } + // Be smart about this, if no error don't print + if (!isset(Error::$errors[$name])) { return ''; } - echo '' . Error::$errors[$name] . ''; + echo '' . Error::$errors[$name] . ''; - } // display + } // display - /** - * auto_init - * This loads the errors from the session back into Ampache - */ - public static function auto_init() { + /** + * auto_init + * This loads the errors from the session back into Ampache + */ + public static function auto_init() { - if (!is_array($_SESSION['errors'])) { return false; } + if (!is_array($_SESSION['errors'])) { return false; } - // Re-insert them - foreach ($_SESSION['errors'] as $key=>$error) { - self::add($key,$error); - } + // Re-insert them + foreach ($_SESSION['errors'] as $key=>$error) { + self::add($key,$error); + } - } // auto_init + } // auto_init } // Error diff --git a/lib/class/flag.class.php b/lib/class/flag.class.php index ed1fef0642..d7fdc81160 100644 --- a/lib/class/flag.class.php +++ b/lib/class/flag.class.php @@ -1,5 +1,5 @@ get_info($flag_id,'flagged'); + $info = $this->get_info($flag_id,'flagged'); - foreach ($info as $key=>$value) { - $this->$key = $value; - } + foreach ($info as $key=>$value) { + $this->$key = $value; + } - return true; + return true; - } // Constructor + } // Constructor - /** - * gc - * - * This cleans out unused flagged items - */ - public static function gc() { - Dba::write("DELETE FROM `flagged` USING `flagged` LEFT JOIN `song` ON `song`.`id` = `flagged`.`object_id` WHERE `song`.`id` IS NULL AND `object_type` = 'song'"); - } + /** + * gc + * + * This cleans out unused flagged items + */ + public static function gc() { + Dba::write("DELETE FROM `flagged` USING `flagged` LEFT JOIN `song` ON `song`.`id` = `flagged`.`object_id` WHERE `song`.`id` IS NULL AND `object_type` = 'song'"); + } - /** - * build_cache - * This takes an array of ids and builds up a nice little cache - * for us - */ - public static function build_cache($ids) { + /** + * build_cache + * This takes an array of ids and builds up a nice little cache + * for us + */ + public static function build_cache($ids) { - if (!is_array($ids) OR !count($ids)) { return false; } + if (!is_array($ids) OR !count($ids)) { return false; } - $idlist = '(' . implode(',',$ids) . ')'; + $idlist = '(' . implode(',',$ids) . ')'; - $sql = "SELECT * FROM `flagged` WHERE `id` IN $idlist"; - $db_results = Dba::read($sql); + $sql = "SELECT * FROM `flagged` WHERE `id` IN $idlist"; + $db_results = Dba::read($sql); - while ($row = Dba::fetch_assoc($db_results)) { - parent::add_to_cache('flagged',$row['id'],$row); - } + while ($row = Dba::fetch_assoc($db_results)) { + parent::add_to_cache('flagged',$row['id'],$row); + } - } // build_cache + } // build_cache - /** - * build_map_cache - * This takes an array of ids and builds a map cache to avoid some of the object_type calls - * we would normally have to make - */ - public static function build_map_cache($ids,$type) { + /** + * build_map_cache + * This takes an array of ids and builds a map cache to avoid some of the object_type calls + * we would normally have to make + */ + public static function build_map_cache($ids,$type) { - if (!is_array($ids) OR !count($ids)) { return false; } + if (!is_array($ids) OR !count($ids)) { return false; } - $idlist = '(' . implode(',',$ids) . ')'; - $type = Dba::escape($type); + $idlist = '(' . implode(',',$ids) . ')'; + $type = Dba::escape($type); - $sql = "SELECT * FROM `flagged` " . - "WHERE `flagged`.`object_type`='$type' AND `flagged`.`object_id` IN $idlist"; - $db_results = Dba::read($sql); + $sql = "SELECT * FROM `flagged` " . + "WHERE `flagged`.`object_type`='$type' AND `flagged`.`object_id` IN $idlist"; + $db_results = Dba::read($sql); - while ($row = Dba::fetch_assoc($db_results)) { - $results[$row['object_id']] = $row; - } + while ($row = Dba::fetch_assoc($db_results)) { + $results[$row['object_id']] = $row; + } - // Itterate through the passed ids as we need to cache 'nulls' - foreach ($ids as $id) { - parent::add_to_cache('flagged_' . $type,$id,$results[$id]); - } + // Itterate through the passed ids as we need to cache 'nulls' + foreach ($ids as $id) { + parent::add_to_cache('flagged_' . $type,$id,$results[$id]); + } - return true; + return true; - } // build_map_cache + } // build_map_cache - /** - * has_flag - * Static function, tries to check the cache, but falls back on a query - */ - public static function has_flag($id,$type) { + /** + * has_flag + * Static function, tries to check the cache, but falls back on a query + */ + public static function has_flag($id,$type) { - if (parent::is_cached('flagged_' . $type,$id)) { - $data = parent::get_from_cache('flagged_' . $type,$id); - return $data['date']; - } + if (parent::is_cached('flagged_' . $type,$id)) { + $data = parent::get_from_cache('flagged_' . $type,$id); + return $data['date']; + } - // Ok we have to query this - $type = Dba::escape($type); + // Ok we have to query this + $type = Dba::escape($type); - $sql = "SELECT * FROM `flagged` WHERE `flagged`.`object_type`='$type' AND `flagged`.`object_id`='$id'"; - $db_results = Dba::read($sql); + $sql = "SELECT * FROM `flagged` WHERE `flagged`.`object_type`='$type' AND `flagged`.`object_id`='$id'"; + $db_results = Dba::read($sql); - $row = Dba::fetch_assoc($db_results); - parent::add_to_cache('flagged_' . $type,$row['object_id'],$row); + $row = Dba::fetch_assoc($db_results); + parent::add_to_cache('flagged_' . $type,$row['object_id'],$row); - return $row['date']; + return $row['date']; - } // has_flag + } // has_flag - /** - * get_recent - * This returns the id's of the most recently flagged songs, it takes an int - * as an argument which is the count of the object you want to return - */ - public static function get_recent($count=0) { + /** + * get_recent + * This returns the id's of the most recently flagged songs, it takes an int + * as an argument which is the count of the object you want to return + */ + public static function get_recent($count=0) { - if ($count) { $limit = " LIMIT " . intval($count); } + if ($count) { $limit = " LIMIT " . intval($count); } - $results = array(); + $results = array(); - $sql = "SELECT id FROM flagged ORDER BY date " . $limit; - $db_results = Dba::read($sql); + $sql = "SELECT id FROM flagged ORDER BY date " . $limit; + $db_results = Dba::read($sql); - while ($r = Dba::fetch_assoc($db_results)) { - $results[] = $r['id']; - } + while ($r = Dba::fetch_assoc($db_results)) { + $results[] = $r['id']; + } - return $results; + return $results; - } // get_recent + } // get_recent - /** - * get_disabled - * This returns all of the songs that have been disabled, this is - * a form of being flagged - */ - public static function get_disabled() { + /** + * get_disabled + * This returns all of the songs that have been disabled, this is + * a form of being flagged + */ + public static function get_disabled() { - $sql = "SELECT `id` FROM `song` WHERE `enabled`='0'"; - $db_results = Dba::read($sql); + $sql = "SELECT `id` FROM `song` WHERE `enabled`='0'"; + $db_results = Dba::read($sql); - $results = array(); + $results = array(); - while ($row = Dba::fetch_assoc($db_results)) { - $results[] = $row['id']; - } + while ($row = Dba::fetch_assoc($db_results)) { + $results[] = $row['id']; + } - return $results; + return $results; - } // get_disabled + } // get_disabled - /** - * get_all - * This returns an array of ids of flagged songs if no limit is passed - * it gets everything - */ - public static function get_all($count=0) { + /** + * get_all + * This returns an array of ids of flagged songs if no limit is passed + * it gets everything + */ + public static function get_all($count=0) { - if ($count) { $limit_clause = "LIMIT " . intval($count); } + if ($count) { $limit_clause = "LIMIT " . intval($count); } - $sql = "SELECT `id` FROM `flagged` $limit_clause"; - $db_results = Dba::read($sql); + $sql = "SELECT `id` FROM `flagged` $limit_clause"; + $db_results = Dba::read($sql); - /* Default it to an array */ - $results = array(); + /* Default it to an array */ + $results = array(); - /* While the query */ - while ($row = Dba::fetch_assoc($db_results)) { - $results[] = $row['id']; - } + /* While the query */ + while ($row = Dba::fetch_assoc($db_results)) { + $results[] = $row['id']; + } - return $results; + return $results; - } // get_all + } // get_all - /** - * get_approved - * This returns an array of approved flagged songs - */ - public static function get_approved() { + /** + * get_approved + * This returns an array of approved flagged songs + */ + public static function get_approved() { - $sql = "SELECT `id` FROM `flagged` WHERE `approved`='1'"; - $db_results = Dba::read($sql); + $sql = "SELECT `id` FROM `flagged` WHERE `approved`='1'"; + $db_results = Dba::read($sql); - /* Default the results array */ - $results = array(); + /* Default the results array */ + $results = array(); - /* While it */ - while ($r = Dba::fetch_assoc($db_results)) { - $results[] = $r['id']; - } + /* While it */ + while ($r = Dba::fetch_assoc($db_results)) { + $results[] = $r['id']; + } - return $results; + return $results; - } // get_approved + } // get_approved - /** - * add - * This adds a flag entry for an item, it takes an id, a type, the flag type - * and a comment and then inserts the mofo - */ - public static function add($id,$type,$flag,$comment) { + /** + * add + * This adds a flag entry for an item, it takes an id, a type, the flag type + * and a comment and then inserts the mofo + */ + public static function add($id,$type,$flag,$comment) { - $id = Dba::escape($id); - $type = Dba::escape($type); - $flag = self::validate_flag($flag); - $user = Dba::escape($GLOBALS['user']->id); - $comment = Dba::escape($comment); - $time = time(); - $approved = '0'; + $id = Dba::escape($id); + $type = Dba::escape($type); + $flag = self::validate_flag($flag); + $user = Dba::escape($GLOBALS['user']->id); + $comment = Dba::escape($comment); + $time = time(); + $approved = '0'; - /* If they are an content manager or higher, it's auto approved */ - if (Access::check('interface','75')) { $approved = '1'; } + /* If they are an content manager or higher, it's auto approved */ + if (Access::check('interface','75')) { $approved = '1'; } - $sql = "INSERT INTO `flagged` (`object_id`,`object_type`,`flag`,`comment`,`date`,`approved`,`user`) VALUES " . - " ('$id','$type','$flag','$comment','$time','$approved','$user')"; - $db_results = Dba::write($sql); + $sql = "INSERT INTO `flagged` (`object_id`,`object_type`,`flag`,`comment`,`date`,`approved`,`user`) VALUES " . + " ('$id','$type','$flag','$comment','$time','$approved','$user')"; + $db_results = Dba::write($sql); - return true; + return true; - } // add + } // add - /** - * delete - * This deletes the flagged entry and rescans the file to revert to the origional - * state, in a perfect world, I could just roll the changes back... not until 3.4 - * or.. haha 3.5! - */ - public function delete() { + /** + * delete + * This deletes the flagged entry and rescans the file to revert to the origional + * state, in a perfect world, I could just roll the changes back... not until 3.4 + * or.. haha 3.5! + */ + public function delete() { - // Re-scan the file - $song = new Song($this->object_id); - $info = Catalog::update_media_from_tags($song); - - // Delete the row - $sql = "DELETE FROM `flagged` WHERE `id`='$this->id'"; - $db_results = Dba::write($sql); - - // Reset the Last-Updated date so that it'll get re-scaned - $song->update_utime($song->id,1); - - return true; - - } // delete - - /** - * approve - * This approves the current flag object ($this->id) by setting approved to - * 1 - */ - public function approve() { - - $sql = "UPDATE `flagged` SET `approved`='1' WHERE `id`='$this->id'"; - $db_results = Dba::write($sql); - - $this->approved = 1; - - return true; - - } // approve - - /** - * format - * This function figures out what kind of object we've got and sets up all the - * vars all nice and fuzzy like - */ - public function format() { - - switch ($this->object_type) { - case 'song': - $song = new Song($this->object_id); - $song->format(); - $this->f_name = $song->f_link; - break; - } // end switch on type - - $client = new User($this->user); - $client->format(); - $this->f_user = $client->f_link; - - } // format - - /** - * print_status - * This prints out a userfriendly version of the current status for this flagged - * object - */ - public function print_status() { - - if ($this->approved) { echo T_('Approved'); } - else { echo T_('Pending'); } - - } // print_status - - /** - * print_flag - * This prints out a userfriendly version of the current flag type - */ - public function print_flag() { - - switch ($this->flag) { - case 'delete': - $name = T_('Delete'); - break; - case 'retag': - $name = T_('Re-Tag'); - break; - case 'reencode': - $name = T_('Re-encode'); - break; - case 'other': - $name = T_('Other'); - break; - default: - $name = T_('Unknown'); - break; - } // end switch - - echo $name; - - } // print_flag - - /** - * validate_flag - * This takes a flag input and makes sure it's one of the reigstered - * and valid 'flag' values - */ - public static function validate_flag($flag) { - - switch ($flag) { - case 'delete': - case 'retag': - case 'reencode': - case 'other': - return $flag; - break; - default: - return 'other'; - break; - } // end switch - - } // validate_flag - - /** - * fill_tags - * This is used by the write_tags script. - */ - public static function fill_tags( $tagWriter, $song, $type = 'comment' ) { - - // Set all of the attributes for the tag to be written(All pulled from the song object) - // Use a function since ID3v1, ID3v2, and vorbis/flac/ape are different - switch ($type) { - case 'comment': - $tagWriter->comments['title'] = $song->title; - $tagWriter->comments['date'] = $song->year; - $tagWriter->comments['year'] = $song->year; - $tagWriter->comments['comment'] = $song->comment; - $tagWriter->comments['size'] = $song->size; - $tagWriter->comments['time'] = $song->time; - $tagWriter->comments['album'] = $song->get_album_name(); - $tagWriter->comments['artist'] = $song->get_artist_name(); - $tagWriter->comments['genre'] = $song->get_genre_name(); - $tagWriter->comments['track'] = $song->track; - break; - case 'id3v1': - $tagWriter->title = $song->title; - $tagWriter->year = $song->year; - $tagWriter->comment = $song->comment; - $tagWriter->artist = $song->get_artist_name(); - $tagWriter->album = $song->get_album_name(); - $tagWriter->genre = $song->get_genre_name(); - $tagWriter->track = $song->track; - unset($tagWriter->genre_id); - break; - case 'id3v2': - $tagWriter->title = $song->title; - $tagWriter->year = $song->year; - $tagWriter->comment = $song->comment; - $tagWriter->artist = $song->get_artist_name(); - $tagWriter->album = $song->get_album_name(); - $tagWriter->genre = $song->get_genre_name(); - $tagWriter->track = $song->track; - unset($tagWriter->genre_id); - break; - } // end switch on type - - } // fill_tags + // Re-scan the file + $song = new Song($this->object_id); + $info = Catalog::update_media_from_tags($song); + + // Delete the row + $sql = "DELETE FROM `flagged` WHERE `id`='$this->id'"; + $db_results = Dba::write($sql); + + // Reset the Last-Updated date so that it'll get re-scaned + $song->update_utime($song->id,1); + + return true; + + } // delete + + /** + * approve + * This approves the current flag object ($this->id) by setting approved to + * 1 + */ + public function approve() { + + $sql = "UPDATE `flagged` SET `approved`='1' WHERE `id`='$this->id'"; + $db_results = Dba::write($sql); + + $this->approved = 1; + + return true; + + } // approve + + /** + * format + * This function figures out what kind of object we've got and sets up all the + * vars all nice and fuzzy like + */ + public function format() { + + switch ($this->object_type) { + case 'song': + $song = new Song($this->object_id); + $song->format(); + $this->f_name = $song->f_link; + break; + } // end switch on type + + $client = new User($this->user); + $client->format(); + $this->f_user = $client->f_link; + + } // format + + /** + * print_status + * This prints out a userfriendly version of the current status for this flagged + * object + */ + public function print_status() { + + if ($this->approved) { echo T_('Approved'); } + else { echo T_('Pending'); } + + } // print_status + + /** + * print_flag + * This prints out a userfriendly version of the current flag type + */ + public function print_flag() { + + switch ($this->flag) { + case 'delete': + $name = T_('Delete'); + break; + case 'retag': + $name = T_('Re-Tag'); + break; + case 'reencode': + $name = T_('Re-encode'); + break; + case 'other': + $name = T_('Other'); + break; + default: + $name = T_('Unknown'); + break; + } // end switch + + echo $name; + + } // print_flag + + /** + * validate_flag + * This takes a flag input and makes sure it's one of the reigstered + * and valid 'flag' values + */ + public static function validate_flag($flag) { + + switch ($flag) { + case 'delete': + case 'retag': + case 'reencode': + case 'other': + return $flag; + break; + default: + return 'other'; + break; + } // end switch + + } // validate_flag + + /** + * fill_tags + * This is used by the write_tags script. + */ + public static function fill_tags( $tagWriter, $song, $type = 'comment' ) { + + // Set all of the attributes for the tag to be written(All pulled from the song object) + // Use a function since ID3v1, ID3v2, and vorbis/flac/ape are different + switch ($type) { + case 'comment': + $tagWriter->comments['title'] = $song->title; + $tagWriter->comments['date'] = $song->year; + $tagWriter->comments['year'] = $song->year; + $tagWriter->comments['comment'] = $song->comment; + $tagWriter->comments['size'] = $song->size; + $tagWriter->comments['time'] = $song->time; + $tagWriter->comments['album'] = $song->get_album_name(); + $tagWriter->comments['artist'] = $song->get_artist_name(); + $tagWriter->comments['genre'] = $song->get_genre_name(); + $tagWriter->comments['track'] = $song->track; + break; + case 'id3v1': + $tagWriter->title = $song->title; + $tagWriter->year = $song->year; + $tagWriter->comment = $song->comment; + $tagWriter->artist = $song->get_artist_name(); + $tagWriter->album = $song->get_album_name(); + $tagWriter->genre = $song->get_genre_name(); + $tagWriter->track = $song->track; + unset($tagWriter->genre_id); + break; + case 'id3v2': + $tagWriter->title = $song->title; + $tagWriter->year = $song->year; + $tagWriter->comment = $song->comment; + $tagWriter->artist = $song->get_artist_name(); + $tagWriter->album = $song->get_album_name(); + $tagWriter->genre = $song->get_genre_name(); + $tagWriter->track = $song->track; + unset($tagWriter->genre_id); + break; + } // end switch on type + + } // fill_tags } //end of flag class diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php index 28c8bed9dc..187ae5484c 100644 --- a/lib/class/localplay.class.php +++ b/lib/class/localplay.class.php @@ -1,5 +1,5 @@ type = $type; - - $this->_get_info(); - - } // Localplay - - /** - * _get_info - * This functions takes the type and attempts to get all the - * information needed to load it. Will log errors if there are - * any failures, fatal errors will actually return something to the - * gui - */ - private function _get_info() { - - $this->_load_player(); - - } // _get_info - - /** - * player_loaded - * This returns true / false if the player load - * failed / worked - */ - public function player_loaded() { - - if (is_object($this->_player)) { - return true; - } - else { - return false; - } - - } // player_loaded - - /** - * format - * This makes the localplay/plugin information - * human readable - */ - public function format() { - - if (!is_object($this->_player)) { return false; } - - $this->f_name = ucfirst($this->type); - $this->f_description = $this->_player->get_description(); - $this->f_version = $this->_player->get_version(); - - - } // format - - /** - * _load_player - * This function attempts to load the player class that localplay - * Will interface with in order to make all this magical stuf work - * all LocalPlay modules should be located in /modules/
' . - '- Added date to user_vote to allow sorting by vote time.
' . - '- Added Random Method and Object Count Preferences.
' . - '- Removed some unused tables/fields.
' . - '- Added Label, Catalog # and Language to Extended Song Data Table.'; + $update_string = '- Moved back to ID for user tracking internally.
' . + '- Added date to user_vote to allow sorting by vote time.
' . + '- Added Random Method and Object Count Preferences.
' . + '- Removed some unused tables/fields.
' . + '- Added Label, Catalog # and Language to Extended Song Data Table.'; - $version[] = array('version' => '340001','description' => $update_string); + $version[] = array('version' => '340001','description' => $update_string); - $update_string = '- Added Offset Limit to Preferences and removed from user table.'; + $update_string = '- Added Offset Limit to Preferences and removed from user table.'; - $version[] = array('version' => '340002','description' => $update_string); + $version[] = array('version' => '340002','description' => $update_string); - $update_string = '- Moved Art from the Album table into album_data to improve performance.
' . - '- Made some minor changes to song table to reduce size of each row.
' . - '- Moved song_ext_data to song_data to match album_data pattern.
' . - '- Added Playlist Method and Rate Limit Preferences.
' . - '- Renamed preferences and ratings to preference and rating to fit table pattern.
' . - '- Fixed rating table, renamed user_rating to rating and switched 00 for -1.
'; + $update_string = '- Moved Art from the Album table into album_data to improve performance.
' . + '- Made some minor changes to song table to reduce size of each row.
' . + '- Moved song_ext_data to song_data to match album_data pattern.
' . + '- Added Playlist Method and Rate Limit Preferences.
' . + '- Renamed preferences and ratings to preference and rating to fit table pattern.
' . + '- Fixed rating table, renamed user_rating to rating and switched 00 for -1.
'; - $version[] = array('version' => '340003','description' => $update_string); + $version[] = array('version' => '340003','description' => $update_string); - $update_string = '- Alter the Session.id to be VARCHAR(64) to account for all potential configs.
' . - '- Added new user_shout table for Sticky objects / shoutbox.
' . - '- Added new playlist preferences, and new preference catagory of playlist.
' . - '- Tweaked Now Playing Table.
'; + $update_string = '- Alter the Session.id to be VARCHAR(64) to account for all potential configs.
' . + '- Added new user_shout table for Sticky objects / shoutbox.
' . + '- Added new playlist preferences, and new preference catagory of playlist.
' . + '- Tweaked Now Playing Table.
'; - $version[] = array('version' => '340004','description' => $update_string); + $version[] = array('version' => '340004','description' => $update_string); - $update_string = '- Altered Ratings table so the fields make more sense.
' . - '- Moved Random Method to Playlist catagory.
' . - '- Added Transcode Method to Streaming.
'; + $update_string = '- Altered Ratings table so the fields make more sense.
' . + '- Moved Random Method to Playlist catagory.
' . + '- Added Transcode Method to Streaming.
'; - $version[] = array('version' => '340005','description' => $update_string); + $version[] = array('version' => '340005','description' => $update_string); - $update_string = '- Remove Random Method config option, ended up being useless.
' . - '- Check and change album_data.art to a MEDIUMBLOB if needed.
'; + $update_string = '- Remove Random Method config option, ended up being useless.
' . + '- Check and change album_data.art to a MEDIUMBLOB if needed.
'; - $version[] = array('version' => '340006','description' => $update_string); + $version[] = array('version' => '340006','description' => $update_string); - $update_string = '- Added new session_stream table for sessions tied directly to stream instances.
' . - '- Altered the session table, making value a LONGTEXT.
'; + $update_string = '- Added new session_stream table for sessions tied directly to stream instances.
' . + '- Altered the session table, making value a LONGTEXT.
'; - $version[] = array('version' => '340007','description' => $update_string); + $version[] = array('version' => '340007','description' => $update_string); - $update_string = '- Modified Playlist_Data table to account for multiple object types.
' . - '- Verified previous updates, adjusting as needed.
' . - '- Dropped Allow Downsampling pref, configured in cfg file.
' . - '- Renamed Downsample Rate --> Transcode Rate to reflect new terminiology.
'; + $update_string = '- Modified Playlist_Data table to account for multiple object types.
' . + '- Verified previous updates, adjusting as needed.
' . + '- Dropped Allow Downsampling pref, configured in cfg file.
' . + '- Renamed Downsample Rate --> Transcode Rate to reflect new terminiology.
'; - $version[] = array('version' => '340008','description' => $update_string); + $version[] = array('version' => '340008','description' => $update_string); - $update_string = '- Added disk to Album table.
' . - '- Added artist_data for artist images and bios.
' . - '- Added DNS to access list to allow for dns based ACLs.
'; + $update_string = '- Added disk to Album table.
' . + '- Added artist_data for artist images and bios.
' . + '- Added DNS to access list to allow for dns based ACLs.
'; - $version[] = array('version' => '340009','description' => $update_string); + $version[] = array('version' => '340009','description' => $update_string); - $update_string = '- Removed Playlist Add preference.
' . - '- Moved Localplay* preferences to options.
' . - '- Tweaked Default Playlist Method.
' . - '- Change wording on Localplay preferences.
'; - $version[] = array('version' => '340010','description'=>$update_string); + $update_string = '- Removed Playlist Add preference.
' . + '- Moved Localplay* preferences to options.
' . + '- Tweaked Default Playlist Method.
' . + '- Change wording on Localplay preferences.
'; + $version[] = array('version' => '340010','description'=>$update_string); - $update_string = '- Added api session table, will eventually recombine with others.
'; + $update_string = '- Added api session table, will eventually recombine with others.
'; - $version[] = array('version' => '340011','description'=>$update_string); + $version[] = array('version' => '340011','description'=>$update_string); - $update_string = '- Added Democratic Table for new democratic play features.
' . - '- Added Add Path to Catalog to improve add speeds on large catalogs.
'; + $update_string = '- Added Democratic Table for new democratic play features.
' . + '- Added Add Path to Catalog to improve add speeds on large catalogs.
'; - $version[] = array('version' => '340012','description'=>$update_string); + $version[] = array('version' => '340012','description'=>$update_string); - $update_string = '- Removed Unused Preferences.
' . - '- Changed Localplay Config to Localplay Access.
' . - '- Changed all XML-RPC acls to RPC to reflect inclusion of new API.
'; + $update_string = '- Removed Unused Preferences.
' . + '- Changed Localplay Config to Localplay Access.
' . + '- Changed all XML-RPC acls to RPC to reflect inclusion of new API.
'; - $version[] = array('version' => '340013','description'=>$update_string); + $version[] = array('version' => '340013','description'=>$update_string); - $update_string = '- Removed API Session table, been a nice run....
' . - '- Alterted Session table to handle API sessions correctly.
'; + $update_string = '- Removed API Session table, been a nice run....
' . + '- Alterted Session table to handle API sessions correctly.
'; - $version[] = array('version' => '340014','description'=>$update_string); + $version[] = array('version' => '340014','description'=>$update_string); - $update_string = '- Alter Playlist Date Field to fix issues with some MySQL configurations.
' . - '- Alter Rating type to correct AVG issue on searching.
'; + $update_string = '- Alter Playlist Date Field to fix issues with some MySQL configurations.
' . + '- Alter Rating type to correct AVG issue on searching.
'; - $version[] = array('version' => '340015','description'=>$update_string); + $version[] = array('version' => '340015','description'=>$update_string); - $update_string = '- Alter the Democratic Playlist table, adding base_playlist.
' . - '- Alter tmp_playlist to account for Democratic changes.
' . - '- Cleared Existing Democratic playlists due to changes.
'; + $update_string = '- Alter the Democratic Playlist table, adding base_playlist.
' . + '- Alter tmp_playlist to account for Democratic changes.
' . + '- Cleared Existing Democratic playlists due to changes.
'; - $version[] = array('version' => '340016','description'=>$update_string); + $version[] = array('version' => '340016','description'=>$update_string); - $update_string = '- Fix Tables for new Democratic Play methodology.
'; + $update_string = '- Fix Tables for new Democratic Play methodology.
'; - $version[] = array('version' => '340017','description'=>$update_string); + $version[] = array('version' => '340017','description'=>$update_string); - $update_string = '- Attempt to detect and correct charset issues between filesystem and database.
'; + $update_string = '- Attempt to detect and correct charset issues between filesystem and database.
'; - $version[] = array('version' => '340018','description'=>$update_string); + $version[] = array('version' => '340018','description'=>$update_string); - $update_string = '- Modify the Tag tables so that they actually work.
' . - '- Alter the Prefix fields to allow for more prefixs.
'; + $update_string = '- Modify the Tag tables so that they actually work.
' . + '- Alter the Prefix fields to allow for more prefixs.
'; - $version[] = array('version' => '350001','description'=>$update_string); + $version[] = array('version' => '350001','description'=>$update_string); - $update_string = '- Remove Genre Field from song table.
' . - '- Add user_catalog table for tracking user<-->catalog mappings.
' . - '- Add tmp_browse to handle caching rather then session table.
'; + $update_string = '- Remove Genre Field from song table.
' . + '- Add user_catalog table for tracking user<-->catalog mappings.
' . + '- Add tmp_browse to handle caching rather then session table.
'; - $version[] = array('version' => '350002','description'=>$update_string); + $version[] = array('version' => '350002','description'=>$update_string); - $update_string = '- Modify Tag tables.
' . - '- Remove useless config preferences.
'; + $update_string = '- Modify Tag tables.
' . + '- Remove useless config preferences.
'; - $version[] = array('version'=> '350003','description'=>$update_string); + $version[] = array('version'=> '350003','description'=>$update_string); - $update_string = '- Modify ACL table to enable IPv6 ACL support
' . - '- Modify Session Tables to store IPv6 addresses if provided
' . - '- Modify IP History table to store IPv6 addresses and User Agent
'; + $update_string = '- Modify ACL table to enable IPv6 ACL support
' . + '- Modify Session Tables to store IPv6 addresses if provided
' . + '- Modify IP History table to store IPv6 addresses and User Agent
'; - $version[] = array('version'=>'350004','description'=>$update_string); + $version[] = array('version'=>'350004','description'=>$update_string); - $update_string = "- Add table for Video files
"; + $update_string = "- Add table for Video files
"; - $version[] = array('version'=>'350005','description'=>$update_string); + $version[] = array('version'=>'350005','description'=>$update_string); - $update_string = "- Add data for Lyrics
"; + $update_string = "- Add data for Lyrics
"; - $version[] = array('version'=>'350006','description'=>$update_string); + $version[] = array('version'=>'350006','description'=>$update_string); - $update_string = '- Remove unused fields from catalog, playlist, playlist_data
' . - '- Add tables for dynamic playlists
' . - '- Add last_clean to catalog table
' . - '- Add track to tmp_playlist_data
' . - '- Increase Thumbnail blob size
'; + $update_string = '- Remove unused fields from catalog, playlist, playlist_data
' . + '- Add tables for dynamic playlists
' . + '- Add last_clean to catalog table
' . + '- Add track to tmp_playlist_data
' . + '- Increase Thumbnail blob size
'; - $version[] = array('version'=>'350007','description'=>$update_string); + $version[] = array('version'=>'350007','description'=>$update_string); - $update_string = '- Modify Now Playing table to handle Videos
' . - '- Modify tmp_browse to make it easier to prune
' . - '- Add missing indexes to the _data tables
' . - '- Drop unused song.hash
' . - '- Add addition_time and update_time to video table
'; + $update_string = '- Modify Now Playing table to handle Videos
' . + '- Modify tmp_browse to make it easier to prune
' . + '- Add missing indexes to the _data tables
' . + '- Drop unused song.hash
' . + '- Add addition_time and update_time to video table
'; - $version[] = array('version'=>'350008','description'=>$update_string); + $version[] = array('version'=>'350008','description'=>$update_string); - $update_string = '- Add MBID (MusicBrainz ID) fields
' . - '- Remove useless preferences
'; + $update_string = '- Add MBID (MusicBrainz ID) fields
' . + '- Remove useless preferences
'; - $version[] = array('version'=>'360001','description'=>$update_string); + $version[] = array('version'=>'360001','description'=>$update_string); - $update_string = '- Add Bandwidth and Feature preferences to simplify how interface is presented
' . - '- Change Tables to FULLTEXT() for improved searching
' . - '- Increase Filename lengths to 4096
' . - '- Remove useless "KEY" reference from ACL and Catalog tables
' . - '- Add new Remote User / Remote Password fields to Catalog
'; + $update_string = '- Add Bandwidth and Feature preferences to simplify how interface is presented
' . + '- Change Tables to FULLTEXT() for improved searching
' . + '- Increase Filename lengths to 4096
' . + '- Remove useless "KEY" reference from ACL and Catalog tables
' . + '- Add new Remote User / Remote Password fields to Catalog
'; - $version[] = array('version'=>'360002','description'=>$update_string); + $version[] = array('version'=>'360002','description'=>$update_string); - $update_string = '- Add image table to store images.
' . - '- Drop album_data and artist_data.
'; - $version[] = array('version'=>'360003','description'=>$update_string); + $update_string = '- Add image table to store images.
' . + '- Drop album_data and artist_data.
'; + $version[] = array('version'=>'360003','description'=>$update_string); - $update_string = '- Add uniqueness constraint to ratings.
'; - $version[] = array('version' => '360004','description' => $update_string); + $update_string = '- Add uniqueness constraint to ratings.
'; + $version[] = array('version' => '360004','description' => $update_string); - $update_string = '- Modify tmp_browse to allow caching of multiple browses per session.
'; - $version[] = array('version' => '360005','description' => $update_string); + $update_string = '- Modify tmp_browse to allow caching of multiple browses per session.
'; + $version[] = array('version' => '360005','description' => $update_string); - $update_string = '- Add table for dynamic playlists.
'; - $version[] = array('version' => '360006','description' => $update_string); + $update_string = '- Add table for dynamic playlists.
'; + $version[] = array('version' => '360006','description' => $update_string); - $update_string = '- Add local auth method to session.type.
'; - $version[] = array('version' => '360007','description' => $update_string); + $update_string = '- Add local auth method to session.type.
'; + $version[] = array('version' => '360007','description' => $update_string); - $update_string = '- Verify remote_username and remote_password were added correctly to catalog table.
'; - $version[] = array('version' => '360008','description' => $update_string); + $update_string = '- Verify remote_username and remote_password were added correctly to catalog table.
'; + $version[] = array('version' => '360008','description' => $update_string); - $update_string = '- Allow long sessionids in tmp_playlist table.
'; - $version[] = array('version' => '360009', 'description' => $update_string); + $update_string = '- Allow long sessionids in tmp_playlist table.
'; + $version[] = array('version' => '360009', 'description' => $update_string); - $update_string = '- Allow compound MBIDs in the artist table.
'; - $version[] = array('version' => '360010', 'description' => $update_string); + $update_string = '- Allow compound MBIDs in the artist table.
'; + $version[] = array('version' => '360010', 'description' => $update_string); - $update_string = '- Add table to store stream session playlist.
'; - $version[] = array('version' => '360011', 'description' => $update_string); + $update_string = '- Add table to store stream session playlist.
'; + $version[] = array('version' => '360011', 'description' => $update_string); - return $version; + return $version; - } // populate_version + } // populate_version - /** - * display_update - * This displays a list of the needed - * updates to the database. This will actually - * echo out the list... - */ - public static function display_update() { + /** + * display_update + * This displays a list of the needed + * updates to the database. This will actually + * echo out the list... + */ + public static function display_update() { - $current_version = self::get_version(); - if (!is_array(self::$versions)) { - self::$versions = self::populate_version(); - } - $update_needed = false; + $current_version = self::get_version(); + if (!is_array(self::$versions)) { + self::$versions = self::populate_version(); + } + $update_needed = false; - if (!defined('CLI')) { echo "
- \n"; }
+ if (!defined('CLI')) { echo "
- '; }
- echo 'Version: ', self::format_version($update['version']);
- if (defined('CLI')) {
- echo "\n", str_replace('
', "\n", $update['description']), "\n"; - } - else { - echo '
', $update['description'], " \n";
- }
- } // if newer
+ if ($update['version'] > $current_version) {
+ $update_needed = true;
+ if (!defined('CLI')) { echo ' - '; }
+ echo 'Version: ', self::format_version($update['version']);
+ if (defined('CLI')) {
+ echo "\n", str_replace('
', "\n", $update['description']), "\n"; + } + else { + echo '
', $update['description'], " \n";
+ }
+ } // if newer
- } // foreach versions
+ } // foreach versions
- if (!defined('CLI')) { echo "
- \n"; }
- foreach (self::$versions as $update) {
+ foreach (self::$versions as $update) {
- if ($update['version'] > $current_version) {
- $update_needed = true;
- if (!defined('CLI')) { echo '
'; } - echo T_('No updates needed.'); - if (!defined('CLI')) { - echo '[Return]
'; - } - else { - echo "\n"; - } - } - } // display_update + if (!$update_needed) { + if (!defined('CLI')) { echo ''; } + echo T_('No updates needed.'); + if (!defined('CLI')) { + echo '[Return]
'; + } + else { + echo "\n"; + } + } + } // display_update - /** - * run_update - * This function actually updates the db. - * it goes through versions and finds the ones - * that need to be run. Checking to make sure - * the function exists first. - */ - public static function run_update() { + /** + * run_update + * This function actually updates the db. + * it goes through versions and finds the ones + * that need to be run. Checking to make sure + * the function exists first. + */ + public static function run_update() { - /* Nuke All Active session before we start the mojo */ - $sql = "TRUNCATE session"; - $db_results = Dba::write($sql); - - // Prevent the script from timing out, which could be bad - set_time_limit(0); - - /* Verify that there are no plugins installed - //FIXME: provide a link to remove all plugins, otherwise this could turn into a catch 22 - if (!$self::plugins_installed()) { - $GLOBALS['error']->add_error('general', T_('Plugins detected, please remove all Plugins and try again')); - return false; - } */ - - $methods = array(); + /* Nuke All Active session before we start the mojo */ + $sql = "TRUNCATE session"; + $db_results = Dba::write($sql); + + // Prevent the script from timing out, which could be bad + set_time_limit(0); + + /* Verify that there are no plugins installed + //FIXME: provide a link to remove all plugins, otherwise this could turn into a catch 22 + if (!$self::plugins_installed()) { + $GLOBALS['error']->add_error('general', T_('Plugins detected, please remove all Plugins and try again')); + return false; + } */ + + $methods = array(); - $current_version = self::get_version(); - - // Run a check to make sure that they don't try to upgrade from a version that - // won't work. - if ($current_version < '340001') { - echo "Database version too old, please upgrade to Ampache-3.3.3.5 first
"; - return false; - } - - - $methods = get_class_methods('Update'); - - if (!is_array((self::$versions))) { - self::$versions = self::populate_version(); - } - - foreach (self::$versions as $version) { + $current_version = self::get_version(); + + // Run a check to make sure that they don't try to upgrade from a version that + // won't work. + if ($current_version < '340001') { + echo "Database version too old, please upgrade to Ampache-3.3.3.5 first
"; + return false; + } + + + $methods = get_class_methods('Update'); + + if (!is_array((self::$versions))) { + self::$versions = self::populate_version(); + } + + foreach (self::$versions as $version) { - // If it's newer than our current version - // let's see if a function exists and run the - // bugger - if ($version['version'] > $current_version) { - $update_function = "update_" . $version['version']; - if (in_array($update_function,$methods)) { - $success = call_user_func(array('Update',$update_function)); - - // If the update fails drop out - if (!$success) { - Error::display('update'); - return false; - } - } - - } - - } // end foreach version + // If it's newer than our current version + // let's see if a function exists and run the + // bugger + if ($version['version'] > $current_version) { + $update_function = "update_" . $version['version']; + if (in_array($update_function,$methods)) { + $success = call_user_func(array('Update',$update_function)); + + // If the update fails drop out + if (!$success) { + Error::display('update'); + return false; + } + } + + } + + } // end foreach version - // Once we've run all of the updates let's re-sync the character set as the user - // can change this between updates and cause mis-matches on any new tables - Dba::reset_db_charset(); + // Once we've run all of the updates let's re-sync the character set as the user + // can change this between updates and cause mis-matches on any new tables + Dba::reset_db_charset(); - } // run_update + } // run_update - /** - * set_version - * This updates the 'update_info' which is used by the updater - * and plugins - */ - private static function set_version($key,$value) { + /** + * set_version + * This updates the 'update_info' which is used by the updater + * and plugins + */ + private static function set_version($key,$value) { - $sql = "UPDATE update_info SET value='$value' WHERE `key`='$key'"; - $db_results = Dba::write($sql); + $sql = "UPDATE update_info SET value='$value' WHERE `key`='$key'"; + $db_results = Dba::write($sql); - } //set_version + } //set_version - /** - * update_340001 - * This update moves back to the ID for user UID and - * adds date to the user_vote so that it can be sorted - * correctly - */ - private function update_340001() { + /** + * update_340001 + * This update moves back to the ID for user UID and + * adds date to the user_vote so that it can be sorted + * correctly + */ + private function update_340001() { - // Build the User -> ID map using the username as the key - $sql = "SELECT `id`,`username` FROM `user`"; - $db_results = Dba::read($sql); + // Build the User -> ID map using the username as the key + $sql = "SELECT `id`,`username` FROM `user`"; + $db_results = Dba::read($sql); - $user_array = array(); + $user_array = array(); - while ($r = Dba::fetch_assoc($db_results)) { - $username = $r['username']; - $user_array[$username] = Dba::escape($r['id']); - } // end while + while ($r = Dba::fetch_assoc($db_results)) { + $username = $r['username']; + $user_array[$username] = Dba::escape($r['id']); + } // end while - // Alter the user table so that you can't have an ID beyond the - // range of the other tables which have to allow for -1 - $sql = "ALTER TABLE `user` CHANGE `id` `id` INT ( 11 ) NOT NULL AUTO_INCREMENT"; - $db_results = Dba::write($sql); + // Alter the user table so that you can't have an ID beyond the + // range of the other tables which have to allow for -1 + $sql = "ALTER TABLE `user` CHANGE `id` `id` INT ( 11 ) NOT NULL AUTO_INCREMENT"; + $db_results = Dba::write($sql); - // Now pull the access list users, alter table and then re-insert - $sql = "SELECT DISTINCT(`user`) FROM `access_list`"; - $db_results = Dba::read($sql); + // Now pull the access list users, alter table and then re-insert + $sql = "SELECT DISTINCT(`user`) FROM `access_list`"; + $db_results = Dba::read($sql); - while ($r = Dba::fetch_assoc($db_results)) { - // Build the new SQL - $username = $r['user']; - $user_id = $user_array[$username]; - $username = Dba::escape($username); + while ($r = Dba::fetch_assoc($db_results)) { + // Build the new SQL + $username = $r['user']; + $user_id = $user_array[$username]; + $username = Dba::escape($username); - $sql = "UPDATE `access_list` SET `user`='$user_id' WHERE `user`='$username'"; - $update_results = Dba::write($sql); + $sql = "UPDATE `access_list` SET `user`='$user_id' WHERE `user`='$username'"; + $update_results = Dba::write($sql); - } // end while access_list + } // end while access_list - // Alter the table - $sql = "ALTER TABLE `access_list` CHANGE `user` `user` INT ( 11 ) NOT NULL"; - $db_results = Dba::write($sql); + // Alter the table + $sql = "ALTER TABLE `access_list` CHANGE `user` `user` INT ( 11 ) NOT NULL"; + $db_results = Dba::write($sql); - // Now pull flagged users, update and alter - $sql = "SELECT DISTINCT(`user`) FROM `flagged`"; - $db_results = Dba::read($sql); + // Now pull flagged users, update and alter + $sql = "SELECT DISTINCT(`user`) FROM `flagged`"; + $db_results = Dba::read($sql); - while ($r = Dba::fetch_assoc($db_results)) { - $username = $r['user']; - $user_id = $user_array[$username]; - $username = Dba::escape($username); + while ($r = Dba::fetch_assoc($db_results)) { + $username = $r['user']; + $user_id = $user_array[$username]; + $username = Dba::escape($username); - $sql = "UPDATE `flagged` SET `user`='$user_id' WHERE `user`='$username'"; - $update_results = Dba::write($sql); + $sql = "UPDATE `flagged` SET `user`='$user_id' WHERE `user`='$username'"; + $update_results = Dba::write($sql); - } // end while + } // end while - // Alter the table - $sql = "ALTER TABLE `flagged` CHANGE `user` `user` INT ( 11 ) NOT NULL"; - $db_results = Dba::write($sql); + // Alter the table + $sql = "ALTER TABLE `flagged` CHANGE `user` `user` INT ( 11 ) NOT NULL"; + $db_results = Dba::write($sql); - // Now fix up the ip history - $sql = "SELECT DISTINCT(`user`) FROM `ip_history`"; - $db_results = Dba::read($sql); + // Now fix up the ip history + $sql = "SELECT DISTINCT(`user`) FROM `ip_history`"; + $db_results = Dba::read($sql); - while ($r = Dba::fetch_assoc($db_results)) { - $username = $r['user']; - $user_id = $user_array[$username]; - $username = Dba::escape($username); + while ($r = Dba::fetch_assoc($db_results)) { + $username = $r['user']; + $user_id = $user_array[$username]; + $username = Dba::escape($username); - $sql = "UPDATE `ip_history` SET `user`='$user_id' WHERE `user`='$username'"; - $update_results = Dba::write($sql); + $sql = "UPDATE `ip_history` SET `user`='$user_id' WHERE `user`='$username'"; + $update_results = Dba::write($sql); - } // end while + } // end while - // Alter the table - $sql = "ALTER TABLE `ip_history` CHANGE `user` `user` INT ( 11 ) NOT NULL"; - $db_results = Dba::write($sql); + // Alter the table + $sql = "ALTER TABLE `ip_history` CHANGE `user` `user` INT ( 11 ) NOT NULL"; + $db_results = Dba::write($sql); - // Now fix now playing - $sql = "SELECT DISTINCT(`user`) FROM `now_playing`"; - $db_results = Dba::read($sql); + // Now fix now playing + $sql = "SELECT DISTINCT(`user`) FROM `now_playing`"; + $db_results = Dba::read($sql); - while ($r = Dba::fetch_assoc($db_results)) { - $username = $r['user']; - $user_id = $user_array[$username]; - $username = Dba::escape($username); + while ($r = Dba::fetch_assoc($db_results)) { + $username = $r['user']; + $user_id = $user_array[$username]; + $username = Dba::escape($username); - $sql = "UPDATE `now_playing` SET `user`='$user_id' WHERE `user`='$username'"; - $update_results = Dba::write($sql); + $sql = "UPDATE `now_playing` SET `user`='$user_id' WHERE `user`='$username'"; + $update_results = Dba::write($sql); - } // end while + } // end while - // Alter the table - $sql = "ALTER TABLE `now_playing` CHANGE `user` `user` INT ( 11 ) NOT NULL"; - $db_results = Dba::write($sql); + // Alter the table + $sql = "ALTER TABLE `now_playing` CHANGE `user` `user` INT ( 11 ) NOT NULL"; + $db_results = Dba::write($sql); - // Now fix the playlist table - $sql = "SELECT DISTINCT(`user`) FROM `playlist`"; - $db_results = Dba::read($sql); + // Now fix the playlist table + $sql = "SELECT DISTINCT(`user`) FROM `playlist`"; + $db_results = Dba::read($sql); - while ($r = Dba::fetch_assoc($db_results)) { - $username = $r['user']; - $user_id = $user_array[$username]; - $username = Dba::escape($username); + while ($r = Dba::fetch_assoc($db_results)) { + $username = $r['user']; + $user_id = $user_array[$username]; + $username = Dba::escape($username); - $sql = "UPDATE `playlist` SET `user`='$user_id' WHERE `user`='$username'"; - $update_results = Dba::write($sql); + $sql = "UPDATE `playlist` SET `user`='$user_id' WHERE `user`='$username'"; + $update_results = Dba::write($sql); - } // end while + } // end while - // Alter the table - $sql = "ALTER TABLE `playlist` CHANGE `user` `user` INT ( 11 ) NOT NULL"; - $db_results = Dba::write($sql); + // Alter the table + $sql = "ALTER TABLE `playlist` CHANGE `user` `user` INT ( 11 ) NOT NULL"; + $db_results = Dba::write($sql); - // Drop unused table - $sql = "DROP TABLE `playlist_permission`"; - $db_results = Dba::write($sql); + // Drop unused table + $sql = "DROP TABLE `playlist_permission`"; + $db_results = Dba::write($sql); - // Now fix the ratings table - $sql = "SELECT DISTINCT(`user`) FROM `ratings`"; - $db_results = Dba::read($sql); + // Now fix the ratings table + $sql = "SELECT DISTINCT(`user`) FROM `ratings`"; + $db_results = Dba::read($sql); - while ($r = Dba::fetch_assoc($db_results)) { - $username = $r['user']; - $user_id = $user_array[$username]; - $username = Dba::escape($username); + while ($r = Dba::fetch_assoc($db_results)) { + $username = $r['user']; + $user_id = $user_array[$username]; + $username = Dba::escape($username); - $sql = "UPDATE `ratings` SET `user`='$user_id' WHERE `user`='$username'"; - $update_results = Dba::write($sql); + $sql = "UPDATE `ratings` SET `user`='$user_id' WHERE `user`='$username'"; + $update_results = Dba::write($sql); - } // end while + } // end while - $sql = "ALTER TABLE `ratings` CHANGE `user` `user` INT ( 11 ) NOT NULL"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `ratings` CHANGE `user` `user` INT ( 11 ) NOT NULL"; + $db_results = Dba::write($sql); - // Now work on the tag_map - $sql = "ALTER TABLE `tag_map` CHANGE `user_id` `user` INT ( 11 ) NOT NULL"; - $db_results = Dba::write($sql); + // Now work on the tag_map + $sql = "ALTER TABLE `tag_map` CHANGE `user_id` `user` INT ( 11 ) NOT NULL"; + $db_results = Dba::write($sql); - // Now fix user preferences - $sql = "SELECT DISTINCT(`user`) FROM `user_preference`"; - $db_results = Dba::read($sql); + // Now fix user preferences + $sql = "SELECT DISTINCT(`user`) FROM `user_preference`"; + $db_results = Dba::read($sql); - while ($r = Dba::fetch_assoc($db_results)) { - $username = $r['user']; - $user_id = $user_array[$username]; - $username = Dba::escape($username); + while ($r = Dba::fetch_assoc($db_results)) { + $username = $r['user']; + $user_id = $user_array[$username]; + $username = Dba::escape($username); - $sql = "UPDATE `user_preference` SET `user`='$user_id' WHERE `user`='$username'"; - $update_results = Dba::write($sql); + $sql = "UPDATE `user_preference` SET `user`='$user_id' WHERE `user`='$username'"; + $update_results = Dba::write($sql); - } // end while + } // end while - // Alter the table - $sql = "ALTER TABLE `user_preference` CHANGE `user` `user` INT ( 11 ) NOT NULL"; - $db_results = Dba::write($sql); + // Alter the table + $sql = "ALTER TABLE `user_preference` CHANGE `user` `user` INT ( 11 ) NOT NULL"; + $db_results = Dba::write($sql); - // Add a date to the user_vote - $sql = "ALTER TABLE `user_vote` ADD `date` INT( 11 ) UNSIGNED NOT NULL"; - $db_results = Dba::write($sql); + // Add a date to the user_vote + $sql = "ALTER TABLE `user_vote` ADD `date` INT( 11 ) UNSIGNED NOT NULL"; + $db_results = Dba::write($sql); - // Add the index for said field - $sql = "ALTER TABLE `user_vote` ADD INDEX(`date`)"; - $db_results = Dba::write($sql); + // Add the index for said field + $sql = "ALTER TABLE `user_vote` ADD INDEX(`date`)"; + $db_results = Dba::write($sql); - // Add the thumb fields to album - $sql = "ALTER TABLE `album` ADD `thumb` TINYBLOB NULL ,ADD `thumb_mime` VARCHAR( 128 ) NULL"; - $db_results = Dba::write($sql); + // Add the thumb fields to album + $sql = "ALTER TABLE `album` ADD `thumb` TINYBLOB NULL ,ADD `thumb_mime` VARCHAR( 128 ) NULL"; + $db_results = Dba::write($sql); - // Now add in the min_object_count preference and the random_method - $sql = "INSERT INTO `preferences` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES('min_object_count','1','Min Element Count','5','integer','interface')"; - $db_results = Dba::write($sql); + // Now add in the min_object_count preference and the random_method + $sql = "INSERT INTO `preferences` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES('min_object_count','1','Min Element Count','5','integer','interface')"; + $db_results = Dba::write($sql); - $sql = "INSERT INTO `preferences` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES('random_method','default','Random Method','5','string','interface')"; - $db_results = Dba::write($sql); + $sql = "INSERT INTO `preferences` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES('random_method','default','Random Method','5','string','interface')"; + $db_results = Dba::write($sql); - // Delete old preference - $sql = "DELETE FROM `preferences` WHERE `name`='min_album_size'"; - $db_results = Dba::write($sql); + // Delete old preference + $sql = "DELETE FROM `preferences` WHERE `name`='min_album_size'"; + $db_results = Dba::write($sql); - // Make Hash a non-required field and smaller - $sql = "ALTER TABLE `song` CHANGE `hash` `hash` VARCHAR ( 64 ) NULL"; - $db_results = Dba::write($sql); + // Make Hash a non-required field and smaller + $sql = "ALTER TABLE `song` CHANGE `hash` `hash` VARCHAR ( 64 ) NULL"; + $db_results = Dba::write($sql); - // Make user access an int, nothing else - $sql = "UPDATE `user` SET `access`='100' WHERE `access`='admin'"; - $db_results = Dba::write($sql); + // Make user access an int, nothing else + $sql = "UPDATE `user` SET `access`='100' WHERE `access`='admin'"; + $db_results = Dba::write($sql); - $sql = "UPDATE `user` SET `access`='25' WHERE `access`='user'"; - $db_results = Dba::write($sql); + $sql = "UPDATE `user` SET `access`='25' WHERE `access`='user'"; + $db_results = Dba::write($sql); - $sql = "UPDATE `user` SET `access`='5' WHERE `access`='guest'"; - $db_results = Dba::write($sql); + $sql = "UPDATE `user` SET `access`='5' WHERE `access`='guest'"; + $db_results = Dba::write($sql); - // Alter the table - $sql = "ALTER TABLE `user` CHANGE `access` `access` TINYINT ( 4 ) UNSIGNED NOT NULL"; - $db_results = Dba::write($sql); + // Alter the table + $sql = "ALTER TABLE `user` CHANGE `access` `access` TINYINT ( 4 ) UNSIGNED NOT NULL"; + $db_results = Dba::write($sql); - // Add in Label and Catalog # and language - $sql = "ALTER TABLE `song_ext_data` ADD `label` VARCHAR ( 128 ) NULL, ADD `catalog_number` VARCHAR ( 128 ) NULL, ADD `language` VARCHAR ( 128 ) NULL"; - $db_results = Dba::write($sql); + // Add in Label and Catalog # and language + $sql = "ALTER TABLE `song_ext_data` ADD `label` VARCHAR ( 128 ) NULL, ADD `catalog_number` VARCHAR ( 128 ) NULL, ADD `language` VARCHAR ( 128 ) NULL"; + $db_results = Dba::write($sql); - /* Fix every users preferences */ - $sql = "SELECT `id` FROM `user`"; - $db_results = Dba::read($sql); + /* Fix every users preferences */ + $sql = "SELECT `id` FROM `user`"; + $db_results = Dba::read($sql); - User::fix_preferences('-1'); + User::fix_preferences('-1'); - while ($r = Dba::fetch_assoc($db_results)) { - User::fix_preferences($r['id']); - } // while results + while ($r = Dba::fetch_assoc($db_results)) { + User::fix_preferences($r['id']); + } // while results - self::set_version('db_version','340001'); + self::set_version('db_version','340001'); - return true; + return true; - } //update_340001 + } //update_340001 - /** - * update_340002 - * This update tweaks the preferences a little more and make sure that the - * min_object_count has a rational value - */ - private function update_340002() { + /** + * update_340002 + * This update tweaks the preferences a little more and make sure that the + * min_object_count has a rational value + */ + private function update_340002() { - /* Add the offset_limit preference and remove it from the user table */ - $sql = "INSERT INTO `preferences` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES ('offset_limit','50','Offset Limit','5','integer','interface')"; - $db_results = Dba::write($sql); + /* Add the offset_limit preference and remove it from the user table */ + $sql = "INSERT INTO `preferences` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES ('offset_limit','50','Offset Limit','5','integer','interface')"; + $db_results = Dba::write($sql); - self::set_version('db_version','340002'); + self::set_version('db_version','340002'); - return true; + return true; - } // update_340002 + } // update_340002 - /** - * update_340003 - * This update moves the album art out of the album table - * and puts it in an album_data table. It also makes some - * minor changes to the song table in an attempt to reduce - * the size of each row - */ - public static function update_340003() { + /** + * update_340003 + * This update moves the album art out of the album table + * and puts it in an album_data table. It also makes some + * minor changes to the song table in an attempt to reduce + * the size of each row + */ + public static function update_340003() { - $sql = "ALTER TABLE `song` CHANGE `mode` `mode` ENUM( 'abr', 'vbr', 'cbr' ) NULL DEFAULT 'cbr'"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `song` CHANGE `mode` `mode` ENUM( 'abr', 'vbr', 'cbr' ) NULL DEFAULT 'cbr'"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `song` CHANGE `time` `time` SMALLINT( 5 ) UNSIGNED NOT NULL DEFAULT '0'"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `song` CHANGE `time` `time` SMALLINT( 5 ) UNSIGNED NOT NULL DEFAULT '0'"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `song` CHANGE `rate` `rate` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `song` CHANGE `rate` `rate` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `song` CHANGE `bitrate` `bitrate` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `song` CHANGE `bitrate` `bitrate` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `song` CHANGE `track` `track` SMALLINT( 5 ) UNSIGNED NULL DEFAULT NULL "; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `song` CHANGE `track` `track` SMALLINT( 5 ) UNSIGNED NULL DEFAULT NULL "; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `user` CHANGE `disabled` `disabled` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `user` CHANGE `disabled` `disabled` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'"; + $db_results = Dba::write($sql); - $sql = "CREATE TABLE `album_data` (" . - "`album_id` INT( 11 ) UNSIGNED NOT NULL , " . - "`art` MEDIUMBLOB NULL , " . - "`art_mime` VARCHAR( 64 ) NULL , " . - "`thumb` BLOB NULL , " . - "`thumb_mime` VARCHAR( 64 ) NULL , " . - "UNIQUE ( `album_id` )" . - ") ENGINE = MYISAM"; - $db_results = Dba::write($sql); + $sql = "CREATE TABLE `album_data` (" . + "`album_id` INT( 11 ) UNSIGNED NOT NULL , " . + "`art` MEDIUMBLOB NULL , " . + "`art_mime` VARCHAR( 64 ) NULL , " . + "`thumb` BLOB NULL , " . + "`thumb_mime` VARCHAR( 64 ) NULL , " . + "UNIQUE ( `album_id` )" . + ") ENGINE = MYISAM"; + $db_results = Dba::write($sql); - /* Foreach the Albums and move the data into the new album_data table */ - $sql = "SELECT * FROM album"; - $db_results = Dba::write($sql); + /* Foreach the Albums and move the data into the new album_data table */ + $sql = "SELECT * FROM album"; + $db_results = Dba::write($sql); - while ($data = Dba::fetch_assoc($db_results)) { - $id = $data['id']; - $art = Dba::escape($data['art']); - $art_mime = Dba::escape($data['art_mime']); - $thumb = Dba::escape($data['thumb']); - $thumb_mime = Dba::escape($data['thumb_mime']); - $sql = "INSERT INTO `album_data` (`album_id`,`art`,`art_mime`,`thumb`,`thumb_mime`)" . - " VALUES ('$id','$art','$art_mime','$thumb','$thumb_mime')"; - $insert_results = Dba::write($sql); - } // end while + while ($data = Dba::fetch_assoc($db_results)) { + $id = $data['id']; + $art = Dba::escape($data['art']); + $art_mime = Dba::escape($data['art_mime']); + $thumb = Dba::escape($data['thumb']); + $thumb_mime = Dba::escape($data['thumb_mime']); + $sql = "INSERT INTO `album_data` (`album_id`,`art`,`art_mime`,`thumb`,`thumb_mime`)" . + " VALUES ('$id','$art','$art_mime','$thumb','$thumb_mime')"; + $insert_results = Dba::write($sql); + } // end while - $sql = "RENAME TABLE `song_ext_data` TO `song_data`"; - $db_results = Dba::write($sql); + $sql = "RENAME TABLE `song_ext_data` TO `song_data`"; + $db_results = Dba::write($sql); - $sql = "RENAME TABLE `preferences` TO `preference`"; - $db_results = Dba::write($sql); + $sql = "RENAME TABLE `preferences` TO `preference`"; + $db_results = Dba::write($sql); - $sql = "RENAME TABLE `ratings` TO `rating`"; - $db_results = Dba::write($sql); + $sql = "RENAME TABLE `ratings` TO `rating`"; + $db_results = Dba::write($sql); - // Go ahead and drop the art/thumb stuff - $sql = "ALTER TABLE `album` DROP `art`, DROP `art_mime`, DROP `thumb`, DROP `thumb_mime`"; - $db_results = Dba::write($sql); + // Go ahead and drop the art/thumb stuff + $sql = "ALTER TABLE `album` DROP `art`, DROP `art_mime`, DROP `thumb`, DROP `thumb_mime`"; + $db_results = Dba::write($sql); - // We need to fix the user_vote table - $sql = "ALTER TABLE `user_vote` CHANGE `user` `user` INT( 11 ) UNSIGNED NOT NULL"; - $db_results = Dba::write($sql); + // We need to fix the user_vote table + $sql = "ALTER TABLE `user_vote` CHANGE `user` `user` INT( 11 ) UNSIGNED NOT NULL"; + $db_results = Dba::write($sql); - // Remove offset limit from the user - $sql = "ALTER TABLE `user` DROP `offset_limit`"; - $db_results = Dba::write($sql); + // Remove offset limit from the user + $sql = "ALTER TABLE `user` DROP `offset_limit`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `rating` CHANGE `user_rating` `rating` ENUM( '-1', '0', '1', '2', '3', '4', '5' ) NOT NULL DEFAULT '0'"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `rating` CHANGE `user_rating` `rating` ENUM( '-1', '0', '1', '2', '3', '4', '5' ) NOT NULL DEFAULT '0'"; + $db_results = Dba::write($sql); - /* Add the rate_limit preference */ - $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES ('rate_limit','8192','Rate Limit','100','integer','streaming')"; - $db_results = Dba::write($sql); + /* Add the rate_limit preference */ + $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES ('rate_limit','8192','Rate Limit','100','integer','streaming')"; + $db_results = Dba::write($sql); - /* Add the playlist_method preference and remove it from the user table */ - $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES ('playlist_method','normal','Playlist Method','5','string','streaming')"; - $db_results = Dba::write($sql); + /* Add the playlist_method preference and remove it from the user table */ + $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES ('playlist_method','normal','Playlist Method','5','string','streaming')"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `update_info` ADD UNIQUE (`key`)"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `update_info` ADD UNIQUE (`key`)"; + $db_results = Dba::write($sql); - $sql = "SELECT `id` FROM `user`"; - $db_results = Dba::read($sql); + $sql = "SELECT `id` FROM `user`"; + $db_results = Dba::read($sql); - User::fix_preferences('-1'); + User::fix_preferences('-1'); - while ($r = Dba::fetch_assoc($db_results)) { - User::fix_preferences($r['id']); - } + while ($r = Dba::fetch_assoc($db_results)) { + User::fix_preferences($r['id']); + } - self::set_version('db_version','340003'); - - return true; - - } // update_340003 - - /** - * update_340004 - * Update the session.id to varchar(64) to handle - * newer configs - */ - public static function update_340004() { + self::set_version('db_version','340003'); + + return true; + + } // update_340003 + + /** + * update_340004 + * Update the session.id to varchar(64) to handle + * newer configs + */ + public static function update_340004() { - /* Alter the session.id so that it's 64 */ - $sql = "ALTER TABLE `session` CHANGE `id` `id` VARCHAR( 64 ) NOT NULL"; - $db_results = Dba::write($sql); + /* Alter the session.id so that it's 64 */ + $sql = "ALTER TABLE `session` CHANGE `id` `id` VARCHAR( 64 ) NOT NULL"; + $db_results = Dba::write($sql); - /* Add Playlist Related Preferences */ - $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES ('playlist_add','append','Add Behavior','5','string','playlist')"; - $db_results = Dba::write($sql); + /* Add Playlist Related Preferences */ + $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES ('playlist_add','append','Add Behavior','5','string','playlist')"; + $db_results = Dba::write($sql); - // Switch the existing preferences over to this new catagory - $sql = "UPDATE `preference` SET `catagory`='playlist' WHERE `name`='playlist_method' " . - " OR `name`='playlist_type'"; - $db_results = Dba::write($sql); + // Switch the existing preferences over to this new catagory + $sql = "UPDATE `preference` SET `catagory`='playlist' WHERE `name`='playlist_method' " . + " OR `name`='playlist_type'"; + $db_results = Dba::write($sql); - // Change the default value for playlist_method - $sql = "UPDATE `preference` SET `value`='normal' WHERE `name`='playlist_method'"; - $db_results = Dba::write($sql); + // Change the default value for playlist_method + $sql = "UPDATE `preference` SET `value`='normal' WHERE `name`='playlist_method'"; + $db_results = Dba::write($sql); - // Add in the shoutbox - $sql = "CREATE TABLE `user_shout` (`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , " . - "`user` INT( 11 ) NOT NULL , " . - "`text` TEXT NOT NULL , " . - "`date` INT( 11 ) UNSIGNED NOT NULL , " . - "`sticky` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0', " . - "`object_id` INT( 11 ) UNSIGNED NOT NULL , " . - "`object_type` VARCHAR( 32 ) NOT NULL " . - ") ENGINE = MYISAM"; - $db_results = Dba::write($sql); + // Add in the shoutbox + $sql = "CREATE TABLE `user_shout` (`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , " . + "`user` INT( 11 ) NOT NULL , " . + "`text` TEXT NOT NULL , " . + "`date` INT( 11 ) UNSIGNED NOT NULL , " . + "`sticky` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0', " . + "`object_id` INT( 11 ) UNSIGNED NOT NULL , " . + "`object_type` VARCHAR( 32 ) NOT NULL " . + ") ENGINE = MYISAM"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `user_shout` ADD INDEX ( `sticky` )"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `user_shout` ADD INDEX ( `sticky` )"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `user_shout` ADD INDEX ( `date` )"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `user_shout` ADD INDEX ( `date` )"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `user_shout` ADD INDEX ( `user` )"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `user_shout` ADD INDEX ( `user` )"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `now_playing` CHANGE `start_time` `expire` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0'"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `now_playing` CHANGE `start_time` `expire` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0'"; + $db_results = Dba::write($sql); - $sql = "OPTIMIZE TABLE `album`"; - $db_results = Dba::write($sql); + $sql = "OPTIMIZE TABLE `album`"; + $db_results = Dba::write($sql); - $sql = "SELECT `id` FROM `user`"; - $db_results = Dba::read($sql); + $sql = "SELECT `id` FROM `user`"; + $db_results = Dba::read($sql); - User::fix_preferences('-1'); + User::fix_preferences('-1'); - while ($r = Dba::fetch_assoc($db_results)) { - User::fix_preferences($r['id']); - } + while ($r = Dba::fetch_assoc($db_results)) { + User::fix_preferences($r['id']); + } - // Update our database version now that we are all done - self::set_version('db_version','340004'); + // Update our database version now that we are all done + self::set_version('db_version','340004'); - return true; + return true; - } // update_340004 + } // update_340004 - /** - * update_340005 - * This update fixes the preferences types - */ - public static function update_340005() { + /** + * update_340005 + * This update fixes the preferences types + */ + public static function update_340005() { - // Turn user_rating into a tinyint and call it score - $sql = "ALTER TABLE `rating` CHANGE `user_rating` `score` TINYINT( 4 ) UNSIGNED NOT NULL DEFAULT '0'"; - $db_results = Dba::write($sql); + // Turn user_rating into a tinyint and call it score + $sql = "ALTER TABLE `rating` CHANGE `user_rating` `score` TINYINT( 4 ) UNSIGNED NOT NULL DEFAULT '0'"; + $db_results = Dba::write($sql); - $sql = "UPDATE `preference` SET `catagory`='playlist' WHERE `name`='random_method'"; - $db_results = Dba::write($sql); + $sql = "UPDATE `preference` SET `catagory`='playlist' WHERE `name`='random_method'"; + $db_results = Dba::write($sql); - $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES ('transcode','default','Transcoding','25','string','streaming')"; - $db_results = Dba::write($sql); + $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES ('transcode','default','Transcoding','25','string','streaming')"; + $db_results = Dba::write($sql); - /* We need to check for playlist_method here because I fubar'd an earlier update */ - $sql = "SELECT * FROM `preference` WHERE `name`='playlist_method'"; - $db_results = Dba::read($sql); - if (!Dba::num_rows($db_results)) { - /* Add the playlist_method preference and remove it from the user table */ - $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES ('playlist_method','default','Playlist Method','5','string','playlist')"; - $db_results = Dba::write($sql); - } + /* We need to check for playlist_method here because I fubar'd an earlier update */ + $sql = "SELECT * FROM `preference` WHERE `name`='playlist_method'"; + $db_results = Dba::read($sql); + if (!Dba::num_rows($db_results)) { + /* Add the playlist_method preference and remove it from the user table */ + $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES ('playlist_method','default','Playlist Method','5','string','playlist')"; + $db_results = Dba::write($sql); + } - // Add in the object_type to the tmpplaylist data table so that we can have non-songs in there - $sql = "ALTER TABLE `tmp_playlist_data` ADD `object_type` VARCHAR( 32 ) NULL AFTER `tmp_playlist`"; - $db_results = Dba::write($sql); + // Add in the object_type to the tmpplaylist data table so that we can have non-songs in there + $sql = "ALTER TABLE `tmp_playlist_data` ADD `object_type` VARCHAR( 32 ) NULL AFTER `tmp_playlist`"; + $db_results = Dba::write($sql); - $sql = "SELECT `id` FROM `user`"; - $db_results = Dba::read($sql); + $sql = "SELECT `id` FROM `user`"; + $db_results = Dba::read($sql); - User::fix_preferences('-1'); + User::fix_preferences('-1'); - while ($r = Dba::fetch_assoc($db_results)) { - User::fix_preferences($r['id']); - } + while ($r = Dba::fetch_assoc($db_results)) { + User::fix_preferences($r['id']); + } - self::set_version('db_version','340005'); + self::set_version('db_version','340005'); - return true; + return true; - } // update_340005 + } // update_340005 - /** - * update_340006 - * This just updates the size of the album_data table - * and removes the random_method config option - */ - public static function update_340006() { + /** + * update_340006 + * This just updates the size of the album_data table + * and removes the random_method config option + */ + public static function update_340006() { - $sql = "DESCRIBE `album_data`"; - $db_results = Dba::read($sql); + $sql = "DESCRIBE `album_data`"; + $db_results = Dba::read($sql); - while ($row = Dba::fetch_assoc($db_results)) { - if ($row['Field'] == 'art' AND $row['Type'] == 'blob') { - $blob_needed = true; - } - } // end while - if ($blob_needed) { - $sql = "ALTER TABLE `album_data` CHANGE `art` `art` MEDIUMBLOB NULL DEFAULT NULL"; - $db_results = Dba::write($sql); - } + while ($row = Dba::fetch_assoc($db_results)) { + if ($row['Field'] == 'art' AND $row['Type'] == 'blob') { + $blob_needed = true; + } + } // end while + if ($blob_needed) { + $sql = "ALTER TABLE `album_data` CHANGE `art` `art` MEDIUMBLOB NULL DEFAULT NULL"; + $db_results = Dba::write($sql); + } - // No matter what remove that random method preference - $sql = "DELETE FROM `preference` WHERE `name`='random_method'"; - $db_results = Dba::write($sql); + // No matter what remove that random method preference + $sql = "DELETE FROM `preference` WHERE `name`='random_method'"; + $db_results = Dba::write($sql); - $sql = "SELECT `id` FROM `user`"; - $db_results = Dba::read($sql); + $sql = "SELECT `id` FROM `user`"; + $db_results = Dba::read($sql); - User::fix_preferences('-1'); + User::fix_preferences('-1'); - while ($r = Dba::fetch_assoc($db_results)) { - User::fix_preferences($r['id']); - } + while ($r = Dba::fetch_assoc($db_results)) { + User::fix_preferences($r['id']); + } - self::set_version('db_version','340006'); + self::set_version('db_version','340006'); - return true; + return true; - } // update_340006 + } // update_340006 - /** - * update_340007 - * This update converts the session.value to a longtext - * and adds a session_stream table - */ - public static function update_340007() { + /** + * update_340007 + * This update converts the session.value to a longtext + * and adds a session_stream table + */ + public static function update_340007() { - // Tweak the session table to handle larger session vars for my page-a-nation hotness - $sql = "ALTER TABLE `session` CHANGE `value` `value` LONGTEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"; - $db_results = Dba::write($sql); + // Tweak the session table to handle larger session vars for my page-a-nation hotness + $sql = "ALTER TABLE `session` CHANGE `value` `value` LONGTEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"; + $db_results = Dba::write($sql); - // Create the new stream table where we will store stream SIDs - $sql = "CREATE TABLE `session_stream` ( " . - "`id` VARCHAR( 64 ) NOT NULL , " . - "`user` INT( 11 ) UNSIGNED NOT NULL , " . - "`agent` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL , " . - "`expire` INT( 11 ) UNSIGNED NOT NULL , " . - "`ip` INT( 11 ) UNSIGNED NULL , " . - "PRIMARY KEY ( `id` ) " . - ") ENGINE = MYISAM"; - $db_results = Dba::write($sql); + // Create the new stream table where we will store stream SIDs + $sql = "CREATE TABLE `session_stream` ( " . + "`id` VARCHAR( 64 ) NOT NULL , " . + "`user` INT( 11 ) UNSIGNED NOT NULL , " . + "`agent` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL , " . + "`expire` INT( 11 ) UNSIGNED NOT NULL , " . + "`ip` INT( 11 ) UNSIGNED NULL , " . + "PRIMARY KEY ( `id` ) " . + ") ENGINE = MYISAM"; + $db_results = Dba::write($sql); - // Change the now playing to use stream session ids for its ID - $sql = "ALTER TABLE `now_playing` CHANGE `id` `id` VARCHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"; - $db_results = Dba::write($sql); + // Change the now playing to use stream session ids for its ID + $sql = "ALTER TABLE `now_playing` CHANGE `id` `id` VARCHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL"; + $db_results = Dba::write($sql); - // Now longer needed because of the new hotness - $sql = "ALTER TABLE `now_playing` DROP `session`"; - $db_results = Dba::write($sql); + // Now longer needed because of the new hotness + $sql = "ALTER TABLE `now_playing` DROP `session`"; + $db_results = Dba::write($sql); - self::set_version('db_version','340007'); + self::set_version('db_version','340007'); - return true; + return true; - } // update_340007 + } // update_340007 - /** - * update_340008 - * This modifies the playlist table to handle the different types of objects that it needs to be able to - * store, and tweaks how dynamic playlist stuff works - */ - public static function update_340008() { + /** + * update_340008 + * This modifies the playlist table to handle the different types of objects that it needs to be able to + * store, and tweaks how dynamic playlist stuff works + */ + public static function update_340008() { - $sql = "ALTER TABLE `playlist_data` CHANGE `song` `object_id` INT( 11 ) UNSIGNED NULL DEFAULT NULL"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `playlist_data` CHANGE `song` `object_id` INT( 11 ) UNSIGNED NULL DEFAULT NULL"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `playlist_data` CHANGE `dyn_song` `dynamic_song` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `playlist_data` CHANGE `dyn_song` `dynamic_song` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `playlist_data` ADD `object_type` VARCHAR( 32 ) NOT NULL DEFAULT 'song' AFTER `object_id`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `playlist_data` ADD `object_type` VARCHAR( 32 ) NOT NULL DEFAULT 'song' AFTER `object_id`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `playlist` ADD `genre` INT( 11 ) UNSIGNED NOT NULL AFTER `type`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `playlist` ADD `genre` INT( 11 ) UNSIGNED NOT NULL AFTER `type`"; + $db_results = Dba::write($sql); - $sql = "DELETE FROM `preference` WHERE `name`='allow_downsample_playback'"; - $db_results = Dba::write($sql); + $sql = "DELETE FROM `preference` WHERE `name`='allow_downsample_playback'"; + $db_results = Dba::write($sql); - $sql = "UPDATE `preference` SET `description`='Transcode Bitrate' WHERE `name`='sample_rate'"; - $db_results = Dba::write($sql); + $sql = "UPDATE `preference` SET `description`='Transcode Bitrate' WHERE `name`='sample_rate'"; + $db_results = Dba::write($sql); - // Check for old tables and drop if found, seems like there was a glitch that caused them - // not to get droped.. *shrug* - $sql = "DROP TABLE IF EXISTS `preferences`"; - $db_results = Dba::write($sql); + // Check for old tables and drop if found, seems like there was a glitch that caused them + // not to get droped.. *shrug* + $sql = "DROP TABLE IF EXISTS `preferences`"; + $db_results = Dba::write($sql); - $sql = "DROP TABLE IF EXISTS `song_ext_data`"; - $db_results = Dba::write($sql); + $sql = "DROP TABLE IF EXISTS `song_ext_data`"; + $db_results = Dba::write($sql); - $sql = "DROP TABLE IF EXISTS `ratings`"; - $db_results = Dba::write($sql); + $sql = "DROP TABLE IF EXISTS `ratings`"; + $db_results = Dba::write($sql); - $sql = "SELECT `id` FROM `user`"; - $db_results = Dba::read($sql); + $sql = "SELECT `id` FROM `user`"; + $db_results = Dba::read($sql); - User::fix_preferences('-1'); + User::fix_preferences('-1'); - while ($r = Dba::fetch_assoc($db_results)) { - User::fix_preferences($r['id']); - } + while ($r = Dba::fetch_assoc($db_results)) { + User::fix_preferences($r['id']); + } - self::set_version('db_version','340008'); + self::set_version('db_version','340008'); - return true; + return true; - } // update_340008 + } // update_340008 - /** - * update_340009 - * This modifies the song table to handle pos fields - */ - public static function update_340009() { + /** + * update_340009 + * This modifies the song table to handle pos fields + */ + public static function update_340009() { - $sql = "ALTER TABLE `album` ADD `disk` smallint(5) UNSIGNED DEFAULT NULL"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `album` ADD `disk` smallint(5) UNSIGNED DEFAULT NULL"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `album` ADD INDEX (`disk`)"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `album` ADD INDEX (`disk`)"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `access_list` ADD `dns` VARCHAR( 255 ) NOT NULL AFTER `end`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `access_list` ADD `dns` VARCHAR( 255 ) NOT NULL AFTER `end`"; + $db_results = Dba::write($sql); - $sql = "CREATE TABLE `artist_data` (" . - "`artist_id` INT( 11 ) UNSIGNED NOT NULL ," . - "`art` MEDIUMBLOB NOT NULL ," . - "`art_mime` VARCHAR( 32 ) NOT NULL ," . - "`thumb` BLOB NOT NULL ," . - "`thumb_mime` VARCHAR( 32 ) NOT NULL ," . - "`bio` TEXT NOT NULL , " . - "UNIQUE (`artist_id`) ) ENGINE = MYISAM"; - $db_results = Dba::write($sql); + $sql = "CREATE TABLE `artist_data` (" . + "`artist_id` INT( 11 ) UNSIGNED NOT NULL ," . + "`art` MEDIUMBLOB NOT NULL ," . + "`art_mime` VARCHAR( 32 ) NOT NULL ," . + "`thumb` BLOB NOT NULL ," . + "`thumb_mime` VARCHAR( 32 ) NOT NULL ," . + "`bio` TEXT NOT NULL , " . + "UNIQUE (`artist_id`) ) ENGINE = MYISAM"; + $db_results = Dba::write($sql); - self::set_version('db_version','340009'); + self::set_version('db_version','340009'); - return true; + return true; - } // update_340009 + } // update_340009 - /** - * update_340010 - * Bunch of minor tweaks to the preference table - */ - public static function update_340010() { + /** + * update_340010 + * Bunch of minor tweaks to the preference table + */ + public static function update_340010() { - $sql = "UPDATE `preference` SET `catagory`='options' WHERE `name` LIKE 'localplay_%'"; - $db_results = Dba::write($sql); + $sql = "UPDATE `preference` SET `catagory`='options' WHERE `name` LIKE 'localplay_%'"; + $db_results = Dba::write($sql); - $sql = "DELETE FROM `preference` WHERE `name`='playlist_add'"; - $db_results = Dba::write($sql); + $sql = "DELETE FROM `preference` WHERE `name`='playlist_add'"; + $db_results = Dba::write($sql); - $sql = "UPDATE `preference` SET `catagory`='plugins' WHERE (`name` LIKE 'mystrands_%' OR `name` LIKE 'lastfm_%') AND `catagory`='options'"; - $db_results = Dba::write($sql); + $sql = "UPDATE `preference` SET `catagory`='plugins' WHERE (`name` LIKE 'mystrands_%' OR `name` LIKE 'lastfm_%') AND `catagory`='options'"; + $db_results = Dba::write($sql); - $sql = "UPDATE `preference` SET `value`='default' WHERE `name`='playlist_method'"; - $db_results = Dba::write($sql); + $sql = "UPDATE `preference` SET `value`='default' WHERE `name`='playlist_method'"; + $db_results = Dba::write($sql); - $sql = "UPDATE `preference` SET `description`='Localplay Config' WHERE `name`='localplay_level'"; - $db_results = Dba::write($sql); + $sql = "UPDATE `preference` SET `description`='Localplay Config' WHERE `name`='localplay_level'"; + $db_results = Dba::write($sql); - /* Fix every users preferences */ - $sql = "SELECT `id` FROM `user`"; - $db_results = Dba::read($sql); + /* Fix every users preferences */ + $sql = "SELECT `id` FROM `user`"; + $db_results = Dba::read($sql); - User::fix_preferences('-1'); + User::fix_preferences('-1'); - while ($r = Dba::fetch_assoc($db_results)) { - User::fix_preferences($r['id']); - } // while results + while ($r = Dba::fetch_assoc($db_results)) { + User::fix_preferences($r['id']); + } // while results - self::set_version('db_version','340010'); + self::set_version('db_version','340010'); - return true; + return true; - } // update_340010 + } // update_340010 - /** - * update_340011 - * This updates the democratic play stuff so that can handle a little more complext mojo - * It also adds yet another table to the db to handle the sessions for API access. Eventually - * should combine all of the session tables, but I'll do that later - */ - public static function update_340011() { + /** + * update_340011 + * This updates the democratic play stuff so that can handle a little more complext mojo + * It also adds yet another table to the db to handle the sessions for API access. Eventually + * should combine all of the session tables, but I'll do that later + */ + public static function update_340011() { - // First add the new table for the new session stuff - $sql = "CREATE TABLE `session_api` ( " . - "`id` VARCHAR( 64 ) NOT NULL , " . - "`user` INT( 11 ) UNSIGNED NOT NULL , " . - "`agent` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL , " . - "`level` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', " . - "`expire` INT( 11 ) UNSIGNED NOT NULL , " . - "`ip` INT( 11 ) UNSIGNED NULL , " . - "PRIMARY KEY ( `id` ) " . - ") ENGINE = MYISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"; - $db_results = Dba::write($sql); + // First add the new table for the new session stuff + $sql = "CREATE TABLE `session_api` ( " . + "`id` VARCHAR( 64 ) NOT NULL , " . + "`user` INT( 11 ) UNSIGNED NOT NULL , " . + "`agent` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL , " . + "`level` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', " . + "`expire` INT( 11 ) UNSIGNED NOT NULL , " . + "`ip` INT( 11 ) UNSIGNED NULL , " . + "PRIMARY KEY ( `id` ) " . + ") ENGINE = MYISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"; + $db_results = Dba::write($sql); - self::set_version('db_version','340011'); + self::set_version('db_version','340011'); - return true; + return true; - } // 340011 + } // 340011 - /** - * update_340012 - * This update adds in the democratic stuff, checks for some potentially screwed up indexes - * and removes the timestamp from the playlist, and adds the field to the catalog for the upload dir - */ - public static function update_340012() { + /** + * update_340012 + * This update adds in the democratic stuff, checks for some potentially screwed up indexes + * and removes the timestamp from the playlist, and adds the field to the catalog for the upload dir + */ + public static function update_340012() { - $sql = "ALTER TABLE `catalog` ADD `add_path` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL AFTER `path`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `catalog` ADD `add_path` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL AFTER `path`"; + $db_results = Dba::write($sql); - $sql = "CREATE TABLE `democratic` (`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ," . - "`name` VARCHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL ," . - "`cooldown` TINYINT( 4 ) UNSIGNED NULL ," . - "`level` TINYINT( 4 ) UNSIGNED NOT NULL DEFAULT '25'," . - "`user` INT( 11 ) NOT NULL ," . - "`primary` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'" . - ") ENGINE = MYISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"; - $db_results = Dba::write($sql); + $sql = "CREATE TABLE `democratic` (`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ," . + "`name` VARCHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL ," . + "`cooldown` TINYINT( 4 ) UNSIGNED NULL ," . + "`level` TINYINT( 4 ) UNSIGNED NOT NULL DEFAULT '25'," . + "`user` INT( 11 ) NOT NULL ," . + "`primary` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0'" . + ") ENGINE = MYISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `democratic` ADD INDEX (`primary`)"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `democratic` ADD INDEX (`primary`)"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `democratic` ADD INDEX (`level`)"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `democratic` ADD INDEX (`level`)"; + $db_results = Dba::write($sql); - self::set_version('db_version','340012'); + self::set_version('db_version','340012'); - return true; + return true; - } // update_340012 + } // update_340012 - /** - * update_340013 - * This update removes a whole bunch of preferences that are no longer - * being used in any way, and changes the ACL XML-RPC to just RPC - */ - public static function update_340013() { + /** + * update_340013 + * This update removes a whole bunch of preferences that are no longer + * being used in any way, and changes the ACL XML-RPC to just RPC + */ + public static function update_340013() { - $sql = "DELETE FROM `preference` WHERE `name`='localplay_mpd_hostname' OR `name`='localplay_mpd_port' " . - "OR `name`='direct_link' OR `name`='localplay_mpd_password' OR `name`='catalog_echo_count'"; - $db_results = Dba::write($sql); + $sql = "DELETE FROM `preference` WHERE `name`='localplay_mpd_hostname' OR `name`='localplay_mpd_port' " . + "OR `name`='direct_link' OR `name`='localplay_mpd_password' OR `name`='catalog_echo_count'"; + $db_results = Dba::write($sql); - $sql = "UPDATE `preference` SET `description`='Localplay Access' WHERE `name`='localplay_level'"; - $db_results = Dba::write($sql); + $sql = "UPDATE `preference` SET `description`='Localplay Access' WHERE `name`='localplay_level'"; + $db_results = Dba::write($sql); - $sql = "UPDATE `access_list` SET `type`='rpc' WHERE `type`='xml-rpc'"; - $db_results = Dba::write($sql); + $sql = "UPDATE `access_list` SET `type`='rpc' WHERE `type`='xml-rpc'"; + $db_results = Dba::write($sql); - $sql = "SELECT `id` FROM `user`"; - $db_results = Dba::read($sql); + $sql = "SELECT `id` FROM `user`"; + $db_results = Dba::read($sql); - User::fix_preferences('-1'); + User::fix_preferences('-1'); - while ($r = Dba::fetch_assoc($db_results)) { - User::fix_preferences($r['id']); - } // while we're fixing the useres stuff + while ($r = Dba::fetch_assoc($db_results)) { + User::fix_preferences($r['id']); + } // while we're fixing the useres stuff - self::set_version('db_version','340013'); + self::set_version('db_version','340013'); - return true; + return true; - } // update_340013 + } // update_340013 - /** - * update_340014 - * This update drops the session_api table that I added just two updates ago - * it's been nice while it lasted but it's time to pack your stuff and GTFO - * at the same time it updates the core session table to handle the additional - * stuff we're going to ask it to do. - */ - public static function update_340014() { + /** + * update_340014 + * This update drops the session_api table that I added just two updates ago + * it's been nice while it lasted but it's time to pack your stuff and GTFO + * at the same time it updates the core session table to handle the additional + * stuff we're going to ask it to do. + */ + public static function update_340014() { - $sql = "DROP TABLE `session_api`"; - $db_results = Dba::write($sql); + $sql = "DROP TABLE `session_api`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `session` CHANGE `type` `type` ENUM ('mysql','ldap','http','api','xml-rpc') NOT NULL"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `session` CHANGE `type` `type` ENUM ('mysql','ldap','http','api','xml-rpc') NOT NULL"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `session` ADD `agent` VARCHAR ( 255 ) NOT NULL AFTER `type`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `session` ADD `agent` VARCHAR ( 255 ) NOT NULL AFTER `type`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `session` ADD INDEX (`type`)"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `session` ADD INDEX (`type`)"; + $db_results = Dba::write($sql); - self::set_version('db_version','340014'); + self::set_version('db_version','340014'); - return true; + return true; - } // update_340014 + } // update_340014 - /** - * update_340015 - * This update tweaks the playlist table responding to complaints from usres - * who say it doesn't work, unreproduceable. This also adds an index to the - * album art table to try to make the random album art faster - */ - public static function update_340015() { + /** + * update_340015 + * This update tweaks the playlist table responding to complaints from usres + * who say it doesn't work, unreproduceable. This also adds an index to the + * album art table to try to make the random album art faster + */ + public static function update_340015() { - $sql = "ALTER TABLE `playlist` DROP `date`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `playlist` DROP `date`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `playlist` ADD `date` INT ( 11 ) UNSIGNED NOT NULL"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `playlist` ADD `date` INT ( 11 ) UNSIGNED NOT NULL"; + $db_results = Dba::write($sql); - // Pull all of the rating information - $sql = "SELECT `id`,`rating` FROM `rating`"; - $db_results = Dba::read($sql); + // Pull all of the rating information + $sql = "SELECT `id`,`rating` FROM `rating`"; + $db_results = Dba::read($sql); - $results = array(); + $results = array(); - while ($row = Dba::fetch_assoc($db_results)) { - $results[] = $row; - } + while ($row = Dba::fetch_assoc($db_results)) { + $results[] = $row; + } - $sql = "ALTER TABLE `rating` DROP `rating`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `rating` DROP `rating`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `rating` ADD `rating` TINYINT ( 4 ) NOT NULL"; - $db_results = Dba::write($sql); - - foreach ($results as $row) { - $rating = Dba::escape($row['rating']); - $id = Dba::escape($row['id']); - $sql = "UPDATE `rating` SET `rating`='$rating' WHERE `id`='$id'"; - $db_results = Dba::write($sql); - } - - self::set_version('db_version','340015'); - - return true; - - } // update_340015 - - /** - * update_340016 - * This adds in the base_playlist to the democratic table... should have - * done this in the previous one but I screwed up... sigh - */ - public static function update_340016() { - - $sql = "ALTER TABLE `democratic` ADD `base_playlist` INT ( 11 ) UNSIGNED NOT NULL"; - $db_results = Dba::write($sql); - - self::set_version('db_version','340016'); - - return true; - - } // update_340016 - - /** - * update_340017 - * This finalizes the democratic table. - * and fixes the charset crap - */ - public static function update_340017() { - - $sql = "ALTER TABLE `democratic` ADD `base_playlist` INT( 11 ) UNSIGNED NOT NULL AFTER `name`"; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `tmp_playlist` DROP `base_playlist`"; - $db_results = Dba::write($sql); - - $sql = "DELETE FROM `tmp_playlist` WHERE `session`='-1'"; - $db_results = Dba::write($sql); - - $sql = "TRUNCATE `democratic`"; - $db_results = Dba::write($sql); - - self::set_version('db_version','340017'); - - return true; - - } // update_340017 - - /** - * update_340018 - * This attempts to correct the charset on your database, it does some checking - * to make sure that if we do this it will actually will work. We will fail this update - * if it would cause problems - */ - public static function update_340018() { - - // MySQL translate real charset names into fancy smancy MySQL land names - switch (strtoupper(Config::get('site_charset'))) { - case 'CP1250': - case 'WINDOWS-1250': - case 'WINDOWS-1252': - $target_charset = 'cp1250'; - $target_collation = 'cp1250_general_ci'; - break; - case 'ISO-8859': - case 'ISO-8859-2': - $target_charset = 'latin2'; - $target_collation = 'latin2_general_ci'; - break; - case 'ISO-8859-1': - $target_charset = 'latin1'; - $target_charset = 'latin1_general_ci'; - break; - case 'EUC-KR': - $target_charset = 'euckr'; - $target_collation = 'euckr_korean_ci'; - break; - case 'CP932': - $target_charset = 'sjis'; - $target_collation = 'sjis_japanese_ci'; - break; - case 'KOI8-U': - $target_charset = 'koi8u'; - $target_collation = 'koi8u_general_ci'; - break; - case 'KOI8-R': - $target_charset = 'koi8r'; - $target_collation = 'koi8r_general_ci'; - break; - case 'ISO-8859': - $target_charset = 'latin2'; - $target_collation = 'latin2_general_ci'; - break; - default; - case 'UTF-8': - $target_charset = 'utf8'; - $target_collation = 'utf8_unicode_ci'; - break; - } // end mysql charset translation - - // Alter the charset for the entire database - $sql = "ALTER DATABASE `" . Config::get('database_name') . "` DEFAULT CHARACTER SET $target_charset COLLATE $target_collation"; - $db_results = Dba::write($sql); - - $sql = "SHOW TABLES"; - $db_results = Dba::read($sql); - - // Go through the tables! - while ($row = Dba::fetch_row($db_results)) { - $sql = "DESCRIBE `" . $row['0'] . "`"; - $describe_results = Dba::read($sql); - - // Change the tables default charset and colliation - $sql = "ALTER TABLE `" . $row['0'] . "` DEFAULT CHARACTER SET $target_charset COLLATE $target_collation"; - $alter_table = Dba::write($sql); - - // Itterate through the columns of the table - while ($table = Dba::fetch_assoc($describe_results)) { - if ( - (strpos($table['Type'], 'varchar') !== false) || - (strpos($table['Type'], 'enum') !== false) || - strpos($table['Table'],'text') !== false) { - $sql = "ALTER TABLE `" . $row['0'] . "` MODIFY `" . $table['Field'] . "` " . $table['Type'] . " CHARACTER SET " . $target_charset; - $charset_results = Dba::write($sql); - if (!$charset_results) { - debug_event('CHARSET','Unable to update the charset of ' . $table['Field'] . '.' . $table['Type'] . ' to ' . $target_charset,'3'); - } // if it fails - } // if its a varchar - } // end columns - - } // end tables - - self::set_version('db_version','340018'); - - return true; - - } // update_340018 - - /** - * update_350001 - * This updates modifies the tag tables per codeunde1load's specs from his tag patch - * it also adjusts the prefix fields so that we can use more prefixes - */ - public static function update_350001() { - - $sql = "ALTER TABLE `tag_map` ADD `tag_id` INT ( 11 ) UNSIGNED NOT NULL AFTER `id`"; - $db_results = Dba::write($sql); - - $sql = "RENAME TABLE `tags` TO `tag`"; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `tag` CHANGE `map_id` `id` INT ( 11 ) UNSIGNED NOT NULL auto_increment"; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `album` CHANGE `prefix` `prefix` VARCHAR ( 32 ) NULL"; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `artist` CHANGE `prefix` `prefix` VARCHAR ( 32 ) NULL"; - $db_results = Dba::write($sql); - - self::set_version('db_version','350001'); - - return true; - - } // update_350001 - - /** - * update_350002 - * This update adds in the browse_cache table that we use to hold peoples cached browse results - * rather then try to store everything in the session we split them out into one serilized array per - * row, per person. A little slow this way when browsing, but faster when now browsing and more flexible - */ - public static function update_350002() { - - $sql = "CREATE TABLE `tmp_browse` (`sid` varchar(128) NOT NULL,`data` longtext NOT NULL," . - " UNIQUE KEY `sid` (`sid`)) ENGINE=MyISAM"; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `tmp_browse` ADD INDEX ( `type` )"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `rating` ADD `rating` TINYINT ( 4 ) NOT NULL"; + $db_results = Dba::write($sql); + + foreach ($results as $row) { + $rating = Dba::escape($row['rating']); + $id = Dba::escape($row['id']); + $sql = "UPDATE `rating` SET `rating`='$rating' WHERE `id`='$id'"; + $db_results = Dba::write($sql); + } + + self::set_version('db_version','340015'); + + return true; + + } // update_340015 + + /** + * update_340016 + * This adds in the base_playlist to the democratic table... should have + * done this in the previous one but I screwed up... sigh + */ + public static function update_340016() { + + $sql = "ALTER TABLE `democratic` ADD `base_playlist` INT ( 11 ) UNSIGNED NOT NULL"; + $db_results = Dba::write($sql); + + self::set_version('db_version','340016'); + + return true; + + } // update_340016 + + /** + * update_340017 + * This finalizes the democratic table. + * and fixes the charset crap + */ + public static function update_340017() { + + $sql = "ALTER TABLE `democratic` ADD `base_playlist` INT( 11 ) UNSIGNED NOT NULL AFTER `name`"; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `tmp_playlist` DROP `base_playlist`"; + $db_results = Dba::write($sql); + + $sql = "DELETE FROM `tmp_playlist` WHERE `session`='-1'"; + $db_results = Dba::write($sql); + + $sql = "TRUNCATE `democratic`"; + $db_results = Dba::write($sql); + + self::set_version('db_version','340017'); + + return true; + + } // update_340017 + + /** + * update_340018 + * This attempts to correct the charset on your database, it does some checking + * to make sure that if we do this it will actually will work. We will fail this update + * if it would cause problems + */ + public static function update_340018() { + + // MySQL translate real charset names into fancy smancy MySQL land names + switch (strtoupper(Config::get('site_charset'))) { + case 'CP1250': + case 'WINDOWS-1250': + case 'WINDOWS-1252': + $target_charset = 'cp1250'; + $target_collation = 'cp1250_general_ci'; + break; + case 'ISO-8859': + case 'ISO-8859-2': + $target_charset = 'latin2'; + $target_collation = 'latin2_general_ci'; + break; + case 'ISO-8859-1': + $target_charset = 'latin1'; + $target_charset = 'latin1_general_ci'; + break; + case 'EUC-KR': + $target_charset = 'euckr'; + $target_collation = 'euckr_korean_ci'; + break; + case 'CP932': + $target_charset = 'sjis'; + $target_collation = 'sjis_japanese_ci'; + break; + case 'KOI8-U': + $target_charset = 'koi8u'; + $target_collation = 'koi8u_general_ci'; + break; + case 'KOI8-R': + $target_charset = 'koi8r'; + $target_collation = 'koi8r_general_ci'; + break; + case 'ISO-8859': + $target_charset = 'latin2'; + $target_collation = 'latin2_general_ci'; + break; + default; + case 'UTF-8': + $target_charset = 'utf8'; + $target_collation = 'utf8_unicode_ci'; + break; + } // end mysql charset translation + + // Alter the charset for the entire database + $sql = "ALTER DATABASE `" . Config::get('database_name') . "` DEFAULT CHARACTER SET $target_charset COLLATE $target_collation"; + $db_results = Dba::write($sql); + + $sql = "SHOW TABLES"; + $db_results = Dba::read($sql); + + // Go through the tables! + while ($row = Dba::fetch_row($db_results)) { + $sql = "DESCRIBE `" . $row['0'] . "`"; + $describe_results = Dba::read($sql); + + // Change the tables default charset and colliation + $sql = "ALTER TABLE `" . $row['0'] . "` DEFAULT CHARACTER SET $target_charset COLLATE $target_collation"; + $alter_table = Dba::write($sql); + + // Itterate through the columns of the table + while ($table = Dba::fetch_assoc($describe_results)) { + if ( + (strpos($table['Type'], 'varchar') !== false) || + (strpos($table['Type'], 'enum') !== false) || + strpos($table['Table'],'text') !== false) { + $sql = "ALTER TABLE `" . $row['0'] . "` MODIFY `" . $table['Field'] . "` " . $table['Type'] . " CHARACTER SET " . $target_charset; + $charset_results = Dba::write($sql); + if (!$charset_results) { + debug_event('CHARSET','Unable to update the charset of ' . $table['Field'] . '.' . $table['Type'] . ' to ' . $target_charset,'3'); + } // if it fails + } // if its a varchar + } // end columns + + } // end tables + + self::set_version('db_version','340018'); + + return true; + + } // update_340018 + + /** + * update_350001 + * This updates modifies the tag tables per codeunde1load's specs from his tag patch + * it also adjusts the prefix fields so that we can use more prefixes + */ + public static function update_350001() { + + $sql = "ALTER TABLE `tag_map` ADD `tag_id` INT ( 11 ) UNSIGNED NOT NULL AFTER `id`"; + $db_results = Dba::write($sql); + + $sql = "RENAME TABLE `tags` TO `tag`"; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `tag` CHANGE `map_id` `id` INT ( 11 ) UNSIGNED NOT NULL auto_increment"; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `album` CHANGE `prefix` `prefix` VARCHAR ( 32 ) NULL"; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `artist` CHANGE `prefix` `prefix` VARCHAR ( 32 ) NULL"; + $db_results = Dba::write($sql); + + self::set_version('db_version','350001'); + + return true; + + } // update_350001 + + /** + * update_350002 + * This update adds in the browse_cache table that we use to hold peoples cached browse results + * rather then try to store everything in the session we split them out into one serilized array per + * row, per person. A little slow this way when browsing, but faster when now browsing and more flexible + */ + public static function update_350002() { + + $sql = "CREATE TABLE `tmp_browse` (`sid` varchar(128) NOT NULL,`data` longtext NOT NULL," . + " UNIQUE KEY `sid` (`sid`)) ENGINE=MyISAM"; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `tmp_browse` ADD INDEX ( `type` )"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `song` DROP `genre`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `song` DROP `genre`"; + $db_results = Dba::write($sql); - $sql = "CREATE TABLE `user_catalog` (`user` INT( 11 ) UNSIGNED NOT NULL ,`catalog` INT( 11 ) UNSIGNED NOT NULL ,`level` SMALLINT( 4 ) UNSIGNED NOT NULL DEFAULT '5', " . - "INDEX ( `user` )) ENGINE = MYISAM"; - $db_results = Dba::write($sql); + $sql = "CREATE TABLE `user_catalog` (`user` INT( 11 ) UNSIGNED NOT NULL ,`catalog` INT( 11 ) UNSIGNED NOT NULL ,`level` SMALLINT( 4 ) UNSIGNED NOT NULL DEFAULT '5', " . + "INDEX ( `user` )) ENGINE = MYISAM"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `user_catalog` ADD INDEX ( `catalog` )"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `user_catalog` ADD INDEX ( `catalog` )"; + $db_results = Dba::write($sql); - self::set_version('db_version','350002'); + self::set_version('db_version','350002'); - return true; + return true; - } // update_350002 + } // update_350002 - /** - * update_350003 - * This update tweakes the tag tables a little bit more, we're going to simplify things for the first little bit and then - * then if it all works out we will worry about making it complex again. One thing at a time people... - */ - public static function update_350003() { + /** + * update_350003 + * This update tweakes the tag tables a little bit more, we're going to simplify things for the first little bit and then + * then if it all works out we will worry about making it complex again. One thing at a time people... + */ + public static function update_350003() { - $sql = "ALTER TABLE `tag` DROP `order`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `tag` DROP `order`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `tag` DROP INDEX `order`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `tag` DROP INDEX `order`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `tag` ADD UNIQUE ( `name` )"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `tag` ADD UNIQUE ( `name` )"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `tag` CHANGE `name` `name` VARCHAR( 255 )"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `tag` CHANGE `name` `name` VARCHAR( 255 )"; + $db_results = Dba::write($sql); - // Make sure that they don't have any of the mystrands crap left - $sql = "DELETE FROM `preference` WHERE `name`='mystrands_user' OR `name`='mystrands_pass'"; - $db_results = Dba::write($sql); + // Make sure that they don't have any of the mystrands crap left + $sql = "DELETE FROM `preference` WHERE `name`='mystrands_user' OR `name`='mystrands_pass'"; + $db_results = Dba::write($sql); - self::set_version('db_version','350003'); + self::set_version('db_version','350003'); - return true; + return true; - } // update_350003 + } // update_350003 - /** - * update_350004 - * This update makes some changes to the ACL table so that it can support IPv6 entries as well as some other feature - * enhancements - */ - public static function update_350004() { + /** + * update_350004 + * This update makes some changes to the ACL table so that it can support IPv6 entries as well as some other feature + * enhancements + */ + public static function update_350004() { - $sql = "ALTER TABLE `session` CHANGE `ip` `ip` VARBINARY( 255 ) NULL"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `session` CHANGE `ip` `ip` VARBINARY( 255 ) NULL"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `session_stream` CHANGE `ip` `ip` VARBINARY( 255 ) NULL"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `session_stream` CHANGE `ip` `ip` VARBINARY( 255 ) NULL"; + $db_results = Dba::write($sql); - // Pull all of the IP history, this could take a while - $sql = "SELECT * FROM `ip_history`"; - $db_results = Dba::read($sql); + // Pull all of the IP history, this could take a while + $sql = "SELECT * FROM `ip_history`"; + $db_results = Dba::read($sql); - $ip_history = array(); + $ip_history = array(); - while ($row = Dba::fetch_assoc($db_results)) { - $row['ip'] = long2ip($row['ip']); - $ip_history[] = $row; - } - - // Clear the table before we make the changes - $sql = "TRUNCATE `ip_history`"; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `ip_history` CHANGE `ip` `ip` VARBINARY( 255 ) NULL"; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `ip_history` ADD `agent` VARCHAR ( 255 ) NULL AFTER `date`"; - $db_results = Dba::write($sql); - - // Reinsert the old rows - foreach ($ip_history as $row) { - $ip = Dba::escape(inet_pton($row['ip'])); - $sql = "INSERT INTO `ip_history` (`user`,`ip`,`date`,`agent`) " . - "VALUES ('" . $row['user'] . "','" . $ip . "','" . $row['date'] . "',NULL)"; - $db_results = Dba::write($sql); - } - - // First pull all of their current ACL's - $sql = "SELECT * FROM `access_list`"; - $db_results = Dba::read($sql); - - $acl_information = array(); + while ($row = Dba::fetch_assoc($db_results)) { + $row['ip'] = long2ip($row['ip']); + $ip_history[] = $row; + } + + // Clear the table before we make the changes + $sql = "TRUNCATE `ip_history`"; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `ip_history` CHANGE `ip` `ip` VARBINARY( 255 ) NULL"; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `ip_history` ADD `agent` VARCHAR ( 255 ) NULL AFTER `date`"; + $db_results = Dba::write($sql); + + // Reinsert the old rows + foreach ($ip_history as $row) { + $ip = Dba::escape(inet_pton($row['ip'])); + $sql = "INSERT INTO `ip_history` (`user`,`ip`,`date`,`agent`) " . + "VALUES ('" . $row['user'] . "','" . $ip . "','" . $row['date'] . "',NULL)"; + $db_results = Dba::write($sql); + } + + // First pull all of their current ACL's + $sql = "SELECT * FROM `access_list`"; + $db_results = Dba::read($sql); + + $acl_information = array(); - while ($row = Dba::fetch_assoc($db_results)) { - $row['start'] = long2ip($row['start']); - $row['end'] = long2ip($row['end']); - $acl_information[] = $row; - } - - $sql = "TRUNCATE `access_list`"; - $db_results = Dba::write($sql); - - // Make the changes to the database - $sql = "ALTER TABLE `access_list` CHANGE `start` `start` VARBINARY( 255 ) NOT NULL"; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `access_list` CHANGE `end` `end` VARBINARY( 255 ) NOT NULL"; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `access_list` DROP `dns`"; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `access_list` ADD `enabled` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `key`"; - $db_results = Dba::write($sql); - - // If we had nothing in there before add some base ALLOW ALL stuff as we're going - // to start defaulting Access Control to On. - if (!count($acl_information)) { - $v6_start = Dba::escape(inet_pton('::')); - $v6_end = Dba::escape(inet_pton('ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff')); - $v4_start = Dba::escape(inet_pton('0.0.0.0')); - $v4_end = Dba::escape(inet_pton('255.255.255.255')); - $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . - "VALUES ('DEFAULTv4','75','$v4_start','$v4_end',NULL,'-1','interface','1')"; - $db_results = Dba::write($sql); - $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . - "VALUES ('DEFAULTv4','75','$v4_start','$v4_end',NULL,'-1','stream','1')"; - $db_results = Dba::write($sql); - $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . - "VALUES ('DEFAULTv6','75','$v6_start','$v6_end',NULL,'-1','interface','1')"; - $db_results = Dba::write($sql); - $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . - "VALUES ('DEFAULTv6','75','$v6_start','$v6_end',NULL,'-1','stream','1')"; - $db_results = Dba::write($sql); - } // Adding default information - - foreach ($acl_information as $row) { - $row['start'] = Dba::escape(inet_pton($row['start'])); - $row['end'] = Dba::escape(inet_pton($row['end'])); - $row['key'] = Dba::escape($row['key']); - $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . - "VALUES ('" . Dba::escape($row['name']) . "','" . intval($row['level']) . - "','" . $row['start'] . "','" . $row['end'] . "','" . $row['key'] . "','" . intval($row['user']) . "','" . - $row['type'] . "','1')"; - $db_results = Dba::write($sql); - } // end foreach of existing rows - - self::set_version('db_version','350004'); - - return true; - - } // update_350004 - - /** - * update_350005 - * This update adds the video table... *gasp* no you didn't - */ - public static function update_350005() { - - $sql = " CREATE TABLE `video` (" . - "`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ," . - "`file` VARCHAR( 255 ) NOT NULL , " . - "`catalog` INT( 11 ) UNSIGNED NOT NULL ," . - "`title` VARCHAR( 255 ) NOT NULL ," . - "`video_codec` VARCHAR( 255 ) NOT NULL ," . - "`audio_codec` VARCHAR( 255 ) NOT NULL ," . - "`resolution_x` MEDIUMINT UNSIGNED NOT NULL ," . - "`resolution_y` MEDIUMINT UNSIGNED NOT NULL ," . - "`time` INT( 11 ) UNSIGNED NOT NULL ," . - "`size` BIGINT UNSIGNED NOT NULL," . - "`mime` VARCHAR( 255 ) NOT NULL," . - "`enabled` TINYINT( 1) NOT NULL DEFAULT '1'" . - ") ENGINE = MYISAM "; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `access_list` ADD INDEX ( `enabled` )"; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `video` ADD INDEX ( `file` )"; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `video` ADD INDEX ( `enabled` )"; - $db_results = Dba::write($sql); - - $sql = "ALTER TABLE `video` ADD INDEX ( `title` )"; - $db_results = Dba::write($sql); - - self::set_version('db_version','350005'); - - return true; - - } // update_350005 - - /** - * update_350006 - * This update inserts the Lyrics pref table... - */ - public static function update_350006() { - - $sql = "INSERT INTO `preference` VALUES (69,'show_lyrics','0','Show Lyrics',0,'boolean','interface')"; - $db_results = Dba::write($sql); - - $sql = "INSERT INTO `user_preference` VALUES (1,69,'0')"; - $db_results = Dba::write($sql); - - $sql = "SELECT `id` FROM `user`"; - $db_results = Dba::read($sql); - - User::fix_preferences('-1'); - - while ($r = Dba::fetch_assoc($db_results)) { - User::fix_preferences($r['id']); - } // while we're fixing the useres stuff - - self::set_version('db_version','350006'); - - return true; - - } // update_350006 - - /** - * update_350007 - * This update adds in the random rules tables, and also increases the size of the blobs - * on the album and artist data. Also add track to tmp_playlist_data - */ - public static function update_350007() { + while ($row = Dba::fetch_assoc($db_results)) { + $row['start'] = long2ip($row['start']); + $row['end'] = long2ip($row['end']); + $acl_information[] = $row; + } + + $sql = "TRUNCATE `access_list`"; + $db_results = Dba::write($sql); + + // Make the changes to the database + $sql = "ALTER TABLE `access_list` CHANGE `start` `start` VARBINARY( 255 ) NOT NULL"; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `access_list` CHANGE `end` `end` VARBINARY( 255 ) NOT NULL"; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `access_list` DROP `dns`"; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `access_list` ADD `enabled` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `key`"; + $db_results = Dba::write($sql); + + // If we had nothing in there before add some base ALLOW ALL stuff as we're going + // to start defaulting Access Control to On. + if (!count($acl_information)) { + $v6_start = Dba::escape(inet_pton('::')); + $v6_end = Dba::escape(inet_pton('ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff')); + $v4_start = Dba::escape(inet_pton('0.0.0.0')); + $v4_end = Dba::escape(inet_pton('255.255.255.255')); + $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . + "VALUES ('DEFAULTv4','75','$v4_start','$v4_end',NULL,'-1','interface','1')"; + $db_results = Dba::write($sql); + $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . + "VALUES ('DEFAULTv4','75','$v4_start','$v4_end',NULL,'-1','stream','1')"; + $db_results = Dba::write($sql); + $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . + "VALUES ('DEFAULTv6','75','$v6_start','$v6_end',NULL,'-1','interface','1')"; + $db_results = Dba::write($sql); + $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . + "VALUES ('DEFAULTv6','75','$v6_start','$v6_end',NULL,'-1','stream','1')"; + $db_results = Dba::write($sql); + } // Adding default information + + foreach ($acl_information as $row) { + $row['start'] = Dba::escape(inet_pton($row['start'])); + $row['end'] = Dba::escape(inet_pton($row['end'])); + $row['key'] = Dba::escape($row['key']); + $sql = "INSERT INTO `access_list` (`name`,`level`,`start`,`end`,`key`,`user`,`type`,`enabled`) " . + "VALUES ('" . Dba::escape($row['name']) . "','" . intval($row['level']) . + "','" . $row['start'] . "','" . $row['end'] . "','" . $row['key'] . "','" . intval($row['user']) . "','" . + $row['type'] . "','1')"; + $db_results = Dba::write($sql); + } // end foreach of existing rows + + self::set_version('db_version','350004'); + + return true; + + } // update_350004 + + /** + * update_350005 + * This update adds the video table... *gasp* no you didn't + */ + public static function update_350005() { + + $sql = " CREATE TABLE `video` (" . + "`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ," . + "`file` VARCHAR( 255 ) NOT NULL , " . + "`catalog` INT( 11 ) UNSIGNED NOT NULL ," . + "`title` VARCHAR( 255 ) NOT NULL ," . + "`video_codec` VARCHAR( 255 ) NOT NULL ," . + "`audio_codec` VARCHAR( 255 ) NOT NULL ," . + "`resolution_x` MEDIUMINT UNSIGNED NOT NULL ," . + "`resolution_y` MEDIUMINT UNSIGNED NOT NULL ," . + "`time` INT( 11 ) UNSIGNED NOT NULL ," . + "`size` BIGINT UNSIGNED NOT NULL," . + "`mime` VARCHAR( 255 ) NOT NULL," . + "`enabled` TINYINT( 1) NOT NULL DEFAULT '1'" . + ") ENGINE = MYISAM "; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `access_list` ADD INDEX ( `enabled` )"; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `video` ADD INDEX ( `file` )"; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `video` ADD INDEX ( `enabled` )"; + $db_results = Dba::write($sql); + + $sql = "ALTER TABLE `video` ADD INDEX ( `title` )"; + $db_results = Dba::write($sql); + + self::set_version('db_version','350005'); + + return true; + + } // update_350005 + + /** + * update_350006 + * This update inserts the Lyrics pref table... + */ + public static function update_350006() { + + $sql = "INSERT INTO `preference` VALUES (69,'show_lyrics','0','Show Lyrics',0,'boolean','interface')"; + $db_results = Dba::write($sql); + + $sql = "INSERT INTO `user_preference` VALUES (1,69,'0')"; + $db_results = Dba::write($sql); + + $sql = "SELECT `id` FROM `user`"; + $db_results = Dba::read($sql); + + User::fix_preferences('-1'); + + while ($r = Dba::fetch_assoc($db_results)) { + User::fix_preferences($r['id']); + } // while we're fixing the useres stuff + + self::set_version('db_version','350006'); + + return true; + + } // update_350006 + + /** + * update_350007 + * This update adds in the random rules tables, and also increases the size of the blobs + * on the album and artist data. Also add track to tmp_playlist_data + */ + public static function update_350007() { - // We need to clear the thumbs as they will need to be re-generated - $sql = "UPDATE `album_data` SET `thumb`=NULL,`thumb_mime`=NULL"; - $db_results = Dba::write($sql); + // We need to clear the thumbs as they will need to be re-generated + $sql = "UPDATE `album_data` SET `thumb`=NULL,`thumb_mime`=NULL"; + $db_results = Dba::write($sql); - $sql = "UPDATE `artist_data` SET `thumb`=NULL,`thumb_mime`=NULL"; - $db_results = Dba::write($sql); + $sql = "UPDATE `artist_data` SET `thumb`=NULL,`thumb_mime`=NULL"; + $db_results = Dba::write($sql); - // Change the db thumb sizes - $sql = "ALTER TABLE `album_data` CHANGE `thumb` `thumb` MEDIUMBLOB NULL"; - $db_results = Dba::write($sql); + // Change the db thumb sizes + $sql = "ALTER TABLE `album_data` CHANGE `thumb` `thumb` MEDIUMBLOB NULL"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `artist_data` CHANGE `thumb` `thumb` MEDIUMBLOB NULL"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `artist_data` CHANGE `thumb` `thumb` MEDIUMBLOB NULL"; + $db_results = Dba::write($sql); - // Remove dead column - $sql = "ALTER TABLE `playlist_data` DROP `dynamic_song`"; - $db_results = Dba::write($sql); + // Remove dead column + $sql = "ALTER TABLE `playlist_data` DROP `dynamic_song`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `playlist` DROP `genre`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `playlist` DROP `genre`"; + $db_results = Dba::write($sql); - // Add track item to tmp_playlist_data so we can order this stuff manually - $sql = "ALTER TABLE `tmp_playlist_data` ADD `track` INT ( 11 ) UNSIGNED NULL"; - $db_results = Dba::write($sql); + // Add track item to tmp_playlist_data so we can order this stuff manually + $sql = "ALTER TABLE `tmp_playlist_data` ADD `track` INT ( 11 ) UNSIGNED NULL"; + $db_results = Dba::write($sql); - $sql = "DROP TABLE `genre`"; - $db_results = Dba::write($sql); + $sql = "DROP TABLE `genre`"; + $db_results = Dba::write($sql); - // Clean up the catalog and add last_clean to it - $sql = "ALTER TABLE `catalog` ADD `last_clean` INT ( 11 ) UNSIGNED NULL AFTER `last_update`"; - $db_results = Dba::write($sql); + // Clean up the catalog and add last_clean to it + $sql = "ALTER TABLE `catalog` ADD `last_clean` INT ( 11 ) UNSIGNED NULL AFTER `last_update`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `catalog` DROP `add_path`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `catalog` DROP `add_path`"; + $db_results = Dba::write($sql); - $sql = "CREATE TABLE `dynamic_playlist` (" . - "`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ," . - "`name` VARCHAR( 255 ) NOT NULL ," . - "`user` INT( 11 ) NOT NULL ," . - "`date` INT( 11 ) UNSIGNED NOT NULL ," . - "`type` VARCHAR( 128 ) NOT NULL" . - ") ENGINE = MYISAM "; - $db_results = Dba::write($sql); + $sql = "CREATE TABLE `dynamic_playlist` (" . + "`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ," . + "`name` VARCHAR( 255 ) NOT NULL ," . + "`user` INT( 11 ) NOT NULL ," . + "`date` INT( 11 ) UNSIGNED NOT NULL ," . + "`type` VARCHAR( 128 ) NOT NULL" . + ") ENGINE = MYISAM "; + $db_results = Dba::write($sql); - $sql = "CREATE TABLE `dynamic_playlist_data` (" . - "`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ," . - "`dynamic_id` INT( 11 ) UNSIGNED NOT NULL ," . - "`field` VARCHAR( 255 ) NOT NULL ," . - "`internal_operator` VARCHAR( 64 ) NOT NULL ," . - "`external_operator` VARCHAR( 64 ) NOT NULL ," . - "`value` VARCHAR( 255 ) NOT NULL" . - ") ENGINE = MYISAM"; - $db_results = Dba::write($sql); + $sql = "CREATE TABLE `dynamic_playlist_data` (" . + "`id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ," . + "`dynamic_id` INT( 11 ) UNSIGNED NOT NULL ," . + "`field` VARCHAR( 255 ) NOT NULL ," . + "`internal_operator` VARCHAR( 64 ) NOT NULL ," . + "`external_operator` VARCHAR( 64 ) NOT NULL ," . + "`value` VARCHAR( 255 ) NOT NULL" . + ") ENGINE = MYISAM"; + $db_results = Dba::write($sql); - self::set_version('db_version','350007'); + self::set_version('db_version','350007'); - return true; + return true; - } // update_350007 + } // update_350007 - /** - * update_350008 - * Change song_id references to be object so they are a little more general - * add a type to now playing table so that we can handle different playing information - */ - public static function update_350008() { + /** + * update_350008 + * Change song_id references to be object so they are a little more general + * add a type to now playing table so that we can handle different playing information + */ + public static function update_350008() { - $sql = "ALTER TABLE `now_playing` CHANGE `song_id` `object_id` INT( 11 ) UNSIGNED NOT NULL"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `now_playing` CHANGE `song_id` `object_id` INT( 11 ) UNSIGNED NOT NULL"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `now_playing` ADD `object_type` VARCHAR ( 255 ) NOT NULL AFTER `object_id`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `now_playing` ADD `object_type` VARCHAR ( 255 ) NOT NULL AFTER `object_id`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `now_playing` ADD INDEX ( `expire` )"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `now_playing` ADD INDEX ( `expire` )"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `video` ADD `addition_time` INT( 11 ) UNSIGNED NOT NULL AFTER `mime`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `video` ADD `addition_time` INT( 11 ) UNSIGNED NOT NULL AFTER `mime`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `video` ADD `update_time` INT( 11 ) UNSIGNED NULL AFTER `addition_time`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `video` ADD `update_time` INT( 11 ) UNSIGNED NULL AFTER `addition_time`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `video` ADD INDEX (`addition_time`)"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `video` ADD INDEX (`addition_time`)"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `video` ADD INDEX (`update_time`)"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `video` ADD INDEX (`update_time`)"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `artist_data` ADD INDEX ( `art_mime` )"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `artist_data` ADD INDEX ( `art_mime` )"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `album_data` ADD INDEX ( `art_mime` )"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `album_data` ADD INDEX ( `art_mime` )"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `tmp_browse` ADD `type` VARCHAR ( 255 ) NOT NULL AFTER `sid`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `tmp_browse` ADD `type` VARCHAR ( 255 ) NOT NULL AFTER `sid`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `tmp_browse` ADD INDEX (`type)"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `tmp_browse` ADD INDEX (`type)"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `song` DROP `hash`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `song` DROP `hash`"; + $db_results = Dba::write($sql); - self::set_version('db_version','350008'); + self::set_version('db_version','350008'); - } // update_350008 + } // update_350008 - /** - * update_360001 - * This adds the MB UUIDs to the different tables as well as some additional cleanup - */ - public static function update_360001() { + /** + * update_360001 + * This adds the MB UUIDs to the different tables as well as some additional cleanup + */ + public static function update_360001() { - $sql = "ALTER TABLE `album` ADD `mbid` CHAR ( 36 ) AFTER `prefix`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `album` ADD `mbid` CHAR ( 36 ) AFTER `prefix`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `artist` ADD `mbid` CHAR ( 36 ) AFTER `prefix`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `artist` ADD `mbid` CHAR ( 36 ) AFTER `prefix`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `song` ADD `mbid` CHAR ( 36 ) AFTER `track`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `song` ADD `mbid` CHAR ( 36 ) AFTER `track`"; + $db_results = Dba::write($sql); - // Remove any RIO related information from the database as the plugin has been removed - $sql = "DELETE FROM `update_info` WHERE `key` LIKE 'Plugin_Ri%'"; - $db_results = Dba::write($sql); + // Remove any RIO related information from the database as the plugin has been removed + $sql = "DELETE FROM `update_info` WHERE `key` LIKE 'Plugin_Ri%'"; + $db_results = Dba::write($sql); - $sql = "DELETE FROM `preference` WHERE `name` LIKE 'rio_%'"; - $db_results = Dba::write($sql); + $sql = "DELETE FROM `preference` WHERE `name` LIKE 'rio_%'"; + $db_results = Dba::write($sql); - $sql = "SELECT `id` FROM `user`"; - $db_results = Dba::read($sql); + $sql = "SELECT `id` FROM `user`"; + $db_results = Dba::read($sql); - User::fix_preferences('-1'); + User::fix_preferences('-1'); - while ($r = Dba::fetch_assoc($db_results)) { - User::fix_preferences($r['id']); - } // while we're fixing the useres stuff + while ($r = Dba::fetch_assoc($db_results)) { + User::fix_preferences($r['id']); + } // while we're fixing the useres stuff - self::set_version('db_version','360001'); + self::set_version('db_version','360001'); - } // update_360001 + } // update_360001 - /** - * update_360002 - * This update makes changes to the cataloging to accomodate the new method for syncing between - * Ampache instances, could be adapted to sync with whatever for "full" catalog - */ - public static function update_360002() { + /** + * update_360002 + * This update makes changes to the cataloging to accomodate the new method for syncing between + * Ampache instances, could be adapted to sync with whatever for "full" catalog + */ + public static function update_360002() { - // Drop the key from catalog and ACL - $sql = "ALTER TABLE `catalog` DROP `key`"; - $db_results = Dba::write($sql); + // Drop the key from catalog and ACL + $sql = "ALTER TABLE `catalog` DROP `key`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `access_list` DROP `key`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `access_list` DROP `key`"; + $db_results = Dba::write($sql); - // Add in Username / Password for catalog - to be used for remote catalogs - $sql = "ALTER TABLE `catalog` ADD `remote_username` VARCHAR ( 255 ) AFTER `catalog_type`"; - $db_results = Dba::write($sql); + // Add in Username / Password for catalog - to be used for remote catalogs + $sql = "ALTER TABLE `catalog` ADD `remote_username` VARCHAR ( 255 ) AFTER `catalog_type`"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `catalog` ADD `remote_password` VARCHAR ( 255 ) AFTER `remote_username`"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `catalog` ADD `remote_password` VARCHAR ( 255 ) AFTER `remote_username`"; + $db_results = Dba::write($sql); - // Adjust the Filename field in song, make it gi-normous. If someone has anything close to - // this file length, they seriously need to reconsider what they are doing. - $sql = "ALTER TABLE `song` CHANGE `file` `file` VARCHAR ( 4096 )"; - $db_results = Dba::write($sql); + // Adjust the Filename field in song, make it gi-normous. If someone has anything close to + // this file length, they seriously need to reconsider what they are doing. + $sql = "ALTER TABLE `song` CHANGE `file` `file` VARCHAR ( 4096 )"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `video` CHANGE `file` `file` VARCHAR ( 4096 )"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `video` CHANGE `file` `file` VARCHAR ( 4096 )"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `live_stream` CHANGE `url` `url` VARCHAR ( 4096 )"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `live_stream` CHANGE `url` `url` VARCHAR ( 4096 )"; + $db_results = Dba::write($sql); - // Index the Artist, Album, and Song tables to prepare for Fulltext searches. - $sql = "ALTER TABLE `artist` ADD FULLTEXT(`name`)"; - $db_results = Dba::write($sql); + // Index the Artist, Album, and Song tables to prepare for Fulltext searches. + $sql = "ALTER TABLE `artist` ADD FULLTEXT(`name`)"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `album` ADD FULLTEXT(`name`)"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `album` ADD FULLTEXT(`name`)"; + $db_results = Dba::write($sql); - $sql = "ALTER TABLE `song` ADD FULLTEXT(`title`)"; - $db_results = Dba::write($sql); + $sql = "ALTER TABLE `song` ADD FULLTEXT(`title`)"; + $db_results = Dba::write($sql); - // Now add in the min_object_count preference and the random_method - $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES ('bandwidth','50','Bandwidth','5','integer','interface')"; - $db_results = Dba::write($sql); + // Now add in the min_object_count preference and the random_method + $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES ('bandwidth','50','Bandwidth','5','integer','interface')"; + $db_results = Dba::write($sql); - $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . - "VALUES ('features','50','Features','5','integer','interface')"; - $db_results = Dba::write($sql); + $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " . + "VALUES ('features','50','Features','5','integer','interface')"; + $db_results = Dba::write($sql); - /* Fix every users preferences */ - $sql = "SELECT `id` FROM `user`"; - $db_results = Dba::read($sql); + /* Fix every users preferences */ + $sql = "SELECT `id` FROM `user`"; + $db_results = Dba::read($sql); - User::fix_preferences('-1'); + User::fix_preferences('-1'); - while ($r = Dba::fetch_assoc($db_results)) { - User::fix_preferences($r['id']); - } // while results + while ($r = Dba::fetch_assoc($db_results)) { + User::fix_preferences($r['id']); + } // while results - self::set_version('db_version','360002'); - - } // update_360002 - - /** - * update_360003 - * This update moves the image data to its own table. - */ - public static function update_360003() { - $sql = "CREATE TABLE `image` (" . - "`id` int(11) unsigned NOT NULL auto_increment," . - "`image` mediumblob NOT NULL," . - "`mime` varchar(64) NOT NULL," . - "`size` varchar(64) NOT NULL," . - "`object_type` varchar(64) NOT NULL," . - "`object_id` int(11) unsigned NOT NULL," . - "PRIMARY KEY (`id`)," . - "KEY `object_type` (`object_type`)," . - "KEY `object_id` (`object_id`)" . - ") ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"; - $db_results = Dba::write($sql); - - foreach (array('album', 'artist') as $type) { - $sql = "SELECT `" . $type . "_id` AS `object_id`, " . - "`art`, `art_mime` FROM `" . $type . - "_data` WHERE `art` IS NOT NULL"; - $db_results = Dba::read($sql); - while ($row = Dba::fetch_assoc($db_results)) { - $sql = "INSERT INTO `image` " . - "(`image`, `mime`, `size`, " . - "`object_type`, `object_id`) " . - "VALUES('" . Dba::escape($row['art']) . - "', '" . $row['art_mime'] . - "', 'original', '" . $type . "', '" . - $row['object_id'] . "')"; - $db_other_results = Dba::write($sql); - } - $sql = "DROP TABLE `" . $type . "_data`"; - $db_results = Dba::write($sql); - } - - self::set_version('db_version','360003'); - - } // update_360003 + self::set_version('db_version','360002'); + + } // update_360002 + + /** + * update_360003 + * This update moves the image data to its own table. + */ + public static function update_360003() { + $sql = "CREATE TABLE `image` (" . + "`id` int(11) unsigned NOT NULL auto_increment," . + "`image` mediumblob NOT NULL," . + "`mime` varchar(64) NOT NULL," . + "`size` varchar(64) NOT NULL," . + "`object_type` varchar(64) NOT NULL," . + "`object_id` int(11) unsigned NOT NULL," . + "PRIMARY KEY (`id`)," . + "KEY `object_type` (`object_type`)," . + "KEY `object_id` (`object_id`)" . + ") ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"; + $db_results = Dba::write($sql); + + foreach (array('album', 'artist') as $type) { + $sql = "SELECT `" . $type . "_id` AS `object_id`, " . + "`art`, `art_mime` FROM `" . $type . + "_data` WHERE `art` IS NOT NULL"; + $db_results = Dba::read($sql); + while ($row = Dba::fetch_assoc($db_results)) { + $sql = "INSERT INTO `image` " . + "(`image`, `mime`, `size`, " . + "`object_type`, `object_id`) " . + "VALUES('" . Dba::escape($row['art']) . + "', '" . $row['art_mime'] . + "', 'original', '" . $type . "', '" . + $row['object_id'] . "')"; + $db_other_results = Dba::write($sql); + } + $sql = "DROP TABLE `" . $type . "_data`"; + $db_results = Dba::write($sql); + } + + self::set_version('db_version','360003'); + + } // update_360003 /** - * update_360004 - * This update creates an index on the rating table. - */ - public static function update_360004() { - $sql = "CREATE UNIQUE INDEX `unique_rating` ON `rating` (`user`, `object_type`, `object_id`)"; - $db_results = Dba::write($sql); - - self::set_version('db_version','360004'); - } // update_360004 - - /** - * update_360005 - * This changes the tmp_browse table around. - */ - public static function update_360005() { - $sql = "DROP TABLE `tmp_browse`"; - $db_results = Dba::write($sql); - - $sql = "CREATE TABLE `tmp_browse` (" . - "`id` int(13) NOT NULL auto_increment," . - "`sid` varchar(128) character set utf8 NOT NULL default ''," . - "`data` longtext NOT NULL," . - "`object_data` longtext," . - "PRIMARY KEY (`sid`,`id`)" . - ") ENGINE=MyISAM DEFAULT CHARSET=utf8"; - $db_results = Dba::write($sql); - - self::set_version('db_version','360005'); - } // update_360005 - - /** - * update_360006 - * This adds the table for newsearch/dynamic playlists - */ - public static function update_360006() { - $sql = "CREATE TABLE `search` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `user` int(11) NOT NULL, - `type` enum('private','public') CHARACTER SET utf8 DEFAULT NULL, - `rules` mediumtext NOT NULL, - `name` varchar(255) CHARACTER SET utf8 DEFAULT NULL, - `logic_operator` varchar(3) CHARACTER SET utf8 DEFAULT NULL, - PRIMARY KEY (`id`) - ) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=utf8"; - $db_results = Dba::write($sql); - - self::set_version('db_version','360006'); - } - - /** - * update_360007 - * This fixes the session table - */ - public static function update_360007() { - $sql = "ALTER TABLE `session` MODIFY `type` ENUM ('mysql','ldap','http','api','xml-rpc','local') NOT NULL"; - $db_results = Dba::write($sql); - self::set_version('db_version','360007'); - } - - /** - * update_360008 - * Fix bug that caused the remote_username/password fields to not be created - */ - public static function update_360008() { - - $remote_username = false; - $remote_password = false; - - $sql = "DESCRIBE `catalog`"; - $db_results = Dba::read($sql); - - while ($row = Dba::fetch_assoc($db_results)) { - if ($row['Field'] == 'remote_username') { - $remote_username = true; - } - if ($row['Field'] == 'remote_password') { - $remote_password = true; - } - } // end while - - if (!$remote_username) { - // Add in Username / Password for catalog - to be used for remote catalogs - $sql = "ALTER TABLE `catalog` ADD `remote_username` VARCHAR ( 255 ) AFTER `catalog_type`"; - $db_results = Dba::write($sql); - } - if (!$remote_password) { - $sql = "ALTER TABLE `catalog` ADD `remote_password` VARCHAR ( 255 ) AFTER `remote_username`"; - $db_results = Dba::write($sql); - } - - self::set_version('db_version','360008'); - - } // update_360008 - - - /** - * update_360009 - * The main session table was already updated to use varchar(64) for the ID, - * tmp_playlist needs the same change - */ - public static function update_360009() { - $sql = "ALTER TABLE `tmp_playlist` CHANGE `session` `session` VARCHAR(64)"; - $db_results = Dba::write($sql); - - self::set_version('db_version','360009'); - } - - /** - * update_360010 - * MBz NGS means collaborations have more than one MBID (the ones - * belonging to the underlying artists). We need a bigger column. - */ - public static function update_360010() { - $sql = 'ALTER TABLE `artist` CHANGE `mbid` `mbid` VARCHAR(1369)'; - $db_results = Dba::write($sql); - - self::set_version('db_version', '360010'); - } - - /** - * update_380011 - * We need a place to store actual playlist data for downloadable - * playlist files. - */ - public static function update_360011() { - $sql = 'CREATE TABLE `stream_playlist` (' . - '`id` int(11) unsigned NOT NULL AUTO_INCREMENT,' . - '`sid` varchar(64) NOT NULL,' . - '`url` text NOT NULL,' . - '`info_url` text DEFAULT NULL,' . - '`image_url` text DEFAULT NULL,' . - '`title` varchar(255) DEFAULT NULL,' . - '`author` varchar(255) DEFAULT NULL,' . - '`album` varchar(255) DEFAULT NULL,' . - '`type` varchar(255) DEFAULT NULL,' . - '`time` smallint(5) DEFAULT NULL,' . - 'PRIMARY KEY (`id`), KEY `sid` (`sid`))'; - $db_results = Dba::write($sql); - self::set_version('db_version', '360011'); - } + * update_360004 + * This update creates an index on the rating table. + */ + public static function update_360004() { + $sql = "CREATE UNIQUE INDEX `unique_rating` ON `rating` (`user`, `object_type`, `object_id`)"; + $db_results = Dba::write($sql); + + self::set_version('db_version','360004'); + } // update_360004 + + /** + * update_360005 + * This changes the tmp_browse table around. + */ + public static function update_360005() { + $sql = "DROP TABLE `tmp_browse`"; + $db_results = Dba::write($sql); + + $sql = "CREATE TABLE `tmp_browse` (" . + "`id` int(13) NOT NULL auto_increment," . + "`sid` varchar(128) character set utf8 NOT NULL default ''," . + "`data` longtext NOT NULL," . + "`object_data` longtext," . + "PRIMARY KEY (`sid`,`id`)" . + ") ENGINE=MyISAM DEFAULT CHARSET=utf8"; + $db_results = Dba::write($sql); + + self::set_version('db_version','360005'); + } // update_360005 + + /** + * update_360006 + * This adds the table for newsearch/dynamic playlists + */ + public static function update_360006() { + $sql = "CREATE TABLE `search` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `user` int(11) NOT NULL, + `type` enum('private','public') CHARACTER SET utf8 DEFAULT NULL, + `rules` mediumtext NOT NULL, + `name` varchar(255) CHARACTER SET utf8 DEFAULT NULL, + `logic_operator` varchar(3) CHARACTER SET utf8 DEFAULT NULL, + PRIMARY KEY (`id`) + ) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=utf8"; + $db_results = Dba::write($sql); + + self::set_version('db_version','360006'); + } + + /** + * update_360007 + * This fixes the session table + */ + public static function update_360007() { + $sql = "ALTER TABLE `session` MODIFY `type` ENUM ('mysql','ldap','http','api','xml-rpc','local') NOT NULL"; + $db_results = Dba::write($sql); + self::set_version('db_version','360007'); + } + + /** + * update_360008 + * Fix bug that caused the remote_username/password fields to not be created + */ + public static function update_360008() { + + $remote_username = false; + $remote_password = false; + + $sql = "DESCRIBE `catalog`"; + $db_results = Dba::read($sql); + + while ($row = Dba::fetch_assoc($db_results)) { + if ($row['Field'] == 'remote_username') { + $remote_username = true; + } + if ($row['Field'] == 'remote_password') { + $remote_password = true; + } + } // end while + + if (!$remote_username) { + // Add in Username / Password for catalog - to be used for remote catalogs + $sql = "ALTER TABLE `catalog` ADD `remote_username` VARCHAR ( 255 ) AFTER `catalog_type`"; + $db_results = Dba::write($sql); + } + if (!$remote_password) { + $sql = "ALTER TABLE `catalog` ADD `remote_password` VARCHAR ( 255 ) AFTER `remote_username`"; + $db_results = Dba::write($sql); + } + + self::set_version('db_version','360008'); + + } // update_360008 + + + /** + * update_360009 + * The main session table was already updated to use varchar(64) for the ID, + * tmp_playlist needs the same change + */ + public static function update_360009() { + $sql = "ALTER TABLE `tmp_playlist` CHANGE `session` `session` VARCHAR(64)"; + $db_results = Dba::write($sql); + + self::set_version('db_version','360009'); + } + + /** + * update_360010 + * MBz NGS means collaborations have more than one MBID (the ones + * belonging to the underlying artists). We need a bigger column. + */ + public static function update_360010() { + $sql = 'ALTER TABLE `artist` CHANGE `mbid` `mbid` VARCHAR(1369)'; + $db_results = Dba::write($sql); + + self::set_version('db_version', '360010'); + } + + /** + * update_380011 + * We need a place to store actual playlist data for downloadable + * playlist files. + */ + public static function update_360011() { + $sql = 'CREATE TABLE `stream_playlist` (' . + '`id` int(11) unsigned NOT NULL AUTO_INCREMENT,' . + '`sid` varchar(64) NOT NULL,' . + '`url` text NOT NULL,' . + '`info_url` text DEFAULT NULL,' . + '`image_url` text DEFAULT NULL,' . + '`title` varchar(255) DEFAULT NULL,' . + '`author` varchar(255) DEFAULT NULL,' . + '`album` varchar(255) DEFAULT NULL,' . + '`type` varchar(255) DEFAULT NULL,' . + '`time` smallint(5) DEFAULT NULL,' . + 'PRIMARY KEY (`id`), KEY `sid` (`sid`))'; + $db_results = Dba::write($sql); + self::set_version('db_version', '360011'); + } } // end update class ?> diff --git a/lib/class/user.class.php b/lib/class/user.class.php index 01f709f276..edc711e9fc 100644 --- a/lib/class/user.class.php +++ b/lib/class/user.class.php @@ -1,5 +1,5 @@ id = intval($user_id); + $this->id = intval($user_id); - $info = $this->_get_info(); + $info = $this->_get_info(); - foreach ($info as $key=>$value) { - // Let's not save the password in this object :S - if ($key == 'password') { continue; } - $this->$key = $value; - } + foreach ($info as $key=>$value) { + // Let's not save the password in this object :S + if ($key == 'password') { continue; } + $this->$key = $value; + } - // Make sure the Full name is always filled - if (strlen($this->fullname) < 1) { $this->fullname = $this->username; } + // Make sure the Full name is always filled + if (strlen($this->fullname) < 1) { $this->fullname = $this->username; } - } // Constructor + } // Constructor - /** - * _get_info - * This function returns the information for this object - */ - private function _get_info() { + /** + * _get_info + * This function returns the information for this object + */ + private function _get_info() { - $id = intval($this->id); + $id = intval($this->id); - if (parent::is_cached('user',$id)) { - return parent::get_from_cache('user',$id); - } + if (parent::is_cached('user',$id)) { + return parent::get_from_cache('user',$id); + } - // If the ID is -1 then - if ($id == '-1') { - $data['username'] = 'System'; - $data['fullname'] = 'Ampache User'; - $data['access'] = '25'; - return $data; - } + // If the ID is -1 then + if ($id == '-1') { + $data['username'] = 'System'; + $data['fullname'] = 'Ampache User'; + $data['access'] = '25'; + return $data; + } - $sql = "SELECT * FROM `user` WHERE `id`='$id'"; - $db_results = Dba::read($sql); + $sql = "SELECT * FROM `user` WHERE `id`='$id'"; + $db_results = Dba::read($sql); - $data = Dba::fetch_assoc($db_results); + $data = Dba::fetch_assoc($db_results); - parent::add_to_cache('user',$id,$data); + parent::add_to_cache('user',$id,$data); - return $data; + return $data; - } // _get_info + } // _get_info - /** - * load_playlist - * This is called once per page load it makes sure that this session - * has a tmp_playlist, creating it if it doesn't, then sets $this->playlist - * as a tmp_playlist object that can be fiddled with later on - */ - public function load_playlist() { + /** + * load_playlist + * This is called once per page load it makes sure that this session + * has a tmp_playlist, creating it if it doesn't, then sets $this->playlist + * as a tmp_playlist object that can be fiddled with later on + */ + public function load_playlist() { - $session_id = session_id(); + $session_id = session_id(); - $this->playlist = Tmp_Playlist::get_from_session($session_id); + $this->playlist = Tmp_Playlist::get_from_session($session_id); - } // load_playlist + } // load_playlist - /** - * get_from_username - * This returns a built user from a username. This is a - * static function so it doesn't require an instance - */ - public static function get_from_username($username) { + /** + * get_from_username + * This returns a built user from a username. This is a + * static function so it doesn't require an instance + */ + public static function get_from_username($username) { - $username = Dba::escape($username); + $username = Dba::escape($username); - $sql = "SELECT `id` FROM `user` WHERE `username`='$username'"; - $db_results = Dba::read($sql); - $results = Dba::fetch_assoc($db_results); + $sql = "SELECT `id` FROM `user` WHERE `username`='$username'"; + $db_results = Dba::read($sql); + $results = Dba::fetch_assoc($db_results); - $user = new User($results['id']); + $user = new User($results['id']); - return $user; + return $user; - } // get_from_username + } // get_from_username - /** - * get_from_email - * This returns a built user from a email. This is a - * static function so it doesn't require an instance - */ - public static function get_from_email($email) { + /** + * get_from_email + * This returns a built user from a email. This is a + * static function so it doesn't require an instance + */ + public static function get_from_email($email) { - $email = Dba::escape($email); + $email = Dba::escape($email); - $sql = "SELECT `id` FROM `user` WHERE `email`='$email'"; - $db_results = Dba::read($sql); - $results = Dba::fetch_assoc($db_results); + $sql = "SELECT `id` FROM `user` WHERE `email`='$email'"; + $db_results = Dba::read($sql); + $results = Dba::fetch_assoc($db_results); - $user = new User($results['id']); + $user = new User($results['id']); - return $user; + return $user; - } // get_from_username + } // get_from_username - /** - * get_catalogs - * This returns the catalogs as an array of ids that this user is allowed to access - */ - public function get_catalogs() { + /** + * get_catalogs + * This returns the catalogs as an array of ids that this user is allowed to access + */ + public function get_catalogs() { - if (parent::is_cached('user_catalog',$this->id)) { - return parent::get_from_cache('user_catalog',$this->id); - } + if (parent::is_cached('user_catalog',$this->id)) { + return parent::get_from_cache('user_catalog',$this->id); + } - $sql = "SELECT * FROM `user_catalog` WHERE `user`='$user_id'"; - $db_results = Dba::read($sql); + $sql = "SELECT * FROM `user_catalog` WHERE `user`='$user_id'"; + $db_results = Dba::read($sql); - while ($row = Dba::fetch_assoc($db_results)) { - $catalogs[] = $row['catalog']; - } + while ($row = Dba::fetch_assoc($db_results)) { + $catalogs[] = $row['catalog']; + } - parent::add_to_cache('user_catalog',$this->id,$catalogs); + parent::add_to_cache('user_catalog',$this->id,$catalogs); - return $catalogs; + return $catalogs; - } // get_catalogs + } // get_catalogs - /** - * get_preferences - * This is a little more complicate now that we've got many types of preferences - * This funtions pulls all of them an arranges them into a spiffy little array - * You can specify a type to limit it to a single type of preference - * []['title'] = ucased type name - * []['prefs'] = array(array('name','display','value')); - * []['admin'] = t/f value if this is an admin only section - */ - function get_preferences($type = 0, $system = false) { + /** + * get_preferences + * This is a little more complicate now that we've got many types of preferences + * This funtions pulls all of them an arranges them into a spiffy little array + * You can specify a type to limit it to a single type of preference + * []['title'] = ucased type name + * []['prefs'] = array(array('name','display','value')); + * []['admin'] = t/f value if this is an admin only section + */ + function get_preferences($type = 0, $system = false) { - // Fill out the user id - $user_id = $system ? Dba::escape(-1) : Dba::escape($this->id); + // Fill out the user id + $user_id = $system ? Dba::escape(-1) : Dba::escape($this->id); - if (!$system) { - $user_limit = "AND preference.catagory != 'system'"; - } - - if ($type != '0') { - $user_limit = "AND preference.catagory = '" . Dba::escape($type) . "'"; - } - - - $sql = "SELECT preference.name, preference.description, preference.catagory, preference.level, user_preference.value " . - "FROM preference INNER JOIN user_preference ON user_preference.preference=preference.id " . - "WHERE user_preference.user='$user_id' " . $user_limit . - " ORDER BY preference.catagory, preference.description"; - - $db_results = Dba::read($sql); - - /* Ok this is crapy, need to clean this up or improve the code FIXME */ - while ($r = Dba::fetch_assoc($db_results)) { - $type = $r['catagory']; - $admin = false; - if ($type == 'system') { $admin = true; } - $type_array[$type][$r['name']] = array('name'=>$r['name'],'level'=>$r['level'],'description'=>$r['description'],'value'=>$r['value']); - $results[$type] = array ('title'=>ucwords($type),'admin'=>$admin,'prefs'=>$type_array[$type]); - } // end while - - return $results; - - } // get_preferences - - /** - * set_preferences - * sets the prefs for this specific user - */ - public function set_preferences() { - - $user_id = Dba::escape($this->id); - - $sql = "SELECT preference.name,user_preference.value FROM preference,user_preference WHERE user_preference.user='$user_id' " . - "AND user_preference.preference=preference.id AND preference.type != 'system'"; - $db_results = Dba::read($sql); - - while ($r = Dba::fetch_assoc($db_results)) { - $key = $r['name']; - $this->prefs[$key] = $r['value']; - } - } // set_preferences - - /** - * get_favorites - * returns an array of your $type favorites - */ - function get_favorites($type) { - - $web_path = Config::get('web_path'); - - $results = Stats::get_user(Config::get('popular_threshold'),$type,$this->id,1); - - $items = array(); - - foreach ($results as $r) { - /* If its a song */ - if ($type == 'song') { - $data = new Song($r['object_id']); - $data->count = $r['count']; - $data->format(); - $data->f_name = $data->f_link; - $items[] = $data; - } - /* If its an album */ - elseif ($type == 'album') { - $data = new Album($r['object_id']); - $data->count = $r['count']; - $data->format(); - $items[] = $data; - } - /* If its an artist */ - elseif ($type == 'artist') { - $data = new Artist($r['object_id']); - $data->count = $r['count']; - $data->format(); - $data->f_name = $data->f_link; - $items[] = $data; - } - /* If it's a genre */ - elseif ($type == 'genre') { - $data = new Genre($r['object_id']); - $data->count = $r['count']; - $data->format(); - $data->f_name = $data->f_link; - $items[] = $data; - } - - } // end foreach - - return $items; - - } // get_favorites - - /** - * get_recommendations - * This returns recommended objects of $type. The recommendations - * are based on voodoo economics,the phase of the moon and my current BAL. - */ - function get_recommendations($type) { - - /* First pull all of your ratings of this type */ - $sql = "SELECT object_id,user_rating FROM ratings " . - "WHERE object_type='" . Dba::escape($type) . "' AND user='" . Dba::escape($this->id) . "'"; - $db_results = Dba::read($sql); - - // Incase they only have one user - $users = array(); - - while ($r = Dba::fetch_assoc($db_results)) { - /* Store the fact that you rated this */ - $key = $r['object_id']; - $ratings[$key] = true; - - /* Build a key'd array of users with this same rating */ - $sql = "SELECT user FROM ratings WHERE object_type='" . Dba::escape($type) . "' " . - "AND user !='" . Dba::escape($this->id) . "' AND object_id='" . Dba::escape($r['object_id']) . "' " . - "AND user_rating ='" . Dba::escape($r['user_rating']) . "'"; - $user_results = Dba::read($sql); - - while ($user_info = Dba::fetch_assoc($user_results)) { - $key = $user_info['user']; - $users[$key]++; - } - - } // end while - - /* now we've got your ratings, and all users and the # of ratings that match your ratings - * sort the users[$key] array by value and then find things they've rated high (4+) that you - * haven't rated - */ - $recommendations = array(); - asort($users); - - foreach ($users as $user_id=>$score) { - - /* Find everything they've rated at 4+ */ - $sql = "SELECT object_id,user_rating FROM ratings " . - "WHERE user='" . Dba::escape($user_id) . "' AND user_rating >='4' AND " . - "object_type = '" . Dba::escape($type) . "' ORDER BY user_rating DESC"; - $db_results = Dba::read($sql); - - while ($r = Dba::fetch_assoc($db_results)) { - $key = $r['object_id']; - if (isset($ratings[$key])) { continue; } - - /* Let's only get 5 total for now */ - if (count($recommendations) > 5) { return $recommendations; } - - $recommendations[$key] = $r['user_rating']; - - } // end while - - - } // end foreach users - - return $recommendations; - - } // get_recommendations - - /** - * is_logged_in - * checks to see if $this user is logged in returns their current IP if they - * are logged in - */ - public function is_logged_in() { - - $username = Dba::escape($this->username); - - $sql = "SELECT `id`,`ip` FROM `session` WHERE `username`='$username'" . - " AND `expire` > ". time(); - $db_results = Dba::read($sql); - - if ($row = Dba::fetch_assoc($db_results)) { - $ip = $row['ip'] ? $row['ip'] : NULL; - return $ip; - } - - return false; - - } // is_logged_in + if (!$system) { + $user_limit = "AND preference.catagory != 'system'"; + } + + if ($type != '0') { + $user_limit = "AND preference.catagory = '" . Dba::escape($type) . "'"; + } + + + $sql = "SELECT preference.name, preference.description, preference.catagory, preference.level, user_preference.value " . + "FROM preference INNER JOIN user_preference ON user_preference.preference=preference.id " . + "WHERE user_preference.user='$user_id' " . $user_limit . + " ORDER BY preference.catagory, preference.description"; + + $db_results = Dba::read($sql); + + /* Ok this is crapy, need to clean this up or improve the code FIXME */ + while ($r = Dba::fetch_assoc($db_results)) { + $type = $r['catagory']; + $admin = false; + if ($type == 'system') { $admin = true; } + $type_array[$type][$r['name']] = array('name'=>$r['name'],'level'=>$r['level'],'description'=>$r['description'],'value'=>$r['value']); + $results[$type] = array ('title'=>ucwords($type),'admin'=>$admin,'prefs'=>$type_array[$type]); + } // end while + + return $results; + + } // get_preferences + + /** + * set_preferences + * sets the prefs for this specific user + */ + public function set_preferences() { + + $user_id = Dba::escape($this->id); + + $sql = "SELECT preference.name,user_preference.value FROM preference,user_preference WHERE user_preference.user='$user_id' " . + "AND user_preference.preference=preference.id AND preference.type != 'system'"; + $db_results = Dba::read($sql); + + while ($r = Dba::fetch_assoc($db_results)) { + $key = $r['name']; + $this->prefs[$key] = $r['value']; + } + } // set_preferences + + /** + * get_favorites + * returns an array of your $type favorites + */ + function get_favorites($type) { + + $web_path = Config::get('web_path'); + + $results = Stats::get_user(Config::get('popular_threshold'),$type,$this->id,1); + + $items = array(); + + foreach ($results as $r) { + /* If its a song */ + if ($type == 'song') { + $data = new Song($r['object_id']); + $data->count = $r['count']; + $data->format(); + $data->f_name = $data->f_link; + $items[] = $data; + } + /* If its an album */ + elseif ($type == 'album') { + $data = new Album($r['object_id']); + $data->count = $r['count']; + $data->format(); + $items[] = $data; + } + /* If its an artist */ + elseif ($type == 'artist') { + $data = new Artist($r['object_id']); + $data->count = $r['count']; + $data->format(); + $data->f_name = $data->f_link; + $items[] = $data; + } + /* If it's a genre */ + elseif ($type == 'genre') { + $data = new Genre($r['object_id']); + $data->count = $r['count']; + $data->format(); + $data->f_name = $data->f_link; + $items[] = $data; + } + + } // end foreach + + return $items; + + } // get_favorites + + /** + * get_recommendations + * This returns recommended objects of $type. The recommendations + * are based on voodoo economics,the phase of the moon and my current BAL. + */ + function get_recommendations($type) { + + /* First pull all of your ratings of this type */ + $sql = "SELECT object_id,user_rating FROM ratings " . + "WHERE object_type='" . Dba::escape($type) . "' AND user='" . Dba::escape($this->id) . "'"; + $db_results = Dba::read($sql); + + // Incase they only have one user + $users = array(); + + while ($r = Dba::fetch_assoc($db_results)) { + /* Store the fact that you rated this */ + $key = $r['object_id']; + $ratings[$key] = true; + + /* Build a key'd array of users with this same rating */ + $sql = "SELECT user FROM ratings WHERE object_type='" . Dba::escape($type) . "' " . + "AND user !='" . Dba::escape($this->id) . "' AND object_id='" . Dba::escape($r['object_id']) . "' " . + "AND user_rating ='" . Dba::escape($r['user_rating']) . "'"; + $user_results = Dba::read($sql); + + while ($user_info = Dba::fetch_assoc($user_results)) { + $key = $user_info['user']; + $users[$key]++; + } + + } // end while + + /* now we've got your ratings, and all users and the # of ratings that match your ratings + * sort the users[$key] array by value and then find things they've rated high (4+) that you + * haven't rated + */ + $recommendations = array(); + asort($users); + + foreach ($users as $user_id=>$score) { + + /* Find everything they've rated at 4+ */ + $sql = "SELECT object_id,user_rating FROM ratings " . + "WHERE user='" . Dba::escape($user_id) . "' AND user_rating >='4' AND " . + "object_type = '" . Dba::escape($type) . "' ORDER BY user_rating DESC"; + $db_results = Dba::read($sql); + + while ($r = Dba::fetch_assoc($db_results)) { + $key = $r['object_id']; + if (isset($ratings[$key])) { continue; } + + /* Let's only get 5 total for now */ + if (count($recommendations) > 5) { return $recommendations; } + + $recommendations[$key] = $r['user_rating']; + + } // end while + + + } // end foreach users + + return $recommendations; + + } // get_recommendations + + /** + * is_logged_in + * checks to see if $this user is logged in returns their current IP if they + * are logged in + */ + public function is_logged_in() { + + $username = Dba::escape($this->username); + + $sql = "SELECT `id`,`ip` FROM `session` WHERE `username`='$username'" . + " AND `expire` > ". time(); + $db_results = Dba::read($sql); + + if ($row = Dba::fetch_assoc($db_results)) { + $ip = $row['ip'] ? $row['ip'] : NULL; + return $ip; + } + + return false; + + } // is_logged_in - /** - * has_access - * this function checkes to see if this user has access - * to the passed action (pass a level requirement) - */ - function has_access($needed_level) { + /** + * has_access + * this function checkes to see if this user has access + * to the passed action (pass a level requirement) + */ + function has_access($needed_level) { - if (!Config::get('use_auth') || Config::get('demo_mode')) { return true; } + if (!Config::get('use_auth') || Config::get('demo_mode')) { return true; } - if ($this->access >= $needed_level) { return true; } + if ($this->access >= $needed_level) { return true; } - return false; + return false; - } // has_access + } // has_access - /** - * update - * This function is an all encompasing update function that - * calls the mini ones does all the error checking and all that - * good stuff - */ - public function update($data) { + /** + * update + * This function is an all encompasing update function that + * calls the mini ones does all the error checking and all that + * good stuff + */ + public function update($data) { - if (empty($data['username'])) { - Error::add('username', T_('Error Username Required')); - } + if (empty($data['username'])) { + Error::add('username', T_('Error Username Required')); + } - if ($data['password1'] != $data['password2'] AND !empty($data['password1'])) { - Error::add('password', T_("Error Passwords don't match")); - } + if ($data['password1'] != $data['password2'] AND !empty($data['password1'])) { + Error::add('password', T_("Error Passwords don't match")); + } - if (Error::occurred()) { - return false; - } + if (Error::occurred()) { + return false; + } - foreach ($data as $name=>$value) { - switch ($name) { - case 'password1'; - $name = 'password'; - case 'access': - case 'email': - case 'username': - case 'fullname'; - if ($this->$name != $value) { - $function = 'update_' . $name; - $this->$function($value); - } - break; - default: - // Rien a faire - break; - } // end switch on field + foreach ($data as $name=>$value) { + switch ($name) { + case 'password1'; + $name = 'password'; + case 'access': + case 'email': + case 'username': + case 'fullname'; + if ($this->$name != $value) { + $function = 'update_' . $name; + $this->$function($value); + } + break; + default: + // Rien a faire + break; + } // end switch on field - } // end foreach + } // end foreach - return true; + return true; - } // update + } // update - /** - * update_username - * updates their username - */ - public function update_username($new_username) { + /** + * update_username + * updates their username + */ + public function update_username($new_username) { - $new_username = Dba::escape($new_username); - $sql = "UPDATE `user` SET `username`='$new_username' WHERE `id`='$this->id'"; - $this->username = $new_username; - $db_results = Dba::write($sql); + $new_username = Dba::escape($new_username); + $sql = "UPDATE `user` SET `username`='$new_username' WHERE `id`='$this->id'"; + $this->username = $new_username; + $db_results = Dba::write($sql); - } // update_username + } // update_username - /** - * update_validation - * This is used by the registration mumbojumbo - * Use this function to update the validation key - * NOTE: crap this doesn't have update_item the humanity of it all - */ - public function update_validation($new_validation) { + /** + * update_validation + * This is used by the registration mumbojumbo + * Use this function to update the validation key + * NOTE: crap this doesn't have update_item the humanity of it all + */ + public function update_validation($new_validation) { - $new_validation = Dba::escape($new_validation); - $sql = "UPDATE `user` SET `validation`='$new_validation', `disabled`='1' WHERE `id`='" . Dba::escape($this->id) . "'"; - $db_results = Dba::write($sql); - $this->validation = $new_validation; + $new_validation = Dba::escape($new_validation); + $sql = "UPDATE `user` SET `validation`='$new_validation', `disabled`='1' WHERE `id`='" . Dba::escape($this->id) . "'"; + $db_results = Dba::write($sql); + $this->validation = $new_validation; - return $db_results; + return $db_results; - } // update_validation + } // update_validation - /** - * update_fullname - * updates their fullname - */ - public function update_fullname($new_fullname) { + /** + * update_fullname + * updates their fullname + */ + public function update_fullname($new_fullname) { - $new_fullname = Dba::escape($new_fullname); - $sql = "UPDATE `user` SET `fullname`='$new_fullname' WHERE `id`='$this->id'"; - $db_results = Dba::write($sql); - - } // update_fullname - - /** - * update_email - * updates their email address - */ - public function update_email($new_email) { + $new_fullname = Dba::escape($new_fullname); + $sql = "UPDATE `user` SET `fullname`='$new_fullname' WHERE `id`='$this->id'"; + $db_results = Dba::write($sql); + + } // update_fullname + + /** + * update_email + * updates their email address + */ + public function update_email($new_email) { - $new_email = Dba::escape($new_email); - $sql = "UPDATE `user` SET `email`='$new_email' WHERE `id`='$this->id'"; - $db_results = Dba::write($sql); + $new_email = Dba::escape($new_email); + $sql = "UPDATE `user` SET `email`='$new_email' WHERE `id`='$this->id'"; + $db_results = Dba::write($sql); - } // update_email - - /** - * disable - * This disables the current user - */ - public function disable() { - - // Make sure we aren't disabling the last admin - $sql = "SELECT `id` FROM `user` WHERE `disabled` = '0' AND `id` != '" . $this->id . "' AND `access`='100'"; - $db_results = Dba::read($sql); - - if (!Dba::num_rows($db_results)) { return false; } - - $sql = "UPDATE `user` SET `disabled`='1' WHERE id='" . $this->id . "'"; - $db_results = Dba::write($sql); - - // Delete any sessions they may have - $sql = "DELETE FROM `session` WHERE `username`='" . Dba::escape($this->username) . "'"; - $db_results = Dba::write($sql); - - return true; - - } // disable - - /** - * enable - * this enables the current user - */ - public function enable() { - - $sql = "UPDATE `user` SET `disabled`='0' WHERE id='" . $this->id . "'"; - $db_results = Dba::write($sql); + } // update_email + + /** + * disable + * This disables the current user + */ + public function disable() { + + // Make sure we aren't disabling the last admin + $sql = "SELECT `id` FROM `user` WHERE `disabled` = '0' AND `id` != '" . $this->id . "' AND `access`='100'"; + $db_results = Dba::read($sql); + + if (!Dba::num_rows($db_results)) { return false; } + + $sql = "UPDATE `user` SET `disabled`='1' WHERE id='" . $this->id . "'"; + $db_results = Dba::write($sql); + + // Delete any sessions they may have + $sql = "DELETE FROM `session` WHERE `username`='" . Dba::escape($this->username) . "'"; + $db_results = Dba::write($sql); + + return true; + + } // disable + + /** + * enable + * this enables the current user + */ + public function enable() { + + $sql = "UPDATE `user` SET `disabled`='0' WHERE id='" . $this->id . "'"; + $db_results = Dba::write($sql); - return true; + return true; - } // enable + } // enable - /** - * update_access - * updates their access level - */ - public function update_access($new_access) { + /** + * update_access + * updates their access level + */ + public function update_access($new_access) { - /* Prevent Only User accounts */ - if ($new_access < '100') { - $sql = "SELECT `id` FROM user WHERE `access`='100' AND `id` != '$this->id'"; - $db_results = Dba::read($sql); - if (!Dba::num_rows($db_results)) { return false; } - } - - $new_access = Dba::escape($new_access); - $sql = "UPDATE `user` SET `access`='$new_access' WHERE `id`='$this->id'"; - $db_results = Dba::write($sql); - - } // update_access - - /*! - @function update_last_seen - @discussion updates the last seen data for this user - */ - function update_last_seen() { - - $sql = "UPDATE user SET last_seen='" . time() . "' WHERE `id`='$this->id'"; - $db_results = Dba::write($sql); + /* Prevent Only User accounts */ + if ($new_access < '100') { + $sql = "SELECT `id` FROM user WHERE `access`='100' AND `id` != '$this->id'"; + $db_results = Dba::read($sql); + if (!Dba::num_rows($db_results)) { return false; } + } + + $new_access = Dba::escape($new_access); + $sql = "UPDATE `user` SET `access`='$new_access' WHERE `id`='$this->id'"; + $db_results = Dba::write($sql); + + } // update_access + + /*! + @function update_last_seen + @discussion updates the last seen data for this user + */ + function update_last_seen() { + + $sql = "UPDATE user SET last_seen='" . time() . "' WHERE `id`='$this->id'"; + $db_results = Dba::write($sql); - } // update_last_seen + } // update_last_seen - /** - * update_user_stats - * updates the playcount mojo for this specific user - */ - public function update_stats($song_id) { + /** + * update_user_stats + * updates the playcount mojo for this specific user + */ + public function update_stats($song_id) { - $song_info = new Song($song_id); - $song_info->format(); - $user = $this->id; + $song_info = new Song($song_id); + $song_info->format(); + $user = $this->id; - if (!strlen($song_info->file)) { return false; } + if (!strlen($song_info->file)) { return false; } - $this->set_preferences(); + $this->set_preferences(); - foreach (Plugin::get_plugins('save_songplay') as $plugin_name) { - $plugin = new Plugin($plugin_name); - if ($plugin->load()) { - $plugin->_plugin->save_songplay($song_info); - } - } + foreach (Plugin::get_plugins('save_songplay') as $plugin_name) { + $plugin = new Plugin($plugin_name); + if ($plugin->load()) { + $plugin->_plugin->save_songplay($song_info); + } + } - // Do this last so the 'last played checks are correct' - Stats::insert('song',$song_id,$user); - Stats::insert('album',$song_info->album,$user); - Stats::insert('artist',$song_info->artist,$user); + // Do this last so the 'last played checks are correct' + Stats::insert('song',$song_id,$user); + Stats::insert('album',$song_info->album,$user); + Stats::insert('artist',$song_info->artist,$user); - return true; + return true; - } // update_stats + } // update_stats - /** - * insert_ip_history - * This inserts a row into the IP History recording this user at this - * address at this time in this place, doing this thing.. you get the point - */ - public function insert_ip_history() { + /** + * insert_ip_history + * This inserts a row into the IP History recording this user at this + * address at this time in this place, doing this thing.. you get the point + */ + public function insert_ip_history() { - if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])){ - $sip = $_SERVER['HTTP_X_FORWARDED_FOR']; - debug_event('User Ip', 'Login from ip adress: ' . $sip,'3'); - } - else { - $sip = $_SERVER['REMOTE_ADDR']; - debug_event('User Ip', 'Login from ip adress: ' . $sip,'3'); - } + if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])){ + $sip = $_SERVER['HTTP_X_FORWARDED_FOR']; + debug_event('User Ip', 'Login from ip adress: ' . $sip,'3'); + } + else { + $sip = $_SERVER['REMOTE_ADDR']; + debug_event('User Ip', 'Login from ip adress: ' . $sip,'3'); + } - $ip = Dba::escape(inet_pton($sip)); - $date = time(); - $user = $this->id; - $agent = Dba::escape($_SERVER['HTTP_USER_AGENT']); - - $sql = "INSERT INTO `ip_history` (`ip`,`user`,`date`,`agent`) VALUES ('$ip','$user','$date','$agent')"; - $db_results = Dba::write($sql); - - /* Clean up old records... sometimes */ - if (rand(1,100) > 60) { - $date = time() - (86400*Config::get('user_ip_cardinality')); - $sql = "DELETE FROM `ip_history` WHERE `date` < $date"; - $db_results = Dba::write($sql); - } - - return true; - - } // insert_ip_history - - /** - * create - * inserts a new user into ampache - */ - public static function create($username, $fullname, $email, $password, $access, $disabled = false) { - - /* Lets clean up the fields... */ - $username = Dba::escape($username); - $fullname = Dba::escape($fullname); - $email = Dba::escape($email); - $access = Dba::escape($access); - $password = hash('sha256', $password); - $disabled = $disabled ? 1 : 0; - - /* Now Insert this new user */ - $sql = "INSERT INTO `user` (`username`, `disabled`, " . - "`fullname`, `email`, `password`, `access`, " . - "`create_date`)" . - "VALUES('$username', '$disabled', '$fullname', " . - "'$email', '$password', '$access', '" . time() ."')"; - $db_results = Dba::write($sql); - - if (!$db_results) { return false; } - - // Get the insert_id - $insert_id = Dba::insert_id(); - - /* Populates any missing preferences, in this case all of them */ - self::fix_preferences($insert_id); - - return $insert_id; - - } // create - - /** - * update_password - * updates a users password - */ - public function update_password($new_password) { - - $new_password = hash('sha256',$new_password); - - $new_password = Dba::escape($new_password); - $sql = "UPDATE `user` SET `password`='$new_password' WHERE `id`='$this->id'"; - $db_results = Dba::write($sql); - - // Clear this (temp fix) - if ($db_results) { unset($_SESSION['userdata']['password']); } - - } // update_password - - /** - * format - * This function sets up the extra variables we need when we are displaying a - * user for an admin, these should not be normally called when creating a - * user object - */ - public function format() { - - /* If they have a last seen date */ - if (!$this->last_seen) { $this->f_last_seen = T_('Never'); } - else { $this->f_last_seen = date("m\/d\/Y - H:i",$this->last_seen); } - - /* If they have a create date */ - if (!$this->create_date) { $this->f_create_date = T_('Unknown'); } - else { $this->f_create_date = date("m\/d\/Y - H:i",$this->create_date); } - - // Base link - $this->f_link = '' . $this->fullname . ''; - - /* Calculate their total Bandwidth Useage */ - $sql = "SELECT `song`.`size` FROM `song` LEFT JOIN `object_count` ON `song`.`id`=`object_count`.`object_id` " . - "WHERE `object_count`.`user`='$this->id' AND `object_count`.`object_type`='song'"; - $db_results = Dba::read($sql); - - while ($r = Dba::fetch_assoc($db_results)) { - $total = $total + $r['size']; - } - - $this->f_useage = UI::format_bytes($total); - - /* Get Users Last ip */ - if (count($data = $this->get_ip_history(1))) { - $this->ip_history = inet_ntop($data['0']['ip']); - } - else { - $this->ip_history = T_('Not Enough Data'); - } - - } // format_user - - /** - * format_favorites - * takes an array of objects and formats them corrrectly - * and returns a simply array with just count); - - // Go through the favs - foreach ($items as $data) { - - // Make all number lengths equal - $len = strlen($data->count); - while ($len < $maxlen) { - $data->count = "0" . $data->count; - $len++; - } - - $item = "[$data->count] - $data->f_name"; - $results[]->f_name_link = $item; - } // end foreach items - - return $results; - - } // format_favorites - - /** - * format_recommendations - * This takes an array of [object_id] = ratings - * and displays them in a semi-pretty format - */ - function format_recommendations($items,$type) { - - foreach ($items as $object_id=>$rating) { - - switch ($type) { - case 'artist': - $object = new Artist($object_id); - $object->format_artist(); - $name = $object->link; - break; - case 'album': - $object = new Album($object_id); - $object->format_album(); - $name = $object->f_link; - break; - case 'song': - $object = new Song($object_id); - $object->format_song(); - $name = $object->f_link; - break; - } // end switch on type - $results[] = "\n
\n
', - strip_tags($tags['lyrics'])); - - $info['track'] = $info['track'] ?: intval($tags['track']); - $info['resolution_x'] = $info['resolution_x'] ?: intval($tags['resolution_x']); - $info['resolution_y'] = $info['resolution_y'] ?: intval($tags['resolution_y']); - $info['audio_codec'] = $info['audio_codec'] ?: Dba::escape($tags['audio_codec']); - $info['video_codec'] = $info['video_codec'] ?: Dba::escape($tags['video_codec']); - } - - if ($info['totaldiscs'] == 1 && $info['disk'] == 1) { - unset($info['disk']); - unset($info['totaldiscs']); - } - - return $info; - - } // clean_tag_info - - /** - * _get_type - * This function takes the raw information and figures out - * what type of file we are dealing with for use by the tag - * function - */ - public function _get_type() { - - /* There are a few places that the file type can - * come from, in the end we trust the encoding - * type - */ - if ($type = $this->_raw['video']['dataformat']) { - $type = $this->_clean_type($type); - return $type; - } - if ($type = $this->_raw['audio']['streams']['0']['dataformat']) { - $type = $this->_clean_type($type); - return $type; - } - if ($type = $this->_raw['audio']['dataformat']) { - $type = $this->_clean_type($type); - return $type; - } - if ($type = $this->_raw['fileformat']) { - $type = $this->_clean_type($type); - return $type; - } - - return false; - - } // _get_type - - - /** - * _get_tags - * This function takes the raw information and the type and - * attempts to gather the tags and then normalize them into - * ['tag_name']['var'] = value - */ - public function _get_tags() { - - $results = array(); - - /* The tags can come in many different shapes and colors - * depending on the encoding time of day and phase of the moon. - */ - foreach ($this->_raw['tags'] as $key => $tag_array) { - switch ($key) { - case 'vorbiscomment': - debug_event('_get_tags', 'Parsing vorbis', '5'); - $results[$key] = $this->_parse_vorbiscomment($tag_array); - break; - case 'id3v1': - debug_event('_get_tags', 'Parsing id3v1', '5'); - $results[$key] = $this->_parse_id3v1($tag_array); - break; - case 'id3v2': - debug_event('_get_tags', 'Parsing id3v2', '5'); - $results[$key] = $this->_parse_id3v2($tag_array); - break; - case 'ape': - debug_event('_get_tags', 'Parsing ape', '5'); - $results[$key] = $this->_parse_ape($tag_array); - break; - case 'quicktime': - debug_event('_get_tags', 'Parsing quicktime', '5'); - $results[$key] = $this->_parse_quicktime($tag_array); - break; - case 'riff': - debug_event('_get_tags', 'Parsing riff', '5'); - $results[$key] = $this->_parse_riff($tag_array); - break; - case 'flv': - debug_event('_get_tags', 'Parsing flv', '5'); - $results[$key] = $this->_parse_flv($this->_raw); - break; - case 'mpg': - case 'mpeg': - debug_event('_get_tags', 'Parsing MPEG', '5'); - $results['mpeg'] = $this->_parse_mpg($this->_raw); - break; - case 'asf': - case 'wmv': - debug_event('_get_tags', 'Parsing WMV/WMA/ASF', '5'); - $results['asf'] = $this->_parse_wmv($this->_raw); - break; - case 'avi': - debug_event('_get_tags', 'Parsing avi', '5'); - $results[$key] = $this->_parse_avi($this->_raw); - break; - case 'lyrics3': - debug_event('_get_tags', 'Parsing lyrics3', '5'); - $results[$key] = $this->_parse_lyrics($tag_array); - break; - default: - debug_event('vainfo','Error: Unable to determine tag type of ' . $key . ' for file ' . $this->filename . ' Assuming id3v2','5'); - $results[$key] = $this->_parse_id3v2($this->_raw['id3v2']['comments']); - break; - } // end switch - } // end foreach - - - $cleaned = self::clean_tag_info($results, self::get_tag_type($results, 'getid3_tag_order'), $this->filename); - $cleaned = array_merge($cleaned, $this->_get_info()); - $cleaned['raw'] = $results; - - return $cleaned; - - } // _get_tags - - /** - * _get_plugin_tags - * Get additional metadata from plugins - */ - private function _get_plugin_tags() { - $tag_order = Config::get('metadata_order'); - if (!is_array($tag_order)) { - $tag_order = array($tag_order); - } - - $plugin_names = Plugin::get_plugins('get_metadata'); - foreach ($tag_order as $key => $tag_source) { - if (in_array($tag_source, $plugin_names)) { - $plugin = new Plugin($tag_source); - if ($plugin->load()) { - $this->tags[$tag_source] = $plugin->_plugin->get_metadata(self::clean_tag_info($this->tags, self::get_tag_type($this->tags), $this->filename)); - } - } - } - } // _get_plugin_tags - - /** - * _get_info - * Gather and return the general information about a song (vbr/cbr, - * sample rate, channels, etc.) - */ - private function _get_info() { - - $array = array(); - - /* Try to pull the information directly from - * the audio array - */ - if ($this->_raw['audio']['bitrate_mode']) { - $array['mode'] = $this->_raw['audio']['bitrate_mode']; - if ($array['mode'] == 'con') { - $array['mode'] = 'cbr'; - } - } - if ($this->_raw['audio']['bitrate']) { - $array['bitrate'] = $this->_raw['audio']['bitrate']; - } - if ($this->_raw['audio']['channels']) { - $array['channels'] = intval($this->_raw['audio']['channels']); - } - if ($this->_raw['audio']['sample_rate']) { - $array['rate'] = intval($this->_raw['audio']['sample_rate']); - } - if ($this->_raw['filesize']) { - $array['size'] = intval($this->_raw['filesize']); - } - if ($this->_raw['encoding']) { - $array['encoding'] = $this->_raw['encoding']; - } - if ($this->_raw['mime_type']) { - $array['mime'] = $this->_raw['mime_type']; - } - if ($this->_raw['playtime_seconds']) { - $array['time'] = $this->_raw['playtime_seconds']; - } - - return $array; - - } // _get_info - - /** - * _clean_type - * This standardizes the type that we are given into a recognized type. - */ - private function _clean_type($type) { - - switch ($type) { - case 'mp3': - case 'mp2': - case 'mpeg3': - return 'mp3'; - break; - case 'vorbis': - return 'ogg'; - break; - case 'flac': - case 'flv': - case 'mpg': - case 'mpeg': - case 'asf': - case 'wmv': - case 'avi': - case 'quicktime': - return $type; - default: - /* Log the fact that we couldn't figure it out */ - debug_event('vainfo','Unable to determine file type from ' . $type . ' on file ' . $this->filename,'5'); - return $type; - break; - } // end switch on type - - } // _clean_type - - /** - * _parse_lyrics - * This function takes a lyrics3 from getid3() - * nothing to do? - */ - private function _parse_lyrics($tags) { - - /* Results array */ - $array = array(); - - /* go through them all! */ - foreach ($tags as $tag => $data) { - if ($tag == 'unsynchedlyrics' || $tag == 'unsynchronised lyric') { - $tag = 'lyrics'; - } - $array[$tag] = $this->_clean_tag($data['0']); - - } // end foreach - - return $array; - - } // _parse_lyrics - - /** - * _parse_vorbiscomment - * This function takes a vorbiscomment from getid3() and then - * returns the elements translated using iconv if needed in a - * pretty little format - */ - private function _parse_vorbiscomment($tags) { - - /* Results array */ - $array = array(); - - /* go through them all! */ - foreach ($tags as $tag=>$data) { - - /* We need to translate a few of these tags */ - switch ($tag) { - - case 'genre': - // multiple genre support - foreach($data as $foo) { - $array['genre'][] = $this->_clean_tag($foo,''); - } - break; - case 'tracknumber': - $array['track'] = $this->_clean_tag($data['0']); - break; - case 'discnumber': - $el = explode('/', $data['0']); - $array['disk'] = $el[0]; - break; - case 'date': - $array['year'] = $this->_clean_tag($data['0']); - break; - default: - $array[$tag] = $this->_clean_tag($data['0']); - break; - } // end switch - - } // end foreach - - return $array; - - } // _parse_vorbiscomment - - /** - * _parse_id3v1 - * This function takes an id3v1 tag set from getid3() and then - * returns the elements (translated using iconv if needed) in a - * pretty little format. - */ - private function _parse_id3v1($tags) { - - $array = array(); - - /* Go through all the tags */ - foreach ($tags as $tag=>$data) { - - /* This is our baseline for naming - * so no translation needed - */ - $array[$tag] = $this->_clean_tag($data['0']); - - } // end foreach - - return $array; - - } // _parse_id3v1 - - /** - * _parse_id3v2 - * This function takes an id3v2 tag set from getid3() and then - * returns the elements (translated using iconv if needed) in a - * pretty little format. - */ - private function _parse_id3v2($tags) { - - $array = array(); - - /* Go through the tags */ - foreach ($tags as $tag=>$data) { - - /** - * the new getid3 handles this differently - * so we now need to account for it :( - */ - switch ($tag) { - case 'genre': - // multiple genre support - foreach($data as $genre) { - $array['genre'][] = $this->_clean_tag($genre); - } - break; - case 'part_of_a_set': - $el = explode('/', $data['0']); - $array['disk'] = $el[0]; - $array['totaldiscs'] = $el[1]; - break; - case 'track_number': - $array['track'] = $this->_clean_tag($data['0']); - break; - case 'comments': - $array['comment'] = $this->_clean_tag($data['0']); - break; - default: - $array[$tag] = $this->_clean_tag($data['0']); - break; - } // end switch on tag - - } // end foreach - - $id3v2 = $this->_raw['id3v2']; - - if(!empty($id3v2['UFID'])) { - // Find the MBID for the track - foreach ($id3v2['UFID'] as $ufid) { - if ($ufid['ownerid'] == 'http://musicbrainz.org') { - $array['mb_trackid'] = $this->_clean_tag($ufid['data']); - } - } - - // Find the MBIDs for the album and artist - foreach ($id3v2['TXXX'] as $txxx) { - switch ($txxx['description']) { - case 'MusicBrainz Album Id': - $array['mb_albumid'] = $this->_clean_tag($txxx['data']); - break; - case 'MusicBrainz Artist Id': - $array['mb_artistid'] = $this->_clean_tag($txxx['data']); - break; - } - } - } - - // Find the rating - if (is_array($id3v2['POPM'])) { - foreach ($id3v2['POPM'] as $popm) { - if (array_key_exists('email', $popm) && - $user = User::get_from_email($popm['email'])) { - // Ratings are out of 255; scale it - $array['rating'][$user->id] = $popm['rating'] / 255 * 5; - } - } - } - - return $array; - - } // _parse_id3v2 - - /** - * _parse_ape - * This function takes ape tags set by getid3() and then - * returns the elements translated using iconv if needed in a - * pretty little format - */ - private function _parse_ape($tags) { - - foreach ($tags as $tag=>$data) { - switch ($tag) { - - case 'genre': - // multiple genre support - foreach($data as $genre) { - $array['genre'][] = $this->_clean_tag($genre); - } - break; - - default: - $array[$tag] = $this->_clean_tag($data['0'], $this->_file_encoding); - break; - } // end switch on tag - - } // end foreach tags - - return $array; - - } // _parse_ape - - /** - * _parse_riff - * this function takes the riff take information passed by getid3() and - * then reformats it so that it matches the other formats. May require iconv - */ - private function _parse_riff($tags) { - - foreach ($tags as $tag=>$data) { - - switch ($tag) { - case 'product': - $array['album'] = $this->_clean_tag($data['0'], $this->_file_encoding); - break; - default: - $array[$tag] = $this->_clean_tag($data['0'], $this->_file_encoding); - break; - } // end switch on tag - - } // foreach tags - - return $array; - - } // _parse_riff - - /** - * _parse_quicktime - * this function takes the quicktime tags set by getid3() and then - * returns the elements translated using iconv if needed in a - * pretty little format - */ - private function _parse_quicktime($tags) { - - /* Results array */ - $array = array(); - - /* go through them all! */ - foreach ($tags as $tag=>$data) { - - /* We need to translate a few of these tags */ - switch ($tag) { - case 'creation_date': - if (strlen($data['0']) > 4) { - /* Weird Date format, attempt to normalize */ - $data['0'] = date("Y",strtotime($data['0'])); - } - $array['year'] = $this->_clean_tag($data['0']); - break; - case 'MusicBrainz Track Id': - $array['mb_trackid'] = $this->_clean_tag($data['0']); - break; - case 'MusicBrainz Album Id': - $array['mb_albumid'] = $this->_clean_tag($data['0']); - break; - case 'MusicBrainz Artist Id': - $array['mb_artistid'] = $this->_clean_tag($data['0']); - break; - } // end switch - - $array[$tag] = $this->_clean_tag($data['0']); - - } // end foreach - - // Also add in any video related stuff we might find - if (strpos($this->_raw['mime_type'], 'video') !== false) { - $info = $this->_parse_avi($this->_raw); - $info['video_codec'] = $this->_raw['quicktime']['ftyp']['fourcc']; - $array = array_merge($info, $array); - } - - return $array; - - } // _parse_quicktime - - /** - * _parse_avi - * This attempts to parse our the information on an avi file and present it in some - * kind of sane format, this is a little hard as these files don't have tags - */ - private function _parse_avi($tags) { - - $array = array(); - - $array['title'] = urldecode($this->_pathinfo['filename']); - $array['video_codec'] = $tags['video']['fourcc']; - $array['audio_codec'] = $tags['audio']['dataformat']; - $array['resolution_x'] = $tags['video']['resolution_x']; - $array['resolution_y'] = $tags['video']['resolution_y']; - $array['mime'] = $tags['mime_type']; - $array['comment'] = $tags['video']['codec']; - - return $array; - - } // _parse_avi - - /** - * _parse_mpg - * This attempts to parse our the information on a mpg file and present it in some - * kind of sane format, this is a little hard as these files don't have tags - */ - private function _parse_mpg($tags) { - - $array = array(); - - $array['title'] = urldecode($this->_pathinfo['filename']); - $array['video_codec'] = $tags['video']['codec']; - $array['audio_codec'] = $tags['audio']['dataformat']; - $array['resolution_x'] = $tags['video']['resolution_x']; - $array['resolution_y'] = $tags['video']['resolution_y']; - $array['mime'] = $tags['mime_type']; - $array['comment'] = $tags['video']['codec']; - - return $array; - - } // _parse_mpg - - /** - * _parse_wmv - * This attempts to parse our the information on a asf/wmv file and present it in some - * kind of sane format, this is a little hard as these files don't have tags - */ - private function _parse_wmv($tags) { - - $array = array(); - - $array['mime'] = $tags['mime_type']; - - switch($array['mime']) { - default: - case 'video/x-ms-wmv': - if(isset($tags['tags']['asf']['title']['0'])) { - $array['title'] = $tags['tags']['asf']['title']['0']; - } - else { - $array['title'] = urldecode($this->_pathinfo['filename']); - } - $array['video_codec'] = $tags['video']['streams']['2']['codec']; - $array['audio_codec'] = $tags['audio']['streams']['1']['codec']; - $array['resolution_x'] = $tags['video']['streams']['2']['resolution_x']; - $array['resolution_y'] = $tags['video']['streams']['2']['resolution_y']; - $array['comment'] = $tags['tags']['asf']['title']['1']; - break; - } - - foreach($tags['tags']['asf'] as $tag => $data) { - $array[$tag] = $this->_clean_tag($data['0']); - } - - return $array; - - } // _parse_wmv - - /** - * _parse_flv - * This attempts to parse our the information on an flv file and present it in some - * kind of sane format, this is a little hard as these files don't have tags - */ - private function _parse_flv($tags) { - - $array = array(); - - $array['title'] = urldecode($this->_pathinfo['filename']); - $array['video_codec'] = $tags['video']['codec']; - $array['audio_codec'] = $tags['audio']['dataformat']; - $array['resolution_x'] = $tags['video']['resolution_x']; - $array['resolution_y'] = $tags['video']['resolution_y']; - $array['mime'] = $tags['mime_type']; - $array['comment'] = $tags['video']['codec']; - - return $array; - - } // _parse_flv - - /** - * _parse_filename - * - * This function uses the passed file and dir patterns - * To pull out extra tag information and populate it into - * its own array - * - * @param string $filename Filename that want to parse - * @return array Parsed results - */ - private function _parse_filename($filename) { - - $results = array(); - - // Correctly detect the slash we need to use here - if (strpos($filename, '/') !== false) { - $slash_type = '/'; - } - else { - $slash_type = '\\'; - } - - // Combine the patterns - $pattern = preg_quote($this->_dir_pattern) . $slash_type . preg_quote($this->_file_pattern); - - // Pull out the pattern codes into an array - preg_match_all('/\%\w/', $pattern, $elements); - - // Mangle the pattern by turning the codes into regex captures - $pattern = preg_replace('/\%[Ty]/', '([0-9]+?)', $pattern); - $pattern = preg_replace('/\%\w/', '(.+?)', $pattern); - $pattern = str_replace('/', '\/', $pattern); - $pattern = str_replace(' ', '\s', $pattern); - $pattern = '/' . $pattern . '\..+$/'; - - // Pull out our actual matches - preg_match($pattern, $filename, $matches); - - // The first element is the full match text - $matched = array_shift($matches); - debug_event('vainfo', $pattern . ' matched ' . $matched . ' on ' . $filename, 5); - - // Iterate over what we found - foreach ($matches as $key => $value) { - $new_key = translate_pattern_code($elements['0'][$key]); - if ($new_key) { - $results[$new_key] = $value; - } - } - - $results['size'] = filesize($filename); - - return $results; - - } // _parse_filename - - /** - * _id3v2_tag_to_frame - * - * This translates the tag name to a frame, if there a many it returns the first - * one if finds that exists in the raw - * - * @param string $tag_name Tag name - * @return mixed If found id3v2 frame, return frame. If not found, return false. - */ - private function _id3v2_tag_to_frame($tag_name) { - - static $map = array( - 'comment'=>array('COM','COMM'), - 'cd_ident'=>array('MCDI','MCI'), - 'album'=>array('TAL','TALB'), - 'language'=>array('TLA','TLAN'), - 'mood'=>array('TMOO'), - 'artist'=>array('TPE1'), - 'year'=>array('TDRC')); - - foreach ($map[$tag_name] as $frame) { - if (isset($this->_raw['id3v2'][$frame])) { - return $frame; - } - } - - return false; - - } // _id3v2_tag_to_frame - - /** - * _clean_tag - * - * This function cleans up the tag that it's passed using Iconv - * if we've got it. It also takes an optional encoding param - * for the cases where we know what the tags source encoding - * is, and or if it's different then the encoding recorded - * in the file - * - * @param string $tag Encoding string - * @param string $encoding Encode charset - * @return string Return encoded string - */ - private function _clean_tag($tag, $encoding = null) { - - // Default to getID3's native encoding - if (!$encoding) { - $encoding = $this->_getID3->encoding; - } - // If we've got iconv then go ahead and clear her up - if ($encoding == $this->encoding) { - debug_event('vainfo', "\$encoding -> ${encoding}, \$this->encoding -> {$this->encoding}", 5); - return $tag; - } - if ($this->_iconv) { - debug_event('vainfo', 'Use iconv()',5); - - // Try GNU iconv //TRANSLIT extension first - $new_encoding = $this->encoding . '//TRANSLIT'; - $clean = iconv($encoding, $new_encoding, $tag); - - // If that fails, do a plain conversion - if(strcmp($clean, '') == 0) { - $clean = iconv($encoding, $this->encoding, $tag); - } - } - elseif (function_exists('mb_convert_encoding')) { - debug_event('vainfo', 'Use mbstring',5); - debug_event('vainfo', "Try to convert from {$this->encoding} to $encoding", 5); - $clean = mb_convert_encoding($tag, $encoding, $this->encoding); - } - else { - $clean = $tag; - } - - return $clean; - - } // _clean_tag - - /** - * set_broken - * - * This fills all tag types with Unknown (Broken) - * - * @return array Return broken title, album, artist - */ - public function set_broken() { - - /* Pull In the config option */ - $order = Config::get('tag_order'); - - if (!is_array($order)) { - $order = array($order); - } - - $key = array_shift($order); - - $broken[$key]['title'] = '**BROKEN** ' . $this->filename; - $broken[$key]['album'] = 'Unknown (Broken)'; - $broken[$key]['artist'] = 'Unknown (Broken)'; - - return $broken; - - } // set_broken + public $encoding = ''; + public $encoding_id3v1 = ''; + public $encoding_id3v2 = ''; + + public $filename = ''; + public $type = ''; + public $tags = array(); + + protected $_raw = array(); + protected $_getID3 = ''; + protected $_iconv = false; + + protected $_file_encoding = ''; + protected $_file_pattern = ''; + protected $_dir_pattern = ''; + + private $_pathinfo; + private $_broken = false; + + /** + * Constructor + * + * This function just sets up the class, it doesn't + * actually pull the information + * + * @param string $file filename + * @param string $encoding Target encode character set + * @param string $encoding_id3v1 Default id3v1 encode character set + * @param string $encoding_iv3v2 Default id3v2 encode character set + * @param string $dir_pattern Directory pattern + * @param string $file_pattern File pattern + * @return mixed If can't analyze file, return false. default return: void + */ + public function __construct($file, $encoding = null, $encoding_id3v1 = null, $encoding_id3v2 = null, $dir_pattern, $file_pattern) { + + /* Check for ICONV */ + if (function_exists('iconv') && Config::get('use_iconv') == "1") { + $this->_iconv = true; + } + else { + $this->_iconv = false; + } + + $this->filename = $file; + if ($encoding) { + $this->encoding = $encoding; + } + else { + $this->encoding = Config::get('site_charset'); + } + + /* These are needed for the filename mojo */ + $this->_file_pattern = $file_pattern; + $this->_dir_pattern = $dir_pattern; + + if(strtoupper(substr(PHP_OS,0,3)) == 'WIN') { + $this->_pathinfo = str_replace('%3A', ':', urlencode($this->filename)); + $this->_pathinfo = pathinfo(str_replace('%5C', '\\', $this->_pathinfo)); + } + else { + $this->_pathinfo = pathinfo(str_replace('%2F', '/', urlencode($this->filename))); + } + $this->_pathinfo['extension'] = strtolower($this->_pathinfo['extension']); + + // Initialize getID3 engine + $this->_getID3 = new getID3(); + + $this->_getID3->option_md5_data = false; + $this->_getID3->option_md5_data_source = false; + $this->_getID3->option_tags_html = false; + $this->_getID3->option_extra_info = true; + $this->_getID3->option_tag_lyrics3 = true; + $this->_getID3->option_tags_process = true; + $this->_getID3->encoding = $this->encoding; + + // get id3tag encoding (try to work around off-spec id3v1 tags) + try { + $this->_raw = $this->_getID3->analyze($file); + } + catch (Exception $error) { + debug_event('Getid3()',"Broken file detected $file - " . $error->message,'1'); + $this->_broken = true; + return false; + } + + /* Use default mb_detect_order in php.ini or not */ + if (Config::get('mb_detect_order')) { + $mb_order = Config::get('mb_detect_order'); + } + elseif (function_exists('mb_detect_order')) { + $mb_order = implode(", ", mb_detect_order()); + } + else { + $mb_order = "auto"; + } + + $test_tags = array('artist', 'album', 'genre', 'title'); + + if ($encoding_id3v1) { + $this->encoding_id3v1 = $encoding_id3v1; + } + else { + foreach ($test_tags as $tag) { + if ($value = $this->_raw['id3v1'][$tag]) { + $tags[$tag] = $value; + } + } + + $this->encoding_id3v1 = self::_detect_encoding($tags, $mb_order); + } + + if (Config::get('getid3_detect_id3v2_encoding')) { + foreach ($test_tags as $tag) { + if ($value = $this->_raw['id3v2']['comments'][$tag]) { + $tags[$tag] = $value; + } + } + + $this->encoding_id3v2 = self::_detect_encoding($tags, $mb_order); + $this->_getID3->encoding_id3v2 = $this->encoding_id3v2; + } + + $this->_getID3->encoding_id3v1 = $this->encoding_id3v1; + + } // vainfo + + /** + * _detect_encoding + * Takes an array of tags and attempts to automatically detect their + * encoding. + */ + private static function _detect_encoding($tags, $mb_order) { + if (function_exists('mb_detect_encoding')) { + $encodings = array(); + $tags = array('artist', 'album', 'genre', 'title'); + foreach ($tags as $tag) { + $encodings[mb_detect_encoding($tag, $mb_order, true)]++; + } + + debug_event('vainfo', 'encoding detection: ' . json_encode($encodings), 5); + $high = 0; + foreach ($encodings as $key => $value) { + if ($value > $high) { + $encoding = $key; + $high = $value; + } + } + + if ($encoding != 'ASCII' && $encoding != '0') { + return $encoding; + } + else { + return 'ISO-8859-1'; + } + } + return 'ISO-8859-1'; + } + + + /** + * get_info + * This function runs the various steps to gathering the metadata + */ + public function get_info() { + + // If this is broken, don't waste time figuring it out a second + // time, just return their rotting carcass of a media file. + if ($this->_broken) { + $this->tags = $this->set_broken(); + return true; + } + + /* Get the Raw file information */ + try { + $this->_raw = $this->_getID3->analyze($this->filename); + } + catch (Exception $error) { + debug_event('Getid3()',"Unable to catalog file:" . $error->message,'1'); + } + + /* Figure out what type of file we are dealing with */ + $this->type = $this->_get_type(); + + $enabled_sources = (array)Config::get('metadata_order'); + + if (in_array('filename', $enabled_sources)) { + $this->tags['filename'] = $this->_parse_filename($this->filename); + } + + if (in_array('getID3', $enabled_sources)) { + $this->tags['getID3'] = $this->_get_tags(); + } + + $this->_get_plugin_tags(); + + } // get_info + + /** + * get_tag_type + * This takes the result set and the tag_order defined in your config + * file and tries to figure out which tag type(s) it should use. If your + * tag_order doesn't match anything then it throws up its hands and uses + * everything. + */ + public static function get_tag_type($results, $config_key = 'metadata_order') { + + $order = (array)Config::get($config_key); + + /* Iterate through the defined key order adding them to an + * ordered array as we go. + */ + + foreach($order as $key) { + if ($results[$key]) { + $returned_keys[] = $key; + } + } + + /* If we didn't find anything then default to everything. + */ + if (!isset($returned_keys)) { + $returned_keys = array_keys($results); + $returned_keys = sort($returned_keys); + } + + return $returned_keys; + + } // get_tag_type + + /** + * clean_tag_info + * This function takes the array from vainfo along with the + * key we've decided on and the filename and returns it in a + * sanitized format that ampache can actually use + */ + public static function clean_tag_info($results, $keys, $filename = null) { + + $info = array(); + + if ($filename) { + $info['file'] = $filename; + } + + // Iteration! + foreach ($keys as $key) { + $tags = $results[$key]; + + $info['file'] = $info['file'] ?: $tags['file']; + $info['bitrate'] = $info['bitrate'] ?: intval($tags['bitrate']); + $info['rate'] = $info['rate'] ?: intval($tags['rate']); + $info['mode'] = $info['mode'] ?: $tags['mode']; + $info['size'] = $info['size'] ?: $tags['size']; + $info['mime'] = $info['mime'] ?: $tags['mime']; + $info['encoding'] = $info['encoding'] ?: $tags['encoding']; + $info['rating'] = $info['rating'] ?: $tags['rating']; + $info['time'] = $info['time'] ?: intval($tags['time']); + $info['channels'] = $info['channels'] ?: $tags['channels']; + + /* These are used to generate the correct IDs later */ + $info['title'] = $info['title'] ?: stripslashes(trim($tags['title'])); + + $info['year'] = $info['year'] ?: intval($tags['year']); + + $info['disk'] = $info['disk'] ?: intval($tags['disk']); + + $info['totaldiscs'] = $info['totaldiscs'] ?: intval($tags['totaldiscs']); + + $info['artist'] = $info['artist'] ?: trim($tags['artist']); + + $info['album'] = $info['album'] ?: trim($tags['album']); + + // multiple genre support + if ((!$info['genre']) && $tags['genre']) { + if (!is_array($tags['genre'])) { + // not all tag formats will return an array, but we need one + $info['genre'][] = trim($tags['genre']); + } + else { + // if we trim the array we lose everything after 1st entry + foreach ($tags['genre'] as $genre) { + $info['genre'][] = trim($genre); + } + } + } + + $info['mb_trackid'] = $info['mb_trackid'] ?: trim($tags['mb_trackid']); + $info['mb_albumid'] = $info['mb_albumid'] ?: trim($tags['mb_albumid']); + $info['mb_artistid'] = $info['mb_artistid'] ?: trim($tags['mb_artistid']); + + /* @TODO language doesn't import from id3tag. @momo-i */ + $info['language'] = $info['language'] ?: Dba::escape($tags['language']); + + $info['lyrics'] = $info['lyrics'] + ?: str_replace( + array("\r\n","\r","\n"), + '
', + strip_tags($tags['lyrics'])); + + $info['track'] = $info['track'] ?: intval($tags['track']); + $info['resolution_x'] = $info['resolution_x'] ?: intval($tags['resolution_x']); + $info['resolution_y'] = $info['resolution_y'] ?: intval($tags['resolution_y']); + $info['audio_codec'] = $info['audio_codec'] ?: Dba::escape($tags['audio_codec']); + $info['video_codec'] = $info['video_codec'] ?: Dba::escape($tags['video_codec']); + } + + if ($info['totaldiscs'] == 1 && $info['disk'] == 1) { + unset($info['disk']); + unset($info['totaldiscs']); + } + + return $info; + + } // clean_tag_info + + /** + * _get_type + * This function takes the raw information and figures out + * what type of file we are dealing with for use by the tag + * function + */ + public function _get_type() { + + /* There are a few places that the file type can + * come from, in the end we trust the encoding + * type + */ + if ($type = $this->_raw['video']['dataformat']) { + $type = $this->_clean_type($type); + return $type; + } + if ($type = $this->_raw['audio']['streams']['0']['dataformat']) { + $type = $this->_clean_type($type); + return $type; + } + if ($type = $this->_raw['audio']['dataformat']) { + $type = $this->_clean_type($type); + return $type; + } + if ($type = $this->_raw['fileformat']) { + $type = $this->_clean_type($type); + return $type; + } + + return false; + + } // _get_type + + + /** + * _get_tags + * This function takes the raw information and the type and + * attempts to gather the tags and then normalize them into + * ['tag_name']['var'] = value + */ + public function _get_tags() { + + $results = array(); + + /* The tags can come in many different shapes and colors + * depending on the encoding time of day and phase of the moon. + */ + foreach ($this->_raw['tags'] as $key => $tag_array) { + switch ($key) { + case 'vorbiscomment': + debug_event('_get_tags', 'Parsing vorbis', '5'); + $results[$key] = $this->_parse_vorbiscomment($tag_array); + break; + case 'id3v1': + debug_event('_get_tags', 'Parsing id3v1', '5'); + $results[$key] = $this->_parse_id3v1($tag_array); + break; + case 'id3v2': + debug_event('_get_tags', 'Parsing id3v2', '5'); + $results[$key] = $this->_parse_id3v2($tag_array); + break; + case 'ape': + debug_event('_get_tags', 'Parsing ape', '5'); + $results[$key] = $this->_parse_ape($tag_array); + break; + case 'quicktime': + debug_event('_get_tags', 'Parsing quicktime', '5'); + $results[$key] = $this->_parse_quicktime($tag_array); + break; + case 'riff': + debug_event('_get_tags', 'Parsing riff', '5'); + $results[$key] = $this->_parse_riff($tag_array); + break; + case 'flv': + debug_event('_get_tags', 'Parsing flv', '5'); + $results[$key] = $this->_parse_flv($this->_raw); + break; + case 'mpg': + case 'mpeg': + debug_event('_get_tags', 'Parsing MPEG', '5'); + $results['mpeg'] = $this->_parse_mpg($this->_raw); + break; + case 'asf': + case 'wmv': + debug_event('_get_tags', 'Parsing WMV/WMA/ASF', '5'); + $results['asf'] = $this->_parse_wmv($this->_raw); + break; + case 'avi': + debug_event('_get_tags', 'Parsing avi', '5'); + $results[$key] = $this->_parse_avi($this->_raw); + break; + case 'lyrics3': + debug_event('_get_tags', 'Parsing lyrics3', '5'); + $results[$key] = $this->_parse_lyrics($tag_array); + break; + default: + debug_event('vainfo','Error: Unable to determine tag type of ' . $key . ' for file ' . $this->filename . ' Assuming id3v2','5'); + $results[$key] = $this->_parse_id3v2($this->_raw['id3v2']['comments']); + break; + } // end switch + } // end foreach + + + $cleaned = self::clean_tag_info($results, self::get_tag_type($results, 'getid3_tag_order'), $this->filename); + $cleaned = array_merge($cleaned, $this->_get_info()); + $cleaned['raw'] = $results; + + return $cleaned; + + } // _get_tags + + /** + * _get_plugin_tags + * Get additional metadata from plugins + */ + private function _get_plugin_tags() { + $tag_order = Config::get('metadata_order'); + if (!is_array($tag_order)) { + $tag_order = array($tag_order); + } + + $plugin_names = Plugin::get_plugins('get_metadata'); + foreach ($tag_order as $key => $tag_source) { + if (in_array($tag_source, $plugin_names)) { + $plugin = new Plugin($tag_source); + if ($plugin->load()) { + $this->tags[$tag_source] = $plugin->_plugin->get_metadata(self::clean_tag_info($this->tags, self::get_tag_type($this->tags), $this->filename)); + } + } + } + } // _get_plugin_tags + + /** + * _get_info + * Gather and return the general information about a song (vbr/cbr, + * sample rate, channels, etc.) + */ + private function _get_info() { + + $array = array(); + + /* Try to pull the information directly from + * the audio array + */ + if ($this->_raw['audio']['bitrate_mode']) { + $array['mode'] = $this->_raw['audio']['bitrate_mode']; + if ($array['mode'] == 'con') { + $array['mode'] = 'cbr'; + } + } + if ($this->_raw['audio']['bitrate']) { + $array['bitrate'] = $this->_raw['audio']['bitrate']; + } + if ($this->_raw['audio']['channels']) { + $array['channels'] = intval($this->_raw['audio']['channels']); + } + if ($this->_raw['audio']['sample_rate']) { + $array['rate'] = intval($this->_raw['audio']['sample_rate']); + } + if ($this->_raw['filesize']) { + $array['size'] = intval($this->_raw['filesize']); + } + if ($this->_raw['encoding']) { + $array['encoding'] = $this->_raw['encoding']; + } + if ($this->_raw['mime_type']) { + $array['mime'] = $this->_raw['mime_type']; + } + if ($this->_raw['playtime_seconds']) { + $array['time'] = $this->_raw['playtime_seconds']; + } + + return $array; + + } // _get_info + + /** + * _clean_type + * This standardizes the type that we are given into a recognized type. + */ + private function _clean_type($type) { + + switch ($type) { + case 'mp3': + case 'mp2': + case 'mpeg3': + return 'mp3'; + break; + case 'vorbis': + return 'ogg'; + break; + case 'flac': + case 'flv': + case 'mpg': + case 'mpeg': + case 'asf': + case 'wmv': + case 'avi': + case 'quicktime': + return $type; + default: + /* Log the fact that we couldn't figure it out */ + debug_event('vainfo','Unable to determine file type from ' . $type . ' on file ' . $this->filename,'5'); + return $type; + break; + } // end switch on type + + } // _clean_type + + /** + * _parse_lyrics + * This function takes a lyrics3 from getid3() + * nothing to do? + */ + private function _parse_lyrics($tags) { + + /* Results array */ + $array = array(); + + /* go through them all! */ + foreach ($tags as $tag => $data) { + if ($tag == 'unsynchedlyrics' || $tag == 'unsynchronised lyric') { + $tag = 'lyrics'; + } + $array[$tag] = $this->_clean_tag($data['0']); + + } // end foreach + + return $array; + + } // _parse_lyrics + + /** + * _parse_vorbiscomment + * This function takes a vorbiscomment from getid3() and then + * returns the elements translated using iconv if needed in a + * pretty little format + */ + private function _parse_vorbiscomment($tags) { + + /* Results array */ + $array = array(); + + /* go through them all! */ + foreach ($tags as $tag=>$data) { + + /* We need to translate a few of these tags */ + switch ($tag) { + + case 'genre': + // multiple genre support + foreach($data as $foo) { + $array['genre'][] = $this->_clean_tag($foo,''); + } + break; + case 'tracknumber': + $array['track'] = $this->_clean_tag($data['0']); + break; + case 'discnumber': + $el = explode('/', $data['0']); + $array['disk'] = $el[0]; + break; + case 'date': + $array['year'] = $this->_clean_tag($data['0']); + break; + default: + $array[$tag] = $this->_clean_tag($data['0']); + break; + } // end switch + + } // end foreach + + return $array; + + } // _parse_vorbiscomment + + /** + * _parse_id3v1 + * This function takes an id3v1 tag set from getid3() and then + * returns the elements (translated using iconv if needed) in a + * pretty little format. + */ + private function _parse_id3v1($tags) { + + $array = array(); + + /* Go through all the tags */ + foreach ($tags as $tag=>$data) { + + /* This is our baseline for naming + * so no translation needed + */ + $array[$tag] = $this->_clean_tag($data['0']); + + } // end foreach + + return $array; + + } // _parse_id3v1 + + /** + * _parse_id3v2 + * This function takes an id3v2 tag set from getid3() and then + * returns the elements (translated using iconv if needed) in a + * pretty little format. + */ + private function _parse_id3v2($tags) { + + $array = array(); + + /* Go through the tags */ + foreach ($tags as $tag=>$data) { + + /** + * the new getid3 handles this differently + * so we now need to account for it :( + */ + switch ($tag) { + case 'genre': + // multiple genre support + foreach($data as $genre) { + $array['genre'][] = $this->_clean_tag($genre); + } + break; + case 'part_of_a_set': + $el = explode('/', $data['0']); + $array['disk'] = $el[0]; + $array['totaldiscs'] = $el[1]; + break; + case 'track_number': + $array['track'] = $this->_clean_tag($data['0']); + break; + case 'comments': + $array['comment'] = $this->_clean_tag($data['0']); + break; + default: + $array[$tag] = $this->_clean_tag($data['0']); + break; + } // end switch on tag + + } // end foreach + + $id3v2 = $this->_raw['id3v2']; + + if(!empty($id3v2['UFID'])) { + // Find the MBID for the track + foreach ($id3v2['UFID'] as $ufid) { + if ($ufid['ownerid'] == 'http://musicbrainz.org') { + $array['mb_trackid'] = $this->_clean_tag($ufid['data']); + } + } + + // Find the MBIDs for the album and artist + foreach ($id3v2['TXXX'] as $txxx) { + switch ($txxx['description']) { + case 'MusicBrainz Album Id': + $array['mb_albumid'] = $this->_clean_tag($txxx['data']); + break; + case 'MusicBrainz Artist Id': + $array['mb_artistid'] = $this->_clean_tag($txxx['data']); + break; + } + } + } + + // Find the rating + if (is_array($id3v2['POPM'])) { + foreach ($id3v2['POPM'] as $popm) { + if (array_key_exists('email', $popm) && + $user = User::get_from_email($popm['email'])) { + // Ratings are out of 255; scale it + $array['rating'][$user->id] = $popm['rating'] / 255 * 5; + } + } + } + + return $array; + + } // _parse_id3v2 + + /** + * _parse_ape + * This function takes ape tags set by getid3() and then + * returns the elements translated using iconv if needed in a + * pretty little format + */ + private function _parse_ape($tags) { + + foreach ($tags as $tag=>$data) { + switch ($tag) { + + case 'genre': + // multiple genre support + foreach($data as $genre) { + $array['genre'][] = $this->_clean_tag($genre); + } + break; + + default: + $array[$tag] = $this->_clean_tag($data['0'], $this->_file_encoding); + break; + } // end switch on tag + + } // end foreach tags + + return $array; + + } // _parse_ape + + /** + * _parse_riff + * this function takes the riff take information passed by getid3() and + * then reformats it so that it matches the other formats. May require iconv + */ + private function _parse_riff($tags) { + + foreach ($tags as $tag=>$data) { + + switch ($tag) { + case 'product': + $array['album'] = $this->_clean_tag($data['0'], $this->_file_encoding); + break; + default: + $array[$tag] = $this->_clean_tag($data['0'], $this->_file_encoding); + break; + } // end switch on tag + + } // foreach tags + + return $array; + + } // _parse_riff + + /** + * _parse_quicktime + * this function takes the quicktime tags set by getid3() and then + * returns the elements translated using iconv if needed in a + * pretty little format + */ + private function _parse_quicktime($tags) { + + /* Results array */ + $array = array(); + + /* go through them all! */ + foreach ($tags as $tag=>$data) { + + /* We need to translate a few of these tags */ + switch ($tag) { + case 'creation_date': + if (strlen($data['0']) > 4) { + /* Weird Date format, attempt to normalize */ + $data['0'] = date("Y",strtotime($data['0'])); + } + $array['year'] = $this->_clean_tag($data['0']); + break; + case 'MusicBrainz Track Id': + $array['mb_trackid'] = $this->_clean_tag($data['0']); + break; + case 'MusicBrainz Album Id': + $array['mb_albumid'] = $this->_clean_tag($data['0']); + break; + case 'MusicBrainz Artist Id': + $array['mb_artistid'] = $this->_clean_tag($data['0']); + break; + } // end switch + + $array[$tag] = $this->_clean_tag($data['0']); + + } // end foreach + + // Also add in any video related stuff we might find + if (strpos($this->_raw['mime_type'], 'video') !== false) { + $info = $this->_parse_avi($this->_raw); + $info['video_codec'] = $this->_raw['quicktime']['ftyp']['fourcc']; + $array = array_merge($info, $array); + } + + return $array; + + } // _parse_quicktime + + /** + * _parse_avi + * This attempts to parse our the information on an avi file and present it in some + * kind of sane format, this is a little hard as these files don't have tags + */ + private function _parse_avi($tags) { + + $array = array(); + + $array['title'] = urldecode($this->_pathinfo['filename']); + $array['video_codec'] = $tags['video']['fourcc']; + $array['audio_codec'] = $tags['audio']['dataformat']; + $array['resolution_x'] = $tags['video']['resolution_x']; + $array['resolution_y'] = $tags['video']['resolution_y']; + $array['mime'] = $tags['mime_type']; + $array['comment'] = $tags['video']['codec']; + + return $array; + + } // _parse_avi + + /** + * _parse_mpg + * This attempts to parse our the information on a mpg file and present it in some + * kind of sane format, this is a little hard as these files don't have tags + */ + private function _parse_mpg($tags) { + + $array = array(); + + $array['title'] = urldecode($this->_pathinfo['filename']); + $array['video_codec'] = $tags['video']['codec']; + $array['audio_codec'] = $tags['audio']['dataformat']; + $array['resolution_x'] = $tags['video']['resolution_x']; + $array['resolution_y'] = $tags['video']['resolution_y']; + $array['mime'] = $tags['mime_type']; + $array['comment'] = $tags['video']['codec']; + + return $array; + + } // _parse_mpg + + /** + * _parse_wmv + * This attempts to parse our the information on a asf/wmv file and present it in some + * kind of sane format, this is a little hard as these files don't have tags + */ + private function _parse_wmv($tags) { + + $array = array(); + + $array['mime'] = $tags['mime_type']; + + switch($array['mime']) { + default: + case 'video/x-ms-wmv': + if(isset($tags['tags']['asf']['title']['0'])) { + $array['title'] = $tags['tags']['asf']['title']['0']; + } + else { + $array['title'] = urldecode($this->_pathinfo['filename']); + } + $array['video_codec'] = $tags['video']['streams']['2']['codec']; + $array['audio_codec'] = $tags['audio']['streams']['1']['codec']; + $array['resolution_x'] = $tags['video']['streams']['2']['resolution_x']; + $array['resolution_y'] = $tags['video']['streams']['2']['resolution_y']; + $array['comment'] = $tags['tags']['asf']['title']['1']; + break; + } + + foreach($tags['tags']['asf'] as $tag => $data) { + $array[$tag] = $this->_clean_tag($data['0']); + } + + return $array; + + } // _parse_wmv + + /** + * _parse_flv + * This attempts to parse our the information on an flv file and present it in some + * kind of sane format, this is a little hard as these files don't have tags + */ + private function _parse_flv($tags) { + + $array = array(); + + $array['title'] = urldecode($this->_pathinfo['filename']); + $array['video_codec'] = $tags['video']['codec']; + $array['audio_codec'] = $tags['audio']['dataformat']; + $array['resolution_x'] = $tags['video']['resolution_x']; + $array['resolution_y'] = $tags['video']['resolution_y']; + $array['mime'] = $tags['mime_type']; + $array['comment'] = $tags['video']['codec']; + + return $array; + + } // _parse_flv + + /** + * _parse_filename + * + * This function uses the passed file and dir patterns + * To pull out extra tag information and populate it into + * its own array + * + * @param string $filename Filename that want to parse + * @return array Parsed results + */ + private function _parse_filename($filename) { + + $results = array(); + + // Correctly detect the slash we need to use here + if (strpos($filename, '/') !== false) { + $slash_type = '/'; + } + else { + $slash_type = '\\'; + } + + // Combine the patterns + $pattern = preg_quote($this->_dir_pattern) . $slash_type . preg_quote($this->_file_pattern); + + // Pull out the pattern codes into an array + preg_match_all('/\%\w/', $pattern, $elements); + + // Mangle the pattern by turning the codes into regex captures + $pattern = preg_replace('/\%[Ty]/', '([0-9]+?)', $pattern); + $pattern = preg_replace('/\%\w/', '(.+?)', $pattern); + $pattern = str_replace('/', '\/', $pattern); + $pattern = str_replace(' ', '\s', $pattern); + $pattern = '/' . $pattern . '\..+$/'; + + // Pull out our actual matches + preg_match($pattern, $filename, $matches); + + // The first element is the full match text + $matched = array_shift($matches); + debug_event('vainfo', $pattern . ' matched ' . $matched . ' on ' . $filename, 5); + + // Iterate over what we found + foreach ($matches as $key => $value) { + $new_key = translate_pattern_code($elements['0'][$key]); + if ($new_key) { + $results[$new_key] = $value; + } + } + + $results['size'] = filesize($filename); + + return $results; + + } // _parse_filename + + /** + * _id3v2_tag_to_frame + * + * This translates the tag name to a frame, if there a many it returns the first + * one if finds that exists in the raw + * + * @param string $tag_name Tag name + * @return mixed If found id3v2 frame, return frame. If not found, return false. + */ + private function _id3v2_tag_to_frame($tag_name) { + + static $map = array( + 'comment'=>array('COM','COMM'), + 'cd_ident'=>array('MCDI','MCI'), + 'album'=>array('TAL','TALB'), + 'language'=>array('TLA','TLAN'), + 'mood'=>array('TMOO'), + 'artist'=>array('TPE1'), + 'year'=>array('TDRC')); + + foreach ($map[$tag_name] as $frame) { + if (isset($this->_raw['id3v2'][$frame])) { + return $frame; + } + } + + return false; + + } // _id3v2_tag_to_frame + + /** + * _clean_tag + * + * This function cleans up the tag that it's passed using Iconv + * if we've got it. It also takes an optional encoding param + * for the cases where we know what the tags source encoding + * is, and or if it's different then the encoding recorded + * in the file + * + * @param string $tag Encoding string + * @param string $encoding Encode charset + * @return string Return encoded string + */ + private function _clean_tag($tag, $encoding = null) { + + // Default to getID3's native encoding + if (!$encoding) { + $encoding = $this->_getID3->encoding; + } + // If we've got iconv then go ahead and clear her up + if ($encoding == $this->encoding) { + debug_event('vainfo', "\$encoding -> ${encoding}, \$this->encoding -> {$this->encoding}", 5); + return $tag; + } + if ($this->_iconv) { + debug_event('vainfo', 'Use iconv()',5); + + // Try GNU iconv //TRANSLIT extension first + $new_encoding = $this->encoding . '//TRANSLIT'; + $clean = iconv($encoding, $new_encoding, $tag); + + // If that fails, do a plain conversion + if(strcmp($clean, '') == 0) { + $clean = iconv($encoding, $this->encoding, $tag); + } + } + elseif (function_exists('mb_convert_encoding')) { + debug_event('vainfo', 'Use mbstring',5); + debug_event('vainfo', "Try to convert from {$this->encoding} to $encoding", 5); + $clean = mb_convert_encoding($tag, $encoding, $this->encoding); + } + else { + $clean = $tag; + } + + return $clean; + + } // _clean_tag + + /** + * set_broken + * + * This fills all tag types with Unknown (Broken) + * + * @return array Return broken title, album, artist + */ + public function set_broken() { + + /* Pull In the config option */ + $order = Config::get('tag_order'); + + if (!is_array($order)) { + $order = array($order); + } + + $key = array_shift($order); + + $broken[$key]['title'] = '**BROKEN** ' . $this->filename; + $broken[$key]['album'] = 'Unknown (Broken)'; + $broken[$key]['artist'] = 'Unknown (Broken)'; + + return $broken; + + } // set_broken } // end class vainfo ?> diff --git a/lib/class/vauth.class.php b/lib/class/vauth.class.php index b978c35c67..e6dcab43f7 100644 --- a/lib/class/vauth.class.php +++ b/lib/class/vauth.class.php @@ -1,5 +1,5 @@ reloadRedirect("' . $target . '")'; - echo xml_from_array($results); - } - else { - /* Redirect them to the login page */ - header('Location: ' . $target); - } - - exit; - - } // logout - - /** - * get_session_data - * This takes a key and returns the raw data from the database, nothing - * to see here move along people - */ - public static function get_session_data($key) { - - $key = Dba::escape($key); - - $sql = "SELECT * FROM `session` WHERE `id`='$key' AND `expire` > '" . time() . "'"; - $db_results = Dba::read($sql); - - if ($results = Dba::fetch_assoc($db_results)) { - return $results; - } - - return false; - - } // get_session_data - - /** - * create_cookie - * This is separated into its own function because of some flaws in - * specific webservers *cough* IIS *cough* which prevent us from setting - * a cookie at the same time as a header redirect. As such on view of a - * login a cookie is set with the proper name - */ - public static function create_cookie() { - - /* Setup the cookie prefs before we throw down, this is very important */ - $cookie_life = Config::get('cookie_life'); - $cookie_path = Config::get('cookie_path'); - $cookie_domain = false; - $cookie_secure = Config::get('cookie_secure'); - - session_set_cookie_params($cookie_life,$cookie_path,$cookie_domain,$cookie_secure); - - session_name(Config::get('session_name')); - - /* Start the session */ - self::ungimp_ie(); - session_start(); - - } // create_cookie, just watch out for the cookie monster - - /** - * create_remember_cookie - * This function just creates the remember me cookie, nothing special - */ - public static function create_remember_cookie() { - - $remember_length = Config::get('remember_length'); - $session_name = Config::get('session_name'); - - Config::set('cookie_life', $remember_length, true); - setcookie($session_name . '_remember',"Rappelez-vous, rappelez-vous le 27 mars", time() + $remember_length, '/'); - - } // create_remember_cookie - - /** - * session_create - * This is called when you want to create a new session - * it takes care of setting the initial cookie, and inserting the first - * chunk of data, nifty ain't it! - */ - public static function session_create($data) { - - // Regenerate the session ID to prevent fixation - switch ($data['type']) { - case 'xml-rpc': - case 'api': - $key = md5(uniqid(rand(), true)); - break; - case 'mysql': - default: - session_regenerate_id(); - - // Before refresh we don't have the cookie so we - // have to use session ID - $key = session_id(); - break; - } // end switch on data type - - $username = Dba::escape($data['username']); - $ip = $_SERVER['REMOTE_ADDR'] - ? Dba::escape(inet_pton($_SERVER['REMOTE_ADDR'])) - : '0'; - $type = Dba::escape($data['type']); - $value = Dba::escape($data['value']); - $agent = Dba::escape(substr($_SERVER['HTTP_USER_AGENT'], 0, 254)); - $expire = Dba::escape(time() + Config::get('session_length')); - - /* We can't have null things here people */ - if (!strlen($value)) { $value = ' '; } - - /* Insert the row */ - $sql = "INSERT INTO `session` (`id`,`username`,`ip`,`type`,`agent`,`value`,`expire`) " . - " VALUES ('$key','$username','$ip','$type','$agent','$value','$expire')"; - $db_results = Dba::write($sql); - - if (!$db_results) { - debug_event('SESSION', "Session Creation Failed with Query: $sql and " . Dba::error(), '1'); - return false; - } - - debug_event('SESSION', 'Session Created:' . $key, '6'); - - return $key; - - } // session_create - - /** - * check_session - * This checks for an existing session. If it's still valid we go ahead - * and start it and return true. - */ - public static function check_session() { - - $session_name = Config::get('session_name'); - - // No cookie no go! - if (!isset($_COOKIE[$session_name])) { return false; } - - // Check for a remember me - if (isset($_COOKIE[$session_name . '_remember'])) { - self::create_remember_cookie(); - } - - // Set up the cookie params before we start the session. - // This is vital - session_set_cookie_params( - Config::get('cookie_life'), - Config::get('cookie_path'), - Config::get('cookie_domain'), - Config::get('cookie_secure')); - - // Set name - session_name($session_name); - - // Ungimp IE and go - self::ungimp_ie(); - session_start(); - - return true; - - } // check_session - - /** - * session_exists - * This checks to see if the specified session of the specified type - * exists, it also provides an array of key'd data that may be required - * based on the type - */ - public static function session_exists($type, $key, $data=array()) { - - // Switch on the type they pass - switch ($type) { - case 'xml-rpc': - case 'api': - $key = Dba::escape($key); - $time = time(); - $sql = "SELECT * FROM `session` WHERE " . - "`id`='$key' AND `expire` > '$time' " . - "AND `type`='$type'"; - $db_results = Dba::read($sql); - - if (Dba::num_rows($db_results)) { - return true; - } - break; - case 'interface': - $key = Dba::escape($key); - $time = time(); - // Build a list of enabled authentication types - $types = Config::get('auth_methods'); - if (!Config::get('use_auth')) { - $types[] = ''; - } - $enabled_types = implode("','", $types); - $sql = "SELECT * FROM `session` WHERE " . - "`id`='$key' AND `expire` > '$time' " . - "AND `type` IN('$enabled_types')"; - $db_results = Dba::read($sql); - - if (Dba::num_rows($db_results)) { - return true; - } - break; - case 'stream': - $key = Dba::escape($key); - $ip = Dba::escape(inet_pton($data['ip'])); - $agent = Dba::escape($data['agent']); - $sql = "SELECT * FROM `session_stream` WHERE " . - "`id`='$key' AND `expire` > '$time' " . - "AND `ip`='$ip' AND `agent`='$agent'"; - $db_results = Dba::read($sql); - - if (Dba::num_rows($db_results)) { - return true; - } - - break; - default: - return false; - break; - } // type - - // Default to false - return false; - - } // session_exists - - /** - * session_extend - * This should really be extend_session but hey you gotta go with the - * flow. - * This takes a SID and extends its expiration. - */ - public static function session_extend($sid) { - $time = time(); - $sid = Dba::escape($sid); - $expire = isset($_COOKIE[Config::get('session_name') . '_remember']) - ? $time + Config::get('remember_length') - : $time + Config::get('session_length'); - - $sql = "UPDATE `session` SET `expire`='$expire' WHERE `id`='$sid'"; - $db_results = Dba::write($sql); - - debug_event('SESSION', $sid . ' has been extended to ' . date('r', $expire) . ' extension length ' . ($expire - $time), 5); - - return $db_results; - } // session_extend - - /** - * _auto_init - * This function is called when the object is included, this sets up the - * session_save_handler - */ - public static function _auto_init() { - - if (!function_exists('session_start')) { - header("Location:" . Config::get('web_path') . "/test.php"); - exit; - } - - session_set_save_handler( - array('vauth', 'open'), - array('vauth', 'close'), - array('vauth', 'read'), - array('vauth', 'write'), - array('vauth', 'destroy'), - array('vauth', 'gc')); - - } // auto init - - /** - * ungimp_ie - * This function sets the cache limiting to public if you are running - * some flavor of IE. The detection used here is very conservative so - * feel free to fix it. This only has to be done if we're rolling HTTPS. - */ - public static function ungimp_ie() { - - // If no https, no ungimpage required - if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'on') { - return true; - } - - // Try to detect IE - $agent = trim($_SERVER['HTTP_USER_AGENT']); - - if ((strpos($agent, 'MSIE') !== false) || - (strpos($agent,'Internet Explorer/') !== false)) { - session_cache_limiter('public'); - } - - return true; - - } // ungimp_ie - - /** - * authenticate - * This takes a username and password and then returns the results - * based on what happens when we try to do the auth. - */ - public static function authenticate($username, $password) { - - // Foreach the auth methods - foreach (Config::get('auth_methods') as $method) { - - // Build the function name and call it - $function_name = $method . '_auth'; - - if (!method_exists('vauth', $function_name)) { - continue; - } - - $results = self::$function_name($username, $password); - - // If we achieve victory return - if ($results['success']) { break; } - - } // end foreach - - return $results; - - } // authenticate - - /** - * mysql_auth - * - * This is the core function of our built-in authentication. - */ - private static function mysql_auth($username, $password) { - - $username = Dba::escape($username); - - if (strlen($password) && strlen($username)) { - $sql = "SELECT `password` FROM `user` WHERE " . - "`username`='$username'"; - $db_results = Dba::read($sql); - if ($row = Dba::fetch_assoc($db_results)) { - - // Use SHA2 now... cooking with fire. - // For backwards compatibility, we hash a couple - // of different variations of the password. - // Increases collision chances, but doesn't - // break things. - $hashed_password[] = hash('sha256', $password); - $hashed_password[] = hash('sha256', - Dba::escape(scrub_in($password))); - - // Automagically update the password if it's - // old and busted. - if($row['password'] == $hashed_password[1] && - $hashed_password[0] != $hashed_password[1]) { - $user = User::get_from_username($username); - $user->update_password($password); - } - - if(in_array($row['password'], $hashed_password)) { - $results['success'] = true; - $results['type'] = 'mysql'; - $results['username'] = $username; - return $results; - } - } - } - - // Default to failure - $results['success'] = false; - $results['error'] = 'MySQL login attempt failed'; - return $results; - - } // mysql_auth - - /** - * local_auth - * Check to make sure the pam_auth function is implemented (module is - * installed), then check the credentials. - */ - private static function local_auth($username, $password) { - if (!function_exists('pam_auth')) { - $results['success'] = false; - $results['error'] = 'The PAM PHP module is not installed'; - return $results; - } - - $password = scrub_in($password); - - if (pam_auth($username, $password)) { - $results['success'] = true; - $results['type'] = 'local'; - $results['username'] = $username; - } - else { - $results['success'] = false; - $results['error'] = 'PAM login attempt failed'; - } - - return $results; - } // local_auth - - /** - * ldap_auth - * Step one, connect to the LDAP server and perform a search for the - * username provided. - * Step two, attempt to bind using that username and the password - * provided. - * Step three, figure out if they are authorized to use ampache: - * TODO: in config but unimplemented: - * * require-dn "Grant access if the DN in the directive matches - * the DN fetched from the LDAP directory" - * * require-attribute "an attribute fetched from the LDAP - * directory matches the given value" - */ - private static function ldap_auth($username, $password) { - - $ldap_username = Config::get('ldap_username'); - $ldap_password = Config::get('ldap_password'); - - $require_group = Config::get('ldap_require_group'); - - // This is the DN for the users (required) - $ldap_dn = Config::get('ldap_search_dn'); - - // This is the server url (required) - $ldap_url = Config::get('ldap_url'); - - // This is the ldap filter string (required) - $ldap_filter = Config::get('ldap_filter'); - - //This is the ldap objectclass (required) - $ldap_class = Config::get('ldap_objectclass'); - - if (!($ldap_dn && $ldap_url && $ldap_filter && $ldap_class)) { - debug_event('ldap_auth', 'Required config value missing', 1); - $results['success'] = false; - $results['error'] = 'Incomplete LDAP config'; - return $results; - } - - $ldap_name_field = Config::get('ldap_name_field'); - $ldap_email_field = Config::get('ldap_email_field'); - - if ($ldap_link = ldap_connect($ldap_url) ) { - - /* Set to Protocol 3 */ - ldap_set_option($ldap_link, LDAP_OPT_PROTOCOL_VERSION, 3); - - // bind using our auth if we need to for initial search - if (!ldap_bind($ldap_link, $ldap_username, $ldap_password)) { - $results['success'] = false; - $results['error'] = 'Could not bind to LDAP server.'; - return $results; - } // If bind fails - - $sr = ldap_search($ldap_link, $ldap_dn, "(&(objectclass=$ldap_class)($ldap_filter=$username))"); - $info = ldap_get_entries($ldap_link, $sr); - - if ($info["count"] == 1) { - $user_entry = ldap_first_entry($ldap_link, $sr); - $user_dn = ldap_get_dn($ldap_link, $user_entry); - $password = scrub_in($password); - // bind using the user.. - $retval = ldap_bind($ldap_link, $user_dn, $password); - - if ($retval) { - // When the current user needs to be in - // a specific group to access Ampache, - // check whether the 'member' list of - // the group contains the DN - if ($require_group) { - $group_result = ldap_read($ldap_link, $require_group, 'objectclass=*', array('member')); - if (!$group_result) { - debug_event('ldap_auth', "Failure reading $require_group", 1); - $results['success'] = false; - $results['error'] = 'The LDAP group could not be read'; - return $results; - } - - $group_info = ldap_get_entries($ldap_link, $group_result); - - if ($group_info['count'] < 1) { - debug_event('ldap_auth', "No members found in $require_group", 1); - $results['success'] = false; - $results['error'] = 'Empty LDAP group'; - return $results; - } - - $group_match = preg_grep("/^$user_dn\$/i", $group_info[0]['member']); - if (!$group_match) { - debug_event('ldap_auth', "$user_dn is not a member of $require_group",1); - $results['success'] = false; - $results['error'] = 'LDAP login attempt failed'; - return $results; - } - } - ldap_close($ldap_link); - $results['success'] = true; - $results['type'] = "ldap"; - $results['username'] = $username; - $results['name'] = $info[0][$ldap_name_field][0]; - $results['email'] = $info[0][$ldap_email_field][0]; - - return $results; - - } // if we get something good back - - } // if something was sent back - - } // if failed connect - - /* Default to bad news */ - $results['success'] = false; - $results['error'] = 'LDAP login attempt failed'; - - return $results; - - } // ldap_auth - - /** - * http_auth - * This auth method relies on HTTP auth from the webserver - */ - private static function http_auth($username, $password) { - if (($_SERVER['REMOTE_USER'] == $username) || - ($_SERVER['HTTP_REMOTE_USER'] == $username)) { - $results['success'] = true; - $results['type'] = 'http'; - $results['username'] = $username; - $results['name'] = $username; - $results['email'] = ''; - } - else { - $results['success'] = false; - $results['error'] = 'HTTP auth login attempt failed'; - } - return $results; - } // http_auth + // Do a quick check to see if this is an AJAXed logout request + // if so use the iframe to redirect + if (defined('AJAX_INCLUDE')) { + ob_end_clean(); + ob_start(); + + /* Set the correct headers */ + header("Content-type: text/xml; charset=" . Config::get('site_charset')); + header("Content-Disposition: attachment; filename=ajax.xml"); + header("Expires: Tuesday, 27 Mar 1984 05:00:00 GMT"); + header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); + header("Cache-Control: no-store, no-cache, must-revalidate"); + header("Pragma: no-cache"); + + $results['rfc3514'] = ''; + echo xml_from_array($results); + } + else { + /* Redirect them to the login page */ + header('Location: ' . $target); + } + + exit; + + } // logout + + /** + * get_session_data + * This takes a key and returns the raw data from the database, nothing + * to see here move along people + */ + public static function get_session_data($key) { + + $key = Dba::escape($key); + + $sql = "SELECT * FROM `session` WHERE `id`='$key' AND `expire` > '" . time() . "'"; + $db_results = Dba::read($sql); + + if ($results = Dba::fetch_assoc($db_results)) { + return $results; + } + + return false; + + } // get_session_data + + /** + * create_cookie + * This is separated into its own function because of some flaws in + * specific webservers *cough* IIS *cough* which prevent us from setting + * a cookie at the same time as a header redirect. As such on view of a + * login a cookie is set with the proper name + */ + public static function create_cookie() { + + /* Setup the cookie prefs before we throw down, this is very important */ + $cookie_life = Config::get('cookie_life'); + $cookie_path = Config::get('cookie_path'); + $cookie_domain = false; + $cookie_secure = Config::get('cookie_secure'); + + session_set_cookie_params($cookie_life,$cookie_path,$cookie_domain,$cookie_secure); + + session_name(Config::get('session_name')); + + /* Start the session */ + self::ungimp_ie(); + session_start(); + + } // create_cookie, just watch out for the cookie monster + + /** + * create_remember_cookie + * This function just creates the remember me cookie, nothing special + */ + public static function create_remember_cookie() { + + $remember_length = Config::get('remember_length'); + $session_name = Config::get('session_name'); + + Config::set('cookie_life', $remember_length, true); + setcookie($session_name . '_remember',"Rappelez-vous, rappelez-vous le 27 mars", time() + $remember_length, '/'); + + } // create_remember_cookie + + /** + * session_create + * This is called when you want to create a new session + * it takes care of setting the initial cookie, and inserting the first + * chunk of data, nifty ain't it! + */ + public static function session_create($data) { + + // Regenerate the session ID to prevent fixation + switch ($data['type']) { + case 'xml-rpc': + case 'api': + $key = md5(uniqid(rand(), true)); + break; + case 'mysql': + default: + session_regenerate_id(); + + // Before refresh we don't have the cookie so we + // have to use session ID + $key = session_id(); + break; + } // end switch on data type + + $username = Dba::escape($data['username']); + $ip = $_SERVER['REMOTE_ADDR'] + ? Dba::escape(inet_pton($_SERVER['REMOTE_ADDR'])) + : '0'; + $type = Dba::escape($data['type']); + $value = Dba::escape($data['value']); + $agent = Dba::escape(substr($_SERVER['HTTP_USER_AGENT'], 0, 254)); + $expire = Dba::escape(time() + Config::get('session_length')); + + /* We can't have null things here people */ + if (!strlen($value)) { $value = ' '; } + + /* Insert the row */ + $sql = "INSERT INTO `session` (`id`,`username`,`ip`,`type`,`agent`,`value`,`expire`) " . + " VALUES ('$key','$username','$ip','$type','$agent','$value','$expire')"; + $db_results = Dba::write($sql); + + if (!$db_results) { + debug_event('SESSION', "Session Creation Failed with Query: $sql and " . Dba::error(), '1'); + return false; + } + + debug_event('SESSION', 'Session Created:' . $key, '6'); + + return $key; + + } // session_create + + /** + * check_session + * This checks for an existing session. If it's still valid we go ahead + * and start it and return true. + */ + public static function check_session() { + + $session_name = Config::get('session_name'); + + // No cookie no go! + if (!isset($_COOKIE[$session_name])) { return false; } + + // Check for a remember me + if (isset($_COOKIE[$session_name . '_remember'])) { + self::create_remember_cookie(); + } + + // Set up the cookie params before we start the session. + // This is vital + session_set_cookie_params( + Config::get('cookie_life'), + Config::get('cookie_path'), + Config::get('cookie_domain'), + Config::get('cookie_secure')); + + // Set name + session_name($session_name); + + // Ungimp IE and go + self::ungimp_ie(); + session_start(); + + return true; + + } // check_session + + /** + * session_exists + * This checks to see if the specified session of the specified type + * exists, it also provides an array of key'd data that may be required + * based on the type + */ + public static function session_exists($type, $key, $data=array()) { + + // Switch on the type they pass + switch ($type) { + case 'xml-rpc': + case 'api': + $key = Dba::escape($key); + $time = time(); + $sql = "SELECT * FROM `session` WHERE " . + "`id`='$key' AND `expire` > '$time' " . + "AND `type`='$type'"; + $db_results = Dba::read($sql); + + if (Dba::num_rows($db_results)) { + return true; + } + break; + case 'interface': + $key = Dba::escape($key); + $time = time(); + // Build a list of enabled authentication types + $types = Config::get('auth_methods'); + if (!Config::get('use_auth')) { + $types[] = ''; + } + $enabled_types = implode("','", $types); + $sql = "SELECT * FROM `session` WHERE " . + "`id`='$key' AND `expire` > '$time' " . + "AND `type` IN('$enabled_types')"; + $db_results = Dba::read($sql); + + if (Dba::num_rows($db_results)) { + return true; + } + break; + case 'stream': + $key = Dba::escape($key); + $ip = Dba::escape(inet_pton($data['ip'])); + $agent = Dba::escape($data['agent']); + $sql = "SELECT * FROM `session_stream` WHERE " . + "`id`='$key' AND `expire` > '$time' " . + "AND `ip`='$ip' AND `agent`='$agent'"; + $db_results = Dba::read($sql); + + if (Dba::num_rows($db_results)) { + return true; + } + + break; + default: + return false; + break; + } // type + + // Default to false + return false; + + } // session_exists + + /** + * session_extend + * This should really be extend_session but hey you gotta go with the + * flow. + * This takes a SID and extends its expiration. + */ + public static function session_extend($sid) { + $time = time(); + $sid = Dba::escape($sid); + $expire = isset($_COOKIE[Config::get('session_name') . '_remember']) + ? $time + Config::get('remember_length') + : $time + Config::get('session_length'); + + $sql = "UPDATE `session` SET `expire`='$expire' WHERE `id`='$sid'"; + $db_results = Dba::write($sql); + + debug_event('SESSION', $sid . ' has been extended to ' . date('r', $expire) . ' extension length ' . ($expire - $time), 5); + + return $db_results; + } // session_extend + + /** + * _auto_init + * This function is called when the object is included, this sets up the + * session_save_handler + */ + public static function _auto_init() { + + if (!function_exists('session_start')) { + header("Location:" . Config::get('web_path') . "/test.php"); + exit; + } + + session_set_save_handler( + array('vauth', 'open'), + array('vauth', 'close'), + array('vauth', 'read'), + array('vauth', 'write'), + array('vauth', 'destroy'), + array('vauth', 'gc')); + + } // auto init + + /** + * ungimp_ie + * This function sets the cache limiting to public if you are running + * some flavor of IE. The detection used here is very conservative so + * feel free to fix it. This only has to be done if we're rolling HTTPS. + */ + public static function ungimp_ie() { + + // If no https, no ungimpage required + if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'on') { + return true; + } + + // Try to detect IE + $agent = trim($_SERVER['HTTP_USER_AGENT']); + + if ((strpos($agent, 'MSIE') !== false) || + (strpos($agent,'Internet Explorer/') !== false)) { + session_cache_limiter('public'); + } + + return true; + + } // ungimp_ie + + /** + * authenticate + * This takes a username and password and then returns the results + * based on what happens when we try to do the auth. + */ + public static function authenticate($username, $password) { + + // Foreach the auth methods + foreach (Config::get('auth_methods') as $method) { + + // Build the function name and call it + $function_name = $method . '_auth'; + + if (!method_exists('vauth', $function_name)) { + continue; + } + + $results = self::$function_name($username, $password); + + // If we achieve victory return + if ($results['success']) { break; } + + } // end foreach + + return $results; + + } // authenticate + + /** + * mysql_auth + * + * This is the core function of our built-in authentication. + */ + private static function mysql_auth($username, $password) { + + $username = Dba::escape($username); + + if (strlen($password) && strlen($username)) { + $sql = "SELECT `password` FROM `user` WHERE " . + "`username`='$username'"; + $db_results = Dba::read($sql); + if ($row = Dba::fetch_assoc($db_results)) { + + // Use SHA2 now... cooking with fire. + // For backwards compatibility, we hash a couple + // of different variations of the password. + // Increases collision chances, but doesn't + // break things. + $hashed_password[] = hash('sha256', $password); + $hashed_password[] = hash('sha256', + Dba::escape(scrub_in($password))); + + // Automagically update the password if it's + // old and busted. + if($row['password'] == $hashed_password[1] && + $hashed_password[0] != $hashed_password[1]) { + $user = User::get_from_username($username); + $user->update_password($password); + } + + if(in_array($row['password'], $hashed_password)) { + $results['success'] = true; + $results['type'] = 'mysql'; + $results['username'] = $username; + return $results; + } + } + } + + // Default to failure + $results['success'] = false; + $results['error'] = 'MySQL login attempt failed'; + return $results; + + } // mysql_auth + + /** + * local_auth + * Check to make sure the pam_auth function is implemented (module is + * installed), then check the credentials. + */ + private static function local_auth($username, $password) { + if (!function_exists('pam_auth')) { + $results['success'] = false; + $results['error'] = 'The PAM PHP module is not installed'; + return $results; + } + + $password = scrub_in($password); + + if (pam_auth($username, $password)) { + $results['success'] = true; + $results['type'] = 'local'; + $results['username'] = $username; + } + else { + $results['success'] = false; + $results['error'] = 'PAM login attempt failed'; + } + + return $results; + } // local_auth + + /** + * ldap_auth + * Step one, connect to the LDAP server and perform a search for the + * username provided. + * Step two, attempt to bind using that username and the password + * provided. + * Step three, figure out if they are authorized to use ampache: + * TODO: in config but unimplemented: + * * require-dn "Grant access if the DN in the directive matches + * the DN fetched from the LDAP directory" + * * require-attribute "an attribute fetched from the LDAP + * directory matches the given value" + */ + private static function ldap_auth($username, $password) { + + $ldap_username = Config::get('ldap_username'); + $ldap_password = Config::get('ldap_password'); + + $require_group = Config::get('ldap_require_group'); + + // This is the DN for the users (required) + $ldap_dn = Config::get('ldap_search_dn'); + + // This is the server url (required) + $ldap_url = Config::get('ldap_url'); + + // This is the ldap filter string (required) + $ldap_filter = Config::get('ldap_filter'); + + //This is the ldap objectclass (required) + $ldap_class = Config::get('ldap_objectclass'); + + if (!($ldap_dn && $ldap_url && $ldap_filter && $ldap_class)) { + debug_event('ldap_auth', 'Required config value missing', 1); + $results['success'] = false; + $results['error'] = 'Incomplete LDAP config'; + return $results; + } + + $ldap_name_field = Config::get('ldap_name_field'); + $ldap_email_field = Config::get('ldap_email_field'); + + if ($ldap_link = ldap_connect($ldap_url) ) { + + /* Set to Protocol 3 */ + ldap_set_option($ldap_link, LDAP_OPT_PROTOCOL_VERSION, 3); + + // bind using our auth if we need to for initial search + if (!ldap_bind($ldap_link, $ldap_username, $ldap_password)) { + $results['success'] = false; + $results['error'] = 'Could not bind to LDAP server.'; + return $results; + } // If bind fails + + $sr = ldap_search($ldap_link, $ldap_dn, "(&(objectclass=$ldap_class)($ldap_filter=$username))"); + $info = ldap_get_entries($ldap_link, $sr); + + if ($info["count"] == 1) { + $user_entry = ldap_first_entry($ldap_link, $sr); + $user_dn = ldap_get_dn($ldap_link, $user_entry); + $password = scrub_in($password); + // bind using the user.. + $retval = ldap_bind($ldap_link, $user_dn, $password); + + if ($retval) { + // When the current user needs to be in + // a specific group to access Ampache, + // check whether the 'member' list of + // the group contains the DN + if ($require_group) { + $group_result = ldap_read($ldap_link, $require_group, 'objectclass=*', array('member')); + if (!$group_result) { + debug_event('ldap_auth', "Failure reading $require_group", 1); + $results['success'] = false; + $results['error'] = 'The LDAP group could not be read'; + return $results; + } + + $group_info = ldap_get_entries($ldap_link, $group_result); + + if ($group_info['count'] < 1) { + debug_event('ldap_auth', "No members found in $require_group", 1); + $results['success'] = false; + $results['error'] = 'Empty LDAP group'; + return $results; + } + + $group_match = preg_grep("/^$user_dn\$/i", $group_info[0]['member']); + if (!$group_match) { + debug_event('ldap_auth', "$user_dn is not a member of $require_group",1); + $results['success'] = false; + $results['error'] = 'LDAP login attempt failed'; + return $results; + } + } + ldap_close($ldap_link); + $results['success'] = true; + $results['type'] = "ldap"; + $results['username'] = $username; + $results['name'] = $info[0][$ldap_name_field][0]; + $results['email'] = $info[0][$ldap_email_field][0]; + + return $results; + + } // if we get something good back + + } // if something was sent back + + } // if failed connect + + /* Default to bad news */ + $results['success'] = false; + $results['error'] = 'LDAP login attempt failed'; + + return $results; + + } // ldap_auth + + /** + * http_auth + * This auth method relies on HTTP auth from the webserver + */ + private static function http_auth($username, $password) { + if (($_SERVER['REMOTE_USER'] == $username) || + ($_SERVER['HTTP_REMOTE_USER'] == $username)) { + $results['success'] = true; + $results['type'] = 'http'; + $results['username'] = $username; + $results['name'] = $username; + $results['email'] = ''; + } + else { + $results['success'] = false; + $results['error'] = 'HTTP auth login attempt failed'; + } + return $results; + } // http_auth } // end of vauth class diff --git a/lib/class/video.class.php b/lib/class/video.class.php index 5a758aae24..8299cf8dbf 100644 --- a/lib/class/video.class.php +++ b/lib/class/video.class.php @@ -1,5 +1,5 @@ get_info($id); - foreach ($info as $key=>$value) { - $this->$key = $value; - } + // Load the data from the database + $info = $this->get_info($id); + foreach ($info as $key=>$value) { + $this->$key = $value; + } - return true; + return true; - } // Constructor + } // Constructor - /** - * build_cache - * Build a cache based on the array of ids passed, saves lots of little queries - */ - public static function build_cache($ids=array()) { + /** + * build_cache + * Build a cache based on the array of ids passed, saves lots of little queries + */ + public static function build_cache($ids=array()) { - if (!is_array($ids) OR !count($ids)) { return false; } + if (!is_array($ids) OR !count($ids)) { return false; } - $idlist = '(' . implode(',',$ids) . ')'; + $idlist = '(' . implode(',',$ids) . ')'; - $sql = "SELECT * FROM `video` WHERE `video`.`id` IN $idlist"; - $db_results = Dba::read($sql); + $sql = "SELECT * FROM `video` WHERE `video`.`id` IN $idlist"; + $db_results = Dba::read($sql); - while ($row = Dba::fetch_assoc($db_results)) { - parent::add_to_cache('video',$row['id'],$row); - } + while ($row = Dba::fetch_assoc($db_results)) { + parent::add_to_cache('video',$row['id'],$row); + } - } // build_cache + } // build_cache - /** - * format - * This formats a video object so that it is human readable - */ - public function format() { + /** + * format + * This formats a video object so that it is human readable + */ + public function format() { - $this->f_title = scrub_out($this->title); - $this->f_link = scrub_out($this->title); - $this->f_codec = $this->video_codec . ' / ' . $this->audio_codec; - $this->f_resolution = $this->resolution_x . 'x' . $this->resolution_y; - $this->f_tags = ''; - $this->f_length = floor($this->time/60) . ' ' . T_('minutes'); + $this->f_title = scrub_out($this->title); + $this->f_link = scrub_out($this->title); + $this->f_codec = $this->video_codec . ' / ' . $this->audio_codec; + $this->f_resolution = $this->resolution_x . 'x' . $this->resolution_y; + $this->f_tags = ''; + $this->f_length = floor($this->time/60) . ' ' . T_('minutes'); - } // format + } // format - public function get_stream_types() { + public function get_stream_types() { - return array('native'); + return array('native'); - } // native_stream + } // native_stream - /** - * play_url - * This returns a "PLAY" url for the video in question here, this currently feels a little - * like a hack, might need to adjust it in the future - */ - public static function play_url($oid,$sid='',$force_http='') { + /** + * play_url + * This returns a "PLAY" url for the video in question here, this currently feels a little + * like a hack, might need to adjust it in the future + */ + public static function play_url($oid,$sid='',$force_http='') { - $video = new Video($oid); + $video = new Video($oid); - if (!$video->id) { return false; } + if (!$video->id) { return false; } - $uid = intval($GLOBALS['user']->id); - $oid = intval($video->id); + $uid = intval($GLOBALS['user']->id); + $oid = intval($video->id); - $url = Stream::get_base_url() . "video=true&uid=$uid&oid=$oid"; + $url = Stream::get_base_url() . "video=true&uid=$uid&oid=$oid"; - return $url; + return $url; - } // play_url + } // play_url - /** - * get_transcode_settings - * - * FIXME: Video transcoding is not implemented - */ - public function get_transcode_settings($target = null) { - return false; - } + /** + * get_transcode_settings + * + * FIXME: Video transcoding is not implemented + */ + public function get_transcode_settings($target = null) { + return false; + } - /** - * has_flag - * returns true if the video has been flagged and we shouldn't try to re-read - * the meta data - */ - public function has_flag() { + /** + * has_flag + * returns true if the video has been flagged and we shouldn't try to re-read + * the meta data + */ + public function has_flag() { - } // has_flag + } // has_flag } // end Video class diff --git a/lib/class/xml_data.class.php b/lib/class/xml_data.class.php index da3c98c2d2..8c7884c9c1 100644 --- a/lib/class/xml_data.class.php +++ b/lib/class/xml_data.class.php @@ -1,5 +1,5 @@ " . self::_footer(); - return $string; - - } // error - - /** - * single_string - * - * This takes two values, first the key second the string - * - * @param string $key (description here...) - * @param string $string xml data - * @return string return xml - */ - public static function single_string($key,$string) { - - $final = self::_header() . "\t<$key>" . self::_footer(); - - return $final; - - } // single_string - - /** - * header - * - * This returns the header - * - * @see _header() - * @return string return xml - */ - public static function header() { - - return self::_header(); - - } // header - - /** - * footer - * - * This returns the footer - * - * @see _footer() - * @return string return xml - */ - public static function footer() { - - return self::_footer(); - - } // footer - - /** - * tags_string - * - * This returns the formatted 'tags' string for an xml document - * - */ - private static function tags_string($tags) { - - $string = ''; - - if (is_array($tags)) { - - foreach ($tags as $tag_id => $data) { - $tag = new Tag($tag_id); - $string .= "\t
' . - sprintf( - T_ngettext( - 'Successfully imported playlist with %d song.', - 'Successfully imported playlist with %d songs.', - $result['count']), - $result['count']); - } - else { - $url = 'show_import_playlist'; - $title = T_('Playlist Not Imported'); - $body = T_($result['error']); - } - show_confirmation($title, $body, Config::get('web_path') . '/playlist.php?action=' . $url); - break; - case 'set_track_numbers': - /* Make sure they have permission */ - if (!$playlist->has_access()) { - UI::access_denied(); - break; - } + case 'add_dyn_song': + /* Check Rights */ + if (!$playlist->has_access()) { + UI::access_denied(); + break; + } + + $playlist->add_dyn_song(); + $_SESSION['data']['playlist_id'] = $playlist->id; + show_playlist($playlist); + break; + case 'create_playlist': + /* Check rights */ + if (!Access::check('interface','25')) { + UI::access_denied(); + break; + } + + $playlist_name = scrub_in($_REQUEST['playlist_name']); + $playlist_type = scrub_in($_REQUEST['type']); + + $playlist->create($playlist_name,$playlist_type); + $_SESSION['data']['playlist_id'] = $playlist->id; + show_confirmation(T_('Playlist Created'), sprintf(T_('%1$s (%2$s) has been created'), $playlist_name, $playlist_type),'playlist.php'); + break; + case 'delete_playlist': + // If we made it here, we didn't have sufficient rights. + UI::access_denied(); + break; + case 'remove_song': + /* Check em for rights */ + if (!$playlist->has_access()) { + UI::access_denied(); + break; + } + $playlist->remove_songs($_REQUEST['song']); + show_playlist($playlist); + break; + case 'show_playlist': + $playlist = new Playlist($_REQUEST['playlist_id']); + $playlist->format(); + $object_ids = $playlist->get_items(); + require_once Config::get('prefix') . '/templates/show_playlist.inc.php'; + break; + case 'show_import_playlist': + require_once Config::get('prefix') . '/templates/show_import_playlist.inc.php'; + break; + case 'import_playlist': + /* first we rename the file to it's original name before importing. + Otherwise the playlist name will have the $_FILES['filename']['tmp_name'] which doesn't look right... */ + $dir = dirname($_FILES['filename']['tmp_name']) . "/"; + $filename = $dir . basename($_FILES['filename']['name']); + move_uploaded_file($_FILES['filename']['tmp_name'], $filename ); + + $catalog = new Catalog(); + $result = $catalog->import_m3u($filename); + + if($result['success']) { + $url = 'show_playlist&playlist_id=' . $result['id']; + $title = T_('Playlist Imported'); + $body = basename($_FILES['filename']['name']); + $body .= '
' . + sprintf( + T_ngettext( + 'Successfully imported playlist with %d song.', + 'Successfully imported playlist with %d songs.', + $result['count']), + $result['count']); + } + else { + $url = 'show_import_playlist'; + $title = T_('Playlist Not Imported'); + $body = T_($result['error']); + } + show_confirmation($title, $body, Config::get('web_path') . '/playlist.php?action=' . $url); + break; + case 'set_track_numbers': + /* Make sure they have permission */ + if (!$playlist->has_access()) { + UI::access_denied(); + break; + } $song_ids = scrub_in($_REQUEST['song']); foreach ($song_ids as $song_id) { $track = scrub_in($_REQUEST['tr_' . $song_id]); @@ -132,34 +132,34 @@ show_playlist($playlist); break; - case 'prune_empty': - /* Make sure they have permission */ - if (!$GLOBALS['user']->has_access(100)) { - UI::access_denied(); - break; - } - - prune_empty_playlists(); - $url = Config::get('web_path') . '/playlist.php'; - $title = T_('Empty Playlists Deleted'); - $body = ''; - show_confirmation($title,$body,$url); - break; - case 'normalize_tracks': - $playlist = new Playlist($_REQUEST['playlist_id']); - - /* Make sure they have permission */ - if (!$playlist->has_access()) { - UI::access_denied(); - break; - } - - /* Normalize the tracks */ - $playlist->normalize_tracks(); - $object_ids = $playlist->get_items(); - default: - require_once Config::get('prefix') . '/templates/show_playlist.inc.php'; - break; + case 'prune_empty': + /* Make sure they have permission */ + if (!$GLOBALS['user']->has_access(100)) { + UI::access_denied(); + break; + } + + prune_empty_playlists(); + $url = Config::get('web_path') . '/playlist.php'; + $title = T_('Empty Playlists Deleted'); + $body = ''; + show_confirmation($title,$body,$url); + break; + case 'normalize_tracks': + $playlist = new Playlist($_REQUEST['playlist_id']); + + /* Make sure they have permission */ + if (!$playlist->has_access()) { + UI::access_denied(); + break; + } + + /* Normalize the tracks */ + $playlist->normalize_tracks(); + $object_ids = $playlist->get_items(); + default: + require_once Config::get('prefix') . '/templates/show_playlist.inc.php'; + break; } // switch on the action UI::show_footer(); diff --git a/preferences.php b/preferences.php index 1b7e0f676c..39fde752bd 100644 --- a/preferences.php +++ b/preferences.php @@ -1,5 +1,5 @@ id; - $fullname = $GLOBALS['user']->fullname; - } - - /* Update and reset preferences */ - update_preferences($user_id); - Preference::init(); - - // Reset gettext so that it's clear whether the preference took - // FIXME: do we need to do any header fiddling? - load_gettext(); - - $preferences = $GLOBALS['user']->get_preferences($_REQUEST['tab'], $system); - break; - case 'admin_update_preferences': - // Make sure only admins here - if (!Access::check('interface','100')) { - UI::access_denied(); - exit; - } - - if (!Core::form_verify('update_preference','post')) { - UI::access_denied(); - exit; - } - - update_preferences($_POST['user_id']); - header("Location: " . Config::get('web_path') . "/admin/users.php?action=show_preferences&user_id=" . scrub_out($_POST['user_id'])); - break; - case 'admin': - // Make sure only admins here - if (!Access::check('interface','100')) { - UI::access_denied(); - exit; - } - $fullname= T_('Server'); - $preferences = $GLOBALS['user']->get_preferences($_REQUEST['tab'], true); - break; - case 'user': - if (!Access::check('interface','100')) { - UI::access_denied(); - exit; - } - $client = new User($_REQUEST['user_id']); - $fullname = $client->fullname; - $preferences = $client->get_preferences($_REQUEST['tab']); - break; - case 'update_user': - // Make sure we're a user and they came from the form - if (!Access::check('interface','25') OR !Config::get('use_auth')) { - UI::access_denied(); - exit; - } - - if (!Core::form_verify('update_user','post')) { - UI::access_denied(); - exit; - } - - // Remove the value - unset($_SESSION['forms']['account']); - - // Don't let them change access, or username here - unset($_POST['access']); - $_POST['username'] = $GLOBALS['user']->username; - - if (!$GLOBALS['user']->update($_POST)) { - Error::add('general', T_('Error Update Failed')); - } - else { - $_REQUEST['action'] = 'confirm'; - $title = T_('Updated'); - $text = T_('Your Account has been updated'); - $next_url = Config::get('web_path') . '/preferences.php?tab=account'; - } - break; - default: - $fullname = $GLOBALS['user']->fullname; - $preferences = $GLOBALS['user']->get_preferences($_REQUEST['tab']); - break; + case 'update_preferences': + if ($_POST['method'] == 'admin' && !Access::check('interface','100')) { + UI::access_denied(); + exit; + } + + if (!Core::form_verify('update_preference','post')) { + UI::access_denied(); + exit; + } + + /* Reset the Theme */ + if ($_POST['method'] == 'admin') { + $user_id = '-1'; + $system = true; + $fullname = T_('Server'); + $_REQUEST['action'] = 'admin'; + } + else { + $user_id = $GLOBALS['user']->id; + $fullname = $GLOBALS['user']->fullname; + } + + /* Update and reset preferences */ + update_preferences($user_id); + Preference::init(); + + // Reset gettext so that it's clear whether the preference took + // FIXME: do we need to do any header fiddling? + load_gettext(); + + $preferences = $GLOBALS['user']->get_preferences($_REQUEST['tab'], $system); + break; + case 'admin_update_preferences': + // Make sure only admins here + if (!Access::check('interface','100')) { + UI::access_denied(); + exit; + } + + if (!Core::form_verify('update_preference','post')) { + UI::access_denied(); + exit; + } + + update_preferences($_POST['user_id']); + header("Location: " . Config::get('web_path') . "/admin/users.php?action=show_preferences&user_id=" . scrub_out($_POST['user_id'])); + break; + case 'admin': + // Make sure only admins here + if (!Access::check('interface','100')) { + UI::access_denied(); + exit; + } + $fullname= T_('Server'); + $preferences = $GLOBALS['user']->get_preferences($_REQUEST['tab'], true); + break; + case 'user': + if (!Access::check('interface','100')) { + UI::access_denied(); + exit; + } + $client = new User($_REQUEST['user_id']); + $fullname = $client->fullname; + $preferences = $client->get_preferences($_REQUEST['tab']); + break; + case 'update_user': + // Make sure we're a user and they came from the form + if (!Access::check('interface','25') OR !Config::get('use_auth')) { + UI::access_denied(); + exit; + } + + if (!Core::form_verify('update_user','post')) { + UI::access_denied(); + exit; + } + + // Remove the value + unset($_SESSION['forms']['account']); + + // Don't let them change access, or username here + unset($_POST['access']); + $_POST['username'] = $GLOBALS['user']->username; + + if (!$GLOBALS['user']->update($_POST)) { + Error::add('general', T_('Error Update Failed')); + } + else { + $_REQUEST['action'] = 'confirm'; + $title = T_('Updated'); + $text = T_('Your Account has been updated'); + $next_url = Config::get('web_path') . '/preferences.php?tab=account'; + } + break; + default: + $fullname = $GLOBALS['user']->fullname; + $preferences = $GLOBALS['user']->get_preferences($_REQUEST['tab']); + break; } // End Switch Action UI::show_header(); @@ -131,13 +131,13 @@ * switch on the view */ switch ($_REQUEST['action']) { - case 'confirm': - show_confirmation($title,$text,$next_url,$cancel); - break; - default: - // Show the default preferences page - require Config::get('prefix') . '/templates/show_preferences.inc.php'; - break; + case 'confirm': + show_confirmation($title,$text,$next_url,$cancel); + break; + default: + // Show the default preferences page + require Config::get('prefix') . '/templates/show_preferences.inc.php'; + break; } // end switch on action UI::show_footer(); diff --git a/radio.php b/radio.php index 360c1ff7d5..e158b1bee4 100644 --- a/radio.php +++ b/radio.php @@ -1,5 +1,5 @@ playlist->add_object($object_id, 'song'); - } - case 'advanced': - default: - require_once Config::get('prefix') . '/templates/show_random.inc.php'; - break; + // We need to add them to the active playlist + foreach ($object_ids as $object_id) { + $GLOBALS['user']->playlist->add_object($object_id, 'song'); + } + case 'advanced': + default: + require_once Config::get('prefix') . '/templates/show_random.inc.php'; + break; } // end switch UI::show_footer(); diff --git a/register.php b/register.php index f96affed0b..68f0c06566 100644 --- a/register.php +++ b/register.php @@ -1,5 +1,5 @@ must accept the user agreement")); - } - } // if they have to agree to something - - if (!$_POST['username']) { - Error::add('username', T_("You did not enter a username")); - } - - if(!$fullname) { - Error::add('fullname', T_("Please fill in your full name (Firstname Lastname)")); - } - - /* Check the mail for correct address formation. */ - $attempt = 0; - $max_attempts = 3; - $response_code = ""; - - while ( $response_code == "" || strstr( $response_code, "fsockopen error" )) { - $validate_results = validateEmail( $email ); - $response_code = $validate_results[1]; - if($attempt == $max_attempts) { - break; - } - $attempt++; - } - - if ($validate_results[0] OR strstr($validate_results[1],"greylist")) { - $mmsg = "MAILOK"; - } - else { - Error::add('email', T_("Error Email address not confirmed") - . "
$validate_results[1]"); - } - /* End of mailcheck */ - - if (!$pass1) { - Error::add('password', T_("You must enter a password")); - } - - if ( $pass1 != $pass2 ) { - Error::add('password', T_("Your passwords do not match")); - } - - if (!User::check_username($username)) { - Error::add('duplicate_user', T_("Error Username already exists")); - } - - // If we've hit an error anywhere up there break! - if (Error::occurred()) { - require_once Config::get('prefix') . '/templates/show_user_registration.inc.php'; - break; - } - - /* Attempt to create the new user */ - $access = '5'; - switch (Config::get('auto_user')) { - case 'admin': - $access = '100'; - break; - case 'user': - $access = '25'; - break; - default: - case 'guest': - $access = '5'; - break; - } // auto-user level - - - $new_user = User::create($username, $fullname, $email, $pass1, - $access, Config::get('admin_enable_required')); - - if (!$new_user) { - Error::add('duplicate_user', T_("Error: Insert Failed")); - require_once Config::get('prefix') . '/templates/show_user_registration.inc.php'; - break; - } - - $client = new User($new_user); - $validation = md5(uniqid(rand(), true)); - $client->update_validation($validation); - - Registration::send_confirmation($username, $fullname, $email, $pass1, $validation); - require_once Config::get('prefix') . '/templates/show_registration_confirmation.inc.php'; - break; - case 'show_add_user': - default: - require_once Config::get('prefix') . '/templates/show_user_registration.inc.php'; - break; + case 'validate': + $username = scrub_in($_GET['username']); + $validation = scrub_in($_GET['auth']); + require_once Config::get('prefix') . '/templates/show_user_activate.inc.php'; + break; + case 'add_user': + /** + * User information has been entered + * we need to check the database for possible existing username first + * if username exists, error and say "Please choose a different name." + * if username does not exist, insert user information into database + * then allow the user to 'click here to login' + * possibly by logging them in right then and there with their current info + * and 'click here to login' would just be a link back to index.php + */ + $fullname = scrub_in($_POST['fullname']); + $username = scrub_in($_POST['username']); + $email = scrub_in($_POST['email']); + $pass1 = scrub_in($_POST['password_1']); + $pass2 = scrub_in($_POST['password_2']); + + /* If we're using the captcha stuff */ + if (Config::get('captcha_public_reg')) { + $captcha = captcha::solved(); + if(!isset ($captcha)) { + Error::add('captcha', T_('Error Captcha Required')); + } + if (isset ($captcha)) { + if ($captcha) { + $msg="SUCCESS"; + } + else { + Error::add('captcha', T_('Error Captcha Failed')); + } + } // end if we've got captcha + } // end if it's enabled + + if (Config::get('user_agreement')) { + if (!$_POST['accept_agreement']) { + Error::add('user_agreement', T_("You must accept the user agreement")); + } + } // if they have to agree to something + + if (!$_POST['username']) { + Error::add('username', T_("You did not enter a username")); + } + + if(!$fullname) { + Error::add('fullname', T_("Please fill in your full name (Firstname Lastname)")); + } + + /* Check the mail for correct address formation. */ + $attempt = 0; + $max_attempts = 3; + $response_code = ""; + + while ( $response_code == "" || strstr( $response_code, "fsockopen error" )) { + $validate_results = validateEmail( $email ); + $response_code = $validate_results[1]; + if($attempt == $max_attempts) { + break; + } + $attempt++; + } + + if ($validate_results[0] OR strstr($validate_results[1],"greylist")) { + $mmsg = "MAILOK"; + } + else { + Error::add('email', T_("Error Email address not confirmed") + . "
$validate_results[1]"); + } + /* End of mailcheck */ + + if (!$pass1) { + Error::add('password', T_("You must enter a password")); + } + + if ( $pass1 != $pass2 ) { + Error::add('password', T_("Your passwords do not match")); + } + + if (!User::check_username($username)) { + Error::add('duplicate_user', T_("Error Username already exists")); + } + + // If we've hit an error anywhere up there break! + if (Error::occurred()) { + require_once Config::get('prefix') . '/templates/show_user_registration.inc.php'; + break; + } + + /* Attempt to create the new user */ + $access = '5'; + switch (Config::get('auto_user')) { + case 'admin': + $access = '100'; + break; + case 'user': + $access = '25'; + break; + default: + case 'guest': + $access = '5'; + break; + } // auto-user level + + + $new_user = User::create($username, $fullname, $email, $pass1, + $access, Config::get('admin_enable_required')); + + if (!$new_user) { + Error::add('duplicate_user', T_("Error: Insert Failed")); + require_once Config::get('prefix') . '/templates/show_user_registration.inc.php'; + break; + } + + $client = new User($new_user); + $validation = md5(uniqid(rand(), true)); + $client->update_validation($validation); + + Registration::send_confirmation($username, $fullname, $email, $pass1, $validation); + require_once Config::get('prefix') . '/templates/show_registration_confirmation.inc.php'; + break; + case 'show_add_user': + default: + require_once Config::get('prefix') . '/templates/show_user_registration.inc.php'; + break; } // end switch on action ?> diff --git a/rss.php b/rss.php index 5f694cc180..091d64a574 100644 --- a/rss.php +++ b/rss.php @@ -1,5 +1,5 @@ set_type($_REQUEST['type']); - $browse->show_objects($results); - $browse->store(); - break; - case 'save_as_track': - $playlist_id = save_search($_REQUEST); - $playlist = new Playlist($playlist_id); - show_confirmation(T_('Search Saved'),sprintf(T_('Your Search has been saved as a track in %s'), $playlist->name), Config::get('web_path') . "/search.php"); - break; - case 'save_as_smartplaylist': - $playlist = new Search(); - $playlist->parse_rules(Search::clean_request($_REQUEST)); - $playlist->save(); - default: - require_once Config::get('prefix') . '/templates/show_search.inc.php'; - break; - case 'descriptor': - // This is a little special we don't want header/footers so trash what we've got in the OB - ob_clean(); - require_once Config::get('prefix') . '/templates/show_search_descriptor.inc.php'; - exit; - break; + case 'search': + $browse = new Browse(); + require_once Config::get('prefix') . '/templates/show_search.inc.php'; + require_once Config::get('prefix') . '/templates/show_search_options.inc.php'; + $results = Search::run($_REQUEST); + $browse->set_type($_REQUEST['type']); + $browse->show_objects($results); + $browse->store(); + break; + case 'save_as_track': + $playlist_id = save_search($_REQUEST); + $playlist = new Playlist($playlist_id); + show_confirmation(T_('Search Saved'),sprintf(T_('Your Search has been saved as a track in %s'), $playlist->name), Config::get('web_path') . "/search.php"); + break; + case 'save_as_smartplaylist': + $playlist = new Search(); + $playlist->parse_rules(Search::clean_request($_REQUEST)); + $playlist->save(); + default: + require_once Config::get('prefix') . '/templates/show_search.inc.php'; + break; + case 'descriptor': + // This is a little special we don't want header/footers so trash what we've got in the OB + ob_clean(); + require_once Config::get('prefix') . '/templates/show_search_descriptor.inc.php'; + exit; + break; } /* Show the Footer */ diff --git a/server/ajax.server.php b/server/ajax.server.php index 55739b8d2f..52175876e9 100644 --- a/server/ajax.server.php +++ b/server/ajax.server.php @@ -1,5 +1,5 @@ format(); - break; - case 'artist_row': - $key = 'artist_' . $_GET['id']; - $artist = new Artist($_GET['id']); - $artist->format(); - break; - case 'song_row': - $key = 'song_' . $_GET['id']; - $song = new Song($_GET['id']); - $song->format(); - break; - case 'live_stream_row': - $key = 'live_stream_' . $_GET['id']; - $radio = new Radio($_GET['id']); - $radio->format(); - break; - case 'playlist_row': - case 'playlist_title': - $key = 'playlist_row_' . $_GET['id']; - $playlist = new Playlist($_GET['id']); - $playlist->format(); - // If the current user is the owner, only user is required - if ($playlist->user == $GLOBALS['user']->id) { - $level = '25'; - } - break; - case 'smartplaylist_row': - case 'smartplaylist_title': - $key = 'playlist_row_' . $_GET['id']; - $playlist = new Search('song', $_GET['id']); - $playlist->format(); - if ($playlist->user == $GLOBALS['user']->id) { - $level = '25'; - } - break; - default: - $key = 'rfc3514'; - echo xml_from_array(array($key=>'0x1')); - exit; - break; - } // end switch on type + switch ($_GET['type']) { + case 'album_row': + $key = 'album_' . $_GET['id']; + $album = new Album($_GET['id']); + $album->format(); + break; + case 'artist_row': + $key = 'artist_' . $_GET['id']; + $artist = new Artist($_GET['id']); + $artist->format(); + break; + case 'song_row': + $key = 'song_' . $_GET['id']; + $song = new Song($_GET['id']); + $song->format(); + break; + case 'live_stream_row': + $key = 'live_stream_' . $_GET['id']; + $radio = new Radio($_GET['id']); + $radio->format(); + break; + case 'playlist_row': + case 'playlist_title': + $key = 'playlist_row_' . $_GET['id']; + $playlist = new Playlist($_GET['id']); + $playlist->format(); + // If the current user is the owner, only user is required + if ($playlist->user == $GLOBALS['user']->id) { + $level = '25'; + } + break; + case 'smartplaylist_row': + case 'smartplaylist_title': + $key = 'playlist_row_' . $_GET['id']; + $playlist = new Search('song', $_GET['id']); + $playlist->format(); + if ($playlist->user == $GLOBALS['user']->id) { + $level = '25'; + } + break; + default: + $key = 'rfc3514'; + echo xml_from_array(array($key=>'0x1')); + exit; + break; + } // end switch on type - // Make sure they got them rights - if (!Access::check('interface',$level)) { - $results['rfc3514'] = '0x1'; - break; - } + // Make sure they got them rights + if (!Access::check('interface',$level)) { + $results['rfc3514'] = '0x1'; + break; + } - ob_start(); - require Config::get('prefix') . '/templates/show_edit_' . $_GET['type'] . '.inc.php'; - $results[$key] = ob_get_contents(); - ob_end_clean(); - break; - case 'edit_object': + ob_start(); + require Config::get('prefix') . '/templates/show_edit_' . $_GET['type'] . '.inc.php'; + $results[$key] = ob_get_contents(); + ob_end_clean(); + break; + case 'edit_object': - $level = '50'; + $level = '50'; - if ($_POST['type'] == 'playlist_row' || $_POST['type'] == 'playlist_title') { - $playlist = new Playlist($_POST['id']); - if ($GLOBALS['user']->id == $playlist->user) { - $level = '25'; - } - } - if ($_POST['type'] == 'smartplaylist_row' || - $_POST['type'] == 'smartplaylist_title') { - $playlist = new Search('song', $_POST['id']); - if ($GLOBALS['user']->id == $playlist->user) { - $level = '25'; - } - } + if ($_POST['type'] == 'playlist_row' || $_POST['type'] == 'playlist_title') { + $playlist = new Playlist($_POST['id']); + if ($GLOBALS['user']->id == $playlist->user) { + $level = '25'; + } + } + if ($_POST['type'] == 'smartplaylist_row' || + $_POST['type'] == 'smartplaylist_title') { + $playlist = new Search('song', $_POST['id']); + if ($GLOBALS['user']->id == $playlist->user) { + $level = '25'; + } + } - // Make sure we've got them rights - if (!Access::check('interface',$level) || Config::get('demo_mode')) { - $results['rfc3514'] = '0x1'; - break; - } + // Make sure we've got them rights + if (!Access::check('interface',$level) || Config::get('demo_mode')) { + $results['rfc3514'] = '0x1'; + break; + } - switch ($_POST['type']) { - case 'album_row': - $key = 'album_' . $_POST['id']; - $album = new Album($_POST['id']); - $songs = $album->get_songs(); - $new_id = $album->update($_POST); - if ($new_id != $_POST['id']) { - $album = new Album($new_id); - foreach ($songs as $song_id) { - Flag::add($song_id,'song','retag','Inline Album Update'); - } - } - $album->format(); - break; - case 'artist_row': - $key = 'artist_' . $_POST['id']; - $artist = new Artist($_POST['id']); - $songs = $artist->get_songs(); - $new_id = $artist->update($_POST); - if ($new_id != $_POST['id']) { - $artist = new Artist($new_id); - foreach ($songs as $song_id) { - Flag::add($song_id,'song','retag','Inline Artist Update'); - } - } - $artist->format(); - break; - case 'song_row': - $key = 'song_' . $_POST['id']; - $song = new Song($_POST['id']); - Flag::add($song->id,'song','retag','Inline Single Song Update'); - $song->update($_POST); - $song->format(); - break; - case 'playlist_row': - case 'playlist_title': - $key = 'playlist_row_' . $_POST['id']; - $playlist->update($_POST); - $playlist->format(); - $count = $playlist->get_song_count(); - break; - case 'smartplaylist_row': - case 'smartplaylist_title': - $key = 'playlist_row_' . $_POST['id']; - $playlist->name = $_POST['name']; - $playlist->type = $_POST['pl_type']; - $playlist->update(); - $playlist->format(); - break; - case 'live_stream_row': - $key = 'live_stream_' . $_POST['id']; - Radio::update($_POST); - $radio = new Radio($_POST['id']); - $radio->format(); - break; - default: - $key = 'rfc3514'; - echo xml_from_array(array($key=>'0x1')); - exit; - break; - } // end switch on type + switch ($_POST['type']) { + case 'album_row': + $key = 'album_' . $_POST['id']; + $album = new Album($_POST['id']); + $songs = $album->get_songs(); + $new_id = $album->update($_POST); + if ($new_id != $_POST['id']) { + $album = new Album($new_id); + foreach ($songs as $song_id) { + Flag::add($song_id,'song','retag','Inline Album Update'); + } + } + $album->format(); + break; + case 'artist_row': + $key = 'artist_' . $_POST['id']; + $artist = new Artist($_POST['id']); + $songs = $artist->get_songs(); + $new_id = $artist->update($_POST); + if ($new_id != $_POST['id']) { + $artist = new Artist($new_id); + foreach ($songs as $song_id) { + Flag::add($song_id,'song','retag','Inline Artist Update'); + } + } + $artist->format(); + break; + case 'song_row': + $key = 'song_' . $_POST['id']; + $song = new Song($_POST['id']); + Flag::add($song->id,'song','retag','Inline Single Song Update'); + $song->update($_POST); + $song->format(); + break; + case 'playlist_row': + case 'playlist_title': + $key = 'playlist_row_' . $_POST['id']; + $playlist->update($_POST); + $playlist->format(); + $count = $playlist->get_song_count(); + break; + case 'smartplaylist_row': + case 'smartplaylist_title': + $key = 'playlist_row_' . $_POST['id']; + $playlist->name = $_POST['name']; + $playlist->type = $_POST['pl_type']; + $playlist->update(); + $playlist->format(); + break; + case 'live_stream_row': + $key = 'live_stream_' . $_POST['id']; + Radio::update($_POST); + $radio = new Radio($_POST['id']); + $radio->format(); + break; + default: + $key = 'rfc3514'; + echo xml_from_array(array($key=>'0x1')); + exit; + break; + } // end switch on type - ob_start(); - require Config::get('prefix') . '/templates/show_' . $_POST['type'] . '.inc.php'; - $results[$key] = ob_get_contents(); - ob_end_clean(); - break; - case 'current_playlist': - switch ($_REQUEST['type']) { - case 'delete': - $GLOBALS['user']->playlist->delete_track($_REQUEST['id']); - break; - } // end switch + ob_start(); + require Config::get('prefix') . '/templates/show_' . $_POST['type'] . '.inc.php'; + $results[$key] = ob_get_contents(); + ob_end_clean(); + break; + case 'current_playlist': + switch ($_REQUEST['type']) { + case 'delete': + $GLOBALS['user']->playlist->delete_track($_REQUEST['id']); + break; + } // end switch - $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); - break; - // Handle the users basketcases... - case 'basket': - switch ($_REQUEST['type']) { - case 'album': - case 'artist': - case 'tag': - $object = new $_REQUEST['type']($_REQUEST['id']); - $songs = $object->get_songs(); - foreach ($songs as $song_id) { - $GLOBALS['user']->playlist->add_object($song_id,'song'); - } // end foreach - break; - case 'browse_set': - $browse = new Browse($_REQUEST['browse_id']); - $objects = $browse->get_saved(); - foreach ($objects as $object_id) { - $GLOBALS['user']->playlist->add_object($object_id,'song'); - } - break; - case 'album_random': - case 'artist_random': - case 'tag_random': - $data = explode('_',$_REQUEST['type']); - $type = $data['0']; - $object = new $type($_REQUEST['id']); - $songs = $object->get_random_songs(); - foreach ($songs as $song_id) { - $GLOBALS['user']->playlist->add_object($song_id,'song'); - } - break; - case 'playlist': - $playlist = new Playlist($_REQUEST['id']); - $items = $playlist->get_items(); - foreach ($items as $item) { - $GLOBALS['user']->playlist->add_object($item['object_id'], $item['object_type']); - } - break; - case 'playlist_random': - $playlist = new Playlist($_REQUEST['id']); - $items = $playlist->get_random_items(); - foreach ($items as $item) { - $GLOBALS['user']->playlist->add_object($item['object_id'], $item['object_type']); - } - break; - case 'smartplaylist': - $playlist = new Search('song', $_REQUEST['id']); - $items = $playlist->get_items(); - foreach ($items as $item) { - $GLOBALS['user']->playlist->add_object($item['object_id'],$item['object_type']); - } - break; - case 'clear_all': - $GLOBALS['user']->playlist->clear(); - break; - case 'live_stream': - $object = new Radio($_REQUEST['id']); - // Confirm its a valid ID - if ($object->name) { - $GLOBALS['user']->playlist->add_object($object->id,'radio'); - } - break; - case 'dynamic': - $random_id = Random::get_type_id($_REQUEST['random_type']); - $GLOBALS['user']->playlist->add_object($random_id,'random'); - break; - case 'video': - $GLOBALS['user']->playlist->add_object($_REQUEST['id'],'video'); - break; - default: - case 'song': - $GLOBALS['user']->playlist->add_object($_REQUEST['id'],'song'); - break; - } // end switch + $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); + break; + // Handle the users basketcases... + case 'basket': + switch ($_REQUEST['type']) { + case 'album': + case 'artist': + case 'tag': + $object = new $_REQUEST['type']($_REQUEST['id']); + $songs = $object->get_songs(); + foreach ($songs as $song_id) { + $GLOBALS['user']->playlist->add_object($song_id,'song'); + } // end foreach + break; + case 'browse_set': + $browse = new Browse($_REQUEST['browse_id']); + $objects = $browse->get_saved(); + foreach ($objects as $object_id) { + $GLOBALS['user']->playlist->add_object($object_id,'song'); + } + break; + case 'album_random': + case 'artist_random': + case 'tag_random': + $data = explode('_',$_REQUEST['type']); + $type = $data['0']; + $object = new $type($_REQUEST['id']); + $songs = $object->get_random_songs(); + foreach ($songs as $song_id) { + $GLOBALS['user']->playlist->add_object($song_id,'song'); + } + break; + case 'playlist': + $playlist = new Playlist($_REQUEST['id']); + $items = $playlist->get_items(); + foreach ($items as $item) { + $GLOBALS['user']->playlist->add_object($item['object_id'], $item['object_type']); + } + break; + case 'playlist_random': + $playlist = new Playlist($_REQUEST['id']); + $items = $playlist->get_random_items(); + foreach ($items as $item) { + $GLOBALS['user']->playlist->add_object($item['object_id'], $item['object_type']); + } + break; + case 'smartplaylist': + $playlist = new Search('song', $_REQUEST['id']); + $items = $playlist->get_items(); + foreach ($items as $item) { + $GLOBALS['user']->playlist->add_object($item['object_id'],$item['object_type']); + } + break; + case 'clear_all': + $GLOBALS['user']->playlist->clear(); + break; + case 'live_stream': + $object = new Radio($_REQUEST['id']); + // Confirm its a valid ID + if ($object->name) { + $GLOBALS['user']->playlist->add_object($object->id,'radio'); + } + break; + case 'dynamic': + $random_id = Random::get_type_id($_REQUEST['random_type']); + $GLOBALS['user']->playlist->add_object($random_id,'random'); + break; + case 'video': + $GLOBALS['user']->playlist->add_object($_REQUEST['id'],'video'); + break; + default: + case 'song': + $GLOBALS['user']->playlist->add_object($_REQUEST['id'],'song'); + break; + } // end switch - $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); - break; - /* Setting ratings */ - case 'set_rating': - ob_start(); - $rating = new Rating($_GET['object_id'], $_GET['rating_type']); - $rating->set_rating($_GET['rating']); - Rating::show($_GET['object_id'], $_GET['rating_type']); - $key = "rating_" . $_GET['object_id'] . "_" . $_GET['rating_type']; - $results[$key] = ob_get_contents(); - ob_end_clean(); - break; - default: - $results['rfc3514'] = '0x1'; - break; + $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); + break; + /* Setting ratings */ + case 'set_rating': + ob_start(); + $rating = new Rating($_GET['object_id'], $_GET['rating_type']); + $rating->set_rating($_GET['rating']); + Rating::show($_GET['object_id'], $_GET['rating_type']); + $key = "rating_" . $_GET['object_id'] . "_" . $_GET['rating_type']; + $results[$key] = ob_get_contents(); + ob_end_clean(); + break; + default: + $results['rfc3514'] = '0x1'; + break; } // end switch action // Go ahead and do the echo diff --git a/server/browse.ajax.php b/server/browse.ajax.php index b6f3e15489..f9e4d39a1f 100644 --- a/server/browse.ajax.php +++ b/server/browse.ajax.php @@ -1,5 +1,5 @@ set_filter($_REQUEST['key'],$_REQUEST['multi_alpha_filter']); - $browse->set_catalog($_SESSION['catalog']); - } - - if ($_REQUEST['sort']) { - // Set the new sort value - $browse->set_sort($_REQUEST['sort']); - } - - - if ($_REQUEST['catalog_key'] || $SESSION['catalog'] != 0) { - $browse->set_filter('catalog',$_REQUEST['catalog_key']); - $_SESSION['catalog'] = $_REQUEST['catalog_key']; - } elseif ($_REQUEST['catalog_key'] == 0) { - $browse->set_filter('catalog', null); - unset($_SESSION['catalog']); - } - - ob_start(); + case 'browse': + $object_ids = array(); + + // Check 'value' with isset because it can null + //(user type a "start with" word and deletes it) + if ($_REQUEST['key'] && (isset($_REQUEST['multi_alpha_filter']) OR isset($_REQUEST['value']))) { + // Set any new filters we've just added + $browse->set_filter($_REQUEST['key'],$_REQUEST['multi_alpha_filter']); + $browse->set_catalog($_SESSION['catalog']); + } + + if ($_REQUEST['sort']) { + // Set the new sort value + $browse->set_sort($_REQUEST['sort']); + } + + + if ($_REQUEST['catalog_key'] || $SESSION['catalog'] != 0) { + $browse->set_filter('catalog',$_REQUEST['catalog_key']); + $_SESSION['catalog'] = $_REQUEST['catalog_key']; + } elseif ($_REQUEST['catalog_key'] == 0) { + $browse->set_filter('catalog', null); + unset($_SESSION['catalog']); + } + + ob_start(); $browse->show_objects(); $results['browse_content'] = ob_get_clean(); - break; - - case 'set_sort': - - if ($_REQUEST['sort']) { - $browse->set_sort($_REQUEST['sort']); - } - - ob_start(); - $browse->show_objects(); - $results['browse_content'] = ob_get_clean(); - break; - case 'toggle_tag': - $type = $_SESSION['tagcloud_type'] ? $_SESSION['tagcloud_type'] : 'song'; - $browse->set_type($type); - break; - case 'delete_object': - switch ($_REQUEST['type']) { - case 'playlist': - // Check the perms we need to on this - $playlist = new Playlist($_REQUEST['id']); - if (!$playlist->has_access()) { exit; } - - // Delete it! - $playlist->delete(); - $key = 'playlist_row_' . $playlist->id; - break; - case 'smartplaylist': - $playlist = new Search('song', $_REQUEST['id']); - if (!$playlist->has_access()) { exit; } - $playlist->delete(); - $key = 'playlist_row_' . $playlist->id; - break; - case 'live_stream': - if (!$GLOBALS['user']->has_access('75')) { exit; } - $radio = new Radio($_REQUEST['id']); - $radio->delete(); - $key = 'live_stream_' . $radio->id; - break; - default: - - break; - } // end switch on type - - $results[$key] = ''; - - break; - case 'page': - $browse->set_start($_REQUEST['start']); - - ob_start(); - $browse->show_objects(); - $results['browse_content'] = ob_get_clean(); - break; - case 'show_art': - Art::set_enabled(); - - ob_start(); - $browse->show_objects(); - $results['browse_content'] = ob_get_clean(); - break; - case 'get_filters': - ob_start(); - require_once Config::get('prefix') . '/templates/browse_filters.inc.php'; - $results['browse_filters'] = ob_get_clean(); - default: - $results['rfc3514'] = '0x1'; - break; + break; + + case 'set_sort': + + if ($_REQUEST['sort']) { + $browse->set_sort($_REQUEST['sort']); + } + + ob_start(); + $browse->show_objects(); + $results['browse_content'] = ob_get_clean(); + break; + case 'toggle_tag': + $type = $_SESSION['tagcloud_type'] ? $_SESSION['tagcloud_type'] : 'song'; + $browse->set_type($type); + break; + case 'delete_object': + switch ($_REQUEST['type']) { + case 'playlist': + // Check the perms we need to on this + $playlist = new Playlist($_REQUEST['id']); + if (!$playlist->has_access()) { exit; } + + // Delete it! + $playlist->delete(); + $key = 'playlist_row_' . $playlist->id; + break; + case 'smartplaylist': + $playlist = new Search('song', $_REQUEST['id']); + if (!$playlist->has_access()) { exit; } + $playlist->delete(); + $key = 'playlist_row_' . $playlist->id; + break; + case 'live_stream': + if (!$GLOBALS['user']->has_access('75')) { exit; } + $radio = new Radio($_REQUEST['id']); + $radio->delete(); + $key = 'live_stream_' . $radio->id; + break; + default: + + break; + } // end switch on type + + $results[$key] = ''; + + break; + case 'page': + $browse->set_start($_REQUEST['start']); + + ob_start(); + $browse->show_objects(); + $results['browse_content'] = ob_get_clean(); + break; + case 'show_art': + Art::set_enabled(); + + ob_start(); + $browse->show_objects(); + $results['browse_content'] = ob_get_clean(); + break; + case 'get_filters': + ob_start(); + require_once Config::get('prefix') . '/templates/browse_filters.inc.php'; + $results['browse_filters'] = ob_get_clean(); + default: + $results['rfc3514'] = '0x1'; + break; } // switch on action; $browse->store(); diff --git a/server/democratic.ajax.php b/server/democratic.ajax.php index 42ac3260a5..a3ebc9989a 100644 --- a/server/democratic.ajax.php +++ b/server/democratic.ajax.php @@ -1,5 +1,5 @@ set_parent(); switch ($_REQUEST['action']) { - case 'delete_vote': - $democratic->remove_vote($_REQUEST['row_id']); - $show_browse = true; - break; - case 'add_vote': - $democratic->add_vote(array( - array( - 'object_type' => $_REQUEST['type'], - 'object_id' => $_REQUEST['object_id'] - ) - )); - $show_browse = true; - break; - case 'delete': - if (!$GLOBALS['user']->has_access('75')) { - echo xml_from_array(array('rfc3514' => '0x1')); - exit; - } + case 'delete_vote': + $democratic->remove_vote($_REQUEST['row_id']); + $show_browse = true; + break; + case 'add_vote': + $democratic->add_vote(array( + array( + 'object_type' => $_REQUEST['type'], + 'object_id' => $_REQUEST['object_id'] + ) + )); + $show_browse = true; + break; + case 'delete': + if (!$GLOBALS['user']->has_access('75')) { + echo xml_from_array(array('rfc3514' => '0x1')); + exit; + } - $democratic->delete_votes($_REQUEST['row_id']); - $show_browse = true; - break; - case 'send_playlist': - if (!Access::check('interface','75')) { - echo xml_from_array(array('rfc3514' => '0x1')); - exit; - } + $democratic->delete_votes($_REQUEST['row_id']); + $show_browse = true; + break; + case 'send_playlist': + if (!Access::check('interface','75')) { + echo xml_from_array(array('rfc3514' => '0x1')); + exit; + } - $_SESSION['iframe']['target'] = Config::get('web_path') . '/stream.php?action=democratic&democratic_id=' . scrub_out($_REQUEST['democratic_id']); - $results['rfc3514'] = ''; - break; - case 'clear_playlist': - if (!Access::check('interface','100')) { - echo xml_from_array(array('rfc3514' => '0x1')); - exit; - } + $_SESSION['iframe']['target'] = Config::get('web_path') . '/stream.php?action=democratic&democratic_id=' . scrub_out($_REQUEST['democratic_id']); + $results['rfc3514'] = ''; + break; + case 'clear_playlist': + if (!Access::check('interface','100')) { + echo xml_from_array(array('rfc3514' => '0x1')); + exit; + } - $democratic = new Democratic($_REQUEST['democratic_id']); - $democratic->set_parent(); - $democratic->clear(); + $democratic = new Democratic($_REQUEST['democratic_id']); + $democratic->set_parent(); + $democratic->clear(); - $show_browse = true; - break; - default: - $results['rfc3514'] = '0x1'; - break; + $show_browse = true; + break; + default: + $results['rfc3514'] = '0x1'; + break; } // switch on action; if ($show_browse) { - ob_start(); - $object_ids = $democratic->get_items(); - $browse = new Browse(); - $browse->set_type('democratic'); - $browse->set_static_content(true); - $browse->show_objects($object_ids); - $browse->store(); - $results['browse_content'] = ob_get_contents(); - ob_end_clean(); + ob_start(); + $object_ids = $democratic->get_items(); + $browse = new Browse(); + $browse->set_type('democratic'); + $browse->set_static_content(true); + $browse->show_objects($object_ids); + $browse->store(); + $results['browse_content'] = ob_get_contents(); + ob_end_clean(); } // We always do this diff --git a/server/flag.ajax.php b/server/flag.ajax.php index a375278933..0445217713 100644 --- a/server/flag.ajax.php +++ b/server/flag.ajax.php @@ -1,5 +1,5 @@ delete(); + // Remove the flag from the table + $flag = new Flag($_REQUEST['flag_id']); + $flag->delete(); - $flagged = Flag::get_all(); - ob_start(); - $browse = new Browse(); - $browse->set_type('flagged'); - $browse->set_static_content(true); - $browse->save_objects($flagged); - $browse->show_objects($flagged); - $browse->store(); - $results['browse_content'] = ob_get_contents(); - ob_end_clean(); + $flagged = Flag::get_all(); + ob_start(); + $browse = new Browse(); + $browse->set_type('flagged'); + $browse->set_static_content(true); + $browse->save_objects($flagged); + $browse->show_objects($flagged); + $browse->store(); + $results['browse_content'] = ob_get_contents(); + ob_end_clean(); - break; - case 'accept': - if (!Access::check('interface','75')) { - $results['rfc3514'] = '0x1'; - break; - } + break; + case 'accept': + if (!Access::check('interface','75')) { + $results['rfc3514'] = '0x1'; + break; + } - $flag = new Flag($_REQUEST['flag_id']); - $flag->approve(); - $flag->format(); - ob_start(); - require_once Config::get('prefix') . '/templates/show_flag_row.inc.php'; - $results['flagged_' . $flag->id] = ob_get_contents(); - ob_end_clean(); + $flag = new Flag($_REQUEST['flag_id']); + $flag->approve(); + $flag->format(); + ob_start(); + require_once Config::get('prefix') . '/templates/show_flag_row.inc.php'; + $results['flagged_' . $flag->id] = ob_get_contents(); + ob_end_clean(); - break; - default: - $results['rfc3514'] = '0x1'; - break; + break; + default: + $results['rfc3514'] = '0x1'; + break; } // switch on action; // We always do this diff --git a/server/index.ajax.php b/server/index.ajax.php index b46674d59c..2dc4b399c2 100644 --- a/server/index.ajax.php +++ b/server/index.ajax.php @@ -1,5 +1,5 @@ '; - } - break; - case 'reloadnp': - ob_start(); - show_now_playing(); - $results['now_playing'] = ob_get_clean(); - ob_start(); - $data = Song::get_recently_played(); - Song::build_cache(array_keys($data)); - if (count($data)) { + case 'random_albums': + $albums = Album::get_random_albums('6'); + if (count($albums) AND is_array($albums)) { + ob_start(); + require_once Config::get('prefix') . '/templates/show_random_albums.inc.php'; + $results['random_selection'] = ob_get_clean(); + } + else { + $results['random_selection'] = ''; + } + break; + case 'reloadnp': + ob_start(); + show_now_playing(); + $results['now_playing'] = ob_get_clean(); + ob_start(); + $data = Song::get_recently_played(); + Song::build_cache(array_keys($data)); + if (count($data)) { require_once Config::get('prefix') . '/templates/show_recently_played.inc.php'; - } - $results['recently_played'] = ob_get_clean(); - break; - case 'sidebar': + } + $results['recently_played'] = ob_get_clean(); + break; + case 'sidebar': switch ($_REQUEST['button']) { case 'home': case 'modules': @@ -72,9 +72,9 @@ require_once Config::get('prefix') . '/templates/sidebar.inc.php'; $results['sidebar'] = ob_get_contents(); ob_end_clean(); - default: - $results['rfc3514'] = '0x1'; - break; + default: + $results['rfc3514'] = '0x1'; + break; } // switch on action; // We always do this diff --git a/server/localplay.ajax.php b/server/localplay.ajax.php index 66368870a9..f37cac7ecc 100644 --- a/server/localplay.ajax.php +++ b/server/localplay.ajax.php @@ -1,5 +1,5 @@ set_active_instance($_REQUEST['instance']); - Preference::update('play_type',$GLOBALS['user']->id,$type); - - // We should also refesh the sidebar - ob_start(); - require_once Config::get('prefix') . '/templates/sidebar.inc.php'; - $results['sidebar'] = ob_get_contents(); - ob_end_clean(); - break; - case 'command': - // Make sure they are allowed to do this - if (!Access::check('localplay','50')) { - debug_event('DENIED','Attempted to control Localplay without sufficient access','1'); - exit; - } - - $localplay = new Localplay(Config::get('localplay_controller')); - $localplay->connect(); - - // Switch on valid commands - switch ($_REQUEST['command']) { - case 'prev': - case 'next': - case 'stop': - case 'play': - case 'pause': - $command = scrub_in($_REQUEST['command']); - $localplay->$command(); - break; - case 'volume_up': - case 'volume_down': - case 'volume_mute': - $command = scrub_in($_REQUEST['command']); - $localplay->$command(); - - // We actually want to refresh something here - ob_start(); - require_once Config::get('prefix') . '/templates/show_localplay_status.inc.php'; - $results['localplay_status'] = ob_get_contents(); - ob_end_clean(); - break; - case 'delete_all': - $localplay->delete_all(); - ob_start(); - $browse = new Browse(); - $browse->set_type('playlist_localplay'); - $browse->set_static_content(true); - $browse->save_objects(array()); - $browse->show_objects(array()); - $browse->store(); - $results['browse_content'] = ob_get_contents(); - ob_end_clean(); - break; - case 'skip': - $localplay->skip(intval($_REQUEST['id'])); - $objects = $localplay->get(); - ob_start(); - $browse = new Browse(); - $browse->set_type('playlist_localplay'); - $browse->set_static_content(true); - $browse->save_objects($objects); - $browse->show_objects($objects); - $browse->store(); - $results['browse_content'] = ob_get_contents(); - ob_end_clean(); - break; - default: - // Nothing - break; - } // end whitelist - - break; - case 'delete_track': - // Load Connect... yada yada - if (!Access::check('localplay','50')) { - debug_event('DENIED','Attempted to delete track without access','1'); - exit; - } - $localplay = new Localplay(Config::get('localplay_controller')); - $localplay->connect(); - - // Scrub in the delete request - $id = intval($_REQUEST['id']); - - $localplay->delete_track($id); - - // Wait in case we just deleted what we were playing - sleep(3); - $objects = $localplay->get(); - $status = $localplay->status(); - - ob_start(); - $browse = new Browse(); - $browse->set_type('playlist_localplay'); - $browse->set_static_content(true); - $browse->save_objects($objects); - $browse->show_objects($objects); - $browse->store(); - $results['browse_content'] = ob_get_contents(); - ob_end_clean(); - - break; - case 'delete_instance': - // Make sure that you have access to do this... - if (!Access::check('localplay','75')) { - debug_event('DENIED','Attempted to delete instance without access','1'); - exit; - } - - // Scrub it in - $localplay = new Localplay(Config::get('localplay_controller')); - $localplay->delete_instance($_REQUEST['instance']); - - $key = 'localplay_instance_' . $_REQUEST['instance']; - $results[$key] = ''; - break; - case 'repeat': - // Make sure that they have access to do this again no clue - if (!Access::check('localplay','50')) { - debug_event('DENIED','Attempted to set repeat without access','1'); - exit; - } - - // Scrub her in - $localplay = new Localplay(Config::get('localplay_controller')); - $localplay->connect(); - $localplay->repeat(make_bool($_REQUEST['value'])); - - ob_start(); - require_once Config::get('prefix') . '/templates/show_localplay_status.inc.php'; - $results['localplay_status'] = ob_get_contents(); - ob_end_clean(); - - break; - case 'random': - // Make sure that they have access to do this - if (!Access::check('localplay','50')) { - debug_event('DENIED','Attempted to set random without access','1'); - exit; - } - - // Scrub her in - $localplay = new Localplay(Config::get('localplay_controller')); - $localplay->connect(); - $localplay->random(make_bool($_REQUEST['value'])); - - ob_start(); - require_once Config::get('prefix') . '/templates/show_localplay_status.inc.php'; - $results['localplay_status'] = ob_get_contents(); - ob_end_clean(); - - break; - default: - $results['rfc3514'] = '0x1'; - break; + case 'set_instance': + // Make sure they they are allowed to do this + if (!Access::check('localplay','5')) { + debug_event('DENIED','Error attempted to set instance without required level','1'); + exit; + } + + $type = $_REQUEST['instance'] ? 'localplay' : 'stream'; + + $localplay = new Localplay(Config::get('localplay_controller')); + $localplay->set_active_instance($_REQUEST['instance']); + Preference::update('play_type',$GLOBALS['user']->id,$type); + + // We should also refesh the sidebar + ob_start(); + require_once Config::get('prefix') . '/templates/sidebar.inc.php'; + $results['sidebar'] = ob_get_contents(); + ob_end_clean(); + break; + case 'command': + // Make sure they are allowed to do this + if (!Access::check('localplay','50')) { + debug_event('DENIED','Attempted to control Localplay without sufficient access','1'); + exit; + } + + $localplay = new Localplay(Config::get('localplay_controller')); + $localplay->connect(); + + // Switch on valid commands + switch ($_REQUEST['command']) { + case 'prev': + case 'next': + case 'stop': + case 'play': + case 'pause': + $command = scrub_in($_REQUEST['command']); + $localplay->$command(); + break; + case 'volume_up': + case 'volume_down': + case 'volume_mute': + $command = scrub_in($_REQUEST['command']); + $localplay->$command(); + + // We actually want to refresh something here + ob_start(); + require_once Config::get('prefix') . '/templates/show_localplay_status.inc.php'; + $results['localplay_status'] = ob_get_contents(); + ob_end_clean(); + break; + case 'delete_all': + $localplay->delete_all(); + ob_start(); + $browse = new Browse(); + $browse->set_type('playlist_localplay'); + $browse->set_static_content(true); + $browse->save_objects(array()); + $browse->show_objects(array()); + $browse->store(); + $results['browse_content'] = ob_get_contents(); + ob_end_clean(); + break; + case 'skip': + $localplay->skip(intval($_REQUEST['id'])); + $objects = $localplay->get(); + ob_start(); + $browse = new Browse(); + $browse->set_type('playlist_localplay'); + $browse->set_static_content(true); + $browse->save_objects($objects); + $browse->show_objects($objects); + $browse->store(); + $results['browse_content'] = ob_get_contents(); + ob_end_clean(); + break; + default: + // Nothing + break; + } // end whitelist + + break; + case 'delete_track': + // Load Connect... yada yada + if (!Access::check('localplay','50')) { + debug_event('DENIED','Attempted to delete track without access','1'); + exit; + } + $localplay = new Localplay(Config::get('localplay_controller')); + $localplay->connect(); + + // Scrub in the delete request + $id = intval($_REQUEST['id']); + + $localplay->delete_track($id); + + // Wait in case we just deleted what we were playing + sleep(3); + $objects = $localplay->get(); + $status = $localplay->status(); + + ob_start(); + $browse = new Browse(); + $browse->set_type('playlist_localplay'); + $browse->set_static_content(true); + $browse->save_objects($objects); + $browse->show_objects($objects); + $browse->store(); + $results['browse_content'] = ob_get_contents(); + ob_end_clean(); + + break; + case 'delete_instance': + // Make sure that you have access to do this... + if (!Access::check('localplay','75')) { + debug_event('DENIED','Attempted to delete instance without access','1'); + exit; + } + + // Scrub it in + $localplay = new Localplay(Config::get('localplay_controller')); + $localplay->delete_instance($_REQUEST['instance']); + + $key = 'localplay_instance_' . $_REQUEST['instance']; + $results[$key] = ''; + break; + case 'repeat': + // Make sure that they have access to do this again no clue + if (!Access::check('localplay','50')) { + debug_event('DENIED','Attempted to set repeat without access','1'); + exit; + } + + // Scrub her in + $localplay = new Localplay(Config::get('localplay_controller')); + $localplay->connect(); + $localplay->repeat(make_bool($_REQUEST['value'])); + + ob_start(); + require_once Config::get('prefix') . '/templates/show_localplay_status.inc.php'; + $results['localplay_status'] = ob_get_contents(); + ob_end_clean(); + + break; + case 'random': + // Make sure that they have access to do this + if (!Access::check('localplay','50')) { + debug_event('DENIED','Attempted to set random without access','1'); + exit; + } + + // Scrub her in + $localplay = new Localplay(Config::get('localplay_controller')); + $localplay->connect(); + $localplay->random(make_bool($_REQUEST['value'])); + + ob_start(); + require_once Config::get('prefix') . '/templates/show_localplay_status.inc.php'; + $results['localplay_status'] = ob_get_contents(); + ob_end_clean(); + + break; + default: + $results['rfc3514'] = '0x1'; + break; } // switch on action; // We always do this diff --git a/server/playlist.ajax.php b/server/playlist.ajax.php index 333690631f..5bfe1a991d 100644 --- a/server/playlist.ajax.php +++ b/server/playlist.ajax.php @@ -1,5 +1,5 @@ format(); - if ($playlist->has_access()) { - $playlist->delete_track($_REQUEST['track_id']); - } - - $object_ids = $playlist->get_items(); - ob_start(); - $browse = new Browse(); - $browse->set_type('playlist_song'); - $browse->add_supplemental_object('playlist',$playlist->id); - $browse->save_objects($object_ids); - $browse->show_objects($object_ids); - $browse->store(); - $results['browse_content'] = ob_get_clean(); - break; - case 'edit_track': - $playlist = new Playlist($_REQUEST['playlist_id']); - if (!$playlist->has_access()) { - $results['rfc3514'] = '0x1'; - break; - } - - // They've got access, show the edit page - $track = $playlist->get_track($_REQUEST['track_id']); - $song = new Song($track['object_id']); - $song->format(); - require_once Config::get('prefix') . '/templates/show_edit_playlist_song_row.inc.php'; - $results['track_' . $track['id']] = ob_get_clean(); - break; - case 'save_track': - $playlist = new Playlist($_REQUEST['playlist_id']); - if (!$playlist->has_access()) { - $results['rfc3514'] = '0x1'; - break; - } - $playlist->format(); - - // They've got access, save this guy and re-display row - $playlist->update_track_number($_GET['track_id'],$_POST['track']); - $track = $playlist->get_track($_GET['track_id']); - $song = new Song($track['object_id']); - $song->format(); - $playlist_track = $track['track']; - require Config::get('prefix') . '/templates/show_playlist_song_row.inc.php'; - $results['track_' . $track['id']] = ob_get_clean(); - break; - case 'create': - if (!Access::check('interface','25')) { - debug_event('DENIED','Error:' . $GLOBALS['user']->username . ' does not have user access, unable to create playlist','1'); - break; - } - - // Pull the current active playlist items - $objects = $GLOBALS['user']->playlist->get_items(); - - $name = $GLOBALS['user']->username . ' - ' . date("Y-m-d H:i:s",time()); - - // generate the new playlist - $playlist_id = Playlist::create($name,'public'); - if (!$playlist_id) { break; } - $playlist = new Playlist($playlist_id); - - // Itterate through and add them to our new playlist - foreach ($objects as $object_data) { - // For now only allow songs on here, we'll change this later - $type = array_shift($object_data); - if ($type == 'song') { - $songs[] = array_shift($object_data); - } - } // object_data - - // Add our new songs - $playlist->add_songs($songs,'ORDERED'); - $playlist->format(); - $object_ids = $playlist->get_items(); - ob_start(); - require_once Config::get('prefix') . '/templates/show_playlist.inc.php'; - $results['content'] = ob_get_clean(); - break; - case 'append': - // Pull the current active playlist items - $objects = $GLOBALS['user']->playlist->get_items(); - - // Create the playlist object - $playlist = new Playlist($_REQUEST['playlist_id']); - - // We need to make sure that they have access - if (!$playlist->has_access()) { - break; - } - - $songs = array(); - - // Itterate through and add them to our new playlist - foreach ($objects as $element) { - $type = array_shift($element); - switch ($type) { - case 'song': - $songs[] = array_shift($element); - break; - } // end switch - } // foreach - - // Override normal include procedure - Ajax::set_include_override(true); - - // Add our new songs - $playlist->add_songs($songs,'ORDERED'); - $playlist->format(); - $object_ids = $playlist->get_items(); - ob_start(); - require_once Config::get('prefix') . '/templates/show_playlist.inc.php'; - $results['content'] = ob_get_contents(); - ob_end_clean(); - break; - default: - $results['rfc3514'] = '0x1'; - break; + case 'delete_track': + // Create the object and remove the track + $playlist = new Playlist($_REQUEST['playlist_id']); + $playlist->format(); + if ($playlist->has_access()) { + $playlist->delete_track($_REQUEST['track_id']); + } + + $object_ids = $playlist->get_items(); + ob_start(); + $browse = new Browse(); + $browse->set_type('playlist_song'); + $browse->add_supplemental_object('playlist',$playlist->id); + $browse->save_objects($object_ids); + $browse->show_objects($object_ids); + $browse->store(); + $results['browse_content'] = ob_get_clean(); + break; + case 'edit_track': + $playlist = new Playlist($_REQUEST['playlist_id']); + if (!$playlist->has_access()) { + $results['rfc3514'] = '0x1'; + break; + } + + // They've got access, show the edit page + $track = $playlist->get_track($_REQUEST['track_id']); + $song = new Song($track['object_id']); + $song->format(); + require_once Config::get('prefix') . '/templates/show_edit_playlist_song_row.inc.php'; + $results['track_' . $track['id']] = ob_get_clean(); + break; + case 'save_track': + $playlist = new Playlist($_REQUEST['playlist_id']); + if (!$playlist->has_access()) { + $results['rfc3514'] = '0x1'; + break; + } + $playlist->format(); + + // They've got access, save this guy and re-display row + $playlist->update_track_number($_GET['track_id'],$_POST['track']); + $track = $playlist->get_track($_GET['track_id']); + $song = new Song($track['object_id']); + $song->format(); + $playlist_track = $track['track']; + require Config::get('prefix') . '/templates/show_playlist_song_row.inc.php'; + $results['track_' . $track['id']] = ob_get_clean(); + break; + case 'create': + if (!Access::check('interface','25')) { + debug_event('DENIED','Error:' . $GLOBALS['user']->username . ' does not have user access, unable to create playlist','1'); + break; + } + + // Pull the current active playlist items + $objects = $GLOBALS['user']->playlist->get_items(); + + $name = $GLOBALS['user']->username . ' - ' . date("Y-m-d H:i:s",time()); + + // generate the new playlist + $playlist_id = Playlist::create($name,'public'); + if (!$playlist_id) { break; } + $playlist = new Playlist($playlist_id); + + // Itterate through and add them to our new playlist + foreach ($objects as $object_data) { + // For now only allow songs on here, we'll change this later + $type = array_shift($object_data); + if ($type == 'song') { + $songs[] = array_shift($object_data); + } + } // object_data + + // Add our new songs + $playlist->add_songs($songs,'ORDERED'); + $playlist->format(); + $object_ids = $playlist->get_items(); + ob_start(); + require_once Config::get('prefix') . '/templates/show_playlist.inc.php'; + $results['content'] = ob_get_clean(); + break; + case 'append': + // Pull the current active playlist items + $objects = $GLOBALS['user']->playlist->get_items(); + + // Create the playlist object + $playlist = new Playlist($_REQUEST['playlist_id']); + + // We need to make sure that they have access + if (!$playlist->has_access()) { + break; + } + + $songs = array(); + + // Itterate through and add them to our new playlist + foreach ($objects as $element) { + $type = array_shift($element); + switch ($type) { + case 'song': + $songs[] = array_shift($element); + break; + } // end switch + } // foreach + + // Override normal include procedure + Ajax::set_include_override(true); + + // Add our new songs + $playlist->add_songs($songs,'ORDERED'); + $playlist->format(); + $object_ids = $playlist->get_items(); + ob_start(); + require_once Config::get('prefix') . '/templates/show_playlist.inc.php'; + $results['content'] = ob_get_contents(); + ob_end_clean(); + break; + default: + $results['rfc3514'] = '0x1'; + break; } // switch on action; // We always do this diff --git a/server/random.ajax.php b/server/random.ajax.php index ff1494765f..dbcd43b5e2 100644 --- a/server/random.ajax.php +++ b/server/random.ajax.php @@ -1,5 +1,5 @@ get_songs(); foreach ($songs as $song_id) { $GLOBALS['user']->playlist->add_object($song_id,'song'); } - $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); + $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); break; case 'artist': $artist_id = Random::artist(); - // If we don't get anything stop - if (!$artist_id) { $results['rfc3514'] = '0x1'; break; } + // If we don't get anything stop + if (!$artist_id) { $results['rfc3514'] = '0x1'; break; } $artist = new Artist($artist_id); $songs = $artist->get_songs(); foreach ($songs as $song_id) { $GLOBALS['user']->playlist->add_object($song_id,'song'); } - $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); + $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); break; case 'playlist': $playlist_id = Random::playlist(); - // If we don't get any results stop right here! - if (!$playlist_id) { $results['rfc3514'] = '0x1'; break; } + // If we don't get any results stop right here! + if (!$playlist_id) { $results['rfc3514'] = '0x1'; break; } $playlist = new Playlist($playlist_id); $items = $playlist->get_items(); foreach ($items as $item) { $GLOBALS['user']->playlist->add_object($item['object_id'],$item['type']); } - $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); + $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); break; - case 'advanced_random': - $object_ids = Random::advanced($_POST); + case 'advanced_random': + $object_ids = Random::advanced($_POST); - // First add them to the active playlist - foreach ($object_ids as $object_id) { - $GLOBALS['user']->playlist->add_object($object_id,'song'); - } - $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); + // First add them to the active playlist + foreach ($object_ids as $object_id) { + $GLOBALS['user']->playlist->add_object($object_id,'song'); + } + $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); - // Now setup the browse and show them below! - $browse = new Browse(); - $browse->set_type('song'); - $browse->save_objects($object_ids); - ob_start(); - $browse->show_objects(); - $results['browse'] = ob_get_contents(); - ob_end_clean(); + // Now setup the browse and show them below! + $browse = new Browse(); + $browse->set_type('song'); + $browse->save_objects($object_ids); + ob_start(); + $browse->show_objects(); + $results['browse'] = ob_get_contents(); + ob_end_clean(); - break; - default: - $results['rfc3514'] = '0x1'; - break; + break; + default: + $results['rfc3514'] = '0x1'; + break; } // switch on action; // We always do this diff --git a/server/song.ajax.php b/server/song.ajax.php index 2fccae37f7..1c83211ef9 100644 --- a/server/song.ajax.php +++ b/server/song.ajax.php @@ -1,5 +1,5 @@ username . ' attempted to change the state of a song','1'); - exit; - } + case 'flip_state': + if (!Access::check('interface','75')) { + debug_event('DENIED',$GLOBALS['user']->username . ' attempted to change the state of a song','1'); + exit; + } - $song = new Song($_REQUEST['song_id']); - $new_enabled = $song->enabled ? '0' : '1'; - $song->update_enabled($new_enabled,$song->id); - $song->enabled = $new_enabled; - $song->format(); + $song = new Song($_REQUEST['song_id']); + $new_enabled = $song->enabled ? '0' : '1'; + $song->update_enabled($new_enabled,$song->id); + $song->enabled = $new_enabled; + $song->format(); - //Return the new Ajax::button - $id = 'button_flip_state_' . $song->id; - $button = $song->enabled ? 'disable' : 'enable'; - $results[$id] = Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$button, T_(ucfirst($button)),'flip_state_' . $song->id); + //Return the new Ajax::button + $id = 'button_flip_state_' . $song->id; + $button = $song->enabled ? 'disable' : 'enable'; + $results[$id] = Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$button, T_(ucfirst($button)),'flip_state_' . $song->id); - break; - default: - $results['rfc3514'] = '0x1'; - break; + break; + default: + $results['rfc3514'] = '0x1'; + break; } // switch on action; // We always do this diff --git a/server/stats.ajax.php b/server/stats.ajax.php index 7e6d99f1d4..b4811ab305 100644 --- a/server/stats.ajax.php +++ b/server/stats.ajax.php @@ -1,5 +1,5 @@ id,$new)) { - Config::set('play_type', $new, true); - } + // Go ahead and update their preference + if (Preference::update('play_type',$GLOBALS['user']->id,$new)) { + Config::set('play_type', $new, true); + } - if (($new == 'localplay' AND $current != 'localplay') OR ($current == 'localplay' AND $new != 'localplay')) { - $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); - } + if (($new == 'localplay' AND $current != 'localplay') OR ($current == 'localplay' AND $new != 'localplay')) { + $results['rightbar'] = UI::ajax_include('rightbar.inc.php'); + } - $results['rfc3514'] = '0x0'; + $results['rfc3514'] = '0x0'; - break; - case 'basket': + break; + case 'basket': - // Go ahead and see if we should clear the playlist here or not, we might not actually clear it in the session - // we'll just have to feed it bad data. - // FIXME: This is sad, will be fixed when I switch how streaming works. + // Go ahead and see if we should clear the playlist here or not, we might not actually clear it in the session + // we'll just have to feed it bad data. + // FIXME: This is sad, will be fixed when I switch how streaming works. // Check to see if 'clear' was passed if it was then we need to reset the basket if ( ($_REQUEST['playlist_method'] == 'clear' || Config::get('playlist_method') == 'clear') AND Config::get('play_type') != 'xspf_player') { - define('NO_SONGS','1'); - ob_start(); - require_once Config::get('prefix') . '/templates/rightbar.inc.php'; - $results['rightbar'] = ob_get_clean(); + define('NO_SONGS','1'); + ob_start(); + require_once Config::get('prefix') . '/templates/rightbar.inc.php'; + $results['rightbar'] = ob_get_clean(); } - // We need to set the basket up! - $_SESSION['iframe']['target'] = Config::get('web_path') . '/stream.php?action=basket&playlist_method=' . scrub_out($_REQUEST['playlist_method']); - $results['rfc3514'] = ''; - break; - default: - $results['rfc3514'] = '0x1'; - break; + // We need to set the basket up! + $_SESSION['iframe']['target'] = Config::get('web_path') . '/stream.php?action=basket&playlist_method=' . scrub_out($_REQUEST['playlist_method']); + $results['rfc3514'] = ''; + break; + default: + $results['rfc3514'] = '0x1'; + break; } // switch on action; // We always do this diff --git a/server/tag.ajax.php b/server/tag.ajax.php index 995318619d..d83c8ce748 100644 --- a/server/tag.ajax.php +++ b/server/tag.ajax.php @@ -1,5 +1,5 @@ remove_map($_GET['type'],$_GET['object_id']); - break; - case 'browse_type': - $browse = new Browse($_GET['browse_id']); - $browse->set_filter('object_type', $_GET['type']); - $browse->store(); - break; - case 'add_filter': - $browse = new Browse($_GET['browse_id']); - $browse->set_filter('tag', $_GET['tag_id']); - $object_ids = $browse->get_objects(); - ob_start(); - $browse->show_objects($object_ids); - $results['browse_content'] = ob_get_clean(); - $browse->store(); - // Retrieve current objects of type based on combined filters - break; - default: - $results['rfc3514'] = '0x1'; - break; + break; + case 'add_tag': + Tag::add_tag_map($_GET['type'],$_GET['object_id'],$_GET['tag_id']); + break; + case 'remove_tag': + $tag = new Tag($_GET['tag_id']); + $tag->remove_map($_GET['type'],$_GET['object_id']); + break; + case 'browse_type': + $browse = new Browse($_GET['browse_id']); + $browse->set_filter('object_type', $_GET['type']); + $browse->store(); + break; + case 'add_filter': + $browse = new Browse($_GET['browse_id']); + $browse->set_filter('tag', $_GET['tag_id']); + $object_ids = $browse->get_objects(); + ob_start(); + $browse->show_objects($object_ids); + $results['browse_content'] = ob_get_clean(); + $browse->store(); + // Retrieve current objects of type based on combined filters + break; + default: + $results['rfc3514'] = '0x1'; + break; } // switch on action; diff --git a/server/xml.server.php b/server/xml.server.php index 4dfc124dc2..ea7b9df611 100644 --- a/server/xml.server.php +++ b/server/xml.server.php @@ -1,5 +1,5 @@ id) { - Error::add('general', T_('Invalid Object Selected')); - Error::display('general'); - break; - } - - // Now go ahead and display the page where we let them add a comment etc - require_once Config::get('prefix') . '/templates/show_add_shout.inc.php'; - break; - default: - header("Location:" . Config::get('web_path')); - break; + case 'add_shout': + // Must be at least a user to do this + if (!Access::check('interface','25')) { + UI::access_denied(); + exit; + } + + if (!Core::form_verify('add_shout','post')) { + UI::access_denied(); + exit; + } + + $shout_id = Shoutbox::create($_POST); + header("Location:" . Config::get('web_path')); + break; + case 'show_add_shout': + // Get our object first + $object = Shoutbox::get_object($_REQUEST['type'],$_REQUEST['id']); + + if (!$object->id) { + Error::add('general', T_('Invalid Object Selected')); + Error::display('general'); + break; + } + + // Now go ahead and display the page where we let them add a comment etc + require_once Config::get('prefix') . '/templates/show_add_shout.inc.php'; + break; + default: + header("Location:" . Config::get('web_path')); + break; } // end switch on action UI::show_footer(); diff --git a/smartplaylist.php b/smartplaylist.php index ac4d5d4631..1a78fd6fb2 100644 --- a/smartplaylist.php +++ b/smartplaylist.php @@ -1,5 +1,5 @@ has_access()) { - $playlist->delete(); - // Go elsewhere - header('Location: ' . Config::get('web_path') . '/browse.php?action=smartplaylist'); - } + // Check rights + $playlist = new Search('song', $_REQUEST['playlist_id']); + if ($playlist->has_access()) { + $playlist->delete(); + // Go elsewhere + header('Location: ' . Config::get('web_path') . '/browse.php?action=smartplaylist'); + } } UI::show_header(); /* Switch on the action passed in */ switch ($_REQUEST['action']) { - case 'create_playlist': - /* Check rights */ - if (!Access::check('interface','25')) { - UI::access_denied(); - break; - } + case 'create_playlist': + /* Check rights */ + if (!Access::check('interface','25')) { + UI::access_denied(); + break; + } - foreach ($_REQUEST as $key => $value) { - $prefix = substr($key, 0, 4); - $value = trim($value); + foreach ($_REQUEST as $key => $value) { + $prefix = substr($key, 0, 4); + $value = trim($value); - if ($prefix == 'rule' && strlen($value)) { - $rules[$key] = Dba::escape($value); - } - } + if ($prefix == 'rule' && strlen($value)) { + $rules[$key] = Dba::escape($value); + } + } - switch($_REQUEST['operator']) { - case 'or': - $operator = 'OR'; - break; - default: - $operator = 'AND'; - break; - } // end switch on operator + switch($_REQUEST['operator']) { + case 'or': + $operator = 'OR'; + break; + default: + $operator = 'AND'; + break; + } // end switch on operator - $playlist_name = scrub_in($_REQUEST['playlist_name']); + $playlist_name = scrub_in($_REQUEST['playlist_name']); - $playlist = new Search('song'); - $playlist->parse_rules($data); - $playlist->logic_operator = $operator; - $playlist->name = $playlist_name; - $playlist->save(); - - break; - case 'delete_playlist': - // If we made it here, we didn't have sufficient rights. - UI::access_denied(); - break; - case 'show_playlist': - $playlist = new Search('song', $_REQUEST['playlist_id']); - $playlist->format(); - require_once Config::get('prefix') . '/templates/show_smartplaylist.inc.php'; - break; - case 'update_playlist': - $playlist = new Search('song', $_REQUEST['playlist_id']); - if ($playlist->has_access()) { - $playlist->parse_rules(Search::clean_request($_REQUEST)); - $playlist->update(); - $playlist->format(); - } - else { - UI::access_denied(); - break; - } - require_once Config::get('prefix') . '/templates/show_smartplaylist.inc.php'; - break; - default: - require_once Config::get('prefix') . '/templates/show_smartplaylist.inc.php'; - break; + $playlist = new Search('song'); + $playlist->parse_rules($data); + $playlist->logic_operator = $operator; + $playlist->name = $playlist_name; + $playlist->save(); + + break; + case 'delete_playlist': + // If we made it here, we didn't have sufficient rights. + UI::access_denied(); + break; + case 'show_playlist': + $playlist = new Search('song', $_REQUEST['playlist_id']); + $playlist->format(); + require_once Config::get('prefix') . '/templates/show_smartplaylist.inc.php'; + break; + case 'update_playlist': + $playlist = new Search('song', $_REQUEST['playlist_id']); + if ($playlist->has_access()) { + $playlist->parse_rules(Search::clean_request($_REQUEST)); + $playlist->update(); + $playlist->format(); + } + else { + UI::access_denied(); + break; + } + require_once Config::get('prefix') . '/templates/show_smartplaylist.inc.php'; + break; + default: + require_once Config::get('prefix') . '/templates/show_smartplaylist.inc.php'; + break; } // switch on the action UI::show_footer(); diff --git a/song.php b/song.php index 2170616d2a..9646712826 100644 --- a/song.php +++ b/song.php @@ -1,5 +1,5 @@ format(); - $song->fill_ext_info(); - require_once Config::get('prefix') . '/templates/show_song.inc.php'; - break; + default: + case 'show_song': + $song = new Song($_REQUEST['song_id']); + $song->format(); + $song->fill_ext_info(); + require_once Config::get('prefix') . '/templates/show_song.inc.php'; + break; } // end data collection UI::show_footer(); diff --git a/stats.php b/stats.php index fd2569ec59..ba96ed4fd4 100644 --- a/stats.php +++ b/stats.php @@ -1,5 +1,5 @@ get_favorites('artist'); - $favorite_albums = $working_user->get_favorites('album'); - $favorite_songs = $working_user->get_favorites('song'); - - require_once Config::get('prefix') . '/templates/show_user_stats.inc.php'; - - break; - // Show stats - case 'newest': - require_once Config::get('prefix') . '/templates/show_newest.inc.php'; - break; - case 'popular': - require_once Config::get('prefix') . '/templates/show_popular.inc.php'; - break; - case 'show': - default: - require_once Config::get('prefix') . '/templates/show_stats.inc.php'; - break; + // Show a Users "Profile" page + case 'show_user': + $client = new User($_REQUEST['user_id']); + require_once Config::get('prefix') . '/templates/show_user.inc.php'; + break; + case 'user_stats': + /* Get em! */ + $working_user = new User($_REQUEST['user_id']); + + /* Pull favs */ + $favorite_artists = $working_user->get_favorites('artist'); + $favorite_albums = $working_user->get_favorites('album'); + $favorite_songs = $working_user->get_favorites('song'); + + require_once Config::get('prefix') . '/templates/show_user_stats.inc.php'; + + break; + // Show stats + case 'newest': + require_once Config::get('prefix') . '/templates/show_newest.inc.php'; + break; + case 'popular': + require_once Config::get('prefix') . '/templates/show_popular.inc.php'; + break; + case 'show': + default: + require_once Config::get('prefix') . '/templates/show_stats.inc.php'; + break; } // end switch on action UI::show_footer(); diff --git a/stream.php b/stream.php index 22f9b85c1b..0b418509a1 100644 --- a/stream.php +++ b/stream.php @@ -1,5 +1,5 @@ playlist->get_items(); + case 'basket': + // Pull in our items (multiple types) + $media_ids = $GLOBALS['user']->playlist->get_items(); - // Check to see if 'clear' was passed if it was then we need to reset the basket - if ( ($_REQUEST['playlist_method'] == 'clear' || Config::get('playlist_method') == 'clear') AND Config::get('play_type') != 'xspf_player') { - $GLOBALS['user']->playlist->clear(); - } + // Check to see if 'clear' was passed if it was then we need to reset the basket + if ( ($_REQUEST['playlist_method'] == 'clear' || Config::get('playlist_method') == 'clear') AND Config::get('play_type') != 'xspf_player') { + $GLOBALS['user']->playlist->clear(); + } - break; - /* This is run if we need to gather info based on a tmp playlist */ - case 'tmp_playlist': - $tmp_playlist = new Tmp_Playlist($_REQUEST['tmpplaylist_id']); - $media_ids = $tmp_playlist->get_items(); - break; - case 'play_favorite': - $data = $GLOBALS['user']->get_favorites($_REQUEST['type']); - $media_ids = array(); - switch ($_REQUEST['type']) { - case 'artist': - case 'album': - foreach ($data as $value) { - $songs = $value->get_songs(); - $media_ids = array_merge($media_ids,$songs); - } - break; - case 'song': - foreach ($data as $value) { - $media_ids[] = $value->id; - } - break; - } // end switch on type - break; - case 'single_song': - $media_ids[] = array( - 'object_type' => 'song', - 'object_id' => scrub_in($_REQUEST['song_id']) - ); - break; - case 'artist': - $artist = new Artist($_REQUEST['artist_id']); - $media_ids = $artist->get_songs(); - break; - case 'artist_random': - $artist = new Artist($_REQUEST['artist_id']); - $artist->get_count(); - $media_ids = $artist->get_random_songs(); - break; - case 'album_random': - $album = new Album($_REQUEST['album_id']); - $media_ids = $album->get_random_songs(); - break; - case 'album': - $album = new Album($_REQUEST['album_id']); - $media_ids = $album->get_songs(); - break; - case 'playlist': - $playlist = new Playlist($_REQUEST['playlist_id']); - $media_ids = $playlist->get_songs($_REQUEST['song']); - break; - case 'playlist_random': - $playlist = new Playlist($_REQUEST['playlist_id']); - $media_ids = $playlist->get_random_songs(); - break; - case 'random': - if($_REQUEST['genre'][0] != '-1') { - $matchlist['genre'] = $_REQUEST['genre']; - } - if($_REQUEST['catalog'] != '-1') { - $matchlist['catalog'] = $_REQUEST['catalog']; - } - /* Setup the options array */ - $options = array('limit' => $_REQUEST['random'], 'random_type' => $_REQUEST['random_type'],'size_limit'=>$_REQUEST['size_limit']); - $media_ids = get_random_songs($options, $matchlist); - break; - case 'democratic': - $democratic = new Democratic($_REQUEST['democratic_id']); - $urls = array($democratic->play_url()); - break; - case 'download': - $media_ids[] = array( - 'object_type' => 'song', - 'object_id' => scrub_in($_REQUEST['song_id']) - ); - default: - break; + break; + /* This is run if we need to gather info based on a tmp playlist */ + case 'tmp_playlist': + $tmp_playlist = new Tmp_Playlist($_REQUEST['tmpplaylist_id']); + $media_ids = $tmp_playlist->get_items(); + break; + case 'play_favorite': + $data = $GLOBALS['user']->get_favorites($_REQUEST['type']); + $media_ids = array(); + switch ($_REQUEST['type']) { + case 'artist': + case 'album': + foreach ($data as $value) { + $songs = $value->get_songs(); + $media_ids = array_merge($media_ids,$songs); + } + break; + case 'song': + foreach ($data as $value) { + $media_ids[] = $value->id; + } + break; + } // end switch on type + break; + case 'single_song': + $media_ids[] = array( + 'object_type' => 'song', + 'object_id' => scrub_in($_REQUEST['song_id']) + ); + break; + case 'artist': + $artist = new Artist($_REQUEST['artist_id']); + $media_ids = $artist->get_songs(); + break; + case 'artist_random': + $artist = new Artist($_REQUEST['artist_id']); + $artist->get_count(); + $media_ids = $artist->get_random_songs(); + break; + case 'album_random': + $album = new Album($_REQUEST['album_id']); + $media_ids = $album->get_random_songs(); + break; + case 'album': + $album = new Album($_REQUEST['album_id']); + $media_ids = $album->get_songs(); + break; + case 'playlist': + $playlist = new Playlist($_REQUEST['playlist_id']); + $media_ids = $playlist->get_songs($_REQUEST['song']); + break; + case 'playlist_random': + $playlist = new Playlist($_REQUEST['playlist_id']); + $media_ids = $playlist->get_random_songs(); + break; + case 'random': + if($_REQUEST['genre'][0] != '-1') { + $matchlist['genre'] = $_REQUEST['genre']; + } + if($_REQUEST['catalog'] != '-1') { + $matchlist['catalog'] = $_REQUEST['catalog']; + } + /* Setup the options array */ + $options = array('limit' => $_REQUEST['random'], 'random_type' => $_REQUEST['random_type'],'size_limit'=>$_REQUEST['size_limit']); + $media_ids = get_random_songs($options, $matchlist); + break; + case 'democratic': + $democratic = new Democratic($_REQUEST['democratic_id']); + $urls = array($democratic->play_url()); + break; + case 'download': + $media_ids[] = array( + 'object_type' => 'song', + 'object_id' => scrub_in($_REQUEST['song_id']) + ); + default: + break; } // end action switch // See if we need a special streamtype switch ($_REQUEST['action']) { - case 'download': - $stream_type = 'download'; - break; - case 'democratic': - // Don't let them loop it - // FIXME: This looks hacky - if (Config::get('play_type') == 'democratic') { - Config::set('play_type', 'stream', true); - } - default: - $stream_type = Config::get('play_type'); - if ($stream_type == 'stream') { - $stream_type = Config::get('playlist_type'); - } - break; + case 'download': + $stream_type = 'download'; + break; + case 'democratic': + // Don't let them loop it + // FIXME: This looks hacky + if (Config::get('play_type') == 'democratic') { + Config::set('play_type', 'stream', true); + } + default: + $stream_type = Config::get('play_type'); + if ($stream_type == 'stream') { + $stream_type = Config::get('playlist_type'); + } + break; } debug_event('stream.php' , 'Stream Type: ' . $stream_type . ' Media IDs: '. json_encode($media_ids), 5); $playlist = new Stream_Playlist(); $playlist->add($media_ids); if (isset($urls)) { - $playlist->add_urls($urls); + $playlist->add_urls($urls); } // Depending on the stream type, will either generate a redirect or actually do // the streaming. diff --git a/templates/base.css b/templates/base.css index 89f207c7f5..cecf6c9f22 100644 --- a/templates/base.css +++ b/templates/base.css @@ -1,4 +1,4 @@ -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -27,16 +27,16 @@ *****************/ .tag_size1 { - font-size:.6em; + font-size:.6em; } .tag_size2 { - font-size:.8em; + font-size:.8em; } .tag_size3 { - font-size:1em; + font-size:1em; } .tag_size4 { - font-size:1.2em; + font-size:1.2em; } a.tag_size1, a.tag_size2, a.tag_size3, a.tag_size4 { text-decoration: none; } @@ -48,8 +48,8 @@ a.tag_size1, a.tag_size2, a.tag_size3, a.tag_size4 { text-decoration: none; } * Generic / Misc *****************/ .item_on { - color: #347C17; + color: #347C17; } .item_off { - color: #FF0000; + color: #FF0000; } diff --git a/templates/browse_content.inc.php b/templates/browse_content.inc.php index 2b5fb94ac7..f1f5ea5df6 100644 --- a/templates/browse_content.inc.php +++ b/templates/browse_content.inc.php @@ -1,5 +1,5 @@
-
-
-
- id . '&key=min_count&value=1', '')); ?> + +
+ id . '&key=min_count&value=1', '')); ?> - -
- id . '&key=rated&value=1', '')); ?> + +
+ id . '&key=rated&value=1', '')); ?> - get_filter('unplayed') ? 'checked="checked"' : ''; ?>/> -
+ get_filter('unplayed') ? 'checked="checked"' : ''; ?>/> +
- get_filter('playlist_type') ? 'checked="checked"' : ''; ?>/> -
- id . '&key=playlist_type&value=1','')); ?> + get_filter('playlist_type') ? 'checked="checked"' : ''; ?>/> +
+ id . '&key=playlist_type&value=1','')); ?> - get_filter('object_type'); ${$string} = 'selected="selected"'; ?> - /> -
- id . '&type=song','')); ?> - -
- id . '&type=album','')); ?> - -
- id . '&type=artist','')); ?> + get_filter('object_type'); ${$string} = 'selected="selected"'; ?> + /> +
+ id . '&type=song','')); ?> + +
+ id . '&type=album','')); ?> + +
+ id . '&type=artist','')); ?> - /> - id, '')); ?> + /> + id, '')); ?>
diff --git a/templates/error_page.inc.php b/templates/error_page.inc.php
index 62cd63f50f..cc4734bb26 100644
--- a/templates/error_page.inc.php
+++ b/templates/error_page.inc.php
@@ -1,5 +1,5 @@
+ xml:lang="" lang=""
+ dir="">
@@ -36,20 +36,20 @@
- id . '&key=min_count&value=1', '')); ?> + +
+ id . '&key=min_count&value=1', '')); ?> - -
- id . '&key=rated&value=1', '')); ?> + +
+ id . '&key=rated&value=1', '')); ?> - get_filter('unplayed') ? 'checked="checked"' : ''; ?>/> -
+ get_filter('unplayed') ? 'checked="checked"' : ''; ?>/> +
- get_filter('playlist_type') ? 'checked="checked"' : ''; ?>/> -
- id . '&key=playlist_type&value=1','')); ?> + get_filter('playlist_type') ? 'checked="checked"' : ''; ?>/> +
+ id . '&key=playlist_type&value=1','')); ?> - get_filter('object_type'); ${$string} = 'selected="selected"'; ?> - /> -
- id . '&type=song','')); ?> - -
- id . '&type=album','')); ?> - -
- id . '&type=artist','')); ?> + get_filter('object_type'); ${$string} = 'selected="selected"'; ?> + /> +
+ id . '&type=song','')); ?> + +
+ id . '&type=album','')); ?> + +
+ id . '&type=artist','')); ?> - /> - id, '')); ?> + /> + id, '')); ?>
-
-
+
diff --git a/templates/footer.inc.php b/templates/footer.inc.php
index 846fca7820..4176884fac 100644
--- a/templates/footer.inc.php
+++ b/templates/footer.inc.php
@@ -1,5 +1,5 @@
diff --git a/templates/header.inc.php b/templates/header.inc.php
index a1deb4028d..803147c930 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -1,5 +1,5 @@
/default.css" type="text/css" media="screen" />
-
-
-
-
-
-
-
-
- ; ?>/images/ampache.png "<?php echo Config::get('site_title'); ?>")
-
-
-
-
-
-
- fullname; ?> []
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ fullname; ?> []
+
+
+
+
+
Loading . . .
has_access(100)) { ?>
diff --git a/templates/install.css b/templates/install.css
index 359dd0bf8e..ddc4e0e72b 100644
--- a/templates/install.css
+++ b/templates/install.css
@@ -1,4 +1,4 @@
-/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
/**
*
* LICENSE: GNU General Public License, version 2 (GPLv2)
@@ -20,123 +20,123 @@
*/
body {
- font-family:Arial, Helvetica, sans-serif;
- font-size: 1em;
- margin: 0;
- padding: 0;
- text-align: center;
- background: #FFFFFF url(../images/top_bg.jpg) repeat-x top left;
+ font-family:Arial, Helvetica, sans-serif;
+ font-size: 1em;
+ margin: 0;
+ padding: 0;
+ text-align: center;
+ background: #FFFFFF url(../images/top_bg.jpg) repeat-x top left;
}
h3 {
- text-align:left;
- border-bottom: 1px dotted #cccccc;
- padding-left: 10px;
+ text-align:left;
+ border-bottom: 1px dotted #cccccc;
+ padding-left: 10px;
}
/* Header */
#header {
- width: 90%;
- min-height: 85px;
- height: 85px;
- margin: 0 auto;
- padding: 0;
- text-align: left;
- font-size: smaller;
- display: block;
+ width: 90%;
+ min-height: 85px;
+ height: 85px;
+ margin: 0 auto;
+ padding: 0;
+ text-align: left;
+ font-size: smaller;
+ display: block;
}
#header h1 {
- margin: 0;
- padding-top: 16px;
- color: #000;
- font-weight: bold;
- font-size: large;
+ margin: 0;
+ padding-top: 16px;
+ color: #000;
+ font-weight: bold;
+ font-size: large;
}
#header p {
- font-size: smaller;
- color: #000;
- margin: 0px;
+ font-size: smaller;
+ color: #000;
+ margin: 0px;
}
/* Content */
#text-box {
- width: 90%;
- min-height: 85px;
- height: 85px;
- display: block;
- margin: 0 auto;
- padding: 0;
- text-align: left;
- font-size: smaller;
+ width: 90%;
+ min-height: 85px;
+ height: 85px;
+ display: block;
+ margin: 0 auto;
+ padding: 0;
+ text-align: left;
+ font-size: smaller;
}
.error {
- color: #ff0033;
- font-weight: bold;
+ color: #ff0033;
+ font-weight: bold;
}
.notify {
- border: 1px solid #cccccc;
- background-color: #f4f4f4;
- padding: 5px;
- margin-top: 3px;
+ border: 1px solid #cccccc;
+ background-color: #f4f4f4;
+ padding: 5px;
+ margin-top: 3px;
}
.content {
- border: 1px solid #cccccc;
- padding: 5px;
- margin-top: 3px;
+ border: 1px solid #cccccc;
+ padding: 5px;
+ margin-top: 3px;
}
/* Table style */
td{
- padding:5px;
- /*background-color: #D9E0E8;*/
- font-size: smaller;
+ padding:5px;
+ /*background-color: #D9E0E8;*/
+ font-size: smaller;
}
.align{
- text-align:right;
+ text-align:right;
}
/* Estilos para formas */
input, radio, select, textarea {
- border: 1px solid #ddd;
- background: #f2f2f2;
- font: 11px verdana, sans-serif;
- color: #443;
- padding: 2px;
- outline: none;
+ border: 1px solid #ddd;
+ background: #f2f2f2;
+ font: 11px verdana, sans-serif;
+ color: #443;
+ padding: 2px;
+ outline: none;
}
input:hover,
textarea:hover,
input:focus,
textarea:focus{
- border: 1px solid #aaa;
+ border: 1px solid #aaa;
}
/* Extras */
.ok {
- font-weight:bold;
- color:#009900;
- margin:10px 10px 10px 10px;
+ font-weight:bold;
+ color:#009900;
+ margin:10px 10px 10px 10px;
}
.notok {
- font-weight:bold;
- color:#FF3300;
- margin:3px 3px 3px 3px;
+ font-weight:bold;
+ color:#FF3300;
+ margin:3px 3px 3px 3px;
}
/* Bottom */
#bottom {
- border-top: 1px dotted #cccccc;
- margin-top: 10px;
- margin-bottom: 10px;
- padding:5px;
+ border-top: 1px dotted #cccccc;
+ margin-top: 10px;
+ margin-bottom: 10px;
+ padding:5px;
}
#bottom p {
- font-size:10px;
+ font-size:10px;
}
diff --git a/templates/install_header.inc.php b/templates/install_header.inc.php
index c30417a797..8b5c643418 100644
--- a/templates/install_header.inc.php
+++ b/templates/install_header.inc.php
@@ -1,5 +1,5 @@
For the love of Music
-
@@ -90,25 +90,25 @@
-
$value) {
- if ($key == 'database_password' || $key == 'mysql_password') { $value = '*********'; }
- if (is_array($value)) {
- $string = '';
- foreach ($value as $setting) {
- $string .= $setting . '
'; - } - $value = $string; - } - if (Preference::is_boolean($key)) { - $value = print_bool($value); - } + if ($key == 'database_password' || $key == 'mysql_password') { $value = '*********'; } + if (is_array($value)) { + $string = ''; + foreach ($value as $setting) { + $string .= $setting . '
'; + } + $value = $string; + } + if (Preference::is_boolean($key)) { + $value = print_bool($value); + } ?>
-
diff --git a/templates/show_democratic.inc.php b/templates/show_democratic.inc.php
index ed951c06ac..c3c8be1893 100644
--- a/templates/show_democratic.inc.php
+++ b/templates/show_democratic.inc.php
@@ -1,5 +1,5 @@
is_enabled()) { ?>
- :f_cooldown; ?>
+ :f_cooldown; ?>
-
-
+
+
is_enabled()) { ?>
- id),'all', T_('Play'),'play_democratic'); ?>
-
+ id),'all', T_('Play'),'play_democratic'); ?>
+
- id),'delete', T_('Clear Playlist'),'clear_democratic'); ?>
-
+ id),'delete', T_('Clear Playlist'),'clear_democratic'); ?>
+
diff --git a/templates/show_democratic_playlist.inc.php b/templates/show_democratic_playlist.inc.php
index 49dd889e46..1ce5bda647 100644
--- a/templates/show_democratic_playlist.inc.php
+++ b/templates/show_democratic_playlist.inc.php
@@ -1,5 +1,5 @@
base_playlist);
+ $playlist = new Playlist($democratic->base_playlist);
?>
- :
-
- name); ?>
-
+ :
+
+ name); ?>
+
-
set_parent();
foreach($object_ids as $item) {
- $media = new $item['object_type']($item['object_id']);
- $media->format();
+ $media = new $item['object_type']($item['object_id']);
+ $media->format();
?>
-
- has_vote($item['object_id'], $item['object_type'])) { ?>
-
-
- id . '&type=' . scrub_out($item['object_type']),'tick', T_('Add Vote'),'remove_vote_' . $item['id']); ?>
-
-
- get_vote($item['id'])); ?>
- f_link; ?>
- f_album_link; ?>
- f_artist_link; ?>
- f_time; ?>
-
-
-
-
-
+
+ has_vote($item['object_id'], $item['object_type'])) { ?>
+
+
+ id . '&type=' . scrub_out($item['object_type']),'tick', T_('Add Vote'),'remove_vote_' . $item['id']); ?>
+
+
+ get_vote($item['id'])); ?>
+ f_link; ?>
+ f_album_link; ?>
+ f_artist_link; ?>
+ f_time; ?>
+
+
+
+
+
-
-
-
- title; ?>
- get_album_name($song->album); ?>
- get_artist_name($song->album); ?>
- file; ?>
- addition_time); ?>
+
+ title; ?>
+ get_album_name($song->album); ?>
+ get_artist_name($song->album); ?>
+ file; ?>
+ addition_time); ?>
-
+
-
-
+
+
-
-
-
-
-
+
+
- -
--
-
+
- - - -
- - - - +
- + + +
- + + + -
-
-
-
+
- + + -
+
- - - - -
- - - - +
- + + +
- + + +
- f_link; ?> - + - + -
- - ... - +
- + ... +
- - id,'add', T_('Add'),'play_full_' . $album->id); ?> - id, T_('Add Album'), 'play_full_text_' . $album->id); ?> - -
- - id,'random', T_('Random'),'play_random_' . $album->id); ?> - id, T_('Add Random from Album'), 'play_random_text_' . $album->id); ?> - - -
- - - - - -
- - - - - -
- - - - - - -
- - - - - +
- + id,'add', T_('Add'),'play_full_' . $album->id); ?> + id, T_('Add Album'), 'play_full_text_' . $album->id); ?> + +
- + id,'random', T_('Random'),'play_random_' . $album->id); ?> + id, T_('Add Random from Album'), 'play_random_text_' . $album->id); ?> + + +
- + + + + +
- + + + + +
- + + + + + +
- + + + +
- - - - - f_name); ?> - - - - f_name); ?> - + + + + f_name); ?> + + + + f_name); ?> +
- - - id,'add', T_('Add'),'add_' . $artist->id); ?> - id,sprintf(T_('Add All Songs By %s'), $artist->f_name),'add_text_' . $artist->id); ?> + + id,'add', T_('Add'),'add_' . $artist->id); ?> + id,sprintf(T_('Add All Songs By %s'), $artist->f_name),'add_text_' . $artist->id); ?>
- - - id,'random', T_('Random'),'random_' . $artist->id); ?> - id, sprintf(T_('Add Random Songs By %s'), $artist->f_name),'random_text_' . $artist->id); ?> + + id,'random', T_('Random'),'random_' . $artist->id); ?> + id, sprintf(T_('Add Random Songs By %s'), $artist->f_name),'random_text_' . $artist->id); ?>
- - - + +
- - - + +
- @@ -75,6 +75,6 @@
+
+
diff --git a/templates/javascript_refresh.inc.php b/templates/javascript_refresh.inc.php
index eacab77650..aa28b3dcc5 100644
--- a/templates/javascript_refresh.inc.php
+++ b/templates/javascript_refresh.inc.php
@@ -1,5 +1,5 @@
get_offset();
-$start = $browse->get_start();
-$total = $browse->get_total();
-$uid = Config::get('list_header_uid');
+$limit = $browse->get_offset();
+$start = $browse->get_start();
+$total = $browse->get_total();
+$uid = Config::get('list_header_uid');
$sides = 5;
// ++ the uid
@@ -47,86 +47,86 @@
/* Calculate how many pages total exist */
if ($limit > 0 && $total > $limit) {
- $pages = ceil($total / $limit);
+ $pages = ceil($total / $limit);
}
else {
- $pages = 0;
+ $pages = 0;
}
// are there enough items to even need this view?
if ($pages > 1) {
- /* Calculate current page and how many we have on each side */
- $page_data = array('up' => array(), 'down' => array());
+ /* Calculate current page and how many we have on each side */
+ $page_data = array('up' => array(), 'down' => array());
- // Can't divide by 0
- if ($start > 0) {
- $current_page = floor($start / $limit);
- }
- else {
- $current_page = 0;
- }
+ // Can't divide by 0
+ if ($start > 0) {
+ $current_page = floor($start / $limit);
+ }
+ else {
+ $current_page = 0;
+ }
- // Create 10 pages in either direction
- // Down first
- $page = $current_page;
- $i = 0;
- while ($page > 0) {
- if ($i == $sides) { $page_data['down'][1] = '...'; $page_data['down'][0] = '0'; break; }
- $i++;
- $page = $page - 1;
- $page_data['down'][$page] = $page * $limit;
- } // while page > 0
+ // Create 10 pages in either direction
+ // Down first
+ $page = $current_page;
+ $i = 0;
+ while ($page > 0) {
+ if ($i == $sides) { $page_data['down'][1] = '...'; $page_data['down'][0] = '0'; break; }
+ $i++;
+ $page = $page - 1;
+ $page_data['down'][$page] = $page * $limit;
+ } // while page > 0
- // Then up
- $page = $current_page + 1;
- $i = 0;
- while ($page <= $pages) {
- if ($page * $limit > $total) { break; }
- if ($i == $sides) {
- $key = $pages - 1;
- if (!$page_data['up'][$key]) { $page_data['up'][$key] = '...'; }
- $page_data['up'][$pages] = ($pages - 1) * $limit;
- break;
- }
- $i++;
- $page = $page + 1;
- $page_data['up'][$page] = ($page - 1) * $limit;
- } // end while
+ // Then up
+ $page = $current_page + 1;
+ $i = 0;
+ while ($page <= $pages) {
+ if ($page * $limit > $total) { break; }
+ if ($i == $sides) {
+ $key = $pages - 1;
+ if (!$page_data['up'][$key]) { $page_data['up'][$key] = '...'; }
+ $page_data['up'][$pages] = ($pages - 1) * $limit;
+ break;
+ }
+ $i++;
+ $page = $page + 1;
+ $page_data['up'][$page] = ($page - 1) * $limit;
+ } // end while
- // Sort these arrays of hotness
- ksort($page_data['up']);
- ksort($page_data['down']);
+ // Sort these arrays of hotness
+ ksort($page_data['up']);
+ ksort($page_data['down']);
?>
+ +
+-
+
-
+ +
-
+
id . '&start=' . $prev_offset, T_('Prev'),'browse_' . $uid . 'prev','','prev'); ?>
- id . '&start=' . $next_offset, T_('Next'),'browse_' . $uid . 'next','','next'); ?>
- $offset) {
- if ($offset === '...') { echo '... '; }
- else {
- // Hack Alert
- $page++;
- echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $offset,$page,'browse_' . $uid . 'page_' . $page,'','page-nb');
- }
- } // end foreach down
+ id . '&start=' . $next_offset, T_('Next'),'browse_' . $uid . 'next','','next'); ?>
+ $offset) {
+ if ($offset === '...') { echo '... '; }
+ else {
+ // Hack Alert
+ $page++;
+ echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $offset,$page,'browse_' . $uid . 'page_' . $page,'','page-nb');
+ }
+ } // end foreach down
- /* Echo current page */
- $current_page++;
- ?>
-
-
+
+ $offset) {
- if ($offset === '...') { echo '... '; }
- else {
- echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $offset,$page,'browse_' . $uid . 'page_' . $page,'','page-nb');
- } // end else
- } // end foreach up
- ?>
+ /* Echo everything above us */
+ foreach ($page_data['up'] as $page=>$offset) {
+ if ($offset === '...') { echo '... '; }
+ else {
+ echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $offset,$page,'browse_' . $uid . 'page_' . $page,'','page-nb');
+ } // end else
+ } // end foreach up
+ ?>
-
-
-
playlist->get_items();
- }
+ //FIXME :: this is kludgy
+ if (!defined('NO_SONGS')) {
+ $objects = $GLOBALS['user']->playlist->get_items();
+ }
- // Limit the number of objects we show here
- if (count($objects) > 100) {
- $truncated = (count($objects) - 100);
- $objects = array_slice($objects, 0, 100, true);
- }
+ // Limit the number of objects we show here
+ if (count($objects) > 100) {
+ $truncated = (count($objects) - 100);
+ $objects = array_slice($objects, 0, 100, true);
+ }
- $normal_array = array('radio','song','video','random');
+ $normal_array = array('radio','song','video','random');
- foreach ($objects as $uid=>$object_data) {
- $type = array_shift($object_data);
- if (in_array($type,$normal_array)) {
- $object = new $type(array_shift($object_data));
- $object->format();
- }
- if ($type == 'random') {
- $object->f_link = Random::get_type_name($type);
- }
+ foreach ($objects as $uid=>$object_data) {
+ $type = array_shift($object_data);
+ if (in_array($type,$normal_array)) {
+ $object = new $type(array_shift($object_data));
+ $object->format();
+ }
+ if ($type == 'random') {
+ $object->f_link = Random::get_type_name($type);
+ }
?>
| : | -- - | +: | ++ + |
| : | -- - | +: | ++ + |
| : | -- - - | +: | ++ + + |
| : | -- - | +: | ++ + |
| : | -- - | +: | ++ + |
-
-
-
-
+
+
+
+
diff --git a/templates/show_add_access.inc.php b/templates/show_add_access.inc.php
index 9e030ccc91..b2d0353105 100644
--- a/templates/show_add_access.inc.php
+++ b/templates/show_add_access.inc.php
@@ -1,5 +1,5 @@
/admin/access.php?action=add_host">
| : | -- - | +: | ++ + | ||||
| : | -- - - - - | +: | ++ + + + + | ||||
| : | -- - | +: | ++ + | ||||
| : | - - | + +||||||
| - (255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff) - | ++ (255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff) + | ||||||
| : | -- - - | -: | -- - - | +: | ++ + + | +: | ++ + + |
-
-
+
+
diff --git a/templates/show_add_catalog.inc.php b/templates/show_add_catalog.inc.php
index 7a3049f736..28f01414cc 100644
--- a/templates/show_add_catalog.inc.php
+++ b/templates/show_add_catalog.inc.php
@@ -1,5 +1,5 @@
/admin/catalog.php" enctype="multipart/form-data">
| : | -- |
- : - %A = - %a = - %c = - %T = - %t = - %y = - %o = - |
+ : | ++ |
+ : + %A = + %a = + %c = + %T = + %t = + %y = + %o = + |
| : | -+ | : | +|||
| : | -- - | +: | ++ + | ||
| : | -* | +: | +* | ||
| : | -* | +: | +* | ||
| : | -+ | : | +|||
| : |
- + | : |
+ |||
| : | -+ | : | +|||
| : | -+ | : | +
diff --git a/templates/show_add_live_stream.inc.php b/templates/show_add_live_stream.inc.php
index ef7402ed65..37a0b8a3bb 100644
--- a/templates/show_add_live_stream.inc.php
+++ b/templates/show_add_live_stream.inc.php
@@ -1,5 +1,5 @@
/radio.php?action=create">
diff --git a/templates/show_add_user.inc.php b/templates/show_add_user.inc.php
index d42988cdbc..56d6461fd7 100644
--- a/templates/show_add_user.inc.php
+++ b/templates/show_add_user.inc.php
@@ -1,5 +1,5 @@
">
-
-
-
- name); ?>
- (path); ?>)
-
-
-
- |
-
- |
-
- |
-
- |
-
-
-
+
+
+ name); ?>
+ (path); ?>)
+
+
+
+ |
+
+ |
+
+ |
+
+ |
+
+
+
-
-
-
+
+
+
-
\n"; }
+ else {
?>
-
- 
-
- -
+
+
+
+ +
\n"; }
+ } // end else
+ $j++;
+ } // end while cells
+ if($i < $rows) { echo " \n"; }
else { echo " "; }
- $i++;
+ $i++;
} // end while
?>
diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php
index db6ce30bc5..1d3782de51 100644
--- a/templates/show_album_row.inc.php
+++ b/templates/show_album_row.inc.php
@@ -1,5 +1,5 @@
- id,'add', T_('Add'),'add_album_' . $album->id); ?>
- id,'random', T_('Random'),'random_album_' . $album->id); ?>
+ id,'add', T_('Add'),'add_album_' . $album->id); ?>
+ id,'random', T_('Random'),'random_album_' . $album->id); ?>
f_artist . '] ' . scrub_out($album->full_name);
+ $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name);
?>
- ; ?>/image.php?id=<?php echo $album->id; ?>&thumb=1 "<?php echo($name) ?>")
+
@@ -41,17 +41,17 @@
f_tags; ?>
id,'album'); ?>
-
-
-
-
-
-
-
-
-
-
-
- id,'edit', T_('Edit'),'edit_album_' . $album->id); ?>
-
+
+
+
+
+
+
+
+
+
+
+
+ id,'edit', T_('Edit'),'edit_album_' . $album->id); ?>
+
diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php
index a97276348b..41d5ccb0c9 100644
--- a/templates/show_albums.inc.php
+++ b/templates/show_albums.inc.php
@@ -1,5 +1,5 @@
- id . '&sort=name', T_('Album'),'album_sort_name'); ?>
- id . '&sort=artist', T_('Artist'),'album_sort_artist'); ?>
- id . '&sort=year', T_('Year'),'album_sort_year'); ?>
- id . '&sort=name', T_('Album'),'album_sort_name'); ?>
+ id . '&sort=artist', T_('Artist'),'album_sort_artist'); ?>
+ id . '&sort=year', T_('Year'),'album_sort_year'); ?>
+
format();
+ if (Config::get('ratings')) {
+ Rating::build_cache('album',$object_ids);
+ }
+ /* Foreach through the albums */
+ foreach ($object_ids as $album_id) {
+ $album = new Album($album_id);
+ $album->format();
?>
-
+
-
- id . '&sort=name', T_('Album'),'album_sort_name_bottom'); ?>
- id . '&sort=year', T_('Year'),'album_sort_year_bottom'); ?>
- id . '&sort=name', T_('Album'),'album_sort_name_bottom'); ?>
+ id . '&sort=year', T_('Year'),'album_sort_year_bottom'); ?>
+
diff --git a/templates/show_all_popular.inc.php b/templates/show_all_popular.inc.php
index 8f1b411988..ea05b14b9b 100644
--- a/templates/show_all_popular.inc.php
+++ b/templates/show_all_popular.inc.php
@@ -1,5 +1,5 @@
diff --git a/templates/show_alphabet_form.inc.php b/templates/show_alphabet_form.inc.php
index 0efcdc9b07..e1d0865801 100644
--- a/templates/show_alphabet_form.inc.php
+++ b/templates/show_alphabet_form.inc.php
@@ -1,5 +1,5 @@
diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php
index aa26d52db4..7bf95c5660 100644
--- a/templates/show_artist.inc.php
+++ b/templates/show_artist.inc.php
@@ -1,5 +1,5 @@
show_objects($object_ids);
- $browse->store();
+ $browse->show_objects($object_ids);
+ $browse->store();
?>
diff --git a/templates/show_artist_row.inc.php b/templates/show_artist_row.inc.php
index f7612c1e4e..295d2e8599 100644
--- a/templates/show_artist_row.inc.php
+++ b/templates/show_artist_row.inc.php
@@ -1,5 +1,5 @@
- id,'add', T_('Add'),'add_artist_' . $artist->id); ?>
- id,'random', T_('Random'),'random_artist_' . $artist->id); ?>
+ id,'add', T_('Add'),'add_artist_' . $artist->id); ?>
+ id,'random', T_('Random'),'random_artist_' . $artist->id); ?>
f_name_link; ?>
songs; ?>
@@ -32,11 +32,11 @@
id,'artist'); ?>
-
-
+
+
- id,'edit', T_('Edit'),'edit_artist_' . $artist->id); ?>
+ id,'edit', T_('Edit'),'edit_artist_' . $artist->id); ?>
diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php
index 36d9b01e30..0a3b664b57 100644
--- a/templates/show_artists.inc.php
+++ b/templates/show_artists.inc.php
@@ -1,5 +1,5 @@
-
-
+
+
format();
+ $artist = new Artist($artist_id, $_SESSION['catalog']);
+ $artist->format();
?>
-
+
-
-
-
-
-
-
+
+
+
+
+
diff --git a/templates/show_big_art.inc.php b/templates/show_big_art.inc.php
index 08fdb72fb3..c969ff6cbe 100644
--- a/templates/show_big_art.inc.php
+++ b/templates/show_big_art.inc.php
@@ -1,5 +1,5 @@
| - | - - - | ++ | + + + |
| - | - - - | ++ | + + + |
| - | - - - | ++ | + + + |
| - | - - | ++ | + + |
| - | - - | ++ | + + |
| - | - - | ++ | + + |
-
-
+
+
diff --git a/templates/show_add_playlist.inc.php b/templates/show_add_playlist.inc.php
index 2a1239b46f..9ad0f4295c 100644
--- a/templates/show_add_playlist.inc.php
+++ b/templates/show_add_playlist.inc.php
@@ -1,5 +1,5 @@
/playlist.php">
| : | -+ | : | +|
| : | -- - | +: | ++ + |
-
-
+
+
diff --git a/templates/show_add_shout.inc.php b/templates/show_add_shout.inc.php
index 739b1571c5..653140848f 100644
--- a/templates/show_add_shout.inc.php
+++ b/templates/show_add_shout.inc.php
@@ -1,5 +1,5 @@
/shout.php?action=add_shout">
| + | |
| + | |
| + | |
| - - - - - | ++ + + + + |
| - : - | -- - - | ++ : + | ++ + + |
| : | -- - | +: | ++ + |
| - : - | -- - | ++ : + | ++ + |
| - : - | -- - - | ++ : + | ++ + + |
| - : - | -- - | ++ : + | ++ + |
| - : - | ++ : + | access; ${$var_name} = 'selected="selected"'; ?> |
-
-
+
+
diff --git a/templates/show_adds_catalog.inc.php b/templates/show_adds_catalog.inc.php
index a1ddf4d97d..7fb04e3232 100644
--- a/templates/show_adds_catalog.inc.php
+++ b/templates/show_adds_catalog.inc.php
@@ -1,5 +1,5 @@
-
+
-
-
-
- ...
-
+
+
+
+ ...
+
diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php
index 0df0be23f8..6bff287860 100644
--- a/templates/show_admin_tools.inc.php
+++ b/templates/show_admin_tools.inc.php
@@ -1,5 +1,5 @@
@@ -31,48 +31,48 @@
@@ -88,12 +88,12 @@
diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php
index 449203baed..b987bf5be4 100644
--- a/templates/show_album.inc.php
+++ b/templates/show_album.inc.php
@@ -1,5 +1,5 @@
name) . ' (' . $album->year . ')';
if ($album->disk) {
- $title .= "disk . "\">, " . T_('Disk') . " " . $album->disk . "";
+ $title .= "disk . "\">, " . T_('Disk') . " " . $album->disk . "";
}
$title .= ' - ' . $album->f_artist_link;
?>
@@ -85,12 +85,12 @@
set_type('song');
- $browse->set_simple_browse(true);
- $browse->set_filter('album', $album->id);
- $browse->set_sort('track', 'ASC');
- $browse->get_objects();
- $browse->show_objects();
- $browse->store();
+ $browse = new Browse();
+ $browse->set_type('song');
+ $browse->set_simple_browse(true);
+ $browse->set_filter('album', $album->id);
+ $browse->set_sort('track', 'ASC');
+ $browse->get_objects();
+ $browse->show_objects();
+ $browse->store();
?>
diff --git a/templates/show_album_art.inc.php b/templates/show_album_art.inc.php
index 838bf5fba4..1ff7fefcbe 100644
--- a/templates/show_album_art.inc.php
+++ b/templates/show_album_art.inc.php
@@ -1,5 +1,5 @@
\n"; }
- else {
+ $j=0;
+ while ($j < 4) {
+ $key = $i*4+$j;
+ $image_url = Config::get('web_path') . '/image.php?type=session&image_index=' . $key;
+ $dimensions = Core::image_dimensions(Art::get_from_source($_SESSION['form']['images'][$key], 'album'));
+ if (!isset($images[$key])) { echo "
- name != T_('Unknown (Orphaned)')) {
+ name != T_('Unknown (Orphaned)')) {
$name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name);
- $aa_url = $web_path . "/image.php?id=" . $album->id . "&type=popup&sid=" . session_id();
- echo "";
- echo "![\"".$name."\"](\"" "\\"\".$name.\"\\"")
";
- echo "\n";
- }
- ?>
+ $aa_url = $web_path . "/image.php?id=" . $album->id . "&type=popup&sid=" . session_id();
+ echo "";
+ echo "";
+ echo "\n";
+ }
+ ?>
- id,'album'); ?>
+ id,'album'); ?>
:
-
-
- -
+ +
| - - | -- - | -- - | ++ + | ++ + | ++ + |
| - - | -- - | -- - | ++ + | ++ + | ++ + |
- id, 'artist'); ?>
+ id, 'artist'); ?>
:
diff --git a/templates/show_catalog_row.inc.php b/templates/show_catalog_row.inc.php
index 7aef9d2721..189e99340d 100644
--- a/templates/show_catalog_row.inc.php
+++ b/templates/show_catalog_row.inc.php
@@ -1,5 +1,5 @@
f_add); ?>
f_clean); ?>
-
- |
+
+ |
|
- |
- |
- |
+ |
+ |
+ |
diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php
index c9f8cedd29..86ab877ee6 100644
--- a/templates/show_catalogs.inc.php
+++ b/templates/show_catalogs.inc.php
@@ -1,5 +1,5 @@
-
format();
+ foreach ($object_ids as $catalog_id) {
+ $catalog = new Catalog($catalog_id);
+ $catalog->format();
?>
-
+
-
+
-
diff --git a/templates/show_clean_catalog.inc.php b/templates/show_clean_catalog.inc.php
index f3f264643c..07fdf1453a 100644
--- a/templates/show_clean_catalog.inc.php
+++ b/templates/show_clean_catalog.inc.php
@@ -1,5 +1,5 @@
- + - + diff --git a/templates/show_create_democratic.inc.php b/templates/show_create_democratic.inc.php index ec82941627..8ec5396ae2 100644 --- a/templates/show_create_democratic.inc.php +++ b/templates/show_create_democratic.inc.php @@ -1,5 +1,5 @@ /democratic.php?action=create" enctype="multipart/form-data">
@@ -37,48 +37,48 @@
- + - + diff --git a/templates/show_create_democratic.inc.php b/templates/show_create_democratic.inc.php index ec82941627..8ec5396ae2 100644 --- a/templates/show_create_democratic.inc.php +++ b/templates/show_create_democratic.inc.php @@ -1,5 +1,5 @@ /democratic.php?action=create" enctype="multipart/form-data">
| - | + | + | |
| - | base_playlist); ?> | ++ | base_playlist); ?> |
| - | + | + | |
| - | + | + |
-
-
+
+
diff --git a/templates/show_debug.inc.php b/templates/show_debug.inc.php
index 369774eb7b..3669fb2abc 100644
--- a/templates/show_debug.inc.php
+++ b/templates/show_debug.inc.php
@@ -1,5 +1,5 @@
| - | + | + | |
|---|---|---|---|
| - | + | + | |
| - | + | + | |
| - | + | + | |
| - | + | + | |
| Open Basedir | -+ | Open Basedir | +|
| - | + | + | |
| - | + | + | |
| - | + | + | |
| - | + | + |
'; - } - $value = $string; - } - if (Preference::is_boolean($key)) { - $value = print_bool($value); - } + if ($key == 'database_password' || $key == 'mysql_password') { $value = '*********'; } + if (is_array($value)) { + $string = ''; + foreach ($value as $setting) { + $string .= $setting . '
'; + } + $value = $string; + } + if (Preference::is_boolean($key)) { + $value = print_bool($value); + } ?>
-
-
+
+
diff --git a/templates/show_duplicate.inc.php b/templates/show_duplicate.inc.php
index bc5435f2a1..85cd33795c 100644
--- a/templates/show_duplicate.inc.php
+++ b/templates/show_duplicate.inc.php
@@ -1,5 +1,5 @@
/admin/duplicates.php?action=find_duplicates" method="post" enctype="multipart/form-data" >
| : | +: |
-
- /> + + /> /> /> /> - |
+
diff --git a/templates/show_duplicates.inc.php b/templates/show_duplicates.inc.php
index 6a62e19ca3..8bd9cbda44 100644
--- a/templates/show_duplicates.inc.php
+++ b/templates/show_duplicates.inc.php
@@ -1,5 +1,5 @@
-
$song_id) {
- $song = new Song($song_id);
- $song->format();
- $row_key = 'duplicate_' . $song_id;
- $button_flip_state_id = 'button_flip_state_' . $song_id;
- $current_class = ($key == '0') ? 'row-highlight' : UI::flip_class();
- $button = $song->enabled ? 'disable' : 'enable';
- ?>
+ foreach ($songs as $key => $song_id) {
+ $song = new Song($song_id);
+ $song->format();
+ $row_key = 'duplicate_' . $song_id;
+ $button_flip_state_id = 'button_flip_state_' . $song_id;
+ $current_class = ($key == '0') ? 'row-highlight' : UI::flip_class();
+ $button = $song->enabled ? 'disable' : 'enable';
+ ?>
-
-
-
- f_link; ?>
- f_artist_link; ?>
- f_album_link; ?>
- f_time; ?>
- f_bitrate; ?>
- f_size; ?>
- file); ?>
+
+
+
+ f_link; ?>
+ f_artist_link; ?>
+ f_album_link; ?>
+ f_time; ?>
+ f_bitrate; ?>
+ f_size; ?>
+ file); ?>
-
diff --git a/templates/show_dynamic.inc.php b/templates/show_dynamic.inc.php
index 67173b97e4..65e411e766 100644
--- a/templates/show_dynamic.inc.php
+++ b/templates/show_dynamic.inc.php
@@ -1,5 +1,5 @@
diff --git a/templates/show_edit_access.inc.php b/templates/show_edit_access.inc.php
index 88cdae60d4..b9a2e6f33c 100644
--- a/templates/show_edit_access.inc.php
+++ b/templates/show_edit_access.inc.php
@@ -1,5 +1,5 @@
/admin/access.php?action=update_record&access_id=id); ?>">
-
+
- artist_count == '1') {
- show_artist_select('artist',$album->artist_id);
- }
- else {
- echo T_('Various');
- }
- ?>
+ artist_count == '1') {
+ show_artist_select('artist',$album->artist_id);
+ }
+ else {
+ echo T_('Various');
+ }
+ ?>
-
+
-
+
-
-
- id . '&type=album_row','download', T_('Save Changes'),'save_album_' . $album->id,'edit_album_' . $album->id); ?>
+
+
+ id . '&type=album_row','download', T_('Save Changes'),'save_album_' . $album->id,'edit_album_' . $album->id); ?>
diff --git a/templates/show_edit_artist.inc.php b/templates/show_edit_artist.inc.php
index 14bb89fe5d..5fc2f383e1 100644
--- a/templates/show_edit_artist.inc.php
+++ b/templates/show_edit_artist.inc.php
@@ -1,5 +1,5 @@
/admin/flag.php?action=edit_artist">
-
+
-
-
- id . '&type=artist_row','download', T_('Save Changes'),'save_artist_' . $artist->id,'edit_artist_' . $artist->id); ?>
+
+
+ id . '&type=artist_row','download', T_('Save Changes'),'save_artist_' . $artist->id,'edit_artist_' . $artist->id); ?>
diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php
index c7d5752eab..7a6e6b8507 100644
--- a/templates/show_edit_catalog.inc.php
+++ b/templates/show_edit_catalog.inc.php
@@ -1,5 +1,5 @@
/admin/catalog.php" enctype="multipart/form-data">
diff --git a/templates/show_edit_playlist_row.inc.php b/templates/show_edit_playlist_row.inc.php
index 9728f05ae1..0c587efed0 100644
--- a/templates/show_edit_playlist_row.inc.php
+++ b/templates/show_edit_playlist_row.inc.php
@@ -1,5 +1,5 @@
id; ?>" action="javascript:void(0);">
diff --git a/templates/show_edit_playlist_song_row.inc.php b/templates/show_edit_playlist_song_row.inc.php
index f5efe59377..edaba2a073 100644
--- a/templates/show_edit_playlist_song_row.inc.php
+++ b/templates/show_edit_playlist_song_row.inc.php
@@ -1,5 +1,5 @@
-
+
f_link; ?>
f_artist_link; ?>
@@ -34,9 +34,9 @@
f_track; ?>
f_time; ?>
-
-
- id . '&track_id=' . $track['id'],'download', T_('Save Changes'),'save_track_' . $track['id'],'edit_track_' . $track['id']); ?>
+
+
+ id . '&track_id=' . $track['id'],'download', T_('Save Changes'),'save_track_' . $track['id'],'edit_track_' . $track['id']); ?>
diff --git a/templates/show_edit_playlist_title.inc.php b/templates/show_edit_playlist_title.inc.php
index 475a882e9f..07707c11db 100644
--- a/templates/show_edit_playlist_title.inc.php
+++ b/templates/show_edit_playlist_title.inc.php
@@ -1,5 +1,5 @@
id; ?>" action="javascript:void(0);">
diff --git a/templates/show_edit_shout.inc.php b/templates/show_edit_shout.inc.php
index c20fee9bbb..eb4b376d86 100644
--- a/templates/show_edit_shout.inc.php
+++ b/templates/show_edit_shout.inc.php
@@ -1,5 +1,5 @@
id; ?>" />
diff --git a/templates/show_edit_smartplaylist_row.inc.php b/templates/show_edit_smartplaylist_row.inc.php
index 08feb91201..d366182a76 100644
--- a/templates/show_edit_smartplaylist_row.inc.php
+++ b/templates/show_edit_smartplaylist_row.inc.php
@@ -1,5 +1,5 @@
id; ?>" action="javascript:void(0);">
diff --git a/templates/show_edit_smartplaylist_title.inc.php b/templates/show_edit_smartplaylist_title.inc.php
index f036235d5e..b7432eb0d8 100644
--- a/templates/show_edit_smartplaylist_title.inc.php
+++ b/templates/show_edit_smartplaylist_title.inc.php
@@ -1,5 +1,5 @@
id; ?>" action="javascript:void(0);">
diff --git a/templates/show_edit_song.inc.php b/templates/show_edit_song.inc.php
index 95c427cc16..d679396336 100644
--- a/templates/show_edit_song.inc.php
+++ b/templates/show_edit_song.inc.php
@@ -1,5 +1,5 @@
/admin/flag.php">
-
+
- artist,true,$song->id); ?>
-
+ artist,true,$song->id); ?>
+
id,'change','check_inline_song_edit("artist", '.$song->id.')'); ?>
- album,true,$song->id); ?>
-
+ album,true,$song->id); ?>
+
id,'change','check_inline_song_edit("album", '.$song->id.')'); ?>
-
+
-
-
- id . '&type=song_row','download', T_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?>
+
+
+ id . '&type=song_row','download', T_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?>
diff --git a/templates/show_edit_user.inc.php b/templates/show_edit_user.inc.php
index 76dfb198e0..d6cb99424f 100644
--- a/templates/show_edit_user.inc.php
+++ b/templates/show_edit_user.inc.php
@@ -1,5 +1,5 @@
">
| - | - | - | + | + | + | + | |
|---|---|---|---|---|---|---|---|
| - - | -- - | -- - | -- - | ++ + | ++ + | ++ + | ++ + |
| - - | -- - | -- - | ++ + | ++ + | ++ + | ||
| - - | ++ + | ||||||
| : | -+ | : | +|||||
| : | +: | ||||||
| : | -- - - | -: | -- - - | +: | ++ + + | +: | ++ + + |
| : | -- user); ?> - | +: | ++ user); ?> + | ||||
| : | -- level; ${$name} = 'checked="checked"'; ?> - > - > - > - > - | +: | ++ level; ${$name} = 'checked="checked"'; ?> + > + > + > + > + | ||||
-
-
+
+
diff --git a/templates/show_edit_album.inc.php b/templates/show_edit_album.inc.php
index 6895bd1fcc..e1a403343c 100644
--- a/templates/show_edit_album.inc.php
+++ b/templates/show_edit_album.inc.php
@@ -1,5 +1,5 @@
/admin/flag.php?action=edit_album">
| - | - - | ++ | + + |
| - | - - | ++ | + + |
| - | - - | ++ | + + |
-
-
+
+
diff --git a/templates/show_edit_album_row.inc.php b/templates/show_edit_album_row.inc.php
index e0330e220a..3ea037d8b9 100644
--- a/templates/show_edit_album_row.inc.php
+++ b/templates/show_edit_album_row.inc.php
@@ -1,5 +1,5 @@
| - | - - | ++ | + + |
| - | - - | ++ | + + |
-
-
+
+
diff --git a/templates/show_edit_artist_row.inc.php b/templates/show_edit_artist_row.inc.php
index 97424f912c..2c52d59f14 100644
--- a/templates/show_edit_artist_row.inc.php
+++ b/templates/show_edit_artist_row.inc.php
@@ -1,5 +1,5 @@
| : | -- |
- : - %A= - %a= - %c= - %T= - %t= - %y= - %o= - |
+ : | ++ |
+ : + %A= + %a= + %c= + %T= + %t= + %y= + %o= + |
| - | catalog_type)); ?> | ++ | catalog_type)); ?> | ||
| : | @@ -51,24 +51,24 @@* | ||||
| : | -- - | +: | ++ + | ||
|
- : - |
- - - | +
+ : + |
+ + + |
-
-
-
+
+
+
diff --git a/templates/show_edit_live_stream_row.inc.php b/templates/show_edit_live_stream_row.inc.php
index 51e076c964..d44e560561 100644
--- a/templates/show_edit_live_stream_row.inc.php
+++ b/templates/show_edit_live_stream_row.inc.php
@@ -1,5 +1,5 @@
id; ?>">
| - | - | - | - | - | + | + | + | + | + | + | |
|---|---|---|---|---|---|---|---|---|---|---|---|
| - + | - + | - + | - + | - + | - - - id . '&type=live_stream_row','download', T_('Save Changes'),'save_live_stream_' . $radio->id,'edit_live_stream_' . $radio->id); ?> + + + id . '&type=live_stream_row','download', T_('Save Changes'),'save_live_stream_' . $radio->id,'edit_live_stream_' . $radio->id); ?> |
| - - | -- type; ${$name} = ' selected="selected"'; ?> - - | - - - id . '&type=playlist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> - | ++ + | ++ type; ${$name} = ' selected="selected"'; ?> + + | + + + id . '&type=playlist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + |
| - - | -- type; ${$name} = ' selected="selected"'; ?> - - | - - - id . '&type=playlist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> - | ++ + | ++ type; ${$name} = ' selected="selected"'; ?> + + | + + + id . '&type=playlist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + |
| f_link, $object->f_link); ?> + | f_link, $object->f_link); ?> |
| + | |
| + | |
| sticky == "1") { echo "checked"; } ?>/> | +sticky == "1") { echo "checked"; } ?>/> |
| - - | ++ + |
| - - | -- type; ${$name} = ' selected="selected"'; ?> - - | - - - id . '&type=smartplaylist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> - | ++ + | ++ type; ${$name} = ' selected="selected"'; ?> + + | + + + id . '&type=smartplaylist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + |
| - - | -- type; ${$name} = ' selected="selected"'; ?> - - | - - - id . '&type=smartplaylist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> - | ++ + | ++ type; ${$name} = ' selected="selected"'; ?> + + | + + + id . '&type=smartplaylist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + |
| : | -file); ?> | +: | +file); ?> |
| - | - - | ++ | + + |
| - |
- album); ?>
- - - |
+ + |
+ album); ?>
+ + + |
| - |
- artist); ?>
- - - |
+ + |
+ artist); ?>
+ + + |
| - | - - | ++ | + + |
| - | - - | ++ | + + |
| - | - - | ++ | + + |
| - | - - | ++ | + + |
-
-
-
+
+
+
diff --git a/templates/show_edit_song_row.inc.php b/templates/show_edit_song_row.inc.php
index 90535c3117..d3a87ab121 100644
--- a/templates/show_edit_song_row.inc.php
+++ b/templates/show_edit_song_row.inc.php
@@ -1,5 +1,5 @@
| + | |||
|---|---|---|---|
| - : - | -- - - | ++ : + | ++ + + |
| : | -- - | +: | ++ + |
| - : - | -- - | ++ : + | ++ + |
| - : - | -- - - | ++ : + | ++ + + |
| - : - | -- - | ++ : + | ++ + |
| - : - | -+ | + : + | +access; ${$var_name} = 'selected="selected"'; ?> - | +
| + | |||
| - | - - | ++ | + + |
| - | - - | ++ | + + |
| - | - - | ++ | + + |
-
-
-
-
+
+
+
+
diff --git a/templates/show_export.inc.php b/templates/show_export.inc.php
index 9615149284..e7cd949e44 100644
--- a/templates/show_export.inc.php
+++ b/templates/show_export.inc.php
@@ -1,5 +1,5 @@
/admin/export.php?action=export" method="post" enctype="multipart/form-data" >
| : | -- + | ||
| : | -- - | +: | ++ + |
diff --git a/templates/show_flag_row.inc.php b/templates/show_flag_row.inc.php
index cbeef4f857..36eff61255 100644
--- a/templates/show_flag_row.inc.php
+++ b/templates/show_flag_row.inc.php
@@ -1,5 +1,5 @@
- f_name; ?>
- f_user; ?>
- print_flag(); ?>
- comment); ?>
- print_status(); ?>
-
- approved) { ?>
- id,'disable', T_('Reject'),'reject_flag_' . $flag->id); ?>
-
- id,'enable', T_('Enable'),'enable_flag_' . $flag->id); ?>
-
-
+ f_name; ?>
+ f_user; ?>
+ print_flag(); ?>
+ comment); ?>
+ print_status(); ?>
+
+ approved) { ?>
+ id,'disable', T_('Reject'),'reject_flag_' . $flag->id); ?>
+
+ id,'enable', T_('Enable'),'enable_flag_' . $flag->id); ?>
+
+
diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php
index ed51f277da..db239205fa 100644
--- a/templates/show_flagged.inc.php
+++ b/templates/show_flagged.inc.php
@@ -1,5 +1,5 @@
-
format();
- require Config::get('prefix') . '/templates/show_flag_row.inc.php';
+ $flag = new Flag($flag_id);
+ $flag->format();
+ require Config::get('prefix') . '/templates/show_flag_row.inc.php';
?>
-
-
diff --git a/templates/show_gather_art.inc.php b/templates/show_gather_art.inc.php
index 9f17c90e78..56598316d8 100644
--- a/templates/show_gather_art.inc.php
+++ b/templates/show_gather_art.inc.php
@@ -1,5 +1,5 @@
/albums.php?action=find_art&album_id=id; ?>&artist_name=&album_name=&cover=" style="Display:inline;">
- :
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -41,13 +41,13 @@
@@ -55,73 +55,73 @@
:
:
:
:
:
@@ -130,48 +130,48 @@
:
:
:
:
@@ -179,24 +179,24 @@
:
diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php
index 703ef89001..bae4d3ba95 100644
--- a/templates/show_install_config.inc.php
+++ b/templates/show_install_config.inc.php
@@ -1,5 +1,5 @@
-
+
| - - | -- - | ++ + | ++ + |
| - - | -- - | ++ + | ++ + |
| - - | -- - | ++ + | ++ + |
| - - | -- - | ++ + | ++ + |
-
-
+
+
-
+
diff --git a/templates/show_import_playlist.inc.php b/templates/show_import_playlist.inc.php
index a767d41aca..436f71c1bd 100644
--- a/templates/show_import_playlist.inc.php
+++ b/templates/show_import_playlist.inc.php
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php
index 7c12cbf494..7c4db26e57 100644
--- a/templates/show_index.inc.php
+++ b/templates/show_index.inc.php
@@ -1,5 +1,5 @@
-
+
-
+
diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php
index ea2f86a9d8..7350f43190 100644
--- a/templates/show_install.inc.php
+++ b/templates/show_install.inc.php
@@ -1,5 +1,5 @@
-
-
-
-
-
- -
- -
diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php
index 86c5b770b5..e3a0a0d1fe 100644
--- a/templates/show_install_account.inc.php
+++ b/templates/show_install_account.inc.php
@@ -1,5 +1,5 @@
- -
-
-
-
-
-
- -
- -
-
-
-
-
- -
diff --git a/templates/show_install_check.inc.php b/templates/show_install_check.inc.php
index 9cd719a8a7..88ce8c6294 100644
--- a/templates/show_install_check.inc.php
+++ b/templates/show_install_check.inc.php
@@ -1,5 +1,5 @@
-
-
-
-
-
-
- -
+
Ampache Installation.
+ For the love of Music.