bugfixing for 1.0.1

livesupport/modules/htmlUI/var/formmask/generic.inc.php

@@ -7,15 +7,6 @@ $ui_fmask = array(
             'type'      => 'hidden',
             'constant'  => 'changeStationPrefs'
         ),
-        array(
-            'element'   => 'basics',
-            'type'      => 'header',
-            'label'     => 'Station Settings',
-        ),
-        array(
-            'rule'      => 'nopunctuation',
-            'element'   => 'stationMaxfilesize',
-        ),
         array(
             'element'   => 'stationFrequency',
             'isPref'    => TRUE,
@@ -66,11 +57,6 @@ $ui_fmask = array(
             'requiredmsg'=> 'please select Logo file',
             'attributes'=> array('multiple' => 'application/pdf')
         ),
-        array(
-            'element'   => 'systemsettings',
-            'type'      => 'header',
-            'label'     => 'System Settings'
-        ),
         array(
             'element'   => UI_SCRATCHPAD_MAXLENGTH_KEY,
             'isPref'    => TRUE,
@@ -86,21 +72,22 @@ $ui_fmask = array(
             'required'  => TRUE
         ),
         array(
-            'element'   => 'stationMaxfilesize',
+            'element'   =>'cancel',
-            'isPref'    => TRUE,
+            'type'      =>'button',
-            'type'      => 'text',
+            'label'     =>'Cancel',
-            'label'     => 'Limit upload filesize',
+            'attributes'=>array('onclick' => 'location.href="'.UI_BROWSER.'"'),
-            'rule'      => 'numeric',
+            'groupit'   => TRUE            
-            'attributes'   => array(
-                                'onClick'  => 'alert ("'.tra('Note: System Maximum is set to $1 in php.ini. You can just reduce this amount here.',
-                                                            ini_get('upload_max_filesize')).'")'
-                           )
         ),
         array(
             'element'   =>'Submit',
             'type'      =>'submit',
-            'label'     =>'Submit'
+            'label'     =>'Submit',
-        )
+            'groupit'   => TRUE
+        ),
+        array(
+            'group'     => array('cancel', 'Submit'),
+            'label'     => ' '
+        ),
     ),
 
     'chgPasswd' => array(

livesupport/modules/htmlUI/var/html/img/test.m3u

@@ -1 +1 @@
-http://fm4.amd.co.at/m3us/listen-high.m3u
+http://phoenux/livesupport/storageServer/var/xmlrpc/simpleGet.php?sessid=3058d2c812f32d5daca3fb30cb1aaf52&id=374aa797870b672a

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

@@ -108,7 +108,12 @@ if (is_array($_REQUEST['popup'])){
                 $Smarty->assign('data', $uiBrowser->testStream($_REQUEST['url']));
                 $Smarty->display('popup/testStream.tpl');
             break;
-
+            
+            case "listen2AudioClip":
+                $Smarty->assign('data', $uiBrowser->listen2AudioClip($_REQUEST['id']));
+                $Smarty->display('popup/listen2AudioClip.tpl');
+            break;
+            
             case "help":
                 $Smarty->display('popup/help.tpl');
             break;
@@ -118,7 +123,7 @@ if (is_array($_REQUEST['popup'])){
 };
 
 if ($uiBrowser->userid) {
-    $Smarty->assign('showMenuTop',        TRUE);
+    $Smarty->assign('showMenuTop',  TRUE);
 
     switch ($_REQUEST['act']){
     case "fileList":

livesupport/modules/htmlUI/var/localizer/require.inc.php

@@ -1,14 +1,16 @@
 <?php
-require_once('PEAR.php');
+ini_set('include_path', '.:../../../../../lib/pear/');  # path should be absulut, parsed during install process
-require_once('DB.php');
-require_once('File.php');
-require_once('File/Find.php');
-require_once('XML/Serializer.php');
-require_once('XML/Unserializer.php');
 
-require_once('display.inc.php');
+require_once 'PEAR.php';
-require_once('data.inc.php');
+require_once 'DB.php';
-require_once('helpfunctions.inc.php');
+require_once 'File.php';
+require_once 'File/Find.php';
+require_once 'XML/Serializer.php';
+require_once 'XML/Unserializer.php';
+
+require_once 'display.inc.php';
+require_once 'data.inc.php';
+require_once 'helpfunctions.inc.php';
 
 define('_DEFAULT_LANG_', 'en_US');
 define('_PREFIX_',       'locals');

livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl

@@ -63,11 +63,11 @@
                 break;
 
                 case "SP.removeItem":
-                    contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href=\"javascript: hpopup('{$UI_HANDLER}?act=SP.removeItem&id="+param+"')\" "+oF+">&nbsp;##Remove from Scratchpad##&nbsp;</a></li>";
+                    contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href=\"javascript: hpopup('{$UI_HANDLER}?act=SP.removeItem&id="+param+"')\" "+oF+">&nbsp;##Remove from ScratchPad##&nbsp;</a></li>";
                 break;
 
                 case "listen":
-                    contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='{$CONFIG.accessRawAudioUrl}?sessid={$START.sessid}&id="+contextmenu.arguments[++i]+"' "+oF+">&nbsp;##Listen##&nbsp;</a></li>";
+                    contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href=\"javascript: hpopup('{$UI_BROWSER}?popup[]=listen2AudioClip&id="+contextmenu.arguments[++i]+"')\" "+oF+">&nbsp;##Listen##&nbsp;</a></li>";
                 break;
 
                 case "edit":
@@ -128,8 +128,7 @@
 
         return false;
     }
-
+    
-
     function showcontextmenu(e) {
         var contextmenuWidth   = document.getElementById('contextmenu').clientWidth;
         var contextmenuHeight  = document.getElementById('contextmenu').clientHeight;

livesupport/modules/htmlUI/var/templates/system/stationprefs.tpl

@@ -1,6 +1,6 @@
-{*include file="sub/x.tpl"*}
 <div class="content">
 <div class="container_elements" style="width: 607px;">
-{include file="sub/dynForm_sections.tpl"}
+<h1>##Station settings##</h1>
+{include file="sub/dynForm_plain.tpl"}
 </div>
 </div>

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

@@ -431,5 +431,25 @@ class uiBrowser extends uiBase {
                      'port'     => $port,
         );
     }
+    
+    function listen2AudioClip($clipid)
+    { 
+        #$pls  = "[playlist]\n".
+        #$pls .= "File1=http://{$_SERVER['SERVER_NAME']}".$this->config['accessRawAudioUrl']."?sessid={$this->sessid}&id=$clipid\n"; 
+        #$pls .= "Title1=Mein Titel\n";
+        #$pls .= "NumberOfEntries=1\nVersion=2";
+        
+        #$m3u  = "#EXTM3U\n";
+        #$m3u .= "#EXTINF:111,Mein Titel\n";
+        $m3u .= "http://{$_SERVER['SERVER_NAME']}".$this->config['accessRawAudioUrl']."?sessid={$this->sessid}&id=$clipid\n"; 
+           
+        touch(UI_TESTSTREAM_MU3_TMP);
+        $handle = fopen(UI_TESTSTREAM_MU3_TMP, "w");
+        fwrite($handle, $m3u);
+        fclose($handle);        
+    }  
+    
+ 
+ 
 }
 ?>