gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 21:51:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2024-11-13 22:35:07 +01:00
commit 27110c06a9
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
out/out.Tasks.php
View File

@ -40,6 +40,7 @@ if($view) {
$view->setParam('previewWidthList', $settings->_previewWidthList); $view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('timeout', $settings->_cmdTimeout); $view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('xsendfile', $settings->_enableXsendfile); $view->setParam('xsendfile', $settings->_enableXsendfile);
$view->setParam('tasksinmenu', []);
$view($_GET); $view($_GET);
exit; exit;
} }

14
restapi/index.php
View File

@ -805,7 +805,7 @@ class RestapiController { /* {{{ */
return $response->withJson(array('success'=>false, 'message'=>'Upload failed', 'data'=>''), 500); return $response->withJson(array('success'=>false, 'message'=>'Upload failed', 'data'=>''), 500);
} else { } else {
if($controller->hasHook('cleanUpDocument')) { if($controller->hasHook('cleanUpDocument')) {
$controller->callHook('cleanUpDocument', $document, $file); $controller->callHook('cleanUpDocument', $document, ['ѕource'=>'restapi', 'type'=>$userfiletype, 'name'=>$origfilename]);
} }
// Send notification to subscribers of folder. // Send notification to subscribers of folder.
if($notifier) { if($notifier) {
@ -977,7 +977,7 @@ class RestapiController { /* {{{ */
} else { } else {
unlink($temp); unlink($temp);
if($controller->hasHook('cleanUpDocument')) { if($controller->hasHook('cleanUpDocument')) {
$controller->callHook('cleanUpDocument', $document, $file_info); $controller->callHook('cleanUpDocument', $document, ['ѕource'=>'restapi', 'type'=>$userfiletype, 'name'=>$origfilename]);
} }
// Send notification to subscribers. // Send notification to subscribers.
if($notifier) { if($notifier) {
@ -2442,7 +2442,7 @@ class RestapiController { /* {{{ */
$params = $request->getParsedBody(); $params = $request->getParsedBody();
if (empty($params['userid'])) { if (empty($params['userid'])) {
return $response->withJson(array('success'=>false, 'message'=>'Missing userid', 'data'=>''), 500); return $response->withJson(array('success'=>false, 'message'=>'Missing userid', 'data'=>''), 400);
} }
$userId = $params['userid']; $userId = $params['userid'];
if(ctype_digit($userId)) if(ctype_digit($userId))
@ -2500,9 +2500,9 @@ class RestapiController { /* {{{ */
if($check !== true) if($check !== true)
return $check; return $check;
$params = $request->getParsedBody(); $params = $request->getParsedBody();
if (empty($params['enable'])) if (!isset($params['enable']))
{ {
return $response->withJson(array('success'=>false, 'message'=>'You must supply an "enable" value', 'data'=>''), 200); return $response->withJson(array('success'=>false, 'message'=>'You must supply an "enable" value', 'data'=>''), 400);
} }
$inherit = false; $inherit = false;
@ -2570,12 +2570,12 @@ class RestapiController { /* {{{ */
{ {
if ($params['id'] == null) if ($params['id'] == null)
{ {
return $response->withJson(array('success'=>false, 'message'=>'Please PUT the user or group Id', 'data'=>''), 200); return $response->withJson(array('success'=>false, 'message'=>'Please PUT the user or group Id', 'data'=>''), 400);
} }
if ($params['mode'] == null) if ($params['mode'] == null)
{ {
return $response->withJson(array('success'=>false, 'message'=>'Please PUT the access mode', 'data'=>''), 200); return $response->withJson(array('success'=>false, 'message'=>'Please PUT the access mode', 'data'=>''), 400);
} }
$modeInput = $params['mode']; $modeInput = $params['mode'];

2
views/bootstrap/class.Dashboard.php
View File

@ -156,7 +156,7 @@ class SeedDMS_View_Dashboard extends SeedDMS_Theme_Style {
$timeout = $this->params['timeout']; $timeout = $this->params['timeout'];
$xsendfile = $this->params['xsendfile']; $xsendfile = $this->params['xsendfile'];
$this->htmlStartPage(getMLText("calendar")); $this->htmlStartPage(getMLText("dashboard"));
$this->globalNavigation(); $this->globalNavigation();
$this->contentStart(); $this->contentStart();

2
views/bootstrap/class.Info.php
View File

@ -116,7 +116,7 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style {
$this->contentHeading(getMLText("missing_php_functions_and_classes")); $this->contentHeading(getMLText("missing_php_functions_and_classes"));
$missingfunc = []; $missingfunc = [];
foreach(array('proc_open', 'openssl_cipher_iv_length') as $funcname) { foreach(array('proc_open', 'openssl_cipher_iv_length', 'system') as $funcname) {
if(!function_exists($funcname)) { if(!function_exists($funcname)) {
$missingfunc[] = $funcname; //getMLText('func_'.$funcname."_missing") $missingfunc[] = $funcname; //getMLText('func_'.$funcname."_missing")
} }

2
views/bootstrap/class.Tasks.php
View File

@ -203,8 +203,6 @@ class SeedDMS_View_Tasks extends SeedDMS_Theme_Style {
function countTasks() { /* {{{ */ function countTasks() { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];
$user = $this->params['user']; $user = $this->params['user'];
$enablereceiptworkflow = $this->params['enablereceiptworkflow'];
$enablerevisionworkflow = $this->params['enablerevisionworkflow'];
$workflowmode = $this->params['workflowmode']; $workflowmode = $this->params['workflowmode'];
$tasksinmenu = $this->params['tasksinmenu']; $tasksinmenu = $this->params['tasksinmenu'];