From 3e6af4880e82182c87db3b5779e0aeb47ed951de Mon Sep 17 00:00:00 2001
From: sebastian <sebastian@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Wed, 23 Mar 2005 13:01:12 +0000
Subject: [PATCH] *** empty log message ***

---
 .../htmlUI/var/formmask/metadata.inc.php      | 44 +++++--------------
 .../modules/htmlUI/var/html/ui_browser.php    |  8 ++--
 .../modules/htmlUI/var/html/ui_handler.php    |  2 +-
 .../var/templates/file/metadataform.tpl       | 27 ++++++++++--
 .../var/templates/playlist/metadata.tpl       | 23 +++++++---
 .../modules/htmlUI/var/ui_base.inc.php        | 10 ++---
 .../modules/htmlUI/var/ui_browser.class.php   | 34 +++++---------
 livesupport/modules/htmlUI/var/ui_conf.php    |  2 +
 .../modules/htmlUI/var/ui_handler.class.php   | 25 ++++++-----
 .../modules/htmlUI/var/ui_playlist.class.php  | 43 +++++++-----------
 10 files changed, 106 insertions(+), 112 deletions(-)

diff --git a/livesupport/modules/htmlUI/var/formmask/metadata.inc.php b/livesupport/modules/htmlUI/var/formmask/metadata.inc.php
index 10db29456..225e01475 100755
--- a/livesupport/modules/htmlUI/var/formmask/metadata.inc.php
+++ b/livesupport/modules/htmlUI/var/formmask/metadata.inc.php
@@ -10,7 +10,11 @@ $mask = array(
             'type'    => 'hidden'
         ),
         array(
-            'element' => 'langid',
+            'element' => 'curr_langid',
+            'type'    => 'hidden'
+        ),
+        array(
+            'element' => 'target_langid',
             'type'    => 'hidden'
         ),
     ),
@@ -30,7 +34,7 @@ $mask = array(
             'label'     => 'Cancel',
             'attributes'=> array(
                 'class'=> "button",
-                'onClick'  => "location.href='".UI_BROWSER."'"
+                'onClick'  => "MData_cancel()"
                 ),
             'groupit'   => TRUE,
         ),
@@ -41,43 +45,17 @@ $mask = array(
             'groupit' => TRUE,
             'attributes'=> array(
                 'class'=> "button",
-                'onClick' => 'return switchMDataLang();'
+                //'onClick' => 'return switchMDataLang();'
+                'onClick'   => 'MData_submit()'
                 ),
         ),
         array(
             '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(
         array(
-            'element'  => 'langid',
+            'element'  => 'target_langid',
             'type'     => 'select',
             'label'    => 'Language',
             'options'  => array(
@@ -86,7 +64,7 @@ $mask = array(
                             'de'    => 'German',
                             'hu'    => 'Hungarian',
                           ),
-            'attributes'=> array('onChange'   => 'return switchMDataLang()')
+            'attributes'=> array('onChange' => 'MData_switchLang()')
         )
     ),
     'pages' => array(
@@ -517,4 +495,4 @@ $mask = array(
             ),
     )
 );
-?>
\ No newline at end of file
+?>
diff --git a/livesupport/modules/htmlUI/var/html/ui_browser.php b/livesupport/modules/htmlUI/var/html/ui_browser.php
index fb24114f8..2587c6350 100644
--- a/livesupport/modules/htmlUI/var/html/ui_browser.php
+++ b/livesupport/modules/htmlUI/var/html/ui_browser.php
@@ -99,17 +99,17 @@ if ($uiBrowser->userid) {
 
     case "editItem":
         $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;
 
     case "editFile":
         $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;
 
     case "editWebstream":
         $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;
 
     case "SEARCH":
@@ -171,7 +171,7 @@ if ($uiBrowser->userid) {
 
     case "PL.editMetaData":
         $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);
     break;
 
diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php
index 0f62a65fc..b57a3a67f 100644
--- a/livesupport/modules/htmlUI/var/html/ui_handler.php
+++ b/livesupport/modules/htmlUI/var/html/ui_handler.php
@@ -109,7 +109,7 @@ switch($_REQUEST['act']){
     break;
 
     case "editMetaData":
-        $uiHandler->editMetaData($uiHandler->id, $_REQUEST);
+        $uiHandler->editMetaData($_REQUEST);
         $uiHandler->SCRATCHPAD->reLoadM();
     break;
 
diff --git a/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl b/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl
index e9dffbd5a..412c99bd0 100755
--- a/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl
+++ b/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl
@@ -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">
 <ul>
@@ -18,17 +18,36 @@
 
 <script language="javascript">
 {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'])) {
-        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['langswitch'].elements['langid'].value = document.forms['editMetaData'].elements['langid'].value
     showMain();
     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)
 {
     if (document.forms['editMetaData'].elements['Main___' + name])     document.forms['editMetaData'].elements['Main___' + name].value  = element.value;
diff --git a/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl b/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl
index 2f0ed8678..7e7aae930 100755
--- a/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl
+++ b/livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl
@@ -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}
 {include file="sub/dynForm_plain.tpl"}
@@ -8,13 +8,26 @@
 
 <script type="text/javascript">
 {literal}
-function switchMDataLang()
+function MData_submit()
 {
-    if (validate_editMetaData(document.forms['editMetaData'])) {
-        document.forms['editMetaData'].elements['langid'].value = document.forms['langswitch'].elements['langid'].value;
-        document.forms['editMetaData'].submit();
+    if (validate_editMetaData(document.forms["editMetaData"])) {
+        document.forms["editMetaData"].elements["target_langid"].value = document.forms["langswitch"].elements["target_langid"].value;
+        document.forms["editMetaData"].submit();
     }
     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}
 </script>
diff --git a/livesupport/modules/htmlUI/var/ui_base.inc.php b/livesupport/modules/htmlUI/var/ui_base.inc.php
index 5c3dd3fa9..f123de58f 100644
--- a/livesupport/modules/htmlUI/var/ui_base.inc.php
+++ b/livesupport/modules/htmlUI/var/ui_base.inc.php
@@ -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);
             return $value['value'];
         }
@@ -349,9 +349,9 @@ class uiBase
     }
 
 
-    function _setMDataValue($id, $key, $value)
-    {
-        if ($this->gb->setMDataValue($id, $key, $this->sessid, $value)) {
+    function _setMDataValue($id, $key, $value, $langid=UI_DEFAULT_LANGID)
+    {   
+        if ($this->gb->setMDataValue($id, $key, $this->sessid, $value, $langid)) {
             return TRUE;
         }
         return FALSE;
diff --git a/livesupport/modules/htmlUI/var/ui_browser.class.php b/livesupport/modules/htmlUI/var/ui_browser.class.php
index 4d7085f67..5b291c16a 100644
--- a/livesupport/modules/htmlUI/var/ui_browser.class.php
+++ b/livesupport/modules/htmlUI/var/ui_browser.class.php
@@ -364,45 +364,35 @@ class uiBrowser extends uiBase {
      *  @param id int
      *  @return string (html)
      */
-    function metaDataForm($parms, $get=FALSE, $data=NULL)
+    function metaDataForm($parms)
     {
-        extract ($parms);
-
         include dirname(__FILE__).'/formmask/metadata.inc.php';
 
-        /*
-        $form = new HTML_QuickForm('tabs', UI_STANDARD_FORM_METHOD, UI_BROWSER);
-        $this->_parseArr2Form($form, $mask['tabs']);
-        $output['tabs'] = $form->toHTML();
-        */
+        extract ($parms);
+        $langid = $langid ? $langid : UI_DEFAULT_LANGID;
+
         $form = new HTML_QuickForm('langswitch', UI_STANDARD_FORM_METHOD, UI_BROWSER);
         $this->_parseArr2Form($form, $mask['langswitch']);
+        $form->setConstants(array('target_langid' => $langid));
         $renderer =& new HTML_QuickForm_Renderer_Array(true, true);
         $form->accept($renderer);
         $output['langswitch'] = $renderer->toArray();
 
         $form = new HTML_QuickForm('editMetaData', UI_STANDARD_FORM_METHOD, UI_HANDLER);
         $this->_parseArr2Form($form, $mask['basics']);
-        $form->setConstants(array('act'     => 'editMetaData',
-                                  'id'      => $id,
-                                  #!!!!!'langid' => array_pop($this->gb->getMDataValue($id, 'langid', $this->sessid))
-                                  'langid'  => 'en'));
+        $form->setConstants(array('act'         => 'editMetaData',
+                                  'id'          => $id,
+                                  'curr_langid' => $langid,
+                            )
+        );
 
         ## 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'][$key] as $k=>$v) {
                 $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'])."')"));
-
-                ## recive data from GreenBox
-                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'], '_', '.')];
-                }
+                ## load data from GreenBox
+                $mask['pages'][$key][$k]['default'] = $this->_getMDataValue($id, $v['element'], $langid);
             }
             $form->addElement('static', NULL, NULL, "<div id='div_$key'>");
             $this->_parseArr2Form($form, $mask['pages'][$key]);
diff --git a/livesupport/modules/htmlUI/var/ui_conf.php b/livesupport/modules/htmlUI/var/ui_conf.php
index 3fe4ed3f7..4f3d4dba8 100755
--- a/livesupport/modules/htmlUI/var/ui_conf.php
+++ b/livesupport/modules/htmlUI/var/ui_conf.php
@@ -2,6 +2,8 @@
 define('UI_VERBOSE', FALSE);
 define('UI_WARNING', TRUE);
 define('UI_ERROR',   TRUE);
+
+define('UI_DEFAULT_LANGID', 'en');
 #define('UI_TIMEZONE', ' +100');
 define('UI_TIMEZONEOFFSET', date('Z'));
 
diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php
index e657e1617..3a3d90a16 100644
--- a/livesupport/modules/htmlUI/var/ui_handler.class.php
+++ b/livesupport/modules/htmlUI/var/ui_handler.class.php
@@ -253,35 +253,36 @@ class uiHandler extends uiBase {
             return FALSE;
         }
         $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->gb->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_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);
         if (UI_VERBOSE) $this->_retMsg('Stream Data changed');
         $this->redirUrl = UI_BROWSER.'?act=editWebstream&id='.$formdata['id'];
     }
 
 
-    function editMetaData($id, &$formdata)
+    function editMetaData(&$formdata)
     {
         include dirname(__FILE__).'/formmask/metadata.inc.php';
-
-        ## first remove old entrys
-        #$this->gb->replaceMetaData($id, $this->_analyzeFile($id, 'xml'), 'string', $this->sessid);
+        $this->redirUrl = UI_BROWSER."?act=editItem&id=$id&curr_langid=".$formdata['target_langid'];
+        $id             = $formdata['id'];
+        $curr_langid    = $formdata['curr_langid'];
 
         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;
             }
         }
-        $data = $this->_dateArr2Str($mData);
-        foreach ($data as $key=>$val) {
-            $r = $this->gb->setMDataValue($id, $key, $this->sessid, $val, 'de');
+
+        if (!count($mData)) return;
+
+        foreach ($mData as $key=>$val) {
+            $r = $this->_setMDataValue($id, $key, $val, $curr_langid);
             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');
-        $this->redirUrl = UI_BROWSER."?act=editItem&id=$id";
     }
 
 
diff --git a/livesupport/modules/htmlUI/var/ui_playlist.class.php b/livesupport/modules/htmlUI/var/ui_playlist.class.php
index 32acbb741..57afd7875 100755
--- a/livesupport/modules/htmlUI/var/ui_playlist.class.php
+++ b/livesupport/modules/htmlUI/var/ui_playlist.class.php
@@ -360,37 +360,32 @@ class uiPlaylist
     }
 
 
-    function metaDataForm($id, $get=TRUE, $data=FALSE)
+    function metaDataForm($langid)
     {
         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) {
-            $mask['playlist'][$k]['element']    = $this->Base->_formElementEncode($v['element']);
-
-            ## 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'], '_', '.')];
-            }
+            $mask['playlist'][$k]['element'] = $this->Base->_formElementEncode($v['element']);
+            $mask['playlist'][$k]['default'] = $this->Base->_getMDataValue($id, $v['element'], $langid);
         }
         $form = new HTML_QuickForm('editMetaData', UI_STANDARD_FORM_METHOD, UI_HANDLER);
         $this->Base->_parseArr2Form($form, $mask['basics']);
         $this->Base->_parseArr2Form($form, $mask['playlist']);
         $this->Base->_parseArr2Form($form, $mask['buttons']);
         $form->setConstants(array('act'  => 'PL.editMetaData',
-                                  'id'   => $id));
+                                  'id'   => $id,
+                                  'curr_langid' => $langid
+                            )
+        );
         $renderer =& new HTML_QuickForm_Renderer_Array(true, true);
         $form->accept($renderer);
         $output['main'] = $renderer->toArray();
 
         $form = new HTML_QuickForm('langswitch', UI_STANDARD_FORM_METHOD, UI_BROWSER);
         $this->Base->_parseArr2Form($form, $mask['langswitch']);
+        $form->setConstants(array('target_langid'   => $langid));
         $renderer =& new HTML_QuickForm_Renderer_Array(true, true);
         $form->accept($renderer);
         $output['langswitch'] = $renderer->toArray();
@@ -403,28 +398,24 @@ class uiPlaylist
     function editMetaData(&$formdata)
     {
         include dirname(__FILE__).'/formmask/metadata.inc.php';
-
-        #$id = $this->activeId;
-        $id = $formdata['id'];
-
-        ## first remove old entrys
-        #$this->gb->replaceMetaData($id, $this->_analyzeFile($id, 'xml'), 'string', $this->sessid);
+        $this->Base->redirUrl = UI_BROWSER."?act=PL.editMetaData&id=$id&curr_langid=".$formdata['target_langid'];
+        $id             = $this->activeId;
+        $curr_langid    = $formdata['curr_langid'];
 
         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;
         }
 
-        $data = $this->Base->_dateArr2Str($mData);
-        foreach ($data as $key=>$val) {
-            $r = $this->Base->gb->setMDataValue($id, $key, $this->Base->sessid, $val);
+        if (!count($mData)) return;
+
+        foreach ($mData as $key=>$val) {
+            $r = $this->Base->gb->setMDataValue($id, $key, $this->Base->sessid, $val, $curr_langid);
             if (PEAR::isError($r)) {
                 #print_r($r);
                 $this->Base->_retMsg('Unable to set $1: $2', $key, $val);
             }
         }
         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";
     }