gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 08:55:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some code cleanups

Browse Source
This commit is contained in:
Uwe Steinmann 2023-04-06 14:30:46 +02:00
parent f63f7847f0
commit 00f7a0ee35
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
views/bootstrap/class.SchedulerTaskMgr.php
View File

@ -250,8 +250,8 @@ $(document).ready( function() {
array(
'element'=>'select',
'class'=>'chzn-select',
'name'=>'params['.$param['name'].']',
'multiple'=>false,
'name'=>'params['.$param['name'].']'.(!empty($param['multiple']) ? '[]' : ''),
'multiple'=>isset($param['multiple']) ? $param['multiple'] : false,
'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
'options'=>$param['options'],
),
@ -282,6 +282,9 @@ $(document).ready( function() {
'multiple'=>isset($param['multiple']) ? $param['multiple'] : false,
'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
'options'=>$options
),
array(
'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
)
);
break;
@ -327,7 +330,9 @@ $(document).ready( function() {
return;
}
$taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$task->getExtension()][$task->getTask()];
$extname = $task->getExtension();
$taskname = $task->getTask();
$taskobj = $GLOBALS['SEEDDMS_SCHEDULER']['tasks'][$extname][$taskname];
$taskobj = resolveTask($taskobj);
if(!is_object($taskobj)) {
$this->errorMsg(getMLText('task_class_not_callable'));
@ -338,12 +343,12 @@ $(document).ready( function() {
<?= createHiddenFieldWithKey('edittask') ?>
<input type="hidden" name="action" value="edittask">
<input type="hidden" name="taskid" value="<?= $taskid ?>">
<input type="hidden" name="extension" value="<?= $task->getExtension() ?>">
<input type="hidden" name="task" value="<?= $task->getTask() ?>">
<input type="hidden" name="extension" value="<?= $extname ?>">
<input type="hidden" name="task" value="<?= $taskname ?>">
<?php
$this->formField(
getMLText('scheduler_class'),
$task->getExtension()
$extname
);
$this->formField(
getMLText('task_name'),
@ -395,7 +400,7 @@ $(document).ready( function() {
switch($param['type']) {
case 'boolean':
$this->formField(
getMLText("task_".$task->getExtension()."_".$task->getTask()."_".$param['name']),
getMLText("task_".$extname."_".$taskname."_".$param['name']),
array(
'element'=>'input',
'type'=>'checkbox',
@ -405,13 +410,13 @@ $(document).ready( function() {
'checked'=>$task->getParameter($param['name']) == 1,
),
array(
'help'=>$param['description']
'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
)
);
break;
case 'password':
$this->formField(
getMLText("task_".$task->getExtension()."_".$task->getTask()."_".$param['name']),
getMLText("task_".$extname."_".$taskname."_".$param['name']),
array(
'element'=>'input',
'type'=>'password',
@ -421,7 +426,7 @@ $(document).ready( function() {
'required'=>false
),
array(
'help'=>$param['description']
'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
)
);
break;
@ -431,11 +436,11 @@ $(document).ready( function() {
else
$vals = [$task->getParameter()[$param['name']]];
foreach($param['options'] as &$opt) {
if(in_array($opt[0], $vals))
if($opt[0] && in_array($opt[0], $vals))
$opt[2] = true;
}
$this->formField(
getMLText('task_'.$task->getExtension()."_".$task->getTask()."_".$param['name']),
getMLText('task_'.$extname."_".$taskname."_".$param['name']),
array(
'element'=>'select',
'class'=>'chzn-select',
@ -445,15 +450,15 @@ $(document).ready( function() {
'options'=>$param['options'],
),
array(
'help'=>$param['description']
'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
)
);
break;
case "folder":
$folderid = $task->getParameter()[$param['name']];
$this->formField(
getMLText('task_'.$task->getExtension()."_".$task->getTask()."_".$param['name']),
$this->getFolderChooserHtml("form".$task->getExtension().$taskid, M_READ, -1, $folderid ? $dms->getFolder($folderid) : 0, 'params['.$param['name']."]")
getMLText('task_'.$extname."_".$taskname."_".$param['name']),
$this->getFolderChooserHtml("form".$extname.$taskid, M_READ, -1, $folderid ? $dms->getFolder($folderid) : 0, 'params['.$param['name']."]")
);
break;
case "users":
@ -468,7 +473,7 @@ $(document).ready( function() {
$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin().' - '.$currUser->getFullName()), in_array($currUser->getID(), $userids), array(array('data-subtitle', htmlspecialchars($currUser->getEmail()))));
}
$this->formField(
getMLText('task_'.$task->getExtension()."_".$task->getTask()."_".$param['name']),
getMLText('task_'.$extname."_".$taskname."_".$param['name']),
array(
'element'=>'select',
'class'=>'chzn-select',
@ -476,12 +481,15 @@ $(document).ready( function() {
'multiple'=>isset($param['multiple']) ? $param['multiple'] : false,
'attributes'=>array(array('data-placeholder', getMLText('select_value'), array('data-no_results_text', getMLText('unknown_value')))),
'options'=>$options
),
array(
'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
)
);
break;
default:
$this->formField(
getMLText("task_".$task->getExtension()."_".$task->getTask()."_".$param['name']),
getMLText("task_".$extname."_".$taskname."_".$param['name']),
array(
'element'=>'input',
'type'=>(($param['type'] == 'integer') ? 'number' : 'text'),
@ -491,7 +499,7 @@ $(document).ready( function() {
'required'=>false
),
array(
'help'=>$param['description']
'help'=>isset($param['description']) ? $param['description'] : getMLText("task_".$extname."_".$taskname."_".$param['name']."_desc")
)
);
break;