gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 07:04:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-10-06 15:27:52 +02:00
commit 1541fc26ec
43 changed files with 74 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SeedDMS_Core/Core/inc.ClassAttribute.php
View File

@ -597,7 +597,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
*/
function getValueSetAsArray() { /* {{{ */
if(strlen($this->_valueset) > 1)
return explode($this->_valueset[0], substr($this->_valueset, 1));
return array_map('trim', explode($this->_valueset[0], substr($this->_valueset, 1)));
else
return array();
} /* }}} */
@ -613,7 +613,7 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
if(strlen($this->_valueset) > 1) {
$tmp = explode($this->_valueset[0], substr($this->_valueset, 1));
if(isset($tmp[$ind]))
return $tmp[$ind];
return trim($tmp[$ind]);
else
return false;
} else

2
inc/inc.ClassLdapAuthentication.php
View File

@ -140,7 +140,7 @@ class SeedDMS_LdapAuthentication extends SeedDMS_Authentication {
if (!is_bool($search)) {
$info = ldap_get_entries($ds, $search);
if (!is_bool($info) && $info["count"]==1 && $info[0]["count"]>0) {
$user = $dms->addUser($username, null, $info[0]['cn'][0], $info[0]['mail'][0], $settings->_language, $settings->_theme, "", 1);
$user = $dms->addUser($username, null, $info[0]['cn'][0], $info[0]['mail'][0], $settings->_language, $settings->_theme, "", 0);
}
}
}

2
op/op.AddDocument.php
View File

@ -29,7 +29,7 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.Authentication.php");
include("../inc/inc.ClassUI.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('adddocument')) {
UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.AddSubFolder.php
View File

@ -29,7 +29,7 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('addsubfolder')) {
UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.AddTransitionToWorkflow.php
View File

@ -32,7 +32,7 @@ if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('addtransitiontoworkflow')) {
UI::exitError(getMLText("workflow_title"),getMLText("invalid_request_token"));
}

7
op/op.Ajax.php
View File

@ -257,6 +257,7 @@ switch($command) {
if($mfolder->setParent($folder)) {
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>getMLText('splash_move_folder'), 'data'=>''));
add_log_line();
} else {
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'Error moving folder', 'data'=>''));
@ -295,6 +296,7 @@ switch($command) {
if($mdocument->setFolder($folder)) {
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>getMLText('splash_move_document'), 'data'=>''));
add_log_line();
} else {
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'Error moving document', 'data'=>''));
@ -349,6 +351,7 @@ switch($command) {
}
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
add_log_line();
} else {
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'Error removing folder', 'data'=>''));
@ -413,6 +416,7 @@ switch($command) {
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
add_log_line();
} else {
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'Error removing document', 'data'=>''));
@ -455,6 +459,7 @@ switch($command) {
} else {
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_locked'), 'data'=>''));
add_log_line();
}
}
} else {
@ -720,6 +725,7 @@ switch($command) {
}
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_added'), 'data'=>$document->getID()));
add_log_line();
} else {
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
@ -728,5 +734,4 @@ switch($command) {
break; /* }}} */
}
add_log_line();
?>

2
op/op.ApproveDocument.php
View File

@ -30,7 +30,7 @@ include("../inc/inc.ClassAccessOperation.php");
include("../inc/inc.Authentication.php");
include("../inc/inc.ClassUI.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('approvedocument')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

6
op/op.AttributeMgr.php
View File

@ -36,7 +36,7 @@ else $action=NULL;
// add new attribute definition ---------------------------------------------
if ($action == "addattrdef") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('addattrdef')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -83,7 +83,7 @@ if ($action == "addattrdef") {
// delete attribute definition -----------------------------------------------
else if ($action == "removeattrdef") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removeattrdef')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -110,7 +110,7 @@ else if ($action == "removeattrdef") {
// edit attribute definition -----------------------------------------------
else if ($action == "editattrdef") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('editattrdef')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}

6
op/op.Categories.php
View File

@ -36,7 +36,7 @@ else $action=NULL;
//Neue Kategorie anlegen -----------------------------------------------------------------------------
if ($action == "addcategory") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('addcategory')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -58,7 +58,7 @@ if ($action == "addcategory") {
//Kategorie löschen ----------------------------------------------------------------------------------
else if ($action == "removecategory") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removecategory')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -81,7 +81,7 @@ else if ($action == "removecategory") {
//Kategorie bearbeiten: Neuer Name --------------------------------------------------------------------
else if ($action == "editcategory") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('editcategory')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}

2
op/op.ClearCache.php
View File

@ -25,7 +25,7 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('clearcache')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}

12
op/op.DefaultKeywords.php
View File

@ -36,7 +36,7 @@ else $action=NULL;
// Create new keyword category ------------------------------------------
if ($action == "addcategory") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('addcategory')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -58,7 +58,7 @@ if ($action == "addcategory") {
// Delete keyword categorie ---------------------------------------------
else if ($action == "removecategory") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removecategory')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -85,7 +85,7 @@ else if ($action == "removecategory") {
// Modify keyword categorie: new name -----------------------------------
else if ($action == "editcategory") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('editcategory')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -113,7 +113,7 @@ else if ($action == "editcategory") {
// Modify keyword categorie: new list of keywords -----------------------
else if ($action == "newkeywords") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('newkeywords')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -136,7 +136,7 @@ else if ($action == "newkeywords") {
// Modify keyword categorie: modify list of keywords -------------------
else if ($action == "editkeywords")
{
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('editkeywords')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -170,7 +170,7 @@ else if ($action == "editkeywords")
// Modify keyword categorie: delete list of keywords --------------------
else if ($action == "removekeywords") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removekeywords')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}

2
op/op.DocumentAccess.php
View File

@ -45,7 +45,7 @@ if ($document->getAccessMode($user) < M_ALL) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied"));
}
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
/* FIXME: Currently GET request are allowed. */
if(!checkFormKey('documentaccess', 'GET')) {
UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("invalid_request_token"));

2
op/op.EditAttributes.php
View File

@ -29,7 +29,7 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('editattributes')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.EditComment.php
View File

@ -29,7 +29,7 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('editcomment')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.EditEvent.php
View File

@ -34,7 +34,7 @@ if ($user->isGuest()) {
UI::exitError(getMLText("edit_event"),getMLText("access_denied"));
}
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('editevent')) {
UI::exitError(getMLText("edit_event"),getMLText("invalid_request_token"));
}

2
op/op.FolderAccess.php
View File

@ -45,7 +45,7 @@ if ($folder->getAccessMode($user) < M_ALL) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("access_denied"));
}
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
/* FIXME: Currently GET request are allowed. */
if(!checkFormKey('folderaccess', 'GET')) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("invalid_request_token"));

12
op/op.GroupMgr.php
View File

@ -38,7 +38,7 @@ else $action = null;
// Create new group --------------------------------------------------------
if ($action == "addgroup") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('addgroup')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -65,7 +65,7 @@ if ($action == "addgroup") {
// Delete group -------------------------------------------------------------
else if ($action == "removegroup") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removegroup')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -93,7 +93,7 @@ else if ($action == "removegroup") {
// Modifiy group ------------------------------------------------------------
else if ($action == "editgroup") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('editgroup')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -125,7 +125,7 @@ else if ($action == "editgroup") {
// Add user to group --------------------------------------------------------
else if ($action == "addmember") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('addmember')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -163,7 +163,7 @@ else if ($action == "addmember") {
// Remove user from group --------------------------------------------------
else if ($action == "rmmember") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('rmmember')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -198,7 +198,7 @@ else if ($action == "rmmember") {
// toggle manager flag
else if ($action == "tmanager") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('tmanager')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}

2
op/op.RemoveArchive.php
View File

@ -30,7 +30,7 @@ if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removearchive')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}

2
op/op.RemoveDocument.php
View File

@ -31,7 +31,7 @@ include("../inc/inc.Authentication.php");
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$controller = Controller::factory($tmp[1]);
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removedocument')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.RemoveDocumentFile.php
View File

@ -26,7 +26,7 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removedocumentfile')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.RemoveDocumentLink.php
View File

@ -26,7 +26,7 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removedocumentlink')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.RemoveDump.php
View File

@ -30,7 +30,7 @@ if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removedump')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}

2
op/op.RemoveEvent.php
View File

@ -30,7 +30,7 @@ include("../inc/inc.ClassUI.php");
include("../inc/inc.Calendar.php");
include("../inc/inc.Authentication.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removeevent')) {
UI::exitError(getMLText("edit_event"),getMLText("invalid_request_token"));
}

2
op/op.RemoveFolder.php
View File

@ -31,7 +31,7 @@ include("../inc/inc.Authentication.php");
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$controller = Controller::factory($tmp[1]);
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removefolder')) {
UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.RemoveFolderFiles.php
View File

@ -30,7 +30,7 @@ if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removefolderfiles')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}

2
op/op.RemoveLog.php
View File

@ -26,7 +26,7 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removelog')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}

2
op/op.RemoveTransitionFromWorkflow.php
View File

@ -31,7 +31,7 @@ if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removetransitionfromworkflow')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.RemoveVersion.php
View File

@ -27,7 +27,7 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removeversion')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.RemoveWorkflow.php
View File

@ -31,7 +31,7 @@ if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removeworkflow')) {
UI::exitError(getMLText("workflow_editor"), getMLText("invalid_request_token"));
}

2
op/op.RemoveWorkflowAction.php
View File

@ -31,7 +31,7 @@ if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removeworkflowaction')) {
UI::exitError(getMLText("workflow_editor"), getMLText("invalid_request_token"));
}

2
op/op.RemoveWorkflowFromDocument.php
View File

@ -31,7 +31,7 @@ if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removeworkflowfromdocument')) {
UI::exitError(getMLText("workflow_editor"), getMLText("invalid_request_token"));
}

2
op/op.RemoveWorkflowState.php
View File

@ -31,7 +31,7 @@ if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removeworkflowstate')) {
UI::exitError(getMLText("workflow_editor"), getMLText("invalid_request_token"));
}

2
op/op.ReturnFromSubWorkflow.php
View File

@ -27,7 +27,7 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('returnfromsubworkflow')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.ReviewDocument.php
View File

@ -30,7 +30,7 @@ include("../inc/inc.ClassAccessOperation.php");
include("../inc/inc.Authentication.php");
include("../inc/inc.ClassUI.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('reviewdocument')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.RewindWorkflow.php
View File

@ -31,7 +31,7 @@ if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('rewindworkflow')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.RunSubWorkflow.php
View File

@ -27,7 +27,7 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('runsubworkflow')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.SetWorkflow.php
View File

@ -28,7 +28,7 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('setworkflow')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

2
op/op.TriggerWorkflow.php
View File

@ -27,7 +27,7 @@ include("../inc/inc.DBInit.php");
include("../inc/inc.ClassUI.php");
include("../inc/inc.Authentication.php");
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('triggerworkflow')) {
UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_request_token"))),getMLText("invalid_request_token"));
}

6
op/op.UsrMgr.php
View File

@ -40,7 +40,7 @@ else $action=NULL;
// add new user ---------------------------------------------------------
if ($action == "adduser") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('adduser')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -134,7 +134,7 @@ if ($action == "adduser") {
// delete user ------------------------------------------------------------
else if ($action == "removeuser") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removeuser')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -177,7 +177,7 @@ else if ($action == "removeuser") {
// modify user ------------------------------------------------------------
else if ($action == "edituser") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('edituser')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}

6
op/op.WorkflowActionsMgr.php
View File

@ -40,7 +40,7 @@ else $action=NULL;
// add new workflow ---------------------------------------------------------
if ($action == "addworkflowaction") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('addworkflowaction')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -63,7 +63,7 @@ if ($action == "addworkflowaction") {
// delete user ------------------------------------------------------------
else if ($action == "removeworkflowaction") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removeworkflowaction')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -93,7 +93,7 @@ else if ($action == "removeworkflowaction") {
// modify workflow ---------------------------------------------------------
else if ($action == "editworkflowaction") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('editworkflowaction')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}

6
op/op.WorkflowMgr.php
View File

@ -40,7 +40,7 @@ else $action=NULL;
// add new workflow ---------------------------------------------------------
if ($action == "addworkflow") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('addworkflow')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -73,7 +73,7 @@ if ($action == "addworkflow") {
// delete workflow --------------------------------------------------------
else if ($action == "removeworkflow") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removeworkflow')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -103,7 +103,7 @@ else if ($action == "removeworkflow") {
// modify workflow ---------------------------------------------------------
else if ($action == "editworkflow") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('editworkflow')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}

6
op/op.WorkflowStatesMgr.php
View File

@ -40,7 +40,7 @@ else $action=NULL;
// add new workflow ---------------------------------------------------------
if ($action == "addworkflowstate") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('addworkflowstate')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -64,7 +64,7 @@ if ($action == "addworkflowstate") {
// delete user ------------------------------------------------------------
else if ($action == "removeworkflowstate") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('removeworkflowstate')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}
@ -94,7 +94,7 @@ else if ($action == "removeworkflowstate") {
// modify workflow ---------------------------------------------------------
else if ($action == "editworkflowstate") {
/* Check if the form data comes for a trusted request */
/* Check if the form data comes from a trusted request */
if(!checkFormKey('editworkflowstate')) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_request_token"));
}

4
views/bootstrap/class.AttributeMgr.php
View File

@ -221,7 +221,11 @@ $(document).ready( function() {
<?php printMLText("attrdef_valueset");?>:
</td>
<td>
<?php if($attrdef && strlen($attrdef->getValueSet()) > 30) { ?>
<textarea name="valueset" rows="5"><?php echo $attrdef ? $attrdef->getValueSet() : '' ?></textarea>
<?php } else { ?>
<input type="text" value="<?php echo $attrdef ? $attrdef->getValueSet() : '' ?>" name="valueset" />
<?php } ?>
</td>
</tr>
<tr>