##Playlist Editor##
diff --git a/livesupport/modules/htmlUI/var/ui_browser.class.php b/livesupport/modules/htmlUI/var/ui_browser.class.php
index 893738a2e..f41f7b23a 100644
--- a/livesupport/modules/htmlUI/var/ui_browser.class.php
+++ b/livesupport/modules/htmlUI/var/ui_browser.class.php
@@ -138,27 +138,7 @@ class uiBrowser extends uiBase {
/**
- * uploadFileM
- *
- * create a form for file-upload
- *
- * @param int local $id of directory to store file in
- *
- * @eturn string (html)
- */
- function uploadFileM(&$mask, $id)
- {
- $form = new HTML_QuickForm('uploadFileM', UI_STANDARD_FORM_METHOD, UI_HANDLER);
- $form->setMaxFileSize($this->STATIONPREFS['stationMaxfilesize']);
- $form->setConstants(array('id' => $id,
- 'act' => 'uploadFileM'));
- $this->_parseArr2Form($form, $mask);
- return $form->toHTML();
- }
-
-
- /**
- * uploadFile
+ * fileForm
*
* create a form for file-upload
*
@@ -175,7 +155,7 @@ class uiBrowser extends uiBase {
$form->setMaxFileSize($this->STATIONPREFS['stationMaxfilesize']);
$form->setConstants(array('folderId' => $folderId,
'id' => $id,
- 'act' => $id ? 'editFile' : 'uploadFile'));
+ 'act' => $id ? 'editItem' : 'addFileData'));
$this->_parseArr2Form($form, $mask);
$renderer =& new HTML_QuickForm_Renderer_Array(true, true);
$form->accept($renderer);
@@ -184,7 +164,7 @@ class uiBrowser extends uiBase {
/**
- * addWebstream
+ * webstreamForm
*
* create a form to add Webstream
*
@@ -200,7 +180,7 @@ class uiBrowser extends uiBase {
$form = new HTML_QuickForm('addWebstream', UI_STANDARD_FORM_METHOD, UI_HANDLER);
$const = array('folderId' => $folderId,
'id' => $id,
- 'act' => 'editWebstream',
+ 'act' => $id ? 'editWebstreamData' : 'addWebstreamData',
'title' => $id ? $this->_getMDataValue($id, UI_MDATA_KEY_TITLE) : NULL,
'url' => $id ? $this->_getMDataValue($id, UI_MDATA_KEY_URL) : 'http://',
'length' => $id ? preg_replace("/\.[0-9]{1,6}/", "", $this->_getMDataValue($id, UI_MDATA_KEY_DURATION)) : NULL
diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php
index a2b9404a7..43be66222 100644
--- a/livesupport/modules/htmlUI/var/ui_handler.class.php
+++ b/livesupport/modules/htmlUI/var/ui_handler.class.php
@@ -147,7 +147,7 @@ class uiHandler extends uiBase {
$this->transMData($r, UI_UPLOAD_LANGID);
}
- $this->redirUrl = UI_BROWSER."?act=editFile&id=$r";
+ $this->redirUrl = UI_BROWSER."?act=addFileMData&id=$r";
if (UI_VERBOSE) $this->_retMsg('Audioclip Data saved');
return $r;
}
@@ -183,7 +183,7 @@ class uiHandler extends uiBase {
foreach ($mask['pages'][$key] as $k=>$v) {
if ($v['id3'] != FALSE) {
$key = strtolower($v['id3']);
- if ($ia['comments'][$key][0]) {
+ if ($ia['comments'][$key][0]) {
$this->_setMdataValue($id, $v['element'], $ia['comments'][$key][0], $langid);
}
}
@@ -214,7 +214,9 @@ class uiHandler extends uiBase {
$this->redirUrl = UI_BROWSER."?act=editWebstream&id=".$id;
return FALSE;
}
+
$r = $this->gb->storeWebstream($folderId, $formdata['title'], NULL, $this->sessid, NULL, $formdata['url']);
+
if(PEAR::isError($r)) {
$this->_retMsg($r->getMessage());
$this->redirUrl = UI_BROWSER."?act=editWebstream&id=".$id;
@@ -227,7 +229,7 @@ class uiHandler extends uiBase {
$this->_setMDataValue($r, UI_MDATA_KEY_DURATION, $extent);
$this->_setMDataValue($r, UI_MDATA_KEY_FORMAT, UI_MDATA_VALUE_FORMAT_STREAM);
- $this->redirUrl = UI_BROWSER."?act=editWebstream&id=$r";
+ $this->redirUrl = UI_BROWSER."?act=addWebstreamMData&id=$r";
if (UI_VERBOSE) $this->_retMsg('Stream Data saved');
return $r;
}
@@ -240,12 +242,14 @@ class uiHandler extends uiBase {
$this->redirUrl = UI_BROWSER."?act=editWebstream&id=".$id;
return FALSE;
}
- $length = sprintf('%02d', $formdata['length']['H']).':'.sprintf('%02d', $formdata['length']['i']).':'.sprintf('%02d', $formdata['length']['s']).'.000000';
- $this->_setMDataValue($id, UI_MDATA_KEY_TITLE, $this->sessid, $formdata['title']);
- $this->_setMDataValue($id, UI_MDATA_KEY_URL, $this->sessid, $formdata['url']);
- $this->_setMDataValue($id, UI_MDATA_KEY_DURATION, $this->sessid, $length);
+ $extent = sprintf('%02d', $formdata['length']['H']).':'.sprintf('%02d', $formdata['length']['i']).':'.sprintf('%02d', $formdata['length']['s']).'.000000';
+
+ $this->_setMDataValue($id, UI_MDATA_KEY_TITLE, $formdata['title']);
+ $this->_setMDataValue($id, UI_MDATA_KEY_URL, $formdata['url']);
+ $this->_setMDataValue($id, UI_MDATA_KEY_DURATION, $extent);
+
+ $this->redirUrl = UI_BROWSER.'?act=editItem&id='.$formdata['id'];
if (UI_VERBOSE) $this->_retMsg('Stream Data changed');
- $this->redirUrl = UI_BROWSER.'?act=editWebstream&id='.$formdata['id'];
}
diff --git a/livesupport/modules/htmlUI/var/ui_scheduler.class.php b/livesupport/modules/htmlUI/var/ui_scheduler.class.php
index a38cbc9f5..af0449e40 100755
--- a/livesupport/modules/htmlUI/var/ui_scheduler.class.php
+++ b/livesupport/modules/htmlUI/var/ui_scheduler.class.php
@@ -26,6 +26,8 @@ class uiScheduler extends uiCalendar
$this->uiCalendar();
$this->initXmlRpc();
+
+ $this->startDaemon();
}
@@ -41,18 +43,30 @@ class uiScheduler extends uiCalendar
}
- function startDaemon()
+ function startDaemon($msg=FALSE)
{
+ if ($this->testDaemon($msg) === TRUE)
+ return TRUE;
+
exec(UI_SCHEDULER_DAEMON_CMD);
sleep(5);
- exec('ps -A', $output);
+
+ if ($this->testDaemon($msg)===FALSE) {
+ if ($msg) $this->Base->_retMsg('Scheduler did not start. Check setting of "UI_SCHEDULER_DAEMON_CMD" in ui_conf.php. File "/tmp/scheduler.log" could be helpful.');
+ return FALSE;
+ }
+ }
+
+ function testDaemon($msg=FALSE)
+ {
+ exec('ps -A', $output);
foreach ($output as $l) {
if (preg_match("/ ".UI_SCHEDULER_DAEMON_NAME."$/", $l)) {
- $this->Base->_retMsg('Scheduler started sucessfully.');
+ if ($msg) $this->Base->_retMsg('Scheduler is running.');
return TRUE;
}
}
- $this->Base->_retMsg('Scheduler did not start. Check setting of "UI_SCHEDULER_DAEMON_CMD" in ui_conf.php. File "/tmp/scheduler.log" could be helpful.');
+
return FALSE;
}