Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for function renaming. Added ability to go directly to a page without showing that waiting popup

This commit is contained in:
paul 2006-11-21 16:55:00 +00:00
parent 89b715cb66
commit 0785f322a0
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
campcaster/src/modules/htmlUI/var/html/ui_handler.php
View File

@ -6,14 +6,16 @@ if (strstr($_REQUEST['act'], "HUBBROWSE")) {
} }
switch ($_REQUEST['act']) { switch ($_REQUEST['act']) {
case "login": case "login":
if ($uiHandler->login($_REQUEST, $ui_fmask["login"]) === TRUE) { if ($uiHandler->login($_REQUEST, $ui_fmask["login"]) === TRUE) {
$uiHandler->loadStationPrefs($ui_fmask['stationPrefs'], TRUE); $uiHandler->loadStationPrefs($ui_fmask['stationPrefs'], TRUE);
# $uiHandler->PLAYLIST->reportLookedPL(); # $uiHandler->PLAYLIST->reportLookedPL();
$uiHandler->PLAYLIST->loadLookedFromPref(); $uiHandler->PLAYLIST->loadLookedFromPref();
} }
break; include('../templates/loader/index.tpl');
include('../templates/popup/_reload_parent.tpl');
include('../templates/popup/_close.tpl');
exit;
case "logout": case "logout":
$uiHandler->SCRATCHPAD->save(); $uiHandler->SCRATCHPAD->save();
@ -42,12 +44,12 @@ switch ($_REQUEST['act']) {
case "addWebstreamMData": case "addWebstreamMData":
case "editWebstreamData": case "editWebstreamData":
$uiHandler->editWebstream($_REQUEST, $ui_fmask['webstream']); $uiHandler->editWebstream($_REQUEST, $ui_fmask['webstream']);
$uiHandler->SCRATCHPAD->reLoadM(); $uiHandler->SCRATCHPAD->reloadMetadata();
break; break;
case "editMetaData": case "editMetaData":
$uiHandler->editMetaData($_REQUEST); $uiHandler->editMetaData($_REQUEST);
$uiHandler->SCRATCHPAD->reLoadM(); $uiHandler->SCRATCHPAD->reloadMetadata();
break; break;
case "newFolder": case "newFolder":
@ -117,8 +119,8 @@ switch ($_REQUEST['act']) {
$uiHandler->SCRATCHPAD->setReload(); $uiHandler->SCRATCHPAD->setReload();
break; break;
case "SP.reOrder": case "SP.reorder":
$uiHandler->SCRATCHPAD->reOrder($_REQUEST['by']); $uiHandler->SCRATCHPAD->reorder($_REQUEST['by']);
$uiHandler->SCRATCHPAD->setReload(); $uiHandler->SCRATCHPAD->setReload();
break; break;
@ -130,8 +132,8 @@ switch ($_REQUEST['act']) {
$uiHandler->SEARCH->simpleSearch($_REQUEST); $uiHandler->SEARCH->simpleSearch($_REQUEST);
break; break;
case "SEARCH.reOrder": case "SEARCH.reorder":
$uiHandler->SEARCH->reOrder($_REQUEST['by']); $uiHandler->SEARCH->reorder($_REQUEST['by']);
break; break;
case "SEARCH.clear": case "SEARCH.clear":
@ -150,8 +152,8 @@ switch ($_REQUEST['act']) {
$uiHandler->BROWSE->setValue($_REQUEST); $uiHandler->BROWSE->setValue($_REQUEST);
break; break;
case "BROWSE.reOrder": case "BROWSE.reorder":
$uiHandler->BROWSE->reOrder($_REQUEST['by']); $uiHandler->BROWSE->reorder($_REQUEST['by']);
break; break;
case "BROWSE.setDefaults": case "BROWSE.setDefaults":
@ -178,8 +180,8 @@ switch ($_REQUEST['act']) {
$HUBBROWSE->setValue($_REQUEST); $HUBBROWSE->setValue($_REQUEST);
break; break;
case "HUBBROWSE.reOrder": case "HUBBROWSE.reorder":
$HUBBROWSE->reOrder($_REQUEST['by']); $HUBBROWSE->reorder($_REQUEST['by']);
break; break;
case "HUBBROWSE.setDefaults": case "HUBBROWSE.setDefaults":
@ -202,8 +204,8 @@ switch ($_REQUEST['act']) {
$uiHandler->HUBSEARCH->newSearch($_REQUEST); $uiHandler->HUBSEARCH->newSearch($_REQUEST);
break; break;
case "HUBSEARCH.reOrder": case "HUBSEARCH.reorder":
$uiHandler->HUBSEARCH->reOrder($_REQUEST['by']); $uiHandler->HUBSEARCH->reorder($_REQUEST['by']);
break; break;
case "HUBSEARCH.clear": case "HUBSEARCH.clear":
@ -214,8 +216,8 @@ switch ($_REQUEST['act']) {
$uiHandler->HUBSEARCH->setOffset($_REQUEST['page']); $uiHandler->HUBSEARCH->setOffset($_REQUEST['page']);
break; break;
case "TRANSFERS.reOrder": case "TRANSFERS.reorder":
$uiHandler->TRANSFERS->reOrder($_REQUEST['by']); $uiHandler->TRANSFERS->reorder($_REQUEST['by']);
break; break;
case "TRANSFERS.setOffset": case "TRANSFERS.setOffset":
@ -317,13 +319,13 @@ switch ($_REQUEST['act']) {
$uiHandler->PLAYLIST->setReload(); $uiHandler->PLAYLIST->setReload();
break; break;
case "PL.reOrder": case "PL.reorder":
$uiHandler->PLAYLIST->reOrder($_REQUEST['pl_items']); $uiHandler->PLAYLIST->reorder($_REQUEST['pl_items']);
$uiHandler->PLAYLIST->setReturn(); $uiHandler->PLAYLIST->setReturn();
break; break;
case "PL.reArrange": case "PL.reArrange":
$uiHandler->PLAYLIST->reOrder($_REQUEST['pl_items']); $uiHandler->PLAYLIST->reorder($_REQUEST['pl_items']);
$uiHandler->PLAYLIST->setReload(); $uiHandler->PLAYLIST->setReload();
break; break;
@ -387,7 +389,7 @@ switch ($_REQUEST['act']) {
$_REQUEST['toDay'] = strlen($_REQUEST['toDay'])>1?$_REQUEST['toDay']:'0'.$_REQUEST['toDay']; $_REQUEST['toDay'] = strlen($_REQUEST['toDay'])>1?$_REQUEST['toDay']:'0'.$_REQUEST['toDay'];
$fromTime=$_REQUEST['fromYear'].'-'.$_REQUEST['fromMonth'].'-'.$_REQUEST['fromDay'].' '.$_REQUEST['fromHour'].':'.$_REQUEST['fromMinute'].':00'; $fromTime=$_REQUEST['fromYear'].'-'.$_REQUEST['fromMonth'].'-'.$_REQUEST['fromDay'].' '.$_REQUEST['fromHour'].':'.$_REQUEST['fromMinute'].':00';
$toTime=$_REQUEST['toYear'].'-'.$_REQUEST['toMonth'].'-'.$_REQUEST['toDay'].' '.$_REQUEST['toHour'].':'.$_REQUEST['toMinute'].':00'; $toTime=$_REQUEST['toYear'].'-'.$_REQUEST['toMonth'].'-'.$_REQUEST['toDay'].' '.$_REQUEST['toHour'].':'.$_REQUEST['toMinute'].':00';
//íecho '<XMP style="background:yellow;">';echo "fromTime:$fromTime | toTime:$toTime";echo'</XMP>'."\n"; //echo '<XMP style="background:yellow;">';echo "fromTime:$fromTime | toTime:$toTime";echo'</XMP>'."\n";
$uiHandler->SCHEDULER->scheduleExportOpen($fromTime, $toTime); $uiHandler->SCHEDULER->scheduleExportOpen($fromTime, $toTime);
$uiHandler->redirUrl = UI_BROWSER.'?act=SCHEDULER'; $uiHandler->redirUrl = UI_BROWSER.'?act=SCHEDULER';
break; break;
@ -449,12 +451,15 @@ switch ($_REQUEST['act']) {
if ($uiHandler->alertMsg) { if ($uiHandler->alertMsg) {
$_SESSION['alertMsg'] = $uiHandler->alertMsg; $_SESSION['alertMsg'] = $uiHandler->alertMsg;
} }
$ui_wait = 0; //$ui_wait = 0;
if (ob_get_contents()) { //if (ob_get_contents()) {
$ui_wait = 10; // $ui_wait = 10;
} //}
ob_end_clean(); ob_end_clean();
?> if (isset($_REQUEST['target'])) {
<meta http-equiv="refresh" content="<?php echo $ui_wait ? $ui_wait : 0; ?>; URL=<?php echo $uiHandler->redirUrl; ?>"> header('Location: ui_browser.php?act='.$_REQUEST['target']);
</body> } else {
</html> header("Location: ".$uiHandler->redirUrl);
}
exit;
?>