Rename tmpPlaylist to Tmp_Playlist

7 files changed, 14 insertions, 14 deletions

diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index ca4b4a05..06d76e6f 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -1517,7 +1517,7 @@ class Catalog extends database_object {
 		Stats::gc();
 		Rating::gc();
 		Playlist::gc();
-		tmpPlaylist::gc();
+		Tmp_Playlist::gc();
 		shoutBox::gc();
 		Tag::gc();
 		debug_event('catalog', 'Database cleanup ended', 5, 'ampache-catalog');
diff --git a/lib/class/democratic.class.php b/lib/class/democratic.class.php
index 9f3e5c8d..0e4fadbb 100644
--- a/lib/class/democratic.class.php
+++ b/lib/class/democratic.class.php
@@ -27,7 +27,7 @@
  * name for voting based playback.
  *
  */
-class Democratic extends tmpPlaylist {
+class Democratic extends Tmp_Playlist {
 
 	public $name;
 	public $cooldown;
@@ -97,7 +97,7 @@ class Democratic extends tmpPlaylist {
 
 	/**
 	 * set_parent
-	 * This returns the tmpPlaylist for this democratic play instance
+	 * This returns the Tmp_Playlist for this democratic play instance
 	 */
 	public function set_parent() {
 
@@ -213,7 +213,7 @@ class Democratic extends tmpPlaylist {
 
 	/**
 	 * get_items
-	 * This returns a sorted array of all object_ids in this tmpPlaylist.
+	 * This returns a sorted array of all object_ids in this Tmp_Playlist.
 	 * The array is multidimensional; the inner array needs to contain the
 	 * keys 'id', 'object_type' and 'object_id'.
 	 *
diff --git a/lib/class/tmpplaylist.class.php b/lib/class/tmp_playlist.class.php
index 2da411cf..129a8d1a 100644
--- a/lib/class/tmpplaylist.class.php
+++ b/lib/class/tmp_playlist.class.php
@@ -28,7 +28,7 @@
  * visit user_vote from time to time.
  *
  */
-class tmpPlaylist extends database_object {
+class Tmp_Playlist extends database_object {
 
 	/* Variables from the Datbase */
 	public $id;
@@ -92,14 +92,14 @@ class tmpPlaylist extends database_object {
 		$results = Dba::fetch_row($db_results);
 
 		if (!$results['0']) {
-			$results['0'] = tmpPlaylist::create(array(
+			$results['0'] = Tmp_Playlist::create(array(
 				'session_id'  => $session_id,
 				'type'        => 'user',
 				'object_type' => 'song'
 			));
 		}
 
-		$playlist = new tmpPlaylist($results['0']);
+		$playlist = new Tmp_Playlist($results['0']);
 
 		return $playlist;
 
@@ -133,7 +133,7 @@ class tmpPlaylist extends database_object {
 
 	/**
 	 * get_items
-	 * Returns an array of all object_ids currently in this tmpPlaylist.
+	 * Returns an array of all object_ids currently in this Tmp_Playlist.
 	 */
 	public function get_items() {
 
@@ -215,7 +215,7 @@ class tmpPlaylist extends database_object {
 
 	/**
 	 * create
-	 * This function initializes a new tmpPlaylist. It is associated with
+	 * This function initializes a new Tmp_Playlist. It is associated with
 	 * the current session rather than a user, as you could have the same 
 	 * user logged in from multiple locations.
 	 */
@@ -371,4 +371,4 @@ class tmpPlaylist extends database_object {
 
 	} // delete_track
 
-} // class tmpPlaylist
+} // class Tmp_Playlist
diff --git a/lib/class/user.class.php b/lib/class/user.class.php
index 35df23df..0ee517f2 100644
--- a/lib/class/user.class.php
+++ b/lib/class/user.class.php
@@ -109,7 +109,7 @@ class User extends database_object {
 
 		$session_id = session_id();
 
-		$this->playlist = tmpPlaylist::get_from_session($session_id);
+		$this->playlist = Tmp_Playlist::get_from_session($session_id);
 
 	} // load_playlist
 
diff --git a/lib/class/vauth.class.php b/lib/class/vauth.class.php
index 4939c5c2..b2f1d909 100644
--- a/lib/class/vauth.class.php
+++ b/lib/class/vauth.class.php
@@ -143,7 +143,7 @@ class vauth {
 
 		// Also clean up things that use sessions as keys
 		Query::clean();
-		tmpPlaylist::gc();
+		Tmp_Playlist::gc();
 
 		return true;
 
diff --git a/stream.php b/stream.php
index 94789ba5..d9b9e4ba 100644
--- a/stream.php
+++ b/stream.php
@@ -47,7 +47,7 @@ switch ($_REQUEST['action']) {
 	break;
 	/* This is run if we need to gather info based on a tmp playlist */
 	case 'tmp_playlist':
-		$tmp_playlist = new tmpPlaylist($_REQUEST['tmpplaylist_id']);
+		$tmp_playlist = new Tmp_Playlist($_REQUEST['tmpplaylist_id']);
 		$media_ids = $tmp_playlist->get_items();
 	break;
 	case 'play_favorite':
diff --git a/templates/show_user.inc.php b/templates/show_user.inc.php
index c5cb1ada..c1f39905 100644
--- a/templates/show_user.inc.php
+++ b/templates/show_user.inc.php
@@ -43,7 +43,7 @@ $client->format();
 		<h2><?php echo T_('Active Playlist'); ?></h2>
 		<div style="padding-left:10px;">
 		<?php
-			$tmp_playlist = new tmpPlaylist(tmpPlaylist::get_from_userid($client->id));
+			$tmp_playlist = new Tmp_Playlist(Tmp_Playlist::get_from_userid($client->id));
 			$object_ids = $tmp_playlist->get_items();
 			foreach ($object_ids as $object_data) {
 				$type = array_shift($object_data);