summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/class/stats.class.php1
-rw-r--r--lib/class/tmp_playlist.class.php16
-rw-r--r--templates/show_tv_adminctl.inc.php14
-rw-r--r--tv.php14
4 files changed, 43 insertions, 2 deletions
diff --git a/lib/class/stats.class.php b/lib/class/stats.class.php
index 004e7b46..ee4fb3aa 100644
--- a/lib/class/stats.class.php
+++ b/lib/class/stats.class.php
@@ -56,6 +56,7 @@ class Stats {
$type = $this->validate_type($type);
$oid = sql_escape($oid);
$user = sql_escape($user);
+ $date = time();
$sql = "INSERT INTO object_count (`object_type`,`object_id`,`date`,`user`) " .
" VALUES ('$type','$oid','$date','$user')";
diff --git a/lib/class/tmp_playlist.class.php b/lib/class/tmp_playlist.class.php
index 127ea2d0..52bcf4c5 100644
--- a/lib/class/tmp_playlist.class.php
+++ b/lib/class/tmp_playlist.class.php
@@ -187,6 +187,22 @@ class tmpPlaylist {
} // create
/**
+ * update_playlist
+ * This updates the base_playlist on this tmp_playlist
+ */
+ function update_playlist($playlist_id) {
+
+ $playlist_id = sql_escape($playlist_id);
+ $tmp_id = sql_escape($this->id);
+
+ $sql = "UPDATE tmp_playlist SET tmp_playlist.base_playlist='$playlist_id' WHERE id='$tmp_id'";
+ $db_results = mysql_query($sql,dbh());
+
+ return true;
+
+ } // update_playlist
+
+ /**
* delete
* This deletes any other tmp_playlists assoicated with this
* session
diff --git a/templates/show_tv_adminctl.inc.php b/templates/show_tv_adminctl.inc.php
index 77becb35..10dd004a 100644
--- a/templates/show_tv_adminctl.inc.php
+++ b/templates/show_tv_adminctl.inc.php
@@ -28,7 +28,17 @@
<input type="hidden" name="action" value="create_playlist" />
<input type="submit" value="<?php echo _('Activate'); ?>" />
</form>
-<?php } else { ?>
+<?php
+}
+
+else {
+?>
<?php echo _('Democratic Play Active'); ?>&nbsp;
-<a href="<?php echo $tmp_playlist->get_vote_url(); ?>"><?php echo _('Play'); ?></a>
+<a href="<?php echo $tmp_playlist->get_vote_url(); ?>"><?php echo _('Play'); ?></a><br />
+<?php echo _('Base Playlist'); ?>:
+<form method="post" style="Display:inline;" action="<?php echo conf('web_path'); ?>/tv.php?action=update_playlist&amp;playlist_id=<?php echo $tmp_playlist->base_playlist; ?>" enctype="multipart/form-data">
+ <?php show_playlist_dropdown($tmp_playlist->base_playlist); ?>
+ <input type="hidden" name="tmp_playlist_id" value="<?php echo $tmp_playlist->id; ?>" />
+ <input type="submit" value="<?php echo _('Update'); ?>" />
+</form>
<?php } ?>
diff --git a/tv.php b/tv.php
index 9176b1fc..1cee4d00 100644
--- a/tv.php
+++ b/tv.php
@@ -34,6 +34,11 @@ $action = scrub_in($_REQUEST['action']);
switch ($action) {
case 'create_playlist':
+ /* Only Admins Here */
+ if (!$GLOBALS['user']->has_access(100)) {
+ access_denied();
+ break;
+ }
/* We need to make ourselfs a new tmp playlist */
$tmp_playlist = new tmpPlaylist();
$id = $tmp_playlist->create('-1','vote','song',$_REQUEST['playlist_id']);
@@ -43,6 +48,15 @@ switch ($action) {
$songs = $tmp_playlist->get_items();
require_once(conf('prefix') . '/templates/show_tv.inc.php');
break;
+ case 'update_playlist':
+ /* Only Admins Here */
+ if (!$GLOBALS['user']->has_access(100)) {
+ access_denied();
+ break;
+ }
+ $tmp_playlist = new tmpPlaylist($_REQUEST['tmp_playlist_id']);
+ $tmp_playlist->update_playlist($_REQUEST['playlist_id']);
+ /* Display the default tv page */
default:
$tmp_playlist = get_democratic_playlist('-1');
$songs = $tmp_playlist->get_items();