Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
sebastian 2005-03-23 13:01:12 +00:00
parent 6a76ada4b7
commit 3e6af4880e
10 changed files with 106 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

42
livesupport/modules/htmlUI/var/formmask/metadata.inc.php
View file

@ -10,7 +10,11 @@ $mask = array(
'type' => 'hidden' 'type' => 'hidden'
), ),
array( array(
'element' => 'langid', 'element' => 'curr_langid',
'type' => 'hidden'
),
array(
'element' => 'target_langid',
'type' => 'hidden' 'type' => 'hidden'
), ),
), ),
@ -30,7 +34,7 @@ $mask = array(
'label' => 'Cancel', 'label' => 'Cancel',
'attributes'=> array( 'attributes'=> array(
'class'=> "button", 'class'=> "button",
'onClick' => "location.href='".UI_BROWSER."'" 'onClick' => "MData_cancel()"
), ),
'groupit' => TRUE, 'groupit' => TRUE,
), ),
@ -41,43 +45,17 @@ $mask = array(
'groupit' => TRUE, 'groupit' => TRUE,
'attributes'=> array( 'attributes'=> array(
'class'=> "button", 'class'=> "button",
'onClick' => 'return switchMDataLang();' //'onClick' => 'return switchMDataLang();'
'onClick' => 'MData_submit()'
), ),
), ),
array( array(
'group' => array('reset', 'cancel', 'button'), 'group' => array('reset', 'cancel', 'button'),
) )
), ),
'tabs' => array(/*
array(
'element' => 'Main',
'type' => 'button',
'label' => 'Main',
'groupit' => TRUE,
'attributes' => array('onClick' => 'showMain()')
),
array(
'element' => 'Music',
'type' => 'button',
'label' => 'Music',
'groupit' => TRUE,
'attributes' => array('onClick' => 'showMusic()')
),
array(
'element' => 'Talk',
'type' => 'button',
'label' => 'Talk',
'groupit' => TRUE,
'attributes' => array('onClick' => 'showTalk()')
),
array(
'group' => array('Main', 'Music', 'Talk'),
)
*/
),
'langswitch' => array( 'langswitch' => array(
array( array(
'element' => 'langid', 'element' => 'target_langid',
'type' => 'select', 'type' => 'select',
'label' => 'Language', 'label' => 'Language',
'options' => array( 'options' => array(
@ -86,7 +64,7 @@ $mask = array(
'de' => 'German', 'de' => 'German',
'hu' => 'Hungarian', 'hu' => 'Hungarian',
), ),
'attributes'=> array('onChange' => 'return switchMDataLang()') 'attributes'=> array('onChange' => 'MData_switchLang()')
) )
), ),
'pages' => array( 'pages' => array(

8
livesupport/modules/htmlUI/var/html/ui_browser.php
View file

@ -99,17 +99,17 @@ if ($uiBrowser->userid) {
case "editItem": case "editItem":
$Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id)); $Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id));
$Smarty->assign('editItem', array('type' => $uiBrowser->type, 'id' => $_REQUEST['id'], 'folderId' => $uiBrowser->fid)); $Smarty->assign('editItem', array('type' => $uiBrowser->type, 'id' => $_REQUEST['id'], 'folderId' => $uiBrowser->fid, 'curr_langid' => $_REQUEST['curr_langid']));
break; break;
case "editFile": case "editFile":
$Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id)); $Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id));
$Smarty->assign('editItem', array('type' => 'file', 'id' => $_REQUEST['id'], 'folderId' => $uiBrowser->fid)); $Smarty->assign('editItem', array('type' => 'file', 'id' => $_REQUEST['id'], 'folderId' => $uiBrowser->fid, 'curr_langid' => $_REQUEST['curr_langid']));
break; break;
case "editWebstream": case "editWebstream":
$Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id)); $Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id));
$Smarty->assign('editItem', array('type' => 'webstream', 'id' => $_REQUEST['id'], 'folderId' => $uiBrowser->fid)); $Smarty->assign('editItem', array('type' => 'webstream', 'id' => $_REQUEST['id'], 'folderId' => $uiBrowser->fid, 'curr_langid' => $_REQUEST['curr_langid']));
break; break;
case "SEARCH": case "SEARCH":
@ -171,7 +171,7 @@ if ($uiBrowser->userid) {
case "PL.editMetaData": case "PL.editMetaData":
$Smarty->assign('PL_editMetaData', TRUE); $Smarty->assign('PL_editMetaData', TRUE);
$Smarty->assign('PL_id', $_REQUEST['id']); $Smarty->assign('_PL', array('curr_langid' => $_REQUEST['curr_langid']));
$Smarty->assign('PL_simpleManagement', TRUE); $Smarty->assign('PL_simpleManagement', TRUE);
break; break;

2
livesupport/modules/htmlUI/var/html/ui_handler.php
View file

@ -109,7 +109,7 @@ switch($_REQUEST['act']){
break; break;
case "editMetaData": case "editMetaData":
$uiHandler->editMetaData($uiHandler->id, $_REQUEST); $uiHandler->editMetaData($_REQUEST);
$uiHandler->SCRATCHPAD->reLoadM(); $uiHandler->SCRATCHPAD->reLoadM();
break; break;

27
livesupport/modules/htmlUI/var/templates/file/metadataform.tpl
View file

@ -1,4 +1,4 @@
{UIBROWSER->metaDataForm id=$editItem.id assign="_metadataform"} {UIBROWSER->metaDataForm id=$editItem.id langid=$editItem.curr_langid assign="_metadataform"}
<div id="tabnav"> <div id="tabnav">
<ul> <ul>
@ -18,17 +18,36 @@
<script language="javascript"> <script language="javascript">
{literal} {literal}
function switchMDataLang() function MData_loadLang()
{
{/literal}
location.href="{$UI_BROWSER}?act=editItem&id={$editItem.id}&MData_langId=" + document.forms['langswitch'].elements['MData_langid'].value;
{literal}
}
function MData_submit()
{ {
if (validate_editMetaData(document.forms['editMetaData'])) { if (validate_editMetaData(document.forms['editMetaData'])) {
document.forms['editMetaData'].elements['langid'].value = document.forms['langswitch'].elements['langid'].value; document.forms['editMetaData'].elements['target_langid'].value = document.forms['langswitch'].elements['target_langid'].value;
document.forms['editMetaData'].submit(); document.forms['editMetaData'].submit();
} }
document.forms['langswitch'].elements['langid'].value = document.forms['editMetaData'].elements['langid'].value
showMain(); showMain();
return false; return false;
} }
function MData_switchLang()
{
document.forms['editMetaData'].elements['target_langid'].value = document.forms['langswitch'].elements['target_langid'].value;
document.forms['editMetaData'].submit();
}
function MData_cancel()
{
{/literal}
location.href='{$UI_BROWSER}';
{literal}
}
function spread(element, name) function spread(element, name)
{ {
if (document.forms['editMetaData'].elements['Main___' + name]) document.forms['editMetaData'].elements['Main___' + name].value = element.value; if (document.forms['editMetaData'].elements['Main___' + name]) document.forms['editMetaData'].elements['Main___' + name].value = element.value;

23
livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl
View file

@ -1,4 +1,4 @@
{assign var="_form" value=$PL->metaDataForm($PL_id)} {assign var="_form" value=$PL->metaDataForm($_PL.curr_langid)}
{assign var="dynform" value=$_form.langswitch} {assign var="dynform" value=$_form.langswitch}
{include file="sub/dynForm_plain.tpl"} {include file="sub/dynForm_plain.tpl"}
@ -8,13 +8,26 @@
<script type="text/javascript"> <script type="text/javascript">
{literal} {literal}
function switchMDataLang() function MData_submit()
{ {
if (validate_editMetaData(document.forms['editMetaData'])) { if (validate_editMetaData(document.forms["editMetaData"])) {
document.forms['editMetaData'].elements['langid'].value = document.forms['langswitch'].elements['langid'].value; document.forms["editMetaData"].elements["target_langid"].value = document.forms["langswitch"].elements["target_langid"].value;
document.forms['editMetaData'].submit(); document.forms["editMetaData"].submit();
} }
return false; return false;
} }
function MData_switchLang()
{
document.forms["editMetaData"].elements["target_langid"].value = document.forms["langswitch"].elements["target_langid"].value;
document.forms["editMetaData"].submit();
}
function MData_cancel()
{
{/literal}
location.href="{$UI_BROWSER}?act=PL.simpleManagement";
{literal}
}
{/literal} {/literal}
</script> </script>

8
livesupport/modules/htmlUI/var/ui_base.inc.php
View file

@ -339,9 +339,9 @@ class uiBase
} }
function _getMDataValue($id, $key) function _getMDataValue($id, $key, $langid=UI_DEFAULT_LANGID)
{ {
if (is_array($arr = $this->gb->getMDataValue($id, $key, $this->sessid))) { if (is_array($arr = $this->gb->getMDataValue($id, $key, $this->sessid, $langid))) {
$value = current($arr); $value = current($arr);
return $value['value']; return $value['value'];
} }
@ -349,9 +349,9 @@ class uiBase
} }
function _setMDataValue($id, $key, $value) function _setMDataValue($id, $key, $value, $langid=UI_DEFAULT_LANGID)
{ {
if ($this->gb->setMDataValue($id, $key, $this->sessid, $value)) { if ($this->gb->setMDataValue($id, $key, $this->sessid, $value, $langid)) {
return TRUE; return TRUE;
} }
return FALSE; return FALSE;

34
livesupport/modules/htmlUI/var/ui_browser.class.php
View file

@ -364,45 +364,35 @@ class uiBrowser extends uiBase {
* @param id int * @param id int
* @return string (html) * @return string (html)
*/ */
function metaDataForm($parms, $get=FALSE, $data=NULL) function metaDataForm($parms)
{ {
extract ($parms);
include dirname(__FILE__).'/formmask/metadata.inc.php'; include dirname(__FILE__).'/formmask/metadata.inc.php';
/* extract ($parms);
$form = new HTML_QuickForm('tabs', UI_STANDARD_FORM_METHOD, UI_BROWSER); $langid = $langid ? $langid : UI_DEFAULT_LANGID;
$this->_parseArr2Form($form, $mask['tabs']);
$output['tabs'] = $form->toHTML();
*/
$form = new HTML_QuickForm('langswitch', UI_STANDARD_FORM_METHOD, UI_BROWSER); $form = new HTML_QuickForm('langswitch', UI_STANDARD_FORM_METHOD, UI_BROWSER);
$this->_parseArr2Form($form, $mask['langswitch']); $this->_parseArr2Form($form, $mask['langswitch']);
$form->setConstants(array('target_langid' => $langid));
$renderer =& new HTML_QuickForm_Renderer_Array(true, true); $renderer =& new HTML_QuickForm_Renderer_Array(true, true);
$form->accept($renderer); $form->accept($renderer);
$output['langswitch'] = $renderer->toArray(); $output['langswitch'] = $renderer->toArray();
$form = new HTML_QuickForm('editMetaData', UI_STANDARD_FORM_METHOD, UI_HANDLER); $form = new HTML_QuickForm('editMetaData', UI_STANDARD_FORM_METHOD, UI_HANDLER);
$this->_parseArr2Form($form, $mask['basics']); $this->_parseArr2Form($form, $mask['basics']);
$form->setConstants(array('act' => 'editMetaData', $form->setConstants(array('act' => 'editMetaData',
'id' => $id, 'id' => $id,
#!!!!!'langid' => array_pop($this->gb->getMDataValue($id, 'langid', $this->sessid)) 'curr_langid' => $langid,
'langid' => 'en')); )
);
## convert element names to be unique over different forms-parts, add javascript to spread values over parts, add existing values from database ## convert element names to be unique over different forms-parts, add javascript to spread values over parts, add existing values from database
foreach ($mask['pages'] as $key=>$val) { foreach ($mask['pages'] as $key=>$val) {
foreach ($mask['pages'][$key] as $k=>$v) { foreach ($mask['pages'][$key] as $k=>$v) {
$mask['pages'][$key][$k]['element'] = $key.'___'.$this->_formElementEncode($v['element']); $mask['pages'][$key][$k]['element'] = $key.'___'.$this->_formElementEncode($v['element']);
$mask['pages'][$key][$k]['attributes'] = array_merge($mask['pages'][$key][$k]['attributes'], array('onChange' => "spread(this, '".$this->_formElementEncode($v['element'])."')")); $mask['pages'][$key][$k]['attributes'] = array_merge($mask['pages'][$key][$k]['attributes'], array('onChange' => "spread(this, '".$this->_formElementEncode($v['element'])."')"));
## load data from GreenBox
## recive data from GreenBox $mask['pages'][$key][$k]['default'] = $this->_getMDataValue($id, $v['element'], $langid);
if ($get) {
$mask['pages'][$key][$k]['default'] = $this->_getMDataValue($id, $v['element']);
}
## get data from parameter
if (is_array($data)) {
$mask['pages'][$key][$k]['default'] = $data[strtr($v['element'], '_', '.')];
}
} }
$form->addElement('static', NULL, NULL, "<div id='div_$key'>"); $form->addElement('static', NULL, NULL, "<div id='div_$key'>");
$this->_parseArr2Form($form, $mask['pages'][$key]); $this->_parseArr2Form($form, $mask['pages'][$key]);

2
livesupport/modules/htmlUI/var/ui_conf.php
View file

@ -2,6 +2,8 @@
define('UI_VERBOSE', FALSE); define('UI_VERBOSE', FALSE);
define('UI_WARNING', TRUE); define('UI_WARNING', TRUE);
define('UI_ERROR', TRUE); define('UI_ERROR', TRUE);
define('UI_DEFAULT_LANGID', 'en');
#define('UI_TIMEZONE', ' +100'); #define('UI_TIMEZONE', ' +100');
define('UI_TIMEZONEOFFSET', date('Z')); define('UI_TIMEZONEOFFSET', date('Z'));

25
livesupport/modules/htmlUI/var/ui_handler.class.php
View file

@ -253,35 +253,36 @@ class uiHandler extends uiBase {
return FALSE; return FALSE;
} }
$length = sprintf('%02d', $formdata['length']['H']).':'.sprintf('%02d', $formdata['length']['i']).':'.sprintf('%02d', $formdata['length']['s']).'.000000'; $length = sprintf('%02d', $formdata['length']['H']).':'.sprintf('%02d', $formdata['length']['i']).':'.sprintf('%02d', $formdata['length']['s']).'.000000';
$this->gb->setMDataValue($id, UI_MDATA_KEY_TITLE, $this->sessid, $formdata['title']); $this->_setMDataValue($id, UI_MDATA_KEY_TITLE, $this->sessid, $formdata['title']);
$this->gb->setMDataValue($id, UI_MDATA_KEY_URL, $this->sessid, $formdata['url']); $this->_setMDataValue($id, UI_MDATA_KEY_URL, $this->sessid, $formdata['url']);
$this->gb->setMDataValue($id, UI_MDATA_KEY_DURATION, $this->sessid, $length); $this->_setMDataValue($id, UI_MDATA_KEY_DURATION, $this->sessid, $length);
if (UI_VERBOSE) $this->_retMsg('Stream Data changed'); if (UI_VERBOSE) $this->_retMsg('Stream Data changed');
$this->redirUrl = UI_BROWSER.'?act=editWebstream&id='.$formdata['id']; $this->redirUrl = UI_BROWSER.'?act=editWebstream&id='.$formdata['id'];
} }
function editMetaData($id, &$formdata) function editMetaData(&$formdata)
{ {
include dirname(__FILE__).'/formmask/metadata.inc.php'; include dirname(__FILE__).'/formmask/metadata.inc.php';
$this->redirUrl = UI_BROWSER."?act=editItem&id=$id&curr_langid=".$formdata['target_langid'];
## first remove old entrys $id = $formdata['id'];
#$this->gb->replaceMetaData($id, $this->_analyzeFile($id, 'xml'), 'string', $this->sessid); $curr_langid = $formdata['curr_langid'];
foreach ($mask['pages'] as $key=>$val) { foreach ($mask['pages'] as $key=>$val) {
foreach ($mask['pages'][$key] as $k=>$v) { 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; $formdata[$key.'___'.$this->_formElementEncode($v['element'])] ? $mData[$this->_formElementDecode($v['element'])] = $formdata[$key.'___'.$this->_formElementEncode($v['element'])] : NULL;
} }
} }
$data = $this->_dateArr2Str($mData);
foreach ($data as $key=>$val) { if (!count($mData)) return;
$r = $this->gb->setMDataValue($id, $key, $this->sessid, $val, 'de');
foreach ($mData as $key=>$val) {
$r = $this->_setMDataValue($id, $key, $val, $curr_langid);
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
$this->_retMsg('Unable to set $1: $2', $key, $val); $this->_retMsg('Unable to set "$1" to "$2" langue "$3"', $key, $val, $curr_langid);
} }
} }
if (UI_VERBOSE) $this->_retMsg('Metadata saved'); if (UI_VERBOSE) $this->_retMsg('Metadata saved');
$this->redirUrl = UI_BROWSER."?act=editItem&id=$id";
} }

43
livesupport/modules/htmlUI/var/ui_playlist.class.php
View file

@ -360,37 +360,32 @@ class uiPlaylist
} }
function metaDataForm($id, $get=TRUE, $data=FALSE) function metaDataForm($langid)
{ {
include dirname(__FILE__).'/formmask/metadata.inc.php'; include dirname(__FILE__).'/formmask/metadata.inc.php';
$id = $this->activeId;
$id = $this->activeId; $langid = $langid ? $langid : UI_DEFAULT_LANGID;
foreach ($mask['playlist'] as $k=>$v) { foreach ($mask['playlist'] as $k=>$v) {
$mask['playlist'][$k]['element'] = $this->Base->_formElementEncode($v['element']); $mask['playlist'][$k]['element'] = $this->Base->_formElementEncode($v['element']);
$mask['playlist'][$k]['default'] = $this->Base->_getMDataValue($id, $v['element'], $langid);
## recive data from GreenBox
if ($get) {
$mask['playlist'][$k]['default'] = $this->Base->_getMDataValue($id, $v['element']);
}
## get data from parameter
if (is_array($data)) {
$mask['playlist'][$k]['default'] = $data[strtr($v['element'], '_', '.')];
}
} }
$form = new HTML_QuickForm('editMetaData', UI_STANDARD_FORM_METHOD, UI_HANDLER); $form = new HTML_QuickForm('editMetaData', UI_STANDARD_FORM_METHOD, UI_HANDLER);
$this->Base->_parseArr2Form($form, $mask['basics']); $this->Base->_parseArr2Form($form, $mask['basics']);
$this->Base->_parseArr2Form($form, $mask['playlist']); $this->Base->_parseArr2Form($form, $mask['playlist']);
$this->Base->_parseArr2Form($form, $mask['buttons']); $this->Base->_parseArr2Form($form, $mask['buttons']);
$form->setConstants(array('act' => 'PL.editMetaData', $form->setConstants(array('act' => 'PL.editMetaData',
'id' => $id)); 'id' => $id,
'curr_langid' => $langid
)
);
$renderer =& new HTML_QuickForm_Renderer_Array(true, true); $renderer =& new HTML_QuickForm_Renderer_Array(true, true);
$form->accept($renderer); $form->accept($renderer);
$output['main'] = $renderer->toArray(); $output['main'] = $renderer->toArray();
$form = new HTML_QuickForm('langswitch', UI_STANDARD_FORM_METHOD, UI_BROWSER); $form = new HTML_QuickForm('langswitch', UI_STANDARD_FORM_METHOD, UI_BROWSER);
$this->Base->_parseArr2Form($form, $mask['langswitch']); $this->Base->_parseArr2Form($form, $mask['langswitch']);
$form->setConstants(array('target_langid' => $langid));
$renderer =& new HTML_QuickForm_Renderer_Array(true, true); $renderer =& new HTML_QuickForm_Renderer_Array(true, true);
$form->accept($renderer); $form->accept($renderer);
$output['langswitch'] = $renderer->toArray(); $output['langswitch'] = $renderer->toArray();
@ -403,28 +398,24 @@ class uiPlaylist
function editMetaData(&$formdata) function editMetaData(&$formdata)
{ {
include dirname(__FILE__).'/formmask/metadata.inc.php'; include dirname(__FILE__).'/formmask/metadata.inc.php';
$this->Base->redirUrl = UI_BROWSER."?act=PL.editMetaData&id=$id&curr_langid=".$formdata['target_langid'];
#$id = $this->activeId; $id = $this->activeId;
$id = $formdata['id']; $curr_langid = $formdata['curr_langid'];
## first remove old entrys
#$this->gb->replaceMetaData($id, $this->_analyzeFile($id, 'xml'), 'string', $this->sessid);
foreach ($mask['playlist'] as $k=>$v) { foreach ($mask['playlist'] as $k=>$v) {
$formdata[$this->Base->_formElementEncode($v['element'])] ? $mData[$this->Base->_formElementDecode($v['element'])] = $formdata[$this->Base->_formElementEncode($v['element'])] : NULL; $formdata[$this->Base->_formElementEncode($v['element'])] ? $mData[$this->Base->_formElementDecode($v['element'])] = $formdata[$this->Base->_formElementEncode($v['element'])] : NULL;
} }
$data = $this->Base->_dateArr2Str($mData); if (!count($mData)) return;
foreach ($data as $key=>$val) {
$r = $this->Base->gb->setMDataValue($id, $key, $this->Base->sessid, $val); foreach ($mData as $key=>$val) {
$r = $this->Base->gb->setMDataValue($id, $key, $this->Base->sessid, $val, $curr_langid);
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
#print_r($r); #print_r($r);
$this->Base->_retMsg('Unable to set $1: $2', $key, $val); $this->Base->_retMsg('Unable to set $1: $2', $key, $val);
} }
} }
if (UI_VERBOSE) $this->Base->_retMsg('Metadata saved'); if (UI_VERBOSE) $this->Base->_retMsg('Metadata saved');
$this->Base->redirUrl = UI_BROWSER."?act=PL.simpleManagement&id=$id";
#$this->Base->redirUrl = UI_BROWSER."?act=PL.editMetaData&id=$id";
} }