*** empty log message ***

livesupport/modules/htmlUI/var/html/ui_handler.php

@@ -29,7 +29,7 @@ switch($_REQUEST['act']){
     break;
 
     case "uploadFile":
-        if ($ui_tmpid = $uiHandler->uploadFile(array_merge($_REQUEST, $_FILES), $ui_fmask["file"]))
+        if (($ui_tmpid = $uiHandler->uploadFile(array_merge($_REQUEST, $_FILES), $ui_fmask["file"])) !== FALSE)
             $uiHandler->SCRATCHPAD->addItem($ui_tmpid);
     break;
 

livesupport/modules/htmlUI/var/templates/file/objects.tpl

@@ -21,7 +21,7 @@
             <tr class="{cycle values='blue1, blue2'}" {assign var="moreContextBefore" value=", 'SP.addItem'"}{include file="sub/contextmenu.tpl"}>
               <td>
                 <span id="ID{$i.id}">
-                    {if $i.type eq 'Folder'}
+                    {if $i.type|lower eq 'folder'}
                          <a href="{$UI_BROWSER}?act=fileList&id={$i.id}" >[{$i.title|truncate:30}]</b>
                     {else}
                         {if $_PL_activeId == $i.id}
@@ -32,7 +32,7 @@
                     {/if}
                 </span>
               </td>
-              <td>{$i.type}</td>
+              <td>{$i.type|lower|capitalize}</td>
               <td style="border: 0">
                   <!-- &nbsp;<a href="javascript:frename('{$i.name}', '{$i.id}')">[rename]</a> -->
                   &nbsp;<a href="javascript:fmove('{$i.id}', '.')">##move##</a>
@@ -46,12 +46,12 @@
                       <a href="{$UI_HANDLER}?act=delete&id={$i.id}"
                         onClick="return confirm('Delete &quot;{$i.name}&quot;?')">[DEL]</a>
                   {/if} -->
-                  {if $i.type != 'Folder'}
+                  {if $i.type|lower != 'folder'}
                       &nbsp;<a href="{$UI_BROWSER}?act=getMData&id={$i.id}">##MDataXML##</a>
                       <!-- &nbsp;<a href="{$UI_BROWSER}?act=editMetaData&id={$i.id}">[MDataForm]</a> -->
-                      {if $i.type eq 'webstream'}
+                      {if $i.type|lower eq 'webstream'}
                           &nbsp;<a href="{$UI_BROWSER}?act=editWebstream&id={$i.id}">##Edit##</a>
-                      {elseif $i.type eq 'audioclip'}
+                      {elseif $i.type|lower eq 'audioclip'}
                           &nbsp;<a href="{$UI_BROWSER}?act=editFile&id={$i.id}">##Edit##</a>
                           &nbsp;<a href="{$CONFIG.accessRawAudioUrl}?id={$i.gunid}&sessid={$START.sessid}">##Access##</a>
                           &nbsp;<a href="{$UI_BROWSER}?act=_analyzeFile&id={$i.id}">##RawAnalyze##</a>

livesupport/modules/htmlUI/var/templates/library/actionhandler.tpl

@@ -1,11 +1,8 @@
-{UIBROWSER->getMDataArr id=$i.id assign="_metaarr"}
+{include file="sub/mouseover.tpl"}
-
-onMouseover="showalttext('{foreach from=$_metaarr.metadata key=_key item=_item}{$_key}: {$_item}<br>{/foreach}')"
-onMouseout="hidealttext()"
 onClick="return contextmenu('{$i.id}'
     , 'SP.addItem'
 
-    {if $i.type == 'audioclip'}
+    {if $i.type|lower == 'audioclip'}
         , 'listen', '{$i.gunid}'
         {if $_PL_activeId}
             , 'PL.addItem'
@@ -15,7 +12,7 @@ onClick="return contextmenu('{$i.id}'
         , 'edit', 'delete'
     {/if}
 
-    {if $i.type == 'webstream'}
+    {if $i.type|lower == 'webstream'}
         {if $_PL_activeId}
             , 'PL.addItem'
         {else}
@@ -24,7 +21,7 @@ onClick="return contextmenu('{$i.id}'
         , 'edit', 'delete'
     {/if}
 
-    {if $i.type == 'playlist'}
+    {if $i.type|lower == 'playlist'}
         {if $_PL_activeId}
             {if $_PL_activeId == $i.id}
                 , 'PL.release'
@@ -37,4 +34,3 @@ onClick="return contextmenu('{$i.id}'
     {/if}
 )"
 
-{assign var="_metaarr" value=NULL} 

livesupport/modules/htmlUI/var/templates/library/results.tpl

@@ -26,7 +26,7 @@
                     </td>
                     <td {include file="library/actionhandler.tpl"}>{$i.creator}</td>
                     <td {include file="library/actionhandler.tpl"}>{$i.duration}</td>
-                    <td {include file="library/actionhandler.tpl"} style="border: 0"><img src="img/{$i.type|lower}.gif" border="0" alt="{$i.type}" /></td>
+                    <td {include file="library/actionhandler.tpl"} style="border: 0"><img src="img/{$i.type|lower}.gif" border="0" alt="{$i.type|lower|capitalize}" /></td>
                 </tr>
             <!-- end item -->
                 {/foreach}

livesupport/modules/htmlUI/var/templates/playlist/actionhandler.tpl

@@ -1,7 +1,2 @@
-{UIBROWSER->getMDataArr id=$i.id assign="_metaarr"}
+{include file="sub/mouseover.tpl"}
-
-onMouseover="showalttext('{foreach from=$_metaarr.metadata key=_key item=_item}{$_key}: {$_item}<br>{/foreach}')"
-onMouseout="hidealttext()"
 onClick="return contextmenu('{$i.attrs.id}', {if $i.type|lower == "audioclip"}'listen', '{$i.gunid}', {/if} 'PL.removeItem')"
-
-{assign var="_metaarr" value=NULL}

livesupport/modules/htmlUI/var/templates/playlist/editor.tpl

@@ -36,7 +36,7 @@
                             <td {include file="playlist/actionhandler.tpl"}>{$i.title}</td>
                             <td {include file="playlist/actionhandler.tpl"}>{$i.duration}</td>
                             <td {include file="playlist/actionhandler.tpl"}>{$i.creator}</td>
-                            <td {include file="playlist/actionhandler.tpl"}>{$i.type}</td>
+                            <td {include file="playlist/actionhandler.tpl"}>{$i.type|lower|capitalize}</td>
                             <td style="border: 0">
                                 <a href="#" onClick="hpopup('{$UI_HANDLER}?act=PL.moveItem&id={$i.attrs.id}&pos={$pos-1}')"><img src="img/bt_top_xsm.gif" alt="##move up##" vspace=1 hspace=1/></a>
                                 <a href="#" onClick="hpopup('{$UI_HANDLER}?act=PL.moveItem&id={$i.attrs.id}&pos={$pos+1}')"><img src="img/bt_bottom_xsm.gif" alt="##move down##" vspace=1 hspace=1/></a>

livesupport/modules/htmlUI/var/templates/playlist/metadata.tpl

@@ -8,15 +8,17 @@
 {assign var="dynform" value=$_form.main}
 {include file="sub/dynForm_plain.tpl"}
 </div>
+
+
 <script type="text/javascript">
 {literal}
 
 var MData_confirmChangeVisited = false;
 function MData_confirmChange(element)
 {
-    //if (MData_confirmChangeVisited) return true;
+    if (MData_confirmChangeVisited) return true;
     MData_confirmChangeVisited = true;
-    if (confirm("Are you sure you want to change this information?") == false) element.blur();
+    if (confirm("##Are you sure you want to change existing metadata?##") == false) element.blur();
 }
 
 function MData_submit()
@@ -40,5 +42,6 @@ function MData_cancel()
     location.href="{$UI_BROWSER}?act=PL.simpleManagement";
     {literal}
 }
+
 {/literal}
 </script>

livesupport/modules/htmlUI/var/templates/scheduler/actionhandler.tpl

@@ -1,7 +1,2 @@
-{UIBROWSER->getMDataArr id=$i.plid assign="_metaarr"}
+{include file="sub/mouseover.tpl"}
-
-onMouseover="showalttext('{foreach from=$_metaarr.metadata key=_key item=_item}{$_key}: {$_item}<br>{/foreach}')"   *}
-onMouseout="hidealttext()"
 onClick="return contextmenu('scheduleId={$i.scheduleid}', 'SCHEDULER.removeItem')"
-
-{assign var="_metaarr" value=NULL}

livesupport/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl

@@ -1,11 +1,8 @@
-{UIBROWSER->getMDataArr id=$i.id assign="_metaarr"}
+{include file="sub/mouseover.tpl"}
-
-onMouseover="showalttext('{foreach from=$_metaarr.metadata key=_key item=_item}{$_key}: {$_item}<br>{/foreach}')"
-onMouseout="hidealttext()"
 onClick="hidealttextnow(); return contextmenu('{$i.id}'
     , 'SP.removeItem'
 
-    {if $i.type == 'audioclip'}
+    {if $i.type|lower == 'audioclip'}
         , 'listen', '{$i.gunid}'
         {if $_PL_activeId}
             , 'PL.addItem'
@@ -15,7 +12,7 @@ onClick="hidealttextnow(); return contextmenu('{$i.id}'
         , 'edit', 'delete'
     {/if}
 
-    {if $i.type == 'webstream'}
+    {if $i.type|lower == 'webstream'}
         {if $_PL_activeId}
             , 'PL.addItem'
         {else}
@@ -24,7 +21,7 @@ onClick="hidealttextnow(); return contextmenu('{$i.id}'
         , 'edit', 'delete'
     {/if}
 
-    {if $i.type == 'playlist'}
+    {if $i.type|lower == 'playlist'}
         {if $_PL_activeId}
             {if $_PL_activeId == $i.id}
                 , 'PL.release'
@@ -37,4 +34,3 @@ onClick="hidealttextnow(); return contextmenu('{$i.id}'
     {/if}
 )"
 
-{assign var="_metaarr" value=NULL}

livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl

@@ -29,7 +29,7 @@
                         {/if}
                     </td>
                     <td {include file="scratchpad/actionhandler.tpl"}>{$i.duration}</td>
-                    <td {include file="scratchpad/actionhandler.tpl"} style="border: 0"><img src="img/{$i.type|lower}.gif" border="0" alt="{$i.type}" /></td>
+                    <td {include file="scratchpad/actionhandler.tpl"} style="border: 0"><img src="img/{$i.type|lower}.gif" border="0" alt="{$i.type|lower|capitalize}" /></td>
                 </tr>
                 {/foreach}
                 <!-- end item -->

livesupport/modules/htmlUI/var/templates/sub/contextmenu.tpl

@@ -2,7 +2,7 @@
 
 onClick="return contextmenu('{$i.id}'
     {$moreContextBefore}
-    {if $i.type == 'audioclip'}
+    {if $i.type|lower == 'audioclip'}
         , 'listen', '{$i.gunid}'
         {if $_PL_activeId}
             , 'PL.addItem'
@@ -12,7 +12,7 @@ onClick="return contextmenu('{$i.id}'
         , 'edit', 'delete'
     {/if}
 
-    {if $i.type == 'webstream'}
+    {if $i.type|lower == 'webstream'}
         {if $_PL_activeId}
             , 'PL.addItem'
         {else}
@@ -21,7 +21,7 @@ onClick="return contextmenu('{$i.id}'
         , 'edit', 'delete'
     {/if}
 
-    {if $i.type == 'playlist'}
+    {if $i.type|lower == 'playlist'}
         {if $_PL_activeId}
             {if $_PL_activeId == $i.id}
                 , 'PL.release'
@@ -33,7 +33,7 @@ onClick="return contextmenu('{$i.id}'
         {/if}
     {/if}
 
-    {if ($i.type == 'Folder')}
+    {if ($i.type|lower == 'folder')}
         , 'fileList', 'delete'
     {/if}
     {$moreContextAfter}

livesupport/modules/htmlUI/var/templates/sub/mouseover.tpl

@@ -0,0 +1,4 @@
+{UIBROWSER->getMDataArr id=$i.id assign="_metaarr"}
+onMouseover="showalttext('<h3>##{$i.type|lower|capitalize}## {if $_PL_activeId == $i.id}##(activated)##{/if}</h3>{foreach from=$_metaarr.metadata key=_key item=_item}{$_key}: {$_item}<br>{/foreach}')"
+onMouseout="hidealttext()"
+{assign var="_metaarr" value=NULL} 

livesupport/modules/htmlUI/var/ui_conf.php

@@ -39,6 +39,7 @@ define('UI_MDATA_KEY_CREATOR',    'dc:creator');
 define('UI_MDATA_KEY_DURATION',   'dcterms:extent');
 define('UI_MDATA_KEY_URL',        'ls:url');
 define('UI_MDATA_KEY_FORMAT',     'dc:format');
+define('UI_MDATA_KEY_DESCRIPTION','dc:description');
 define('UI_MDATA_VALUE_FORMAT_FILE',    'File');
 define('UI_MDATA_VALUE_FORMAT_STREAM',  'live stream');
 
@@ -77,4 +78,10 @@ require_once 'HTML/QuickForm.php';
 #PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'errCallBack');
 PEAR::setErrorHandling(PEAR_ERROR_RETURN);
 #PEAR::setErrorHandling(PEAR_ERROR_PRINT);
+
+## extent config
+$config['audiofiles'] = array('.mp3' => TRUE,
+                              '.wav' => TRUE,
+                              '.ogg' => TRUE
+                        );
 ?>

livesupport/modules/htmlUI/var/ui_handler.class.php

@@ -145,6 +145,12 @@ class uiHandler extends uiBase {
      */
     function uploadFile(&$formdata, &$mask, $replace=NULL)
     {
+        if ($this->test4audioType($formdata['mediafile']['name']) === FALSE) {
+            if (UI_ERROR) $this->_retMsg('$1 is unsupportet file type.', $formdata['mediafile']['name']);
+            $this->redirUrl = UI_BROWSER."?act=editFile&folderId=".$formdata['folderId'];
+            return FALSE;
+        }
+
         $id  = $formdata['id'];
         $folderId = $formdata['folderId'];
 
@@ -179,6 +185,14 @@ class uiHandler extends uiBase {
     }
 
 
+    function test4audioType($filename)
+    {        
+        if (array_key_exists(strrchr($filename, "."), $this->config['audiofiles']))
+            return TRUE;
+        return FALSE;
+    }
+
+
     function transMData($id)
     {
         include dirname(__FILE__).'/formmask/metadata.inc.php';

livesupport/modules/htmlUI/var/ui_playlist.class.php

@@ -189,13 +189,16 @@ class uiPlaylist
             $this->Base->_retMsg('Already active Playlist');
             return FALSE;
         }
-        $datetime = date('Y-m-d H:i:s');
+        $datetime = strftime('%Y-%m-%d %H:%M:%S');
         $plid = $this->Base->gb->createPlaylist($this->Base->homeid, $datetime, $this->Base->sessid);
         if (!$plid) {
             $this->Base->_retMsg('Cannot create Playlist');
             return FALSE;
         }
-        $this->Base->_setMDataValue($plid, UI_MDATA_KEY_TITLE, $datetime);
+
+        $this->Base->_setMDataValue($plid, UI_MDATA_KEY_CREATOR,     $this->Base->login);
+        $this->Base->_setMDataValue($plid, UI_MDATA_KEY_DESCRIPTION, tra('created at $1', $datetime));
+
         if ($this->activate($plid)===FALSE) {
             return FALSE;
         }

livesupport/modules/htmlUI/var/ui_scheduler.class.php

@@ -89,12 +89,13 @@ class uiScheduler extends uiCalendar
 
         foreach ($arr as $key => $val) {
             $items[strftime('%d', $this->_datetime2timestamp($val['start']))][number_format(strftime('%H', $this->_datetime2timestamp($val['start'])))][]= array (
+                'id'        => $this->Base->gb->_idFromGunid($val['playlistId']),
                 'scheduleid'=> $val['id'],
-                'plid'      => $this->Base->gb->_idFromGunid($val['playlistId']),
                 'start'     => substr($val['start'], strpos($val['start'], 'T')+1),
                 'end'       => substr($val['end'],   strpos($val['end'], 'T') + 1),
                 'title'     => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($val['playlistId']), UI_MDATA_KEY_TITLE),
                 'creator'   => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($val['playlistId']), UI_MDATA_KEY_CREATOR),
+                'type'      => 'Playlist'
             );
         }
 
@@ -116,12 +117,13 @@ class uiScheduler extends uiCalendar
 
         foreach ($arr as $key => $val) {
             $items[number_format(strftime('%H', $this->_datetime2timestamp($val['start'])))][]= array (
-                'plid'      => $this->Base->gb->_idFromGunid($val['playlistId']),
+                'id'        => $this->Base->gb->_idFromGunid($val['playlistId']),
                 'scheduleid'=> $val['id'],
                 'start'     => substr($val['start'], strpos($val['start'], 'T')+1),
                 'end'       => substr($val['end'],   strpos($val['end'], 'T') + 1),
                 'title'     => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($val['playlistId']), UI_MDATA_KEY_TITLE),
                 'creator'   => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($val['playlistId']), UI_MDATA_KEY_CREATOR),
+                'type'      => 'Playlist'
             );
         }