diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php
index e16272511..3ad83bd91 100644
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@@ -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
diff --git a/inc/inc.ClassLdapAuthentication.php b/inc/inc.ClassLdapAuthentication.php
index 7f876dc37..93d5d6169 100644
--- a/inc/inc.ClassLdapAuthentication.php
+++ b/inc/inc.ClassLdapAuthentication.php
@@ -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);
}
}
}
diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index ad6fa0e2a..7068a184a 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -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"));
}
diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php
index de8649541..4ebd2fe9e 100644
--- a/op/op.AddSubFolder.php
+++ b/op/op.AddSubFolder.php
@@ -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"));
}
diff --git a/op/op.AddTransitionToWorkflow.php b/op/op.AddTransitionToWorkflow.php
index a861a5ad9..f9789a533 100644
--- a/op/op.AddTransitionToWorkflow.php
+++ b/op/op.AddTransitionToWorkflow.php
@@ -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"));
}
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 56ac7e1fb..8a4dc10da 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -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();
?>
diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php
index 29d4782e9..1dc7ce09a 100644
--- a/op/op.ApproveDocument.php
+++ b/op/op.ApproveDocument.php
@@ -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"));
}
diff --git a/op/op.AttributeMgr.php b/op/op.AttributeMgr.php
index 253be177b..2da77ac30 100644
--- a/op/op.AttributeMgr.php
+++ b/op/op.AttributeMgr.php
@@ -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"));
}
diff --git a/op/op.Categories.php b/op/op.Categories.php
index e45e833d6..794ffacb3 100644
--- a/op/op.Categories.php
+++ b/op/op.Categories.php
@@ -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"));
}
diff --git a/op/op.ClearCache.php b/op/op.ClearCache.php
index a68e302fe..78c5b785a 100644
--- a/op/op.ClearCache.php
+++ b/op/op.ClearCache.php
@@ -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"));
}
diff --git a/op/op.DefaultKeywords.php b/op/op.DefaultKeywords.php
index c042e208e..e5370082b 100644
--- a/op/op.DefaultKeywords.php
+++ b/op/op.DefaultKeywords.php
@@ -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"));
}
diff --git a/op/op.DocumentAccess.php b/op/op.DocumentAccess.php
index 3a99619dc..13029104b 100644
--- a/op/op.DocumentAccess.php
+++ b/op/op.DocumentAccess.php
@@ -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"));
diff --git a/op/op.EditAttributes.php b/op/op.EditAttributes.php
index ce5f0fbb8..f54706bf4 100644
--- a/op/op.EditAttributes.php
+++ b/op/op.EditAttributes.php
@@ -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"));
}
diff --git a/op/op.EditComment.php b/op/op.EditComment.php
index 43caa0a75..1444cf63e 100644
--- a/op/op.EditComment.php
+++ b/op/op.EditComment.php
@@ -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"));
}
diff --git a/op/op.EditEvent.php b/op/op.EditEvent.php
index 0b68d39b4..3fdf9396c 100644
--- a/op/op.EditEvent.php
+++ b/op/op.EditEvent.php
@@ -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"));
}
diff --git a/op/op.FolderAccess.php b/op/op.FolderAccess.php
index 9ba63c42c..cff716a57 100644
--- a/op/op.FolderAccess.php
+++ b/op/op.FolderAccess.php
@@ -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"));
diff --git a/op/op.GroupMgr.php b/op/op.GroupMgr.php
index f3186c4c1..fa7f34deb 100644
--- a/op/op.GroupMgr.php
+++ b/op/op.GroupMgr.php
@@ -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"));
}
diff --git a/op/op.RemoveArchive.php b/op/op.RemoveArchive.php
index 79611976b..c2d14e20f 100644
--- a/op/op.RemoveArchive.php
+++ b/op/op.RemoveArchive.php
@@ -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"));
}
diff --git a/op/op.RemoveDocument.php b/op/op.RemoveDocument.php
index 4d3f48fb1..17812e596 100644
--- a/op/op.RemoveDocument.php
+++ b/op/op.RemoveDocument.php
@@ -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"));
}
diff --git a/op/op.RemoveDocumentFile.php b/op/op.RemoveDocumentFile.php
index d10c984e7..c2126e3a8 100644
--- a/op/op.RemoveDocumentFile.php
+++ b/op/op.RemoveDocumentFile.php
@@ -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"));
}
diff --git a/op/op.RemoveDocumentLink.php b/op/op.RemoveDocumentLink.php
index c77493b48..d89c41bb2 100644
--- a/op/op.RemoveDocumentLink.php
+++ b/op/op.RemoveDocumentLink.php
@@ -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"));
}
diff --git a/op/op.RemoveDump.php b/op/op.RemoveDump.php
index d4facbe59..c5ae666a3 100644
--- a/op/op.RemoveDump.php
+++ b/op/op.RemoveDump.php
@@ -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"));
}
diff --git a/op/op.RemoveEvent.php b/op/op.RemoveEvent.php
index 5697fa92d..395686d89 100644
--- a/op/op.RemoveEvent.php
+++ b/op/op.RemoveEvent.php
@@ -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"));
}
diff --git a/op/op.RemoveFolder.php b/op/op.RemoveFolder.php
index f10576046..2d39d005a 100644
--- a/op/op.RemoveFolder.php
+++ b/op/op.RemoveFolder.php
@@ -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"));
}
diff --git a/op/op.RemoveFolderFiles.php b/op/op.RemoveFolderFiles.php
index d1413f404..dd060c70f 100644
--- a/op/op.RemoveFolderFiles.php
+++ b/op/op.RemoveFolderFiles.php
@@ -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"));
}
diff --git a/op/op.RemoveLog.php b/op/op.RemoveLog.php
index f61ccf788..7836514c7 100644
--- a/op/op.RemoveLog.php
+++ b/op/op.RemoveLog.php
@@ -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"));
}
diff --git a/op/op.RemoveTransitionFromWorkflow.php b/op/op.RemoveTransitionFromWorkflow.php
index d533ad784..093ce03b6 100644
--- a/op/op.RemoveTransitionFromWorkflow.php
+++ b/op/op.RemoveTransitionFromWorkflow.php
@@ -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"));
}
diff --git a/op/op.RemoveVersion.php b/op/op.RemoveVersion.php
index 07e08c224..b528ec273 100644
--- a/op/op.RemoveVersion.php
+++ b/op/op.RemoveVersion.php
@@ -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"));
}
diff --git a/op/op.RemoveWorkflow.php b/op/op.RemoveWorkflow.php
index 2c961a79b..37865ddb0 100644
--- a/op/op.RemoveWorkflow.php
+++ b/op/op.RemoveWorkflow.php
@@ -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"));
}
diff --git a/op/op.RemoveWorkflowAction.php b/op/op.RemoveWorkflowAction.php
index 8934c403b..7fbf709c0 100644
--- a/op/op.RemoveWorkflowAction.php
+++ b/op/op.RemoveWorkflowAction.php
@@ -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"));
}
diff --git a/op/op.RemoveWorkflowFromDocument.php b/op/op.RemoveWorkflowFromDocument.php
index d3c2d027d..c42153f67 100644
--- a/op/op.RemoveWorkflowFromDocument.php
+++ b/op/op.RemoveWorkflowFromDocument.php
@@ -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"));
}
diff --git a/op/op.RemoveWorkflowState.php b/op/op.RemoveWorkflowState.php
index 3298dde03..3b82bff63 100644
--- a/op/op.RemoveWorkflowState.php
+++ b/op/op.RemoveWorkflowState.php
@@ -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"));
}
diff --git a/op/op.ReturnFromSubWorkflow.php b/op/op.ReturnFromSubWorkflow.php
index 59dc7160b..4d5837ba2 100644
--- a/op/op.ReturnFromSubWorkflow.php
+++ b/op/op.ReturnFromSubWorkflow.php
@@ -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"));
}
diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php
index 4d7da8b27..3f5f30655 100644
--- a/op/op.ReviewDocument.php
+++ b/op/op.ReviewDocument.php
@@ -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"));
}
diff --git a/op/op.RewindWorkflow.php b/op/op.RewindWorkflow.php
index 6cbdd22ff..08b2a58c2 100644
--- a/op/op.RewindWorkflow.php
+++ b/op/op.RewindWorkflow.php
@@ -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"));
}
diff --git a/op/op.RunSubWorkflow.php b/op/op.RunSubWorkflow.php
index 7a25ecc80..9a968efcf 100644
--- a/op/op.RunSubWorkflow.php
+++ b/op/op.RunSubWorkflow.php
@@ -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"));
}
diff --git a/op/op.SetWorkflow.php b/op/op.SetWorkflow.php
index 0a5e09c42..f7219e577 100644
--- a/op/op.SetWorkflow.php
+++ b/op/op.SetWorkflow.php
@@ -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"));
}
diff --git a/op/op.TriggerWorkflow.php b/op/op.TriggerWorkflow.php
index f8b4f9725..c7bc30ae7 100644
--- a/op/op.TriggerWorkflow.php
+++ b/op/op.TriggerWorkflow.php
@@ -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"));
}
diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index 80c22fe3a..48584f6b5 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -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"));
}
diff --git a/op/op.WorkflowActionsMgr.php b/op/op.WorkflowActionsMgr.php
index f683468e9..fb91f0029 100644
--- a/op/op.WorkflowActionsMgr.php
+++ b/op/op.WorkflowActionsMgr.php
@@ -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"));
}
diff --git a/op/op.WorkflowMgr.php b/op/op.WorkflowMgr.php
index c7a239a6c..c238f4455 100644
--- a/op/op.WorkflowMgr.php
+++ b/op/op.WorkflowMgr.php
@@ -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"));
}
diff --git a/op/op.WorkflowStatesMgr.php b/op/op.WorkflowStatesMgr.php
index 1b3464a76..4b7db435f 100644
--- a/op/op.WorkflowStatesMgr.php
+++ b/op/op.WorkflowStatesMgr.php
@@ -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"));
}
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 37973b7c7..9f165db54 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -221,7 +221,11 @@ $(document).ready( function() {
: