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

*** empty log message ***

Browse source
This commit is contained in:
sebastian 2005-03-22 20:11:26 +00:00
parent a340148e0c
commit 8ae2b9f8b9
9 changed files with 32 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
livesupport/modules/htmlUI/var/html/ui_handler.php
View file

@ -185,7 +185,7 @@ switch($_REQUEST['act']){
case "PL.create": case "PL.create":
if (($ui_tmpid = $uiHandler->PLAYLIST->create($_REQUEST['id'])) !== FALSE) if (($ui_tmpid = $uiHandler->PLAYLIST->create($_REQUEST['id'])) !== FALSE)
$uiHandler->SCRATCHPAD->addItem($ui_tmpid); $uiHandler->SCRATCHPAD->addItem($ui_tmpid);
$uiHandler->PLAYLIST->setReload(); $uiHandler->PLAYLIST->setRedirect();
break; break;
case "PL.addItem": case "PL.addItem":
@ -267,7 +267,7 @@ if ($uiHandler->alertMsg) $_SESSION['alertMsg'] = $uiHandler->alertMsg;
if (ob_get_contents()) { if (ob_get_contents()) {
$ui_wait = 5; $ui_wait = 5;
} }
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>

4
livesupport/modules/htmlUI/var/templates/file/metadataform.tpl
View file

@ -9,8 +9,8 @@
</ul> </ul>
</div> </div>
{*$_metadataform.tabs*} {assign var="dynform" value=$_metadataform.langswitch}
{*$_metadataform.langswitch*} {include file="sub/dynForm_plain.tpl"}
{foreach from=$_metadataform.pages key="key" item="dynform"} {foreach from=$_metadataform.pages key="key" item="dynform"}
{include file="sub/dynForm_plain.tpl"} {include file="sub/dynForm_plain.tpl"}

12
livesupport/modules/htmlUI/var/templates/script/contextmenu.js.tpl
View file

@ -51,15 +51,15 @@ function contextmenu(param) {
break; break;
case "PL.changeFadeIn": case "PL.changeFadeIn":
contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=fadeIn&id="+param+"', 'PL', '350', '100')\" "+oF+">&nbsp;Change Fadein&nbsp;</a></li>"; contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=fadeIn&id="+param+"', 'PL', '400', '100')\" "+oF+">&nbsp;Change Fadein&nbsp;</a></li>";
break; break;
case "PL.changeTransition": case "PL.changeTransition":
contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=transition&id="+param+"', 'PL', '350', '100')\" "+oF+">&nbsp;Change Transition&nbsp;</a></li>"; contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=transition&id="+param+"', 'PL', '400', '100')\" "+oF+">&nbsp;Change Transition&nbsp;</a></li>";
break; break;
case "PL.changeFadeOut": case "PL.changeFadeOut":
contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=fadeOut&id="+param+"', 'PL', '350', '100')\" "+oF+">&nbsp;Change Fadeout&nbsp;</a></li>"; contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=PL.changeTransition&type=fadeOut&id="+param+"', 'PL', '400', '100')\" "+oF+">&nbsp;Change Fadeout&nbsp;</a></li>";
break; break;
case "PL.editMetaData": case "PL.editMetaData":
@ -85,7 +85,7 @@ function contextmenu(param) {
case "delete": case "delete":
//contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"hpopup('{$UI_HANDLER}?act=delete&id="+param+"')\" "+oF+">&nbsp;Delete Item&nbsp;</a></li>"; //contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"hpopup('{$UI_HANDLER}?act=delete&id="+param+"')\" "+oF+">&nbsp;Delete Item&nbsp;</a></li>";
contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=deleteItem&id="+param+"', 'deleteItem', 300, 150)\"')"+oF+">&nbsp;Delete Item&nbsp;</a></li>"; contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=deleteItem&id="+param+"', 'deleteItem', 400, 200)\"')"+oF+">&nbsp;Delete Item&nbsp;</a></li>";
break; break;
case "fileList": case "fileList":
@ -93,11 +93,11 @@ function contextmenu(param) {
break; break;
case "SCHEDULER.addItem": case "SCHEDULER.addItem":
contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"hpopup('{$UI_HANDLER}?act=SCHEDULER.set&"+param+"'); popup('{$UI_BROWSER}?popup[]=SCHEDULER.addItem', 'Schedule', 600, 400)\"')"+oF+">&nbsp;Insert Playlist here&nbsp;</a></li>"; contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"hpopup('{$UI_HANDLER}?act=SCHEDULER.set&"+param+"'); popup('{$UI_BROWSER}?popup[]=SCHEDULER.addItem', 'Schedule', 400, 200)\"')"+oF+">&nbsp;Insert Playlist here&nbsp;</a></li>";
break; break;
case "SCHEDULER.removeItem": case "SCHEDULER.removeItem":
contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=SCHEDULER.removeItem&"+param+"', 'Schedule', 600, 400)\"')"+oF+">&nbsp;Remove Playlist&nbsp;</a></li>"; contextmenuHtml = contextmenuHtml + "<li><a class='contextmenu' href='#' onClick=\"popup('{$UI_BROWSER}?popup[]=SCHEDULER.removeItem&"+param+"', 'Schedule', 400, 200)\"')"+oF+">&nbsp;Remove Playlist&nbsp;</a></li>";
break; break;
{literal} {literal}
} }

4
livesupport/modules/htmlUI/var/templates/sub/dynForm_plain.tpl
View file

@ -16,7 +16,7 @@
*} *}
{if $element.type eq 'static'} {if $element.type eq 'static'}
{$element.html} {$element.html}
{else} {else}
@ -42,11 +42,13 @@
{/if} {/if}
{/foreach} {/foreach}
{*
{if $dynform.requirednote and not $dynform.frozen} {if $dynform.requirednote and not $dynform.frozen}
<div class='dynformelement'> <div class='dynformelement'>
{$dynform.requirednote} {$dynform.requirednote}
</div> </div>
{/if} {/if}
*}
</form> </form>
<!-- <!--

8
livesupport/modules/htmlUI/var/ui_browser.class.php
View file

@ -74,7 +74,7 @@ class uiBrowser extends uiBase {
{ {
$form = new HTML_QuickForm('login', UI_STANDARD_FORM_METHOD, UI_HANDLER); $form = new HTML_QuickForm('login', UI_STANDARD_FORM_METHOD, UI_HANDLER);
$form->setRequiredNote(file_get_contents(UI_QFORM_REQUIREDNOTE)); $form->setRequiredNote(file_get_contents(UI_QFORM_REQUIREDNOTE));
$this->_parseArr2Form($form, $mask['languages']); $this->_parseArr2Form($form, $mask['languages']);
$this->_parseArr2Form($form, $mask['login']); $this->_parseArr2Form($form, $mask['login']);
$renderer =& new HTML_QuickForm_Renderer_Array(true, true); $renderer =& new HTML_QuickForm_Renderer_Array(true, true);
@ -370,12 +370,16 @@ class uiBrowser extends uiBase {
include dirname(__FILE__).'/formmask/metadata.inc.php'; include dirname(__FILE__).'/formmask/metadata.inc.php';
/*
$form = new HTML_QuickForm('tabs', UI_STANDARD_FORM_METHOD, UI_BROWSER); $form = new HTML_QuickForm('tabs', UI_STANDARD_FORM_METHOD, UI_BROWSER);
$this->_parseArr2Form($form, $mask['tabs']); $this->_parseArr2Form($form, $mask['tabs']);
$output['tabs'] = $form->toHTML(); $output['tabs'] = $form->toHTML();
*/
$form = new HTML_QuickForm('langswitch', UI_STANDARD_FORM_METHOD, UI_BROWSER); $form = new HTML_QuickForm('langswitch', UI_STANDARD_FORM_METHOD, UI_BROWSER);
$this->_parseArr2Form($form, $mask['langswitch']); $this->_parseArr2Form($form, $mask['langswitch']);
$output['langswitch'] = $form->toHTML(); $renderer =& new HTML_QuickForm_Renderer_Array(true, true);
$form->accept($renderer);
$output['langswitch'] = $renderer->toArray();
$form = new HTML_QuickForm('editMetaData', UI_STANDARD_FORM_METHOD, UI_HANDLER); $form = new HTML_QuickForm('editMetaData', UI_STANDARD_FORM_METHOD, UI_HANDLER);
$this->_parseArr2Form($form, $mask['basics']); $this->_parseArr2Form($form, $mask['basics']);

14
livesupport/modules/htmlUI/var/ui_handler.class.php
View file

@ -275,7 +275,7 @@ class uiHandler extends uiBase {
} }
$data = $this->_dateArr2Str($mData); $data = $this->_dateArr2Str($mData);
foreach ($data as $key=>$val) { foreach ($data as $key=>$val) {
$r = $this->gb->setMDataValue($id, $key, $this->sessid, $val); $r = $this->gb->setMDataValue($id, $key, $this->sessid, $val, 'de');
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
$this->_retMsg('Unable to set $1: $2', $key, $val); $this->_retMsg('Unable to set $1: $2', $key, $val);
} }
@ -439,7 +439,7 @@ class uiHandler extends uiBase {
if ($this->_validateForm($formdata, $mask)) { if ($this->_validateForm($formdata, $mask)) {
if($this->gb->checkPerm($this->userid, 'subjects')){ if($this->gb->checkPerm($this->userid, 'subjects')){
$res = $this->gb->addSubj($formdata['login'], ($formdata['pass']=='' ? NULL : $formdata['pass'])); $res = $this->gb->addSubj($formdata['login'], ($formdata['pass']=='' ? NULL : $formdata['pass']));
$this->_retMsg('Subject $1 added.', $formdata['login']); if (UI_VERBOSE) $this->_retMsg('Subject $1 added.', $formdata['login']);
} else { } else {
$this->_retMsg('Access denied.'); $this->_retMsg('Access denied.');
return; return;
@ -601,9 +601,9 @@ class uiHandler extends uiBase {
if ($val['error']) { if ($val['error']) {
switch ($val['error']) { switch ($val['error']) {
case 1: $was_error = TRUE; $this->_retMsg('Uploaded File $1 is greater than System setting.', $mask[$key]['label']); break; case 1: $was_error = TRUE; $this->_retMsg('Uploaded file $1 is greater than setting in php.ini.', $mask[$key]['label']); break;
case 2: $was_error = TRUE; $this->_retMsg('Uploaded File $1 is greater than LS setting.', $mask[$key]['label']); break; case 2: $was_error = TRUE; $this->_retMsg('Uploaded file $1 is greater than LiveSupport system setting.', $mask[$key]['label']); break;
case 3: $was_error = TRUE; $this->_retMsg('File $1 was uploadet partly.', $mask[$key]['label']); break; case 3: $was_error = TRUE; $this->_retMsg('Upload of file $1 was incomplete.', $mask[$key]['label']); break;
case 4: if ($mask[$key]['required']) {$was_error = TRUE; $this->_retMsg('File $1 was not uploadet.', $mask[$key]['label']);} break; case 4: if ($mask[$key]['required']) {$was_error = TRUE; $this->_retMsg('File $1 was not uploadet.', $mask[$key]['label']);} break;
} }
} }
@ -640,7 +640,7 @@ class uiHandler extends uiBase {
if (strlen($formdata[$val['element']])) if (strlen($formdata[$val['element']]))
$this->gb->saveGroupPref($this->sessid, 'StationPrefs', $val['element'], $formdata[$val['element']]); $this->gb->saveGroupPref($this->sessid, 'StationPrefs', $val['element'], $formdata[$val['element']]);
else else
$this->gb->delGroupPref($this->sessid, 'StationPrefs', $val['element']); $this->gb->delGroupPref($this->sessid, 'StationPrefs', $val['element']);
#$this->STATIONPREFS[$val['element']] = is_string($this->gb->loadGroupPref(NULL, 'StationPrefs', $val['element'])) ? $this->gb->loadGroupPref($this->sessid, 'StationPrefs', $val['element']) : NULL; #$this->STATIONPREFS[$val['element']] = is_string($this->gb->loadGroupPref(NULL, 'StationPrefs', $val['element'])) ? $this->gb->loadGroupPref($this->sessid, 'StationPrefs', $val['element']) : NULL;
} }
if ($val['type'] == 'file' && $formdata[$val['element']]['name']) { if ($val['type'] == 'file' && $formdata[$val['element']]['name']) {
@ -650,7 +650,7 @@ class uiHandler extends uiBase {
} }
} }
$this->loadStationPrefs($mask, TRUE); $this->loadStationPrefs($mask, TRUE);
$this->_retMsg('Settings saved'); if (UI_VERBOSE) $this->_retMsg('Settings saved');
return TRUE; return TRUE;
} }
} }

4
livesupport/modules/htmlUI/var/ui_playlist.class.php
View file

@ -6,7 +6,7 @@ class uiPlaylist
$this->Base =& $uiBase; $this->Base =& $uiBase;
$this->activeId =& $_SESSION[UI_PLAYLIST_SESSNAME]['activeId']; $this->activeId =& $_SESSION[UI_PLAYLIST_SESSNAME]['activeId'];
$this->token =& $_SESSION[UI_PLAYLIST_SESSNAME]['token']; $this->token =& $_SESSION[UI_PLAYLIST_SESSNAME]['token'];
$this->reloadUrl = UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close'; $this->reloadUrl = UI_BROWSER.'?popup[]=_reload_parent&popup[]=_close';
$this->redirectUrl = UI_BROWSER.'?popup[]=_2PL.simpleManagement&popup[]=_close'; $this->redirectUrl = UI_BROWSER.'?popup[]=_2PL.simpleManagement&popup[]=_close';
} }
@ -431,7 +431,7 @@ class uiPlaylist
$id = $this->activeId; $id = $this->activeId;
$this->release(FALSE); $this->release(FALSE);
if ($this->Base->delete($id)) if ($this->Base->delete($id))
return TRUE; return $id;
$this->Base->_retMsg('Cannot delete this Playlist'); $this->Base->_retMsg('Cannot delete this Playlist');
return FALSE; return FALSE;
} }

17
livesupport/modules/htmlUI/var/ui_scheduler.class.php
View file

@ -393,7 +393,7 @@ class uiScheduler extends uiCalendar
function initXmlRpc() function initXmlRpc()
{ {
include_once dirname(__FILE__).'/SchedulerPhpClient.class.php'; include_once dirname(__FILE__).'/SchedulerPhpClient.class.php';
$this->spc =& SchedulerPhpClient::factory($this->Base->dbc, $mdefs, $this->Base->config); $this->spc =& SchedulerPhpClient::factory($this->Base->dbc, $mdefs, $this->Base->config, FALSE, FALSE);
} }
@ -406,7 +406,7 @@ class uiScheduler extends uiCalendar
$datetime = $formdata['date']['Y'].sprintf('%02d', $formdata['date']['m']).sprintf('%02d', $formdata['date']['d']).'T'.sprintf('%02d', $formdata['time']['H']).':'.sprintf('%02d', $formdata['time']['i']).':'.sprintf('%02d', $formdata['time']['s']); $datetime = $formdata['date']['Y'].sprintf('%02d', $formdata['date']['m']).sprintf('%02d', $formdata['date']['d']).'T'.sprintf('%02d', $formdata['time']['H']).':'.sprintf('%02d', $formdata['time']['i']).':'.sprintf('%02d', $formdata['time']['s']);
#echo "Schedule Gunid: $gunid At: ".$datetime; #echo "Schedule Gunid: $gunid At: ".$datetime;
$r = $this->spc->UploadPlaylistMethod($this->Base->sessid, $gunid, $datetime.UI_TIMEZONE); $r = $this->spc->UploadPlaylistMethod($this->Base->sessid, $gunid, $datetime);
#print_r($r); #print_r($r);
if ($this->_isError($r)) if ($this->_isError($r))
return FALSE; return FALSE;
@ -428,23 +428,12 @@ class uiScheduler extends uiCalendar
function displayScheduleMethod($from, $to) function displayScheduleMethod($from, $to)
{ { return;
#echo $from.$to; #echo $from.$to;
$r = $this->spc->displayScheduleMethod($this->Base->sessid, $from, $to); $r = $this->spc->displayScheduleMethod($this->Base->sessid, $from, $to);
if ($this->_isError($r)) if ($this->_isError($r))
return FALSE; return FALSE;
return $r; return $r;
} }
function GeneratePlayReportMethod($from, $to)
{
#echo $from.$to;
$r = $this->spc->GeneratePlayReportMethod($this->Base->sessid, $from, $to);
if ($this->_isError($r))
return FALSE;
#print_r($r);
return $r;
}
} }
?> ?>

2
livesupport/modules/htmlUI/var/ui_scratchpad.class.php
View file

@ -101,7 +101,7 @@ class uiScratchPad
foreach ($ids as $id) { foreach ($ids as $id) {
$sp =& $this->get(); $sp =& $this->get();
foreach ($sp as $key=>$val) { foreach ($sp as $key=>$val) {
if ($val['id'] == $id) { if ($val['id'] === $id) {
unset ($sp[$key]); unset ($sp[$key]);
#$this->Base->decAccessCounter($id); #$this->Base->decAccessCounter($id);
} }