%%ScratchPad%%
{if is_array($SCRATCHPAD)}
@@ -32,9 +30,9 @@
{/foreach}
- |
- | [Remove Selected]
- | [Clear]
+ |
+ | [Remove Selected]
+ | [Clear]
|
diff --git a/livesupport/modules/htmlUI/var/templates/script/collector.js.tpl b/livesupport/modules/htmlUI/var/templates/script/collector.js.tpl
new file mode 100755
index 000000000..4be6e6e62
--- /dev/null
+++ b/livesupport/modules/htmlUI/var/templates/script/collector.js.tpl
@@ -0,0 +1,38 @@
+{*Smarty template*}
+
+{literal}
+
+{/literal}
diff --git a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl b/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl
index 9d9aae9d3..2c712f903 100755
--- a/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl
+++ b/livesupport/modules/htmlUI/var/templates/script/contextMenue.js.tpl
@@ -36,12 +36,16 @@ function menu(id) {
menuHtml = menuHtml + " |
";
break;
+ case "PL.removeItem":
+ menuHtml = menuHtml + " |
";
+ break;
+
case "PL.activate":
menuHtml = menuHtml + " |
";
break;
- case "PL.newUsingItem":
- menuHtml = menuHtml + " |
";
+ case "PL.create":
+ menuHtml = menuHtml + " |
";
break;
case "SP.addItem":
menuHtml = menuHtml + " |
";
diff --git a/livesupport/modules/htmlUI/var/templates/script/scratchPad.js.tpl b/livesupport/modules/htmlUI/var/templates/script/scratchPad.js.tpl
deleted file mode 100755
index f39ac55e3..000000000
--- a/livesupport/modules/htmlUI/var/templates/script/scratchPad.js.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{*Smarty template*}
-
-{literal}
-
-{/literal}
diff --git a/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl b/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl
index c6caa38ae..db0e9de99 100755
--- a/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl
+++ b/livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl
@@ -6,7 +6,7 @@ onContextmenu="return menu('{$i.id}'
{if $PLid}
, 'PL.addItem'
{else}
- , 'PL.newUsingItem'
+ , 'PL.create'
{/if}
, 'delete'
{/if}
@@ -19,7 +19,7 @@ onContextmenu="return menu('{$i.id}'
, 'PL.addItem', 'delete'
{/if}
{else}
- , 'PL.activate', 'PL.newUsingItem', 'delete'
+ , 'PL.activate', 'PL.create', 'delete'
{/if}
{/if}
{$moreContextAfter}
diff --git a/livesupport/modules/htmlUI/var/ui_base.inc.php b/livesupport/modules/htmlUI/var/ui_base.inc.php
index 06da7de0a..31b1481c6 100644
--- a/livesupport/modules/htmlUI/var/ui_base.inc.php
+++ b/livesupport/modules/htmlUI/var/ui_base.inc.php
@@ -110,9 +110,9 @@ class uiBase
- function loadStationPrefs(&$mask)
+ function loadStationPrefs(&$mask, $reload=FALSE)
{
- if (!is_array($this->STATIONPREFS)) {
+ if (!is_array($this->STATIONPREFS || $reload===TRUE)) {
foreach ($mask as $key=>$val) {
if ($val['isPref']) {
if (is_string($setting = $this->gb->loadGroupPref(NULL, 'StationPrefs', $val['element']))) {
@@ -254,43 +254,26 @@ class uiBase
$s = $ia['playtime_seconds'];
$extent = date('H:i:s', floor($s)-date('Z')).substr(number_format($s, 6), strpos(number_format($s, 6), '.'));
- if ($format=='array') {
- return array(
- 'Format.Extent' => $extent,
- 'Format.Medium.Bitrate' => $ia['audio']['bitrate'],
- 'Format.Medium.Channels' => $ia['audio']['channelmode'],
- 'Format.Medium.Samplerate' => $ia['audio']['sample_rate'],
- 'Format.Medium.Encoder' => $ia['audio']['codec'] ? $ia['audio']['codec'] : $ia['audio']['encoder'],
- );
- } elseif ($format=='text') {
- #print_r($ia);
- return "fileformat: {$ia['fileformat']}
- seconds: {$ia['playtime_seconds']}
- length: $extent
- channels: {$ia['audio']['channels']}
- sample_rate: {$ia['audio']['sample_rate']}
- bits_per_sample: {$ia['audio']['bits_per_sample']}
- channelmode: {$ia['audio']['channelmode']}
- title: {$ia['id3v1']['title']}
- artist: {$ia['id3v1']['artist']}
- comment: {$ia['id3v1']['comment']}";
+ if ($format=='text') {
+ return "".var_export($ia, TRUE)."
";
+ }
+ }
+ }
+ }
+ }
+
+
/**
* addWebstream
*
@@ -507,7 +529,7 @@ class uiHandler extends uiBase {
## first remove old entrys
$this->gb->replaceMetaData($id, $this->_analyzeFile($id, 'xml'), 'string', $this->sessid);
- foreach ($mask['tabs']['group']['group'] as $key) {
+ foreach ($mask['pages'] as $key=>$val) {
foreach ($mask['pages'][$key] as $k=>$v) {
$formdata[$key.'___'.$this->_formElementEncode($v['element'])] ? $mData[$this->_formElementDecode($v['element'])] = $formdata[$key.'___'.$this->_formElementEncode($v['element'])] : NULL;
}
@@ -574,7 +596,7 @@ class uiHandler extends uiBase {
$this->gb->saveGroupPref($this->sessid, 'StationPrefs', $val['element'], $formdata[$val['element']]);
else
$this->gb->delGroupPref($this->sessid, 'StationPrefs', $val['element']);
- $this->STATIONPREFS[$val['element']] = is_string($this->gb->loadGroupPref(NULL, 'StationPrefs', $val['element'])) ? $this->gb->loadGroupPref($this->sessid, 'StationPrefs', $val['element']) : NULL;
+ #$this->STATIONPREFS[$val['element']] = is_string($this->gb->loadGroupPref(NULL, 'StationPrefs', $val['element'])) ? $this->gb->loadGroupPref($this->sessid, 'StationPrefs', $val['element']) : NULL;
}
if ($val['type'] == 'file' && $formdata[$val['element']]['name']) {
if (FALSE === @move_uploaded_file($formdata[$val['element']]['tmp_name'], $this->gb->loadGroupPref($this->sessid, 'StationPrefs', 'stationLogoPath')))
@@ -582,7 +604,7 @@ class uiHandler extends uiBase {
return;
}
}
-
+ $this->loadStationPrefs($mask, TRUE);
$this->_retMsg('Settings saved');
return TRUE;
}
diff --git a/livesupport/modules/htmlUI/var/ui_playlist.class.php b/livesupport/modules/htmlUI/var/ui_playlist.class.php
index 2119af127..26ad8f22a 100755
--- a/livesupport/modules/htmlUI/var/ui_playlist.class.php
+++ b/livesupport/modules/htmlUI/var/ui_playlist.class.php
@@ -19,6 +19,7 @@ class uiPlaylist
if (!$this->activeId) {
return FALSE;
}
+ #print_r( $this->Base->gb->getPlaylistArray($this->activeId, $this->Base->sessid));
return $this->Base->gb->getPlaylistArray($this->activeId, $this->Base->sessid);
}
@@ -40,7 +41,7 @@ class uiPlaylist
$this->Base->gb->savePref($this->Base->sessid, UI_PL_ACCESSTOKEN_KEY, $this->token);
#$this->active = $this->Base->gb->getPlaylistArray($plid, $this->Base->sessid);
$this->activeId = $plid;
- $this->Base->_retMsg('Playlist "$1" activated', $this->Base->_getMDataValue($plid, 'title'));
+ $this->Base->_retMsg('Playlist "$1" activated', $this->Base->_getMDataValue($plid, UI_MDATA_KEY_TITLE));
return TRUE;
}
@@ -55,7 +56,7 @@ class uiPlaylist
return FALSE;
}
$plgunid = $this->Base->gb->releaseLockedPlaylist($this->token, $this->Base->sessid);
- $this->Base->_retMsg('Playlist "$1" released', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($plgunid), 'title'));
+ $this->Base->_retMsg('Playlist "$1" 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);
@@ -74,55 +75,74 @@ class uiPlaylist
function addItem($id)
{
- if (!$this->Base->gb->addAudioClipToPlaylist($this->token, $id, $this->Base->sessid)) {
- $this->Base_retMsg('Cannot add File to Playlist');
+ if ($this->Base->gb->addAudioClipToPlaylist($this->token, $id, $this->Base->sessid) === FALSE) {
+ $this->Base_retMsg('Cannot add Item to Playlist');
return FALSE;
}
return TRUE;
-
}
- function removeItem($id)
+ function removeItem($gunids)
{
+ if (!$gunids) {
+ $this->Base->_retMsg('No Item(s) given');
+ return FALSE;
+ }
+ if (!is_array($gunids))
+ $gunids = array($gunids);
-
+ foreach ($gunids as $gunid) {
+ if ($this->Base->gb->delAudioClipFromPlaylist($this->token, $this->Base->gb->_idFromGunid($gunid), $this->Base->sessid) !== TRUE) {
+ $this->Base->_retMsg('Cannot remove Item from Playlist');
+ return FALSE;
+ }
+ }
+ return TRUE;
}
- function newUsingItem($id)
+ function create($id=FALSE)
{
# create PL
# activate
- # add clip
- if ($this->testNew() === FALSE) {
+ # add clip if given
+ if (is_array($this->activeId)) {
$this->Base->_retMsg('Already active Playlist');
return FALSE;
}
- $this->addItem($id);
- return TRUE;
- }
-
- function createEmpty()
- {
- if (!$plid = $this->Base->gb->createPlaylist($this->Base->homeid, date('Y-M-D H-i-s'), $this->Base->sessid)) {
+ $datetime = date('Y-m-d H:i:s');
+ if (!$plid = $this->Base->gb->createPlaylist($this->Base->homeid, $datetime, $this->Base->sessid)) {
$this->Base->_retMsg('Cannot create Playlist');
return FALSE;
}
- $this->Base->_setMDataValue($plid, 'dc:title', 'empty');
+ $this->Base->_setMDataValue($plid, 'dc:title', $datetime);
+ if ($this->activate($plid)===FALSE) {
+ return FALSE;
+ }
+ if ($id!==FALSE) {
+ if ($this->addItem($id)!==TRUE) {
+ return FALSE;
+ }
+ }
return $plid;
}
- function testNew()
- {
- # if exists -> return false
- # else
- # create empty
- # activate
- if (is_array($this->activeId)) {
- return FALSE;
+ function getFlat()
+ {
+ $this->plwalk($this->get(), 0);
+ return $this->flat;
+ }
+
+
+ function plwalk($arr, $parent)
+ {
+ foreach ($arr['children'] as $node=>$sub) {
+ if ($sub['elementname']=='playlistelement') {
+ $this->plwalk($sub, $node);
+ }
+ if ($sub['elementname']=='audioclip') {
+ $this->flat["$parent.$node"] = $sub['attrs'];
+ }
}
- $plid = $this->createEmpty();
- $this->activate($plid);
- return TRUE;
}
}
diff --git a/livesupport/modules/htmlUI/var/ui_scratchpad.class.php b/livesupport/modules/htmlUI/var/ui_scratchpad.class.php
index 50be9b375..83e2b0b41 100755
--- a/livesupport/modules/htmlUI/var/ui_scratchpad.class.php
+++ b/livesupport/modules/htmlUI/var/ui_scratchpad.class.php
@@ -89,10 +89,12 @@ class uiScratchPad
function removeItems($ids)
{
- if (!$ids)
- return FALSE; ## empty parameter
+ if (!$ids) {
+ $this->Base->_retMsg('No Item(s) given');
+ return FALSE;
+ }
if (!is_array($ids))
- $ids = array($ids); ## just single id given
+ $ids = array($ids);
foreach ($ids as $id) {
#$info = $this->Base->_getMetaInfo($id);
diff --git a/livesupport/modules/htmlUI/var/ui_search.class.php b/livesupport/modules/htmlUI/var/ui_search.class.php
index b79bb8afc..a52a7856e 100755
--- a/livesupport/modules/htmlUI/var/ui_search.class.php
+++ b/livesupport/modules/htmlUI/var/ui_search.class.php
@@ -18,7 +18,7 @@ class uiSearch
{
include dirname(__FILE__).'/formmask/metadata.inc.php';
$form = new HTML_QuickForm('search', UI_STANDARD_FORM_METHOD, UI_HANDLER);
- $form->setConstants(array('id'=>$id, 'counter'=>UI_SEARCH_MIN_ROWS));
+ $form->setConstants(array('id'=>$id, 'counter'=>$this->criteria['counter'] ? $this->criteria['counter'] : UI_SEARCH_MIN_ROWS));
foreach ($mask['tabs']['group']['group'] as $k=>$v) {
foreach ($mask['pages'][$v] as $val){
@@ -32,7 +32,7 @@ class uiSearch
for($n=1; $n<=UI_SEARCH_MAX_ROWS; $n++) {
unset ($group);
$form->addElement('static', 's1', NULL, "");
- if ($n > UI_SEARCH_MIN_ROWS) $form->addElement('static', 's1_style', NULL, "");
+ if ($n>UI_SEARCH_MIN_ROWS && $n>$this->criteria['counter']) $form->addElement('static', 's1_style', NULL, "");
$sel = &$form->createElement('hierselect', "row_$n", NULL);
$sel->setOptions(array($col1, $col2));
$group[] = &$sel;
@@ -61,16 +61,18 @@ class uiSearch
$this->criteria['operator'] = $formdata['operator'];
$this->criteria['filetype'] = $formdata['filetype'];
$this->criteria['limit'] = $formdata['limit'];
+ $this->criteria['counter'] = 0;
$this->criteria['form']['operator'] = $formdata['operator']; ## $criteria['form'] is used for retransfer to form ##
$this->criteria['form']['filetype'] = $formdata['filetype'];
$this->criteria['form']['limit'] = $formdata['limit'];
foreach ($formdata as $key=>$val) {
if (is_array($val) && strlen($val[2])) {
+ $this->criteria['counter']++;
$this->criteria['conditions'][$key] = array('cat' => $this->Base->_formElementDecode($val[0]),
'op' => $val[1],
'val' => stripslashes($val[2]));
- $this->criteria['form'][$key] = array(0 => $this->Base->_formElementDecode($val[0]),
+ $this->criteria['form'][$key] = array(0 => $val[0],
1 => $val[1],
2 => stripslashes($val[2]));
}
@@ -129,7 +131,8 @@ class uiSearch
function clear()
{
#$this->results = NULL;
- $this->criteria['form'] = NULL;
+ $this->criteria['form'] = NULL;
+ $this->criteria['counter'] = NULL;
$this->setReload();
}