*** empty log message ***

This commit is contained in:
sebastian 2005-03-03 16:44:34 +00:00
parent 786a8b7894
commit 6c2dfef068
22 changed files with 358 additions and 144 deletions

View file

@ -86,13 +86,6 @@
margin-top: 10px;
}
#uploadform {
width: 800px;
border-style : dotted;
padding : 5px;
margin-top: 10px;
}
#searchform {
width: 800px;
border-style : dotted;
@ -124,8 +117,15 @@
margin-top: 10px;
}
#metadataform {;
width: 800px;
#uploadform {
width: 780px;
border-style : dotted;
padding : 5px;
margin-top: 10px;
}
#metadataform {
width: 780px;
border-style : dotted;
padding : 5px;
margin-top: 10px;

View file

@ -56,10 +56,10 @@ if ($uiBrowser->userid) {
#$Smarty->assign('PLid', $uiBrowser->PLAYLIST->activeId);
switch ($_REQUEST['act']){
case "fileBrowse":
case "fileList":
$Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->fid));
$Smarty->assign('fileBrowse', TRUE);
$Smarty->assign('fileList', TRUE);
if ($_REQUEST['tree']=='Y')
$Smarty->assign('showTree', TRUE);
else
@ -71,7 +71,7 @@ if ($uiBrowser->userid) {
$Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id));
$Smarty->assign('permissions', $uiBrowser->permissions($uiBrowser->id));
$Smarty->assign('fileBrowse', TRUE);
$Smarty->assign('fileList', TRUE);
break;
@ -82,26 +82,15 @@ if ($uiBrowser->userid) {
break;
case "uploadFile":
case "editFile":
$Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id));
$Smarty->assign('editMetaData', $uiBrowser->editMetaData($uiBrowser->id, TRUE));
# booth masks on one page
$Smarty->assign('uploadform', $uiBrowser->uploadFile($ui_fmask['uploadFile'], $uiBrowser->id, $_REQUEST['replace']));
$Smarty->assign('editItem', array('type' => 'file', 'id' => $_REQUEST['id'], 'folderId' => $uiBrowser->fid));
break;
case "addWebstream":
case "editWebstream":
$Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id));
$Smarty->assign('uploadform', $uiBrowser->addWebstream($ui_fmask['addWebstream'], $uiBrowser->id, $_REQUEST['replace']));
# booth masks on one page
$Smarty->assign('editMetaData', $uiBrowser->editMetaData($uiBrowser->id, TRUE));
break;
case "editMetaData":
$Smarty->assign('structure', $uiBrowser->getStructure($uiBrowser->id));
$Smarty->assign('editMetaData', $uiBrowser->editMetaData($uiBrowser->id, TRUE));
$Smarty->assign('editItem', array('type' => 'webstream', 'id' => $_REQUEST['id'], 'folderId' => $uiBrowser->fid));
break;
@ -161,11 +150,6 @@ if ($uiBrowser->userid) {
break;
case "PL.simpleManagement":
if ($uiBrowser->PLAYLIST->get() === FALSE) {
if (($ui_tmpid = $uiBrowser->PLAYLIST->create($_REQUEST['id'])) !== FALSE) {
$uiBrowser->SCRATCHPAD->addItem($ui_tmpid);
}
}
$Smarty->assign('PL_simpleManagement', TRUE);
break;
}

View file

@ -4,8 +4,10 @@ require dirname(__FILE__).'/../ui_handler_init.php';
switch($_REQUEST['act']){
case "login":
if ($uiHandler->login($_REQUEST, $ui_fmask["login"]) === TRUE)
if ($uiHandler->login($_REQUEST, $ui_fmask["login"]) === TRUE) {
#$uiHandler->checkSystemPrefs();
$uiHandler->PLAYLIST->loadLookedFromPref();
}
break;
case "logout":
@ -26,29 +28,24 @@ switch($_REQUEST['act']){
break;
case "uploadFile":
if ($ui_tmpid = $uiHandler->uploadFile(array_merge($_REQUEST, $_FILES), $uiHandler->id, $ui_fmask["uploadFile"]))
if ($ui_tmpid = $uiHandler->uploadFile(array_merge($_REQUEST, $_FILES), $ui_fmask["file"]))
$uiHandler->SCRATCHPAD->addItem($ui_tmpid);
break;
case "replaceFile":
$ui_tmpgunid = $uiHandler->gb->_gunidFromId($uiHandler->id);
if ($uiHandler->delete($uiHandler->id) === TRUE) {
$ui_tmpid = $uiHandler->uploadFile(array_merge($_REQUEST, $_FILES), $uiHandler->pid, $ui_fmask["uploadFile"], $ui_tmpgunid);
$ui_tmpid = $uiHandler->uploadFile(array_merge($_REQUEST, $_FILES), $uiHandler->pid, $ui_fmask["file"], $ui_tmpgunid);
$uiHandler->SCRATCHPAD->removeItems($uiHandler->id);
$uiHandler->SCRATCHPAD->addItem($ui_tmpid);
}
break;
case "addWebstream":
if ($ui_tmpid = $uiHandler->addWebstream($_REQUEST, $uiHandler->id, $ui_fmask['addWebstream']))
$uiHandler->SCRATCHPAD->addItem($ui_tmpid);
break;
case "replaceWebstream":
$ui_tmpgunid = $uiHandler->gb->_gunidFromId($uiHandler->id);
if ($uiHandler->delete($uiHandler->id) == TRUE) {
$ui_tmpid = $uiHandler->addWebstream($_REQUEST, $uiHandler->pid, $ui_fmask['addWebstream'], $ui_tmpgunid);
$uiHandler->SCRATCHPAD->removeItems($uiHandler->id);
case "editWebstream":
if ($_REQUEST['id']) {
$uiHandler->editWebstream($_REQUEST, $ui_fmask['webstream']);
} else {
$ui_tmpid = $uiHandler->addWebstream($_REQUEST, $ui_fmask['webstream']);
$uiHandler->SCRATCHPAD->addItem($ui_tmpid);
}
break;