gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

return better error msg if regex is invalid

Browse Source
This commit is contained in:
Uwe Steinmann 2021-09-16 17:11:42 +02:00
parent 56a352caca
commit 4ad5628833
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controllers/class.AttributeMgr.php
View File

@ -78,6 +78,7 @@ class SeedDMS_Controller_AttributeMgr extends SeedDMS_Controller_Common {
return false; return false;
} }
if (!$attrdef->setRegex($regex)) { if (!$attrdef->setRegex($regex)) {
$this->errormsg = 'attrdef_invalid_regex';
return false; return false;
} }

6
op/op.AttributeMgr.php
View File

@ -163,7 +163,11 @@ else if ($action == "editattrdef") {
$controller->setParam('regex', $regex); $controller->setParam('regex', $regex);
$controller->setParam('attrdef', $attrdef); $controller->setParam('attrdef', $attrdef);
if (!$controller($_POST)) { if (!$controller($_POST)) {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); if ($controller->getErrorMsg() != '')
$errormsg = $controller->getErrorMsg();
else
$errormsg = "error_occured";
UI::exitError(getMLText("admin_tools"),getMLText($errormsg));
} }
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_attribute'))); $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_attribute')));