From 1d00e4587dfe72e9b78438ae686b33ea791bfaa3 Mon Sep 17 00:00:00 2001 From: sebastian Date: Sat, 26 Feb 2005 21:18:32 +0000 Subject: [PATCH] *** empty log message *** --- .../modules/htmlUI/var/html/ui_browser.php | 2 +- .../modules/htmlUI/var/html/ui_handler.php | 5 +++ .../htmlUI/var/templates/playlist/editor.tpl | 23 ++++++++++++++ .../templates/playlist/simpleManagement.tpl | 31 +++---------------- .../modules/htmlUI/var/ui_base.inc.php | 23 +++++--------- .../modules/htmlUI/var/ui_playlist.class.php | 30 ++++++++++++++++-- 6 files changed, 70 insertions(+), 44 deletions(-) create mode 100755 livesupport/modules/htmlUI/var/templates/playlist/editor.tpl diff --git a/livesupport/modules/htmlUI/var/html/ui_browser.php b/livesupport/modules/htmlUI/var/html/ui_browser.php index 1405cdc5c..6d766b1e1 100644 --- a/livesupport/modules/htmlUI/var/html/ui_browser.php +++ b/livesupport/modules/htmlUI/var/html/ui_browser.php @@ -148,7 +148,7 @@ if ($uiBrowser->userid) { $Smarty->assign('changeStationPrefs', TRUE); break; - case "PL.simpleManagement": + case "PL.simpleManagement": if ($_REQUEST['createNew']) { $uiBrowser->PLAYLIST->testNew(); #$Smarty->assign('PLAYLIST', $uiBrowser->PLAYLIST->get()); diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php index 9e57babb2..b8bb321d6 100644 --- a/livesupport/modules/htmlUI/var/html/ui_handler.php +++ b/livesupport/modules/htmlUI/var/html/ui_handler.php @@ -178,6 +178,11 @@ switch($_REQUEST['act']){ $uiHandler->PLAYLIST->setReload(); break; + case "PL.revert": + $uiHandler->PLAYLIST->revert(); + $uiHandler->PLAYLIST->setReload(); + break; + default: $_SESSION["alertMsg"] = tra("Unknown method: $1", $_REQUEST["act"]); header("Location: ".UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close'); diff --git a/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl new file mode 100755 index 000000000..f930108c4 --- /dev/null +++ b/livesupport/modules/htmlUI/var/templates/playlist/editor.tpl @@ -0,0 +1,23 @@ +active Playlist: {$PL.children.0.children.0.content} +TitleDurationType + +{PL->getFlat assign='FLAT'} +{foreach from=$FLAT item='i'} + {* {uiBrowser->_niceTime p1=$i.playlength assign='nicelength'} *} + + + {$i.title} + {$i.duration} + {$i.type} + +{/foreach} + + + [Remove Selected] + [Clear] + + + + + + diff --git a/livesupport/modules/htmlUI/var/templates/playlist/simpleManagement.tpl b/livesupport/modules/htmlUI/var/templates/playlist/simpleManagement.tpl index 75a42e191..2c18e12fc 100755 --- a/livesupport/modules/htmlUI/var/templates/playlist/simpleManagement.tpl +++ b/livesupport/modules/htmlUI/var/templates/playlist/simpleManagement.tpl @@ -5,36 +5,15 @@
- +
{PL->get assign='PL'} -{if is_array($PL)} {* already activated Playlist *} - - - - - {PL->getFlat assign='FLAT'} - {foreach from=$FLAT item='i'} - {uiBrowser->_niceTime p1=$i.playlength assign='nicelength'} - - - - - - - {/foreach} - - -
Simple Playlist Management
active Playlist: {$PL.children.0.children.0.content}
TitleDurationType
{$i.title}{$nicelength}{$i.type}
- [Remove Selected] - [Clear] -
- +{if is_array($PL)} {* already activated Playlist *} + {include file="playlist/editor.tpl"} {else} {* no active Playlist *} - No active Playlist! -
- + No active Playlist! + {/if} diff --git a/livesupport/modules/htmlUI/var/ui_base.inc.php b/livesupport/modules/htmlUI/var/ui_base.inc.php index 31b1481c6..8db3f968d 100644 --- a/livesupport/modules/htmlUI/var/ui_base.inc.php +++ b/livesupport/modules/htmlUI/var/ui_base.inc.php @@ -325,23 +325,16 @@ class uiBase function _niceTime($in) { - if(is_array($in)) { - $in = current($in); - } - list ($in, $lost) = explode('.', $in); - if (preg_match('/^[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}$/', $in)) - list($h, $i, $s) = explode(':', $in); - elseif (preg_match('/^[0-9]{1,2}:[0-9]{1,2}$/', $in)) - list($i, $s) = explode(':', $in); - else - $s = $in; + if(is_array($in)) $in = current($in); + if (strpos($in, '.')) list ($in, $lost) = explode('.', $in); + $in = str_replace(' ', '', $in); - if ($h > 0) { - $H = $this->_twoDigits($h).':'; - } else { - $H = '   '; - } + if (preg_match('/^[0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}$/', $in)) list($h, $i, $s) = explode(':', $in); + elseif (preg_match('/^[0-9]{1,2}:[0-9]{1,2}$/', $in)) list($i, $s) = explode(':', $in); + else $s = $in; + if ($h > 0) $H = $this->_twoDigits($h).':'; + else $H = '   '; $I = $this->_twoDigits($i).':'; $S = $this->_twoDigits($s); diff --git a/livesupport/modules/htmlUI/var/ui_playlist.class.php b/livesupport/modules/htmlUI/var/ui_playlist.class.php index 26ad8f22a..796520331 100755 --- a/livesupport/modules/htmlUI/var/ui_playlist.class.php +++ b/livesupport/modules/htmlUI/var/ui_playlist.class.php @@ -56,6 +56,10 @@ class uiPlaylist return FALSE; } $plgunid = $this->Base->gb->releaseLockedPlaylist($this->token, $this->Base->sessid); + if (PEAR::isError($plgunid)) { + $this->Base->_retMsg('Unable to release Playlist'); + return FALSE; + } $this->Base->_retMsg('Playlist "$1" released', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($plgunid), UI_MDATA_KEY_TITLE)); $this->activeId = NULL; $this->token = NULL; @@ -63,6 +67,26 @@ class uiPlaylist return TRUE; } + + function revert() + { + if(!$this->token) { + $this->Base->_retMsg('No Playlist is looked by You'); + return FALSE; + } + $plgunid = $this->Base->gb->revertEditedPlaylist($this->token, $this->Base->sessid); + if (PEAR::isError($plgunid)) { + $this->Base->_retMsg('Unable to revert to looked state'); + return FALSE; + } + $this->Base->_retMsg('Playlist "$1" reverted and released', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($plgunid), UI_MDATA_KEY_TITLE)); + $this->activeId = NULL; + $this->token = NULL; + $this->Base->gb->delPref($this->Base->sessid, UI_PL_ACCESSTOKEN_KEY); + return TRUE; + } + + function testForLooked() { if(is_string($this->token = $this->Base->gb->loadPref($this->Base->sessid, UI_PL_ACCESSTOKEN_KEY))) { @@ -140,8 +164,10 @@ class uiPlaylist if ($sub['elementname']=='playlistelement') { $this->plwalk($sub, $node); } - if ($sub['elementname']=='audioclip') { - $this->flat["$parent.$node"] = $sub['attrs']; + if ($sub['elementname']=='audioclip' || $sub['elementname']=='webstream') { + #$this->flat["$parent.$node"] = $sub['attrs']; + #$this->flat["$parent.$node"]['type'] = $sub['elementname']; + $this->flat["$parent.$node"] = $this->Base->_getMetaInfo($this->Base->gb->_idFromGunid($sub['attrs']['id'])); } } }