From 8ae2b9f8b9da8ce6871f4420228d66d47c9012c4 Mon Sep 17 00:00:00 2001
From: sebastian <sebastian@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Tue, 22 Mar 2005 20:11:26 +0000
Subject: [PATCH] *** empty log message ***

---
 .../modules/htmlUI/var/html/ui_handler.php      |  4 ++--
 .../htmlUI/var/templates/file/metadataform.tpl  |  4 ++--
 .../var/templates/script/contextmenu.js.tpl     | 12 ++++++------
 .../htmlUI/var/templates/sub/dynForm_plain.tpl  |  4 +++-
 .../modules/htmlUI/var/ui_browser.class.php     |  8 ++++++--
 .../modules/htmlUI/var/ui_handler.class.php     | 14 +++++++-------
 .../modules/htmlUI/var/ui_playlist.class.php    |  4 ++--
 .../modules/htmlUI/var/ui_scheduler.class.php   | 17 +++--------------
 .../modules/htmlUI/var/ui_scratchpad.class.php  |  2 +-
 9 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php
index db1e57d3e..fe3f30683 100644
--- a/livesupport/modules/htmlUI/var/html/ui_handler.php
+++ b/livesupport/modules/htmlUI/var/html/ui_handler.php
@@ -185,7 +185,7 @@ switch($_REQUEST['act']){
     case "PL.create":
         if (($ui_tmpid = $uiHandler->PLAYLIST->create($_REQUEST['id'])) !== FALSE)
             $uiHandler->SCRATCHPAD->addItem($ui_tmpid);
-        $uiHandler->PLAYLIST->setReload();
+        $uiHandler->PLAYLIST->setRedirect();
     break;
 
     case "PL.addItem":
@@ -267,7 +267,7 @@ if ($uiHandler->alertMsg) $_SESSION['alertMsg'] = $uiHandler->alertMsg;
 if (ob_get_contents()) {
     $ui_wait = 5;
 }
-ob_end_clean; 
+ob_end_clean;
 ?>
 <meta http-equiv="refresh" content="<?php echo $ui_wait ? $ui_wait : 0; ?>; URL=<?php echo $uiHandler->redirUrl; ?>">
 </body>
diff --git a/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl b/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl
index e37b02bb9..e9dffbd5a 100755
--- a/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl
+++ b/livesupport/modules/htmlUI/var/templates/file/metadataform.tpl
@@ -9,8 +9,8 @@
 </ul>
 </div>
 
-    {*$_metadataform.tabs*}   
-    {*$_metadataform.langswitch*}
+    {assign var="dynform" value=$_metadataform.langswitch}
+    {include file="sub/dynForm_plain.tpl"}
 
     {foreach from=$_metadataform.pages key="key" item="dynform"}
         {include file="sub/dynForm_plain.tpl"}
diff --git a/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl b/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl
index 19888ddc4..42e54ebb3 100755
--- a/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl
+++ b/livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl
@@ -51,15 +51,15 @@ function contextmenu(param) {
             break;
 
             case "PL.changeFadeIn":
-                contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=fadeIn&id="+param+"', 'PL', '350', '100')\" "+oF+">&nbsp;Change Fadein&nbsp;</a></li>";
+                contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=fadeIn&id="+param+"', 'PL', '400', '100')\" "+oF+">&nbsp;Change Fadein&nbsp;</a></li>";
             break;
 
             case "PL.changeTransition":
-                contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=transition&id="+param+"', 'PL', '350', '100')\" "+oF+">&nbsp;Change Transition&nbsp;</a></li>";
+                contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=transition&id="+param+"', 'PL', '400', '100')\" "+oF+">&nbsp;Change Transition&nbsp;</a></li>";
             break;
 
             case "PL.changeFadeOut":
-                contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=fadeOut&id="+param+"', 'PL', '350', '100')\" "+oF+">&nbsp;Change Fadeout&nbsp;</a></li>";
+                contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=fadeOut&id="+param+"', 'PL', '400', '100')\" "+oF+">&nbsp;Change Fadeout&nbsp;</a></li>";
             break;
 
             case "PL.editMetaData":
@@ -85,7 +85,7 @@ function contextmenu(param) {
 
             case "delete":
                 //contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"hpopup('{$UI_HANDLER}?act=delete&id="+param+"')\" "+oF+">&nbsp;Delete Item&nbsp;</a></li>";
-                contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=deleteItem&id="+param+"', 'deleteItem', 300, 150)\"')"+oF+">&nbsp;Delete Item&nbsp;</a></li>";
+                contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=deleteItem&id="+param+"', 'deleteItem', 400, 200)\"')"+oF+">&nbsp;Delete Item&nbsp;</a></li>";
             break;
 
             case "fileList":
@@ -93,11 +93,11 @@ function contextmenu(param) {
             break;
 
             case "SCHEDULER.addItem":
-                contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"hpopup('{$UI_HANDLER}?act=SCHEDULER.set&"+param+"'); popup('{$UI_BROWSER}?popup[]=SCHEDULER.addItem', 'Schedule', 600, 400)\"')"+oF+">&nbsp;Insert Playlist here&nbsp;</a></li>";
+                contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"hpopup('{$UI_HANDLER}?act=SCHEDULER.set&"+param+"'); popup('{$UI_BROWSER}?popup[]=SCHEDULER.addItem', 'Schedule', 400, 200)\"')"+oF+">&nbsp;Insert Playlist here&nbsp;</a></li>";
             break;
 
             case "SCHEDULER.removeItem":
-                contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=SCHEDULER.removeItem&"+param+"', 'Schedule', 600, 400)\"')"+oF+">&nbsp;Remove Playlist&nbsp;</a></li>";
+                contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=SCHEDULER.removeItem&"+param+"', 'Schedule', 400, 200)\"')"+oF+">&nbsp;Remove Playlist&nbsp;</a></li>";
             break;
             {literal}
         }
diff --git a/livesupport/modules/htmlUI/var/templates/sub/dynForm_plain.tpl b/livesupport/modules/htmlUI/var/templates/sub/dynForm_plain.tpl
index 274a7532c..76344b6c3 100644
--- a/livesupport/modules/htmlUI/var/templates/sub/dynForm_plain.tpl
+++ b/livesupport/modules/htmlUI/var/templates/sub/dynForm_plain.tpl
@@ -16,7 +16,7 @@
     *}
 
 
-    {if $element.type eq 'static'}     
+    {if $element.type eq 'static'}
         {$element.html}
 
     {else}
@@ -42,11 +42,13 @@
     {/if}
 {/foreach}
 
+    {*
     {if $dynform.requirednote and not $dynform.frozen}
         <div class='dynformelement'>
             {$dynform.requirednote}
         </div>
     {/if}
+    *}
 </form>
 
 <!--
diff --git a/livesupport/modules/htmlUI/var/ui_browser.class.php b/livesupport/modules/htmlUI/var/ui_browser.class.php
index 280e3ef4d..4d7085f67 100644
--- a/livesupport/modules/htmlUI/var/ui_browser.class.php
+++ b/livesupport/modules/htmlUI/var/ui_browser.class.php
@@ -74,7 +74,7 @@ class uiBrowser extends uiBase {
     {
         $form = new HTML_QuickForm('login', UI_STANDARD_FORM_METHOD, UI_HANDLER);
         $form->setRequiredNote(file_get_contents(UI_QFORM_REQUIREDNOTE));
-        $this->_parseArr2Form($form, $mask['languages']); 
+        $this->_parseArr2Form($form, $mask['languages']);
         $this->_parseArr2Form($form, $mask['login']);
 
         $renderer =& new HTML_QuickForm_Renderer_Array(true, true);
@@ -370,12 +370,16 @@ class uiBrowser extends uiBase {
 
         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();
+        */
         $form = new HTML_QuickForm('langswitch', UI_STANDARD_FORM_METHOD, UI_BROWSER);
         $this->_parseArr2Form($form, $mask['langswitch']);
-        $output['langswitch'] = $form->toHTML();
+        $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']);
diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php
index 416f108c1..815246da7 100644
--- a/livesupport/modules/htmlUI/var/ui_handler.class.php
+++ b/livesupport/modules/htmlUI/var/ui_handler.class.php
@@ -275,7 +275,7 @@ class uiHandler extends uiBase {
         }
         $data = $this->_dateArr2Str($mData);
         foreach ($data as $key=>$val) {
-            $r = $this->gb->setMDataValue($id, $key, $this->sessid, $val);
+            $r = $this->gb->setMDataValue($id, $key, $this->sessid, $val, 'de');
             if (PEAR::isError($r)) {
                 $this->_retMsg('Unable to set $1: $2', $key, $val);
             }
@@ -439,7 +439,7 @@ class uiHandler extends uiBase {
         if ($this->_validateForm($formdata, $mask)) {
             if($this->gb->checkPerm($this->userid, 'subjects')){
                 $res = $this->gb->addSubj($formdata['login'], ($formdata['pass']=='' ? NULL : $formdata['pass']));
-                $this->_retMsg('Subject $1 added.', $formdata['login']);
+                if (UI_VERBOSE) $this->_retMsg('Subject $1 added.', $formdata['login']);
             } else {
                 $this->_retMsg('Access denied.');
                 return;
@@ -601,9 +601,9 @@ class uiHandler extends uiBase {
                 if ($val['error']) {
 
                     switch ($val['error']) {
-                        case 1: $was_error = TRUE; $this->_retMsg('Uploaded File $1 is greater than System setting.', $mask[$key]['label']); break;
-                        case 2: $was_error = TRUE; $this->_retMsg('Uploaded File $1 is greater than LS setting.', $mask[$key]['label']); break;
-                        case 3: $was_error = TRUE; $this->_retMsg('File $1 was uploadet partly.', $mask[$key]['label']); break;
+                        case 1: $was_error = TRUE; $this->_retMsg('Uploaded file $1 is greater than setting in php.ini.', $mask[$key]['label']); break;
+                        case 2: $was_error = TRUE; $this->_retMsg('Uploaded file $1 is greater than LiveSupport system setting.', $mask[$key]['label']); break;
+                        case 3: $was_error = TRUE; $this->_retMsg('Upload of file $1 was incomplete.', $mask[$key]['label']); break;
                         case 4: if ($mask[$key]['required']) {$was_error = TRUE; $this->_retMsg('File $1 was not uploadet.', $mask[$key]['label']);} break;
                     }
                 }
@@ -640,7 +640,7 @@ class uiHandler extends uiBase {
                 if (strlen($formdata[$val['element']]))
                     $this->gb->saveGroupPref($this->sessid, 'StationPrefs', $val['element'], $formdata[$val['element']]);
                 else
-                    $this->gb->delGroupPref($this->sessid, 'StationPrefs', $val['element']);
+                    $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;
             }
             if ($val['type'] == 'file' && $formdata[$val['element']]['name']) {
@@ -650,7 +650,7 @@ class uiHandler extends uiBase {
             }
         }
         $this->loadStationPrefs($mask, TRUE);
-        $this->_retMsg('Settings saved');
+        if (UI_VERBOSE) $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 7443d6d8f..8e4716ee3 100755
--- a/livesupport/modules/htmlUI/var/ui_playlist.class.php
+++ b/livesupport/modules/htmlUI/var/ui_playlist.class.php
@@ -6,7 +6,7 @@ class uiPlaylist
         $this->Base      =& $uiBase;
         $this->activeId  =& $_SESSION[UI_PLAYLIST_SESSNAME]['activeId'];
         $this->token     =& $_SESSION[UI_PLAYLIST_SESSNAME]['token'];
-        $this->reloadUrl = UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close';
+        $this->reloadUrl   = UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close';
         $this->redirectUrl = UI_BROWSER.'?popup[]=_2PL.simpleManagement&popup[]=_close';
     }
 
@@ -431,7 +431,7 @@ class uiPlaylist
         $id = $this->activeId;
         $this->release(FALSE);
         if ($this->Base->delete($id))
-            return TRUE;
+            return $id;
         $this->Base->_retMsg('Cannot delete this Playlist');
         return FALSE;
     }
diff --git a/livesupport/modules/htmlUI/var/ui_scheduler.class.php b/livesupport/modules/htmlUI/var/ui_scheduler.class.php
index f60d44dce..c84342fab 100755
--- a/livesupport/modules/htmlUI/var/ui_scheduler.class.php
+++ b/livesupport/modules/htmlUI/var/ui_scheduler.class.php
@@ -393,7 +393,7 @@ class uiScheduler extends uiCalendar
     function initXmlRpc()
     {
         include_once dirname(__FILE__).'/SchedulerPhpClient.class.php';
-        $this->spc =& SchedulerPhpClient::factory($this->Base->dbc, $mdefs, $this->Base->config);
+        $this->spc =& SchedulerPhpClient::factory($this->Base->dbc, $mdefs, $this->Base->config, FALSE, FALSE);
     }
 
 
@@ -406,7 +406,7 @@ class uiScheduler extends uiCalendar
         $datetime = $formdata['date']['Y'].sprintf('%02d', $formdata['date']['m']).sprintf('%02d', $formdata['date']['d']).'T'.sprintf('%02d', $formdata['time']['H']).':'.sprintf('%02d', $formdata['time']['i']).':'.sprintf('%02d', $formdata['time']['s']);
 
         #echo "Schedule Gunid: $gunid  At: ".$datetime;
-        $r = $this->spc->UploadPlaylistMethod($this->Base->sessid, $gunid, $datetime.UI_TIMEZONE);
+        $r = $this->spc->UploadPlaylistMethod($this->Base->sessid, $gunid, $datetime);
         #print_r($r);
         if ($this->_isError($r))
             return FALSE;
@@ -428,23 +428,12 @@ class uiScheduler extends uiCalendar
 
 
     function displayScheduleMethod($from, $to)
-    {
+    {   return;
         #echo $from.$to;
         $r = $this->spc->displayScheduleMethod($this->Base->sessid, $from, $to);
         if ($this->_isError($r))
             return FALSE;
         return $r;
     }
-
-
-    function GeneratePlayReportMethod($from, $to)
-    {
-        #echo $from.$to;
-        $r = $this->spc->GeneratePlayReportMethod($this->Base->sessid, $from, $to);
-        if ($this->_isError($r))
-            return FALSE;
-        #print_r($r);
-        return $r;
-    }
 }
 ?>
diff --git a/livesupport/modules/htmlUI/var/ui_scratchpad.class.php b/livesupport/modules/htmlUI/var/ui_scratchpad.class.php
index d3bbfb001..3b06b5eca 100755
--- a/livesupport/modules/htmlUI/var/ui_scratchpad.class.php
+++ b/livesupport/modules/htmlUI/var/ui_scratchpad.class.php
@@ -101,7 +101,7 @@ class uiScratchPad
         foreach ($ids as $id) {
             $sp =& $this->get();
             foreach ($sp as $key=>$val) {
-                if ($val['id'] == $id) {
+                if ($val['id'] === $id) {
                     unset ($sp[$key]);
                     #$this->Base->decAccessCounter($id);
                 }