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

Fixed warning about undefined variable, and fixed bug #1758 - after saving system prefs, you are not returned to system prefs.

Browse source
This commit is contained in:
paul 2006-09-01 08:44:00 +00:00
parent 09fae2140f
commit f04c6ee742
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
livesupport/src/modules/htmlUI/var/html/ui_handler.php
View file

@ -100,6 +100,7 @@ switch($_REQUEST['act']){
case "changeStationPrefs": case "changeStationPrefs":
$uiHandler->changeStationPrefs(array_merge($_REQUEST, $_FILES), $ui_fmask["stationPrefs"]); $uiHandler->changeStationPrefs(array_merge($_REQUEST, $_FILES), $ui_fmask["stationPrefs"]);
$uiHandler->redirUrl = UI_BROWSER."?act=changeStationPrefs";
break; break;
case "SP.addItem": case "SP.addItem":
@ -192,7 +193,7 @@ switch($_REQUEST['act']){
case "HUBBROWSE.setFiletype": case "HUBBROWSE.setFiletype":
$uiHandler->HUBBROWSE->setFiletype($_REQUEST['filetype']); $uiHandler->HUBBROWSE->setFiletype($_REQUEST['filetype']);
break; break;
case "HUBSEARCH.newSearch": case "HUBSEARCH.newSearch":
$uiHandler->HUBSEARCH->newSearch($_REQUEST); $uiHandler->HUBSEARCH->newSearch($_REQUEST);
break; break;
@ -223,17 +224,17 @@ switch($_REQUEST['act']){
$ids = ''; $ids = '';
if (is_array($_REQUEST['id'])) { if (is_array($_REQUEST['id'])) {
foreach ($_REQUEST['id'] as $id) { foreach ($_REQUEST['id'] as $id) {
$ids .= '&id[]='.$id; $ids .= '&id[]='.$id;
} }
} else { } else {
$ids = '&id='.$_REQUEST['id']; $ids = '&id='.$_REQUEST['id'];
} }
//echo '<XMP>_REQUEST:'; print_r($_REQUEST); echo "</XMP>\n"; //echo '<XMP>_REQUEST:'; print_r($_REQUEST); echo "</XMP>\n";
$uiHandler->redirUrl = UI_BROWSER."?popup[]={$_REQUEST['act']}{$ids}"; $uiHandler->redirUrl = UI_BROWSER."?popup[]={$_REQUEST['act']}{$ids}";
break; break;
case "TR.cancelConfirm": case "TR.cancelConfirm":
//echo '<XMP>_REQUEST:'; print_r($_REQUEST); echo "</XMP>\n"; //echo '<XMP>_REQUEST:'; print_r($_REQUEST); echo "</XMP>\n";
$uiHandler->TRANSFERS->doTransportAction($_REQUEST['id'],'cancel'); $uiHandler->TRANSFERS->doTransportAction($_REQUEST['id'],'cancel');
$uiHandler->redirUrl = UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close'; $uiHandler->redirUrl = UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close';
break; break;
@ -327,7 +328,7 @@ switch($_REQUEST['act']){
$uiHandler->SCRATCHPAD->removeItems($ui_tmpid); $uiHandler->SCRATCHPAD->removeItems($ui_tmpid);
$uiHandler->PLAYLIST->setReload(); $uiHandler->PLAYLIST->setReload();
break; break;
case "PL.export": case "PL.export":
$uiHandler->redirUrl = UI_BROWSER."?popup[]=PL.redirect2DownloadExportedFile&id={$_REQUEST['id']}&playlisttype={$_REQUEST['playlisttype']}&exporttype={$_REQUEST['exporttype']}"; $uiHandler->redirUrl = UI_BROWSER."?popup[]=PL.redirect2DownloadExportedFile&id={$_REQUEST['id']}&playlisttype={$_REQUEST['playlisttype']}&exporttype={$_REQUEST['exporttype']}";
break; break;
@ -370,7 +371,7 @@ switch($_REQUEST['act']){
$uiHandler->SCHEDULER->stopDaemon(TRUE); $uiHandler->SCHEDULER->stopDaemon(TRUE);
$uiHandler->SCHEDULER->setReload(); $uiHandler->SCHEDULER->setReload();
break; break;
case 'SCHEDULER.scheduleExportOpen': case 'SCHEDULER.scheduleExportOpen':
$_REQUEST['fromDay'] = strlen($_REQUEST['fromDay'])>1?$_REQUEST['fromDay']:'0'.$_REQUEST['fromDay']; $_REQUEST['fromDay'] = strlen($_REQUEST['fromDay'])>1?$_REQUEST['fromDay']:'0'.$_REQUEST['fromDay'];
$_REQUEST['toDay'] = strlen($_REQUEST['toDay'])>1?$_REQUEST['toDay']:'0'.$_REQUEST['toDay']; $_REQUEST['toDay'] = strlen($_REQUEST['toDay'])>1?$_REQUEST['toDay']:'0'.$_REQUEST['toDay'];
@ -385,17 +386,17 @@ switch($_REQUEST['act']){
$uiHandler->SCHEDULER->scheduleImportOpen($_REQUEST['target']); $uiHandler->SCHEDULER->scheduleImportOpen($_REQUEST['target']);
$uiHandler->redirUrl = UI_BROWSER.'?act=SCHEDULER'; $uiHandler->redirUrl = UI_BROWSER.'?act=SCHEDULER';
break; break;
case 'BACKUP.createBackupOpen': case 'BACKUP.createBackupOpen':
$uiHandler->EXCHANGE->createBackupOpen(); $uiHandler->EXCHANGE->createBackupOpen();
$uiHandler->redirUrl = UI_BROWSER.'?act=BACKUP'; $uiHandler->redirUrl = UI_BROWSER.'?act=BACKUP';
break; break;
case 'BACKUP.copy2target': case 'BACKUP.copy2target':
$uiHandler->EXCHANGE->copy2target($_REQUEST['target']); $uiHandler->EXCHANGE->copy2target($_REQUEST['target']);
$uiHandler->redirUrl = UI_BROWSER.'?act=BACKUP'; $uiHandler->redirUrl = UI_BROWSER.'?act=BACKUP';
break; break;
case 'BACKUP.createBackupClose': case 'BACKUP.createBackupClose':
$uiHandler->EXCHANGE->createBackupClose(); $uiHandler->EXCHANGE->createBackupClose();
$uiHandler->redirUrl = UI_BROWSER.'?act=BACKUP'; $uiHandler->redirUrl = UI_BROWSER.'?act=BACKUP';
@ -405,7 +406,7 @@ switch($_REQUEST['act']){
$uiHandler->EXCHANGE->backupRestoreOpen($_REQUEST['target']); $uiHandler->EXCHANGE->backupRestoreOpen($_REQUEST['target']);
$uiHandler->redirUrl = UI_BROWSER.'?act=RESTORE'; $uiHandler->redirUrl = UI_BROWSER.'?act=RESTORE';
break; break;
case 'RESTORE.backupRestoreClose': case 'RESTORE.backupRestoreClose':
$uiHandler->EXCHANGE->backupRestoreClose(); $uiHandler->EXCHANGE->backupRestoreClose();
$uiHandler->redirUrl = UI_BROWSER.'?act=RESTORE'; $uiHandler->redirUrl = UI_BROWSER.'?act=RESTORE';
@ -435,10 +436,11 @@ switch($_REQUEST['act']){
if ($uiHandler->alertMsg) { if ($uiHandler->alertMsg) {
$_SESSION['alertMsg'] = $uiHandler->alertMsg; $_SESSION['alertMsg'] = $uiHandler->alertMsg;
} }
$ui_wait = 0;
if (ob_get_contents()) { if (ob_get_contents()) {
$ui_wait = 10; $ui_wait = 10;
} }
ob_end_clean; ob_end_clean();
?> ?>
<meta http-equiv="refresh" content="<?php echo $ui_wait ? $ui_wait : 0; ?>; URL=<?php echo $uiHandler->redirUrl; ?>"> <meta http-equiv="refresh" content="<?php echo $ui_wait ? $ui_wait : 0; ?>; URL=<?php echo $uiHandler->redirUrl; ?>">
</body> </body>