diff --git a/livesupport/modules/htmlUI/var/SmartyExtensions.inc.php b/livesupport/modules/htmlUI/var/SmartyExtensions.inc.php index 87f2fbd56..8baaa2aa3 100644 --- a/livesupport/modules/htmlUI/var/SmartyExtensions.inc.php +++ b/livesupport/modules/htmlUI/var/SmartyExtensions.inc.php @@ -1,16 +1,19 @@ register_object('UIBROWSER', $uiBrowser); -$Smarty->register_object('BROWSE', $uiBrowser->BROWSE); -$Smarty->register_object('SEARCH', $uiBrowser->SEARCH); -$Smarty->assign_by_ref ('PL', $uiBrowser->PLAYLIST); -$Smarty->assign_by_ref ('SCHEDULER', $uiBrowser->SCHEDULER); - -$Smarty->register_function('str_repeat', 'S_str_repeat'); -$Smarty->register_function('urlencode', 'S_urlencode'); -$Smarty->register_function('htmlspecialchars', 'S_htmlspecialchars'); -$Smarty->register_function('system', 'S_system'); -$Smarty->register_function('tra', 'S_tra'); +$Smarty->register_object('UIBROWSER', $uiBrowser); +$Smarty->register_object('BROWSE', $uiBrowser->BROWSE); +$Smarty->register_object('SEARCH', $uiBrowser->SEARCH); +$Smarty->assign_by_ref ('PL', $uiBrowser->PLAYLIST); +$Smarty->assign_by_ref ('SCHEDULER', $uiBrowser->SCHEDULER); +$Smarty->assign_by_ref ('SCRATCHPAD', $uiBrowser->SCRATCHPAD); +$Smarty->register_function('str_repeat', 'S_str_repeat'); +$Smarty->register_function('urlencode', 'S_urlencode'); +$Smarty->register_function('htmlspecialchars', 'S_htmlspecialchars'); +$Smarty->register_function('system', 'S_system'); +$Smarty->register_function('tra', 'S_tra'); +$Smarty->register_function('getHour', 'S_getHour'); +$Smarty->register_function('getMinute', 'S_getMinute'); +$Smarty->register_function('getSecond', 'S_getSecond'); // --- Smarty Extensions --- /** @@ -60,20 +63,6 @@ function S_htmlspecialchars($param) } -/** - * system - * - * Execute some PHP-code. - * - * @param code string, code to execute - */ -function S_system($param) -{ - extract($param); - eval($code); -} - - /** * tra * @@ -87,4 +76,29 @@ function S_tra($param) echo tra($param[0], $param[1], $param[2], $param[3], $param[4], $param[5], $param[6], $param[7], $param[8], $param[9]); } + + +function S_getHour($param) +{ + ## input format is HH:MM:SS.dddddd + extract ($param); + list ($h, $m, $s) = explode (':', $time); + return $h; +} + +function S_getMinute($param) +{ + ## input format is HH:MM:SS.dddddd + extract ($param); + list ($h, $m, $s) = explode (':', $time); + return $m; +} + +function S_getSecond($param) +{ + ## input format is HH:MM:SS.dddddd + extract ($param); + list ($h, $m, $s) = explode (':', $time); + return $s; +} ?> \ 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 94fc396df..f4e13db7d 100644 --- a/livesupport/modules/htmlUI/var/html/ui_browser.php +++ b/livesupport/modules/htmlUI/var/html/ui_browser.php @@ -88,7 +88,6 @@ if (is_array($_REQUEST['popup'])){ if ($uiBrowser->userid) { $Smarty->assign('showMenuTop', TRUE); - $Smarty->assign('SCRATCHPAD', $uiBrowser->SCRATCHPAD->get()); switch ($_REQUEST['act']){ case "fileList": @@ -104,7 +103,7 @@ if ($uiBrowser->userid) { break; case "permissions": - $Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id)); + $Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id)); $Smarty->assign('permissions', $uiBrowser->permissions($uiBrowser->id)); $Smarty->assign('fileList', TRUE); break; diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php index ec7ef8ee4..ecf640fff 100644 --- a/livesupport/modules/htmlUI/var/html/ui_handler.php +++ b/livesupport/modules/htmlUI/var/html/ui_handler.php @@ -256,6 +256,11 @@ switch($_REQUEST['act']){ $uiHandler->SCHEDULER->setReload(); break; + case "SCHEDULER.setScheduleTime": + $uiHandler->SCHEDULER->setScheduleTime($_REQUEST); + $uiHandler->SCHEDULER->setClose(); + break; + case "SCHEDULER.addItem": $uiHandler->SCHEDULER->uploadPlaylistMethod($_REQUEST); $uiHandler->SCHEDULER->setReload(); diff --git a/livesupport/modules/htmlUI/var/locals.cz_CZ.xml b/livesupport/modules/htmlUI/var/locals.cz_CZ.xml index b0baa7b9d..96752ae1b 100755 --- a/livesupport/modules/htmlUI/var/locals.cz_CZ.xml +++ b/livesupport/modules/htmlUI/var/locals.cz_CZ.xml @@ -486,6 +486,10 @@ Item Položka + + Insert Playlist after previous + + Label Název diff --git a/livesupport/modules/htmlUI/var/locals.de_DE.xml b/livesupport/modules/htmlUI/var/locals.de_DE.xml index 03688e3c3..c494ed5d7 100755 --- a/livesupport/modules/htmlUI/var/locals.de_DE.xml +++ b/livesupport/modules/htmlUI/var/locals.de_DE.xml @@ -486,6 +486,10 @@ Item Element + + Insert Playlist after previous + + Label diff --git a/livesupport/modules/htmlUI/var/locals.en_GB.xml b/livesupport/modules/htmlUI/var/locals.en_GB.xml index 206eeef05..17b0417d6 100755 --- a/livesupport/modules/htmlUI/var/locals.en_GB.xml +++ b/livesupport/modules/htmlUI/var/locals.en_GB.xml @@ -1,5 +1,6 @@ + en_GB Are you sure to delete file "$1"? @@ -485,6 +486,10 @@ Insert Playlist here Insert playlist here + + Insert Playlist after previous + + Item Item diff --git a/livesupport/modules/htmlUI/var/locals.es_CO.xml b/livesupport/modules/htmlUI/var/locals.es_CO.xml index 9297f1a71..94264606e 100644 --- a/livesupport/modules/htmlUI/var/locals.es_CO.xml +++ b/livesupport/modules/htmlUI/var/locals.es_CO.xml @@ -486,6 +486,10 @@ Item Elemento + + Insert Playlist after previous + + Label Sello diff --git a/livesupport/modules/htmlUI/var/locals.hu_HU.xml b/livesupport/modules/htmlUI/var/locals.hu_HU.xml index db91327de..be53e60eb 100755 --- a/livesupport/modules/htmlUI/var/locals.hu_HU.xml +++ b/livesupport/modules/htmlUI/var/locals.hu_HU.xml @@ -486,6 +486,10 @@ Item + + Insert Playlist after previous + + Label diff --git a/livesupport/modules/htmlUI/var/locals.nl_NL.xml b/livesupport/modules/htmlUI/var/locals.nl_NL.xml index 2f94b87ef..b244bd90f 100755 --- a/livesupport/modules/htmlUI/var/locals.nl_NL.xml +++ b/livesupport/modules/htmlUI/var/locals.nl_NL.xml @@ -486,6 +486,10 @@ Item Item + + Insert Playlist after previous + + Label Omschrijving diff --git a/livesupport/modules/htmlUI/var/locals.sr_CS.xml b/livesupport/modules/htmlUI/var/locals.sr_CS.xml index 452982c34..ce303b087 100755 --- a/livesupport/modules/htmlUI/var/locals.sr_CS.xml +++ b/livesupport/modules/htmlUI/var/locals.sr_CS.xml @@ -486,6 +486,10 @@ Item Stavka + + Insert Playlist after previous + + Label diff --git a/livesupport/modules/htmlUI/var/templates/library/results.tpl b/livesupport/modules/htmlUI/var/templates/library/results.tpl index 2bfc01251..1fc46afa1 100755 --- a/livesupport/modules/htmlUI/var/templates/library/results.tpl +++ b/livesupport/modules/htmlUI/var/templates/library/results.tpl @@ -33,20 +33,25 @@ -
+
- {if $_results.prev}##previous##{/if} + {* {if $_results.prev}##previous##{/if} *} {foreach from=$_results.pagination item=p key=k} - {$p} + {if $k != $_results.page+1} + {$p} + {else} + {$p} + {/if} {/foreach} - {if $_results.next}##next##{/if} + {* {if $_results.next}##next##{/if} *}    - ##Count##: {$_results.cnt}   - ##Page##:  {$_results.page+1}   - ##Range##: {$_criteria.offset+1}-{if ($_criteria.offset+$_criteria.limit)>$_results.cnt}{$_results.cnt}{else}{$_criteria.offset+$_criteria.limit}{/if} + ##Range##: {$_criteria.offset+1}-{if ($_criteria.offset+$_criteria.limit)>$_results.cnt}{$_results.cnt}{else}{$_criteria.offset+$_criteria.limit}{/if}  + ##Count##: {$_results.cnt}  + {* ##Page##:  {$_results.page+1}   *} +
- +
diff --git a/livesupport/modules/htmlUI/var/templates/library/simpleSearchForm.tpl b/livesupport/modules/htmlUI/var/templates/library/simpleSearchForm.tpl index 17bd3be6f..8745f6084 100755 --- a/livesupport/modules/htmlUI/var/templates/library/simpleSearchForm.tpl +++ b/livesupport/modules/htmlUI/var/templates/library/simpleSearchForm.tpl @@ -1,12 +1,12 @@ {assign var="dynform" value=$simpleSearchForm} - -
-

##Library Search##

+ +
+

##Library Search##

-
- - -
-
-
- \ No newline at end of file +
+ + +
+ +
+ diff --git a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl index 8a8da73a7..ecf6c6a98 100755 --- a/livesupport/modules/htmlUI/var/templates/masterpanel.tpl +++ b/livesupport/modules/htmlUI/var/templates/masterpanel.tpl @@ -4,60 +4,65 @@ {include file="menu.tpl"} {/if} -{* -{if $structure} - {include file="file/path.tpl"} -{/if} -*} - -{if $showScheduler} -
-
- {include file="scheduler/calendar.tpl"} - {if $SCRATCHPAD} - {include file="scratchpad/main.tpl"} - {/if} -
- 		- {include file="scheduler/main.tpl"} -
-{else} - - {if $fileList} - {include file="file/list.tpl"} - {/if} - - {if $showLibrary} - {include file="library/main.tpl"} - {/if} - - {if $showSubjects} - {include file="subjects.tpl"} - {/if} - - {if $showFile} - {include file="file/data.tpl"} - {/if} - - {if $editItem} - {include file="file/edit.tpl"} - {/if} - - {if $changeStationPrefs} - {include file="stationprefs.tpl"} - {/if} - - {if $PL_simpleManagement} - {include file="playlist/main.tpl"} - {/if} - -
- {if $simpleSearchForm} - {include file="library/simpleSearchForm.tpl"} - {/if} - - {if $SCRATCHPAD} - {include file="scratchpad/main.tpl"} - {/if} -
+ +{if $USER.userid} {* somebody logged in? *} + + {* + {if $structure} + {include file="file/path.tpl"} + {/if} + *} + + {if $showScheduler} +
+
+ {include file="scheduler/calendar.tpl"} + {if $SCRATCHPAD} + {include file="scratchpad/main.tpl"} + {/if} +
+ 		+ {include file="scheduler/main.tpl"} +
+ {else} + + {if $fileList} + {include file="file/list.tpl"} + {/if} + + {if $showLibrary} + {include file="library/main.tpl"} + {/if} + + {if $showSubjects} + {include file="subjects.tpl"} + {/if} + + {if $showFile} + {include file="file/data.tpl"} + {/if} + + {if $editItem} + {include file="file/edit.tpl"} + {/if} + + {if $changeStationPrefs} + {include file="stationprefs.tpl"} + {/if} + + {if $PL_simpleManagement} + {include file="playlist/main.tpl"} + {/if} + +
+ {if $simpleSearchForm} + {include file="library/simpleSearchForm.tpl"} + {/if} + + {if $SCRATCHPAD} + {include file="scratchpad/main.tpl"} + {/if} +
+ {/if} + {/if} diff --git a/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.confirmDelete.tpl b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.confirmDelete.tpl index 0d202e6cb..ff99e1bf1 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.confirmDelete.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.confirmDelete.tpl @@ -1,7 +1,7 @@ {include file="popup/header.tpl"}
-##Are you sure to delete active Playlist?## +##Are you sure to delete active Playlist?##

diff --git a/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.confirmRelease.tpl b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.confirmRelease.tpl index 8c8b5330c..d539a4d58 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.confirmRelease.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.confirmRelease.tpl @@ -1,7 +1,7 @@ {include file="popup/header.tpl"}
-##Do you want to save changes?## +##Do you want to save changes?##

diff --git a/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.confirmRevert.tpl b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.confirmRevert.tpl index 02a9e9c1c..f02a0c66b 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.confirmRevert.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/PLAYLIST.confirmRevert.tpl @@ -1,7 +1,7 @@ {include file="popup/header.tpl"}
-##Are you sure to discard all changes?## +##Are you sure to discard all changes?##

diff --git a/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.addItem.tpl b/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.addItem.tpl index d977296ca..02091f1e7 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.addItem.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.addItem.tpl @@ -1,6 +1,6 @@ {include file="popup/header.tpl"} -{if $SCHEDULER->_copyPlFromSP()} +{if $SCHEDULER->copyPlFromSP()} {assign var="dynform" value=$SCHEDULER->getScheduleForm()} @@ -17,7 +17,7 @@
{else}
- ##You need to have at least one inactive playlist on ScratchPad to schedule it.## + ##You need to have at least one non-open playlist on ScratchPad to schedule it.##
{/if} diff --git a/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.removeItem.tpl b/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.removeItem.tpl index ed3fd6fba..8082d3a96 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.removeItem.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/SCHEDULER.removeItem.tpl @@ -1,7 +1,7 @@ {include file="popup/header.tpl"}
-{tra 0='Are you sure to remove playlist "$1"?' 1=$plname} +{tra 0='Are you sure to remove playlist "$1"?' 1=$plname}

diff --git a/livesupport/modules/htmlUI/var/templates/popup/deleteItem.tpl b/livesupport/modules/htmlUI/var/templates/popup/deleteItem.tpl index 73496dab5..2668c97ff 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/deleteItem.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/deleteItem.tpl @@ -1,7 +1,7 @@ {include file="popup/header.tpl"}
-{tra 0='Are you sure to delete file "$1"?' 1=$filename} +{tra 0='Are you sure to delete file "$1"?' 1=$filename}

diff --git a/livesupport/modules/htmlUI/var/templates/popup/logout.tpl b/livesupport/modules/htmlUI/var/templates/popup/logout.tpl index cde099256..4b1ba046e 100755 --- a/livesupport/modules/htmlUI/var/templates/popup/logout.tpl +++ b/livesupport/modules/htmlUI/var/templates/popup/logout.tpl @@ -1,7 +1,7 @@ {include file="popup/header.tpl"}
-{tra 0='Are you sure to logout $1?' 1=$USER.login} +{tra 0='Are you sure to logout $1?' 1=$USER.login}

  diff --git a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl index 817806fc2..3b9b3954f 100755 --- a/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl +++ b/livesupport/modules/htmlUI/var/templates/scheduler/week.tpl @@ -46,7 +46,7 @@ {$_hour} {foreach from=$SCHEDULER->Week item="_day"} {if is_array($_entrys[$_day.day][$_hour])} - + {foreach from=$_entrys[$_day.day][$_hour] item="i"}
@@ -54,11 +54,12 @@

{$i.start|truncate:5:""} - {$i.end|truncate:5:""}

{$i.creator}

+
{/foreach} {else} - - + + {/if} {/foreach} diff --git a/livesupport/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl b/livesupport/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl index 8de2463a3..d6f3c7859 100755 --- a/livesupport/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl +++ b/livesupport/modules/htmlUI/var/templates/scratchpad/actionhandler.tpl @@ -2,7 +2,7 @@ onClick="hidealttextnow(); return contextmenu('{$i.id}' , 'SP.removeItem' - {if $i.type|lower == 'audioclip'} + {if $i.type === 'audioclip'} , 'listen', '{$i.gunid}' {if $_PL_activeId} , 'PL.addItem' @@ -12,7 +12,7 @@ onClick="hidealttextnow(); return contextmenu('{$i.id}' , 'edit', 'delete' {/if} - {if $i.type|lower == 'webstream'} + {if $i.type === 'webstream'} {if $_PL_activeId} , 'PL.addItem' {else} @@ -21,14 +21,14 @@ onClick="hidealttextnow(); return contextmenu('{$i.id}' , 'edit', 'delete' {/if} - {if $i.type|lower == 'playlist'} + {if $i.type === 'playlist'} {if $_PL_activeId} - {if $_PL_activeId == $i.id} + {if $_PL_activeId === $i.id} , 'PL.release' - {else} + {elseif $PL->isAvailable($i.id) === TRUE} , 'PL.addItem', 'delete' {/if} - {else} + {elseif $PL->isAvailable($i.id) === TRUE} , 'PL.activate', 'PL.create', 'delete' {/if} {/if} diff --git a/livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl b/livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl index 10b3b1922..a5575792d 100755 --- a/livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl +++ b/livesupport/modules/htmlUI/var/templates/scratchpad/main.tpl @@ -1,13 +1,14 @@ {assign var="_PL_activeId" value=$PL->getActiveId()} +{assign var="SCRATCHPAD" value=$SCRATCHPAD->get()} -{if is_array($SCRATCHPAD)}

##ScratchPad##

 
+ @@ -17,26 +18,43 @@ - {foreach from=$SCRATCHPAD item=i} + {if count($SCRATCHPAD) >= 1} + {foreach from=$SCRATCHPAD item=i} - + - {/foreach} + {/foreach} + {else} + + + + {/if}
- {if $_PL_activeId == $i.id} - {$i.title|truncate:12} + {if $i.type === "playlist"} + {if $PL->isAvailable($i.id) === FALSE} +
+ {else} +
+ {/if} + {if $_PL_activeId === $i.id} +
+ {else} +
+ {/if} + {$i.title|truncate:12} +
{else} {$i.title|truncate:12} {/if}
{$i.duration}{$i.type|lower|capitalize}{$i.type|capitalize}
##empty##
-
+
diff --git a/livesupport/modules/htmlUI/var/ui_base.inc.php b/livesupport/modules/htmlUI/var/ui_base.inc.php index 66e2fed5c..9adc5ac5c 100644 --- a/livesupport/modules/htmlUI/var/ui_base.inc.php +++ b/livesupport/modules/htmlUI/var/ui_base.inc.php @@ -326,12 +326,14 @@ class uiBase function _getMetaInfo($id) { + $type = strtolower($this->gb->getFileType($id)); $data = array('id' => $id, 'gunid' => $this->gb->_gunidFromId($id), 'title' => $this->_getMDataValue($id, UI_MDATA_KEY_TITLE), 'creator' => $this->_getMDataValue($id, UI_MDATA_KEY_CREATOR), 'duration' => $this->_niceTime($this->_getMDataValue($id, UI_MDATA_KEY_DURATION)), - 'type' => $this->gb->getFileType($id), + 'type' => $type, + #'isAvailable' => $type == 'playlist' ? $this->gb->playlistIsAvailable($id, $this->sessid) : NULL, ); return ($data); } diff --git a/livesupport/modules/htmlUI/var/ui_browse.class.php b/livesupport/modules/htmlUI/var/ui_browse.class.php index c611c6f58..aed004413 100755 --- a/livesupport/modules/htmlUI/var/ui_browse.class.php +++ b/livesupport/modules/htmlUI/var/ui_browse.class.php @@ -9,7 +9,7 @@ class uiBrowse #$this->results =& $_SESSION[UI_BROWSE_SESSNAME]['results']; $this->reloadUrl = UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close'; - $this->criteria['limit'] ? NULL : $this->criteria['limit'] = 10; + $this->criteria['limit'] ? NULL : $this->criteria['limit'] = UI_BROWSE_DEFAULT_LIMIT; if (!is_array($this->col)) { $this->setDefaults(); @@ -21,22 +21,21 @@ class uiBrowse $this->Base->redirUrl = $this->reloadUrl; } - function setDefaults($reload=FALSE) { - $this->col[1]['category'] = 'dc:type'; + $this->col[1]['category'] = UI_BROWSE_DEFAULT_KEY_1; $this->col[1]['value'][0] = '%%all%%'; - $this->col[2]['category'] = 'dc:creator'; + $this->col[2]['category'] = UI_BROWSE_DEFAULT_KEY_2; $this->col[2]['value'][0] = '%%all%%'; - $this->col[3]['category'] = 'dc:source'; + $this->col[3]['category'] = UI_BROWSE_DEFAULT_KEY_3; $this->col[3]['value'][0] = '%%all%%'; for ($col=1; $col<=3; $col++) { - $this->setCategory(array('col' => $col, 'category' => $this->col[$col]['category'], 'value' => array(0=>'%%all%%'))); + $this->setCategory(array('col' => $col, 'category' => $this->col[$col]['category'], 'value' => array(0 => '%%all%%'))); } - $this->setValue(array('col' => 1, - 'category' => 'dc:type', - 'value' => Array(0 => '%%all%%') + $this->setValue(array('col' => 1, + 'category' => UI_BROWSE_DEFAULTKEY_1, + 'value' => Array(0 => '%%all%%') ) ); @@ -183,7 +182,7 @@ class uiBrowse ( 'id' => 24, 'gunid' => '1cc472228d0cb2ac', - 'title' => 'Strom 10min', + 'title' => 'Item '.$n, 'creator' => 'Sebastian', 'duration' => '   10:00', 'type' => 'webstream' @@ -193,6 +192,7 @@ class uiBrowse $this->results['cnt'] = $results['cnt']; ## end test */ + $this->pagination($results); #print_r($this->criteria); #print_r($this->results); @@ -205,17 +205,31 @@ class uiBrowse if (sizeof($this->results['items']) == 0) { return FALSE; } - $currp = ($this->criteria['offset']/$this->criteria['limit']) + 1; # current page - $maxp = ceil($results['cnt'] / $this->criteria['limit']); # maximum page + $delta = 4; + $currp = ($this->criteria['offset'] / $this->criteria['limit']) + 1; # current page + $maxp = ceil($results['cnt'] / $this->criteria['limit']); # maximum page + /* for ($n = 1; $n <= $maxp; $n = $n+$width) { $width = pow(10, floor(($n)/10)); $this->results['pagination'][$n] = $n; } + */ + + $deltaLower = UI_BROWSERESULTS_DELTA; + $deltaUpper = UI_BROWSERESULTS_DELTA; + $start = $currp; + + if ($start+$delta-$maxp > 0) $deltaLower += $start+$delta-$maxp; ## correct lower boarder if page is near end + + for ($n = $start-$deltaLower; $n <= $start+$deltaUpper; $n++) { + if ($n <= 0) $deltaUpper++; ## correct upper boarder if page is near zero + elseif ($n <= $maxp) $this->results['pagination'][$n] = $n; + } #array_pop($this->results['pagination']); - $this->results['pagination'][1] = '|<<'; - $this->results['pagination'][$maxp] = '>>|'; + $this->results['pagination'][1] ? NULL : $this->results['pagination'][1] = '|<<'; + $this->results['pagination'][$maxp] ? NULL : $this->results['pagination'][$maxp] = '>>|'; $this->results['next'] = $results['cnt'] > $this->criteria['offset'] + $this->criteria['limit'] ? TRUE : FALSE; $this->results['prev'] = $this->criteria['offset'] > 0 ? TRUE : FALSE; ksort($this->results['pagination']); @@ -263,6 +277,7 @@ class uiBrowse function setFiletype($filetype) { $this->criteria['filetype'] = $filetype; + $this->criteria['offset'] = 0; $this->setReload(); #$this->searchDB(); } diff --git a/livesupport/modules/htmlUI/var/ui_browser.class.php b/livesupport/modules/htmlUI/var/ui_browser.class.php index 3d143707c..e5b8c81cc 100644 --- a/livesupport/modules/htmlUI/var/ui_browser.class.php +++ b/livesupport/modules/htmlUI/var/ui_browser.class.php @@ -317,13 +317,14 @@ class uiBrowser extends uiBase { * @return array */ function permissions($id) - { + { return array('pathdata' => $this->gb->getPath($id), 'perms' => $this->gb->getObjPerms($id), 'actions' => $this->gb->getAllowedActions($this->gb->getObjType($id)), 'subjects' => $this->gb->getSubjects(), 'id' => $id, - 'loggedAs' => $this->login); + 'loggedAs' => $this->login + ); } diff --git a/livesupport/modules/htmlUI/var/ui_conf.php b/livesupport/modules/htmlUI/var/ui_conf.php index 5e6e807b6..c206ae4a6 100755 --- a/livesupport/modules/htmlUI/var/ui_conf.php +++ b/livesupport/modules/htmlUI/var/ui_conf.php @@ -7,59 +7,75 @@ define('UI_DEFAULT_LANGID', 'en_GB'); #define('UI_TIMEZONE', ' +100'); define('UI_TIMEZONEOFFSET', date('Z')); +## Basic scripts define('UI_HANDLER', 'ui_handler.php'); define('UI_BROWSER', 'ui_browser.php'); -define('UI_FORM_STANDARD_METHOD', 'POST'); -define('UI_INPUT_STANDARD_SIZE', 20); -define('UI_INPUT_STANDARD_MAXLENGTH', 50); -define('UI_TEXTAREA_STANDART_ROWS', 5); -define('UI_TEXTAREA_STANDART_COLS', 17); -define('UI_BUTTON_STYLE', 'button'); -define('UI_QFORM_REQUIRED', '../templates/sub/form_required.tpl'); -define('UI_QFORM_REQUIREDNOTE', '../templates/sub/form_requirednote.tpl'); -define('UI_QFORM_ERROR', '../templates/sub/form_error.tpl'); -define('UI_SEARCH_MAX_ROWS', 8); -define('UI_REGEX_URL', '/^(ht|f)tps?:\/\/[^ ]+$/'); -define('UI_PL_ACCESSTOKEN_KEY', 'playlistToken'); -define('UI_SCRATCHPAD_KEY', 'djBagContents'); -define('UI_SCRATCHPAD_MAXLENGTH_KEY', 'djBagMaxlength'); + +## HTML Form stuff +define('UI_FORM_STANDARD_METHOD', 'POST'); +define('UI_INPUT_STANDARD_SIZE', 20); +define('UI_INPUT_STANDARD_MAXLENGTH', 50); +define('UI_TEXTAREA_STANDART_ROWS', 5); +define('UI_TEXTAREA_STANDART_COLS', 17); +define('UI_BUTTON_STYLE', 'button'); +define('UI_QFORM_REQUIRED', '../templates/sub/form_required.tpl'); +define('UI_QFORM_REQUIREDNOTE', '../templates/sub/form_requirednote.tpl'); +define('UI_QFORM_ERROR', '../templates/sub/form_error.tpl'); +define('UI_REGEX_URL', '/^(ht|f)tps?:\/\/[^ ]+$/'); + +## DB ls_pref keys +define('UI_PL_ACCESSTOKEN_KEY', 'playlistToken'); +define('UI_SCRATCHPAD_KEY', 'djBagContents'); +define('UI_SCRATCHPAD_MAXLENGTH_KEY', 'djBagMaxlength'); #define('UI_SCRATCHPAD_REGEX', '/^[0-9a-f]{16}:[0-9]{4}-[0-9]{2}-[0-9]{2}$/'); ## Session Keys -define('UI_SCRATCHPAD_SESSNAME', 'SCRATCHPAD'); -define('UI_STATIONINFO_SESSNAME', 'STATIONINFO'); -define('UI_SEARCH_SESSNAME', 'L_SEARCH'); -define('UI_PLAYLIST_SESSNAME', 'PLAYLIST'); -define('UI_BROWSE_SESSNAME', 'L_BROWSE'); -define('UI_MDATA_REC_SESSNAME', 'MDATAREC'); +define('UI_SCRATCHPAD_SESSNAME', 'SCRATCHPAD'); +define('UI_STATIONINFO_SESSNAME', 'STATIONINFO'); +define('UI_BROWSE_SESSNAME', 'L_BROWSE'); +define('UI_SEARCH_SESSNAME', 'L_SEARCH'); +define('UI_PLAYLIST_SESSNAME', 'PLAYLIST'); +define('UI_MDATA_REC_SESSNAME', 'MDATAREC'); ## Metadata Keys -define('UI_MDATA_KEY_TITLE', 'dc:title'); -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_KEY_TITLE', 'dc:title'); +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'); -## Simple Search Preferences -define('UI_SIMPLESEARCH_FILETYPE', 'File'); -define('UI_SIMPLESEARCH_OPERATOR', 'OR'); -define('UI_SIMPLESEARCH_LIMIT', 5); -define('UI_SIMPLESEARCH_ROWS', 3); -define('UI_SIMPLESEARCH_CAT1', 'dc:title'); -define('UI_SIMPLESEARCH_OP1', 'partial'); -define('UI_SIMPLESEARCH_CAT2', 'dc:creator'); -define('UI_SIMPLESEARCH_OP2', 'partial'); -define('UI_SIMPLESEARCH_CAT3', 'dc:source'); -define('UI_SIMPLESEARCH_OP3', 'partial'); +## Search/Browse preferences +define('UI_SIMPLESEARCH_FILETYPE', 'File'); +define('UI_SIMPLESEARCH_OPERATOR', 'OR'); +define('UI_SIMPLESEARCH_LIMIT', 10); +define('UI_SIMPLESEARCH_ROWS', 3); +define('UI_SIMPLESEARCH_CAT1', 'dc:title'); +define('UI_SIMPLESEARCH_OP1', 'partial'); +define('UI_SIMPLESEARCH_CAT2', 'dc:creator'); +define('UI_SIMPLESEARCH_OP2', 'partial'); +define('UI_SIMPLESEARCH_CAT3', 'dc:source'); +define('UI_SIMPLESEARCH_OP3', 'partial'); + +define('UI_SEARCH_MAX_ROWS', 8); +define('UI_SEARCH_DEFAULT_LIMIT', 10); +define('UI_SEARCHRESULTS_DELTA', 4); + +define('UI_BROWSERESULTS_DELTA', 4); +define('UI_BROWSE_DEFAULT_KEY_1', 'dc:type'); +define('UI_BROWSE_DEFAULT_KEY_2', 'dc:creator'); +define('UI_BROWSE_DEFAULT_KEY_3', 'dc:source'); +define('UI_BROWSE_DEFAULT_LIMIT', 10); ## Scheduler / Calendar define('UI_SCHEDULER_FIRSTWEEKDAY', 1); + + +## LS stuff require_once dirname(__FILE__).'/../../storageServer/var/conf.php'; -## LS classes/functions ############################################# require_once dirname(__FILE__).'/ui_base.inc.php'; require_once dirname(__FILE__).'/ui_scratchpad.class.php'; require_once dirname(__FILE__).'/ui_playlist.class.php'; @@ -70,7 +86,7 @@ require_once dirname(__FILE__).'/formmask/generic.inc.php'; require_once dirname(__FILE__).'/ui_calendar.class.php'; require_once dirname(__FILE__).'/ui_scheduler.class.php'; -## well known classes ############################################### +## well known classes require_once 'DB.php'; require_once 'HTML/QuickForm.php'; diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php index c985cf433..12539ae85 100644 --- a/livesupport/modules/htmlUI/var/ui_handler.class.php +++ b/livesupport/modules/htmlUI/var/ui_handler.class.php @@ -530,13 +530,13 @@ class uiHandler extends uiBase { */ function addPerm($subj, $permAction, $id, $allowDeny) { - if($this->gb->checkPerm($this->userid, 'editPerms', $id)){ - $this->gb->addPerm($subj, $permAction, - $id, $allowDeny); - }else{ + #if($this->gb->checkPerm($this->userid, 'editPerms', $id)){ + if (PEAR::isError($this->gb->addPerm($subj, $permAction, $id, $allowDeny))) { $this->_retMsg('Access denied.'); + return FALSE; } $this->redirUrl = UI_BROWSER.'?act=permissions&id='.$id; + return TRUE; } /** @@ -549,10 +549,13 @@ class uiHandler extends uiBase { */ function removePerm($permid, $oid) { - if($this->gb->checkPerm($this->userid, 'editPerms', $oid)) - $this->gb->removePerm($permid); - else $this->_retMsg('Access denied.'); + #if($this->gb->checkPerm($this->userid, 'editPerms', $oid)) + if (PEAR::isError($this->gb->removePerm($permid))) { + $this->_retMsg('Access denied.'); + return FALSE; + } $this->redirUrl = UI_BROWSER.'?act=permissions&id='.$oid; + return TRUE; } diff --git a/livesupport/modules/htmlUI/var/ui_playlist.class.php b/livesupport/modules/htmlUI/var/ui_playlist.class.php index b81eb8851..9f99f742b 100755 --- a/livesupport/modules/htmlUI/var/ui_playlist.class.php +++ b/livesupport/modules/htmlUI/var/ui_playlist.class.php @@ -57,8 +57,8 @@ class uiPlaylist } $token = $this->Base->gb->lockPlaylistForEdit($plid, $this->Base->sessid); if (PEAR::isError($token)) { - #print_r($this->token); - $this->Base->_retMsg('Unable to activate playlist "$1"'. $this->Base->_getMDataValue($plid, UI_MDATA_KEY_TITLE)); + #print_r($token); + $this->Base->_retMsg('Unable to activate playlist "$1"', $this->Base->_getMDataValue($plid, UI_MDATA_KEY_TITLE)); return FALSE; } $this->token = $token; @@ -452,6 +452,14 @@ class uiPlaylist } + function isAvailable($id) + { + if (strtolower($this->Base->gb->getFileType($id))==="playlist" && $this->Base->gb->playlistIsAvailable($id, $this->Base->sessid) === TRUE) + return TRUE; + return FALSE; + } + + function _plTimeToSecs($plt, $length=4) { $arr = split(':', $plt); diff --git a/livesupport/modules/htmlUI/var/ui_scheduler.class.php b/livesupport/modules/htmlUI/var/ui_scheduler.class.php index ab741ff7b..2c625f2a7 100755 --- a/livesupport/modules/htmlUI/var/ui_scheduler.class.php +++ b/livesupport/modules/htmlUI/var/ui_scheduler.class.php @@ -3,7 +3,9 @@ class uiScheduler extends uiCalendar { function uiScheduler(&$uiBase) { - $this->curr =& $_SESSION[UI_CALENDAR_SESSNAME]['current']; + $this->curr =& $_SESSION[UI_CALENDAR_SESSNAME]['current']; + $this->scheduleAt =& $_SESSION[UI_CALENDAR_SESSNAME]['schedule']; + if (!is_array($this->curr)) { $this->curr['view'] = 'month'; $this->curr['year'] = strftime("%Y"); @@ -18,6 +20,7 @@ class uiScheduler extends uiCalendar $this->Base =& $uiBase; $this->reloadUrl = UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close'; + $this->closeUrl = UI_BROWSER.'?popup[]=_close'; $this->uiCalendar(); $this->initXmlRpc(); @@ -29,6 +32,13 @@ class uiScheduler extends uiCalendar $this->Base->redirUrl = $this->reloadUrl; } + + function setClose() + { + $this->Base->redirUrl = $this->closeUrl; + } + + function set($arr) { extract($arr); @@ -43,17 +53,17 @@ class uiScheduler extends uiCalendar $stampNow = $this->_datetime2timestamp($this->curr['year'].$this->curr['month'].$this->curr['day'].'T'.$this->curr['hour'].':00:00'); $stampTarget = $stampNow; - if ($month=='++') + if ($month==='++') $stampTarget = strtotime("+1 month", $stampNow); - if ($month=='--') + if ($month==='--') $stampTarget = strtotime("-1 month", $stampNow); - if ($week=='++') + if ($week==='++') $stampTarget = strtotime("+1 week", $stampNow); - if ($week=='--') + if ($week==='--') $stampTarget = strtotime("-1 week", $stampNow); - if ($day=='++') + if ($day==='++') $stampTarget = strtotime("+1 day", $stampNow); - if ($day=='--') + if ($day==='--') $stampTarget = strtotime("-1 day", $stampNow); if ($today) @@ -67,7 +77,7 @@ class uiScheduler extends uiCalendar $this->curr['dayname'] = strftime("%A", $stampTarget); $this->curr['monthname']= strftime("%B", $stampTarget); - if ($this->curr['year'] == strftime("%Y") && $this->curr['month'] == strftime("%m") && $this->curr['day'] == strftime("%d")) + if ($this->curr['year'] === strftime("%Y") && $this->curr['month'] === strftime("%m") && $this->curr['day'] === strftime("%d")) $this->curr['isToday'] = TRUE; else $this->curr['isToday'] = FALSE; @@ -75,6 +85,19 @@ class uiScheduler extends uiCalendar } + function setscheduleAt($arr) + { + extract($arr); + #print_r($arr); + + if (is_numeric($year)) $this->scheduleAt['year'] = $year; + if (is_numeric($month)) $this->scheduleAt['month'] = sprintf('%02d', $month); + if (is_numeric($day)) $this->scheduleAt['day'] = sprintf('%02d', $day); + if (is_numeric($hour)) $this->scheduleAt['hour'] = sprintf('%02d', $hour); + if (is_numeric($minute)) $this->scheduleAt['minute'] = sprintf('%02d', $minute); + if (is_numeric($second)) $this->scheduleAt['second'] = sprintf('%02d', $second); + } + function getWeekEntrys() { ## build array within all entrys of current week ## @@ -242,15 +265,19 @@ class uiScheduler extends uiCalendar function getScheduleForm() { global $ui_fmask; - foreach ($this->playlists as $val) + + foreach ($this->availablePlaylists as $val) $ui_fmask['schedule']['playlist']['options'][$val['gunid']] = $val['title']; #print_r($ui_fmask); $form = new HTML_QuickForm('schedule', UI_STANDARD_FORM_METHOD, UI_HANDLER); $this->Base->_parseArr2Form($form, $ui_fmask['schedule']); - $settime = array('H' => $this->curr['hour']); - $setdate = array('Y' => $this->curr['year'], - 'm' => $this->curr['month'], - 'd' => $this->curr['day']); + $settime = array('H' => $this->scheduleAt['hour'], + 'i' => $this->scheduleAt['minute'], + 's' => $this->scheduleAt['second'] + ); + $setdate = array('Y' => $this->scheduleAt['year'], + 'm' => $this->scheduleAt['month'], + 'd' => $this->scheduleAt['day']); $form->setDefaults(array('time' => $settime, 'date' => $setdate, 'playlist' => $setplaylist)); @@ -263,6 +290,19 @@ class uiScheduler extends uiCalendar } + function copyPlFromSP() + { + foreach ($this->Base->SCRATCHPAD->get() as $val) { + if ($val['type'] === 'playlist' && $this->Base->gb->playlistIsAvailable($val['id'], $this->Base->sessid) === TRUE && $val['id'] != $this->Base->PLAYLIST->activeId) + $this->availablePlaylists[] = $val; + } + if (!count($this->availablePlaylists)) + return FALSE; + + return TRUE; + } + + function getNowNextClip($distance=0) { $datetime = strftime('%Y-%m-%dT%H:%M:%S'); @@ -286,18 +326,6 @@ class uiScheduler extends uiCalendar } - function _copyPlFromSP() - { - foreach ($this->Base->SCRATCHPAD->get() as $val) { - if (strtolower($val['type'])=='playlist' && $val['id']!=$this->Base->PLAYLIST->activeId) - $this->playlists[] = $val; - } - if (!count($this->playlists)) - return FALSE; - return TRUE; - } - - function _datetime2timestamp($i) { $i = str_replace('T', ' ', $i); @@ -321,11 +349,11 @@ class uiScheduler extends uiCalendar function _scheduledDays($period) { - if ($period=='month') { + if ($period==='month') { require_once 'Calendar/Month/Weekdays.php'; $Period = new Calendar_Month_Weekdays($this->curr['year'], $this->curr['month'], $this->firstDayOfWeek); $Period->build(); - } elseif ($period=='week') { + } elseif ($period==='week') { require_once 'Calendar/Week.php'; $Period = new Calendar_Week ($this->curr['year'], $this->curr['month'], $this->curr['day'], $this->firstDayOfWeek); $Period->build(); diff --git a/livesupport/modules/htmlUI/var/ui_scratchpad.class.php b/livesupport/modules/htmlUI/var/ui_scratchpad.class.php index a1779c5e4..9ed1792bb 100755 --- a/livesupport/modules/htmlUI/var/ui_scratchpad.class.php +++ b/livesupport/modules/htmlUI/var/ui_scratchpad.class.php @@ -76,7 +76,7 @@ class uiScratchPad } if (!is_array($ids)) $ids = array($ids); - + $sp = $this->get(); foreach ($ids as $id) { $item = $this->Base->_getMetaInfo($id); diff --git a/livesupport/modules/htmlUI/var/ui_search.class.php b/livesupport/modules/htmlUI/var/ui_search.class.php index 1da6f1e68..e20f12c0f 100755 --- a/livesupport/modules/htmlUI/var/ui_search.class.php +++ b/livesupport/modules/htmlUI/var/ui_search.class.php @@ -125,7 +125,7 @@ class uiSearch $this->criteria['counter'] = UI_SIMPLESEARCH_ROWS; $this->criteria['form']['operator'] = 'OR'; ## $criteria['form'] is used for retransfer to form ## $this->criteria['form']['filetype'] = 'File'; - $this->criteria['form']['limit'] = 5; + $this->criteria['form']['limit'] = UI_SIMPLESEARCH_LIMIT; for ($n = 1; $n<=UI_SIMPLESEARCH_ROWS; $n++) { $this->criteria['conditions'][$n] = array('cat' => constant('UI_SIMPLESEARCH_CAT'.$n), @@ -146,8 +146,8 @@ class uiSearch { if (count($this->criteria) === 0) return FALSE; - - $this->results = array('page' => $this->criteria['offset']/$this->criteria['limit']); + + $this->results = array('page' => $this->criteria['offset'] / $this->criteria['limit']); #print_r($this->criteria); $results = $this->Base->gb->localSearch($this->criteria, $this->Base->sessid); @@ -167,7 +167,7 @@ class uiSearch ( 'id' => 24, 'gunid' => '1cc472228d0cb2ac', - 'title' => 'Strom 10min', + 'title' => 'Item '.$n, 'creator' => 'Sebastian', 'duration' => '   10:00', 'type' => 'webstream' @@ -185,28 +185,34 @@ class uiSearch function pagination(&$results) { - if (sizeof($this->results) == 0) { + if (sizeof($this->results['items']) == 0) { return FALSE; } - $pot = 0; # potence - $lpr = 10; # links pro range - $width = 1; # width bettween pages - $currp = ($this->criteria['offset']/$this->criteria['limit']) +1 ; # current page - $maxp = ceil($results['cnt']/$this->criteria['limit']); # maximum page + $currp = ($this->criteria['offset'] / $this->criteria['limit']) + 1; # current page + $maxp = ceil($results['cnt'] / $this->criteria['limit']); # maximum page + /* for ($n = 1; $n <= $maxp; $n = $n+$width) { - if ($n<$currp) - $width = pow($lpr, floor(log10(abs($n-$currp)))); - else - $width = pow($lpr, floor(log10(abs($n-$currp)+1))); + $width = pow(10, floor(($n)/10)); $this->results['pagination'][$n] = $n; + } + */ + $deltaLower = UI_SEARCHRESULTS_DELTA; + $deltaUpper = UI_SEARCHRESULTS_DELTA; + $start = $currp; + + if ($start+$delta-$maxp > 0) $deltaLower += $start+$delta-$maxp; ## correct lower boarder if page is near end + + for ($n = $start-$deltaLower; $n <= $start+$deltaUpper; $n++) { + if ($n <= 0) $deltaUpper++; ## correct upper boarder if page is near zero + elseif ($n <= $maxp) $this->results['pagination'][$n] = $n; } #array_pop($this->results['pagination']); - $this->results['pagination'][$maxp] = '>>|'; - $this->results['pagination'][1] = '|<<'; + $this->results['pagination'][1] ? NULL : $this->results['pagination'][1] = '|<<'; + $this->results['pagination'][$maxp] ? NULL : $this->results['pagination'][$maxp] = '>>|'; $this->results['next'] = $results['cnt'] > $this->criteria['offset'] + $this->criteria['limit'] ? TRUE : FALSE; $this->results['prev'] = $this->criteria['offset'] > 0 ? TRUE : FALSE; ksort($this->results['pagination']);