summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorPaul 'flowerysong' Arthur <flowerysong00@yahoo.com>2010-04-28 22:20:42 +0000
committerPaul 'flowerysong' Arthur <flowerysong00@yahoo.com>2010-04-28 22:20:42 +0000
commitb290f52c8d13b21cf4620035206957e3bc3dbcdb (patch)
tree7ad5b85061bb0a7c0c84968cb07c2a6aa7510951 /server
parent7bed87b064736c76653279e779bc4a268f435483 (diff)
downloadampache-b290f52c8d13b21cf4620035206957e3bc3dbcdb.tar.gz
ampache-b290f52c8d13b21cf4620035206957e3bc3dbcdb.tar.bz2
ampache-b290f52c8d13b21cf4620035206957e3bc3dbcdb.zip
Some missed hunks for playlist editing and miscellaneous related cleanup.
Diffstat (limited to 'server')
-rw-r--r--server/ajax.server.php4
-rw-r--r--server/playlist.ajax.php2
2 files changed, 4 insertions, 2 deletions
diff --git a/server/ajax.server.php b/server/ajax.server.php
index 96a510cf..56a2e3a8 100644
--- a/server/ajax.server.php
+++ b/server/ajax.server.php
@@ -119,6 +119,7 @@ switch ($_REQUEST['action']) {
$radio->format();
break;
case 'playlist':
+ case 'playlist_full':
$key = 'playlist_row_' . $_GET['id'];
$playlist = new Playlist($_GET['id']);
$playlist->format();
@@ -149,7 +150,7 @@ switch ($_REQUEST['action']) {
$level = '50';
- if ($_POST['type'] == 'playlist') {
+ if ($_POST['type'] == 'playlist' || $_POST['type'] == 'playlist_full') {
$playlist = new Playlist($_POST['id']);
if ($GLOBALS['user']->id == $playlist->user) {
$level = '25';
@@ -197,6 +198,7 @@ switch ($_REQUEST['action']) {
$song->format();
break;
case 'playlist':
+ case 'playlist_full':
$key = 'playlist_row_' . $_POST['id'];
$playlist->update($_POST);
$playlist->format();
diff --git a/server/playlist.ajax.php b/server/playlist.ajax.php
index 9cf209cc..4c517746 100644
--- a/server/playlist.ajax.php
+++ b/server/playlist.ajax.php
@@ -82,7 +82,7 @@ switch ($_REQUEST['action']) {
// Pull the current active playlist items
$objects = $GLOBALS['user']->playlist->get_items();
- $name = $GLOBALS['user']->username . ' - ' . date("d/m/Y H:i:s",time());
+ $name = $GLOBALS['user']->username . ' - ' . date("Y-m-d H:i:s",time());
// generate the new playlist
$playlist_id = Playlist::create($name,'public');