fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-789

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2016-04-20 19:46:20 -04:00
parent f3aee9a00d
commit 4993fb2630
3 changed files with 73 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -6781,6 +6781,18 @@ msgstr "Departments"
msgid "Department Name" msgid "Department Name"
msgstr "Department Name" msgstr "Department Name"
# TRANSLATION
# LABEL/ID_DEPARTMENT_ERROR_CREATE
#: LABEL/ID_DEPARTMENT_ERROR_CREATE
msgid "Error creating department"
msgstr "Error creating department"
# TRANSLATION
# LABEL/ID_DEPARTMENT_CHECK_PARENT_DEPARTMENT
#: LABEL/ID_DEPARTMENT_CHECK_PARENT_DEPARTMENT
msgid "It's necessary to check the parent-department: {0} for the sub-department: {1}"
msgstr "It's necessary to check the parent-department: {0} for the sub-department: {1}"
# TRANSLATION # TRANSLATION
# LABEL/ID_CONFIRM_CANCEL_CASE # LABEL/ID_CONFIRM_CANCEL_CASE
#: LABEL/ID_CONFIRM_CANCEL_CASE #: LABEL/ID_CONFIRM_CANCEL_CASE

4
workflow/engine/data/mysql/insert.sql
View File

@@ -2566,6 +2566,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_EDIT_ROLE_TITLE','en','Edit Role','2014-01-15') , ( 'LABEL','ID_EDIT_ROLE_TITLE','en','Edit Role','2014-01-15') ,
( 'LABEL','ID_DEPARTMENTS','en','Departments','2014-01-15') , ( 'LABEL','ID_DEPARTMENTS','en','Departments','2014-01-15') ,
( 'LABEL','ID_DEPARTMENT_NAME','en','Department Name','2014-01-15') , ( 'LABEL','ID_DEPARTMENT_NAME','en','Department Name','2014-01-15') ,
( 'LABEL','ID_DEPARTMENT_ERROR_CREATE','en','Error creating department','2014-01-15') ,
( 'LABEL','ID_DEPARTMENT_CHECK_PARENT_DEPARTMENT','en','It''s necessary to check the parent-department: {0} for the sub-department: {1}','2014-01-15') ,
( 'LABEL','ID_CONFIRM_CANCEL_CASE','en','Are you sure you want to cancel this case?','2014-01-15') , ( 'LABEL','ID_CONFIRM_CANCEL_CASE','en','Are you sure you want to cancel this case?','2014-01-15') ,
( 'LABEL','ID_FIRSTNAME','en','First Name','2014-01-15') , ( 'LABEL','ID_FIRSTNAME','en','First Name','2014-01-15') ,
( 'LABEL','ID_LASTNAME','en','Last Name','2014-01-15') , ( 'LABEL','ID_LASTNAME','en','Last Name','2014-01-15') ,
@@ -4757,7 +4759,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_MAFE_b1f38dfe86f39ccbd8ab1d89b266fe25','en','- Select a starting task -','2016-03-30') , ( 'LABEL','ID_MAFE_b1f38dfe86f39ccbd8ab1d89b266fe25','en','- Select a starting task -','2016-03-30') ,
( 'LABEL','ID_MAFE_288aae25bc408055f50c21c991903a44','en','Asynchronous','2016-03-30') , ( 'LABEL','ID_MAFE_288aae25bc408055f50c21c991903a44','en','Asynchronous','2016-03-30') ,
( 'LABEL','ID_MAFE_2fe4167817733fec8e6ba1afddf78f1b','en','Synchronous','2016-03-30') , ( 'LABEL','ID_MAFE_2fe4167817733fec8e6ba1afddf78f1b','en','Synchronous','2016-03-30') ,
( 'LABEL','ID_MAFE_0f5ae6bbf3c2244f799acb687894378c','en','The value introduced doesn\''t have the correct format with a vallid prefix (@@, @#, @=)','2016-03-30') , ( 'LABEL','ID_MAFE_0f5ae6bbf3c2244f799acb687894378c','en','The value introduced doesn''t have the correct format with a vallid prefix (@@, @#, @=)','2016-03-30') ,
( 'LABEL','ID_MAFE_686e697538050e4664636337cc3b834f','en','Create','2016-03-30') , ( 'LABEL','ID_MAFE_686e697538050e4664636337cc3b834f','en','Create','2016-03-30') ,
( 'LABEL','ID_MAFE_7dce122004969d56ae2e0245cb754d35','en','Edit','2016-03-30') , ( 'LABEL','ID_MAFE_7dce122004969d56ae2e0245cb754d35','en','Edit','2016-03-30') ,
( 'LABEL','ID_MAFE_49ee3087348e8d44e1feda1917443987','en','Name','2016-03-30') , ( 'LABEL','ID_MAFE_49ee3087348e8d44e1feda1917443987','en','Name','2016-03-30') ,

128
workflow/engine/methods/authSources/authSourcesSynchronizeAjax.php
View File

@@ -57,99 +57,87 @@ try {
die($json->encode($nodes)); die($json->encode($nodes));
break; break;
case "saveDepartments": case "saveDepartments":
$depsToCheck = explode("|", $_REQUEST["departmentsDN"]); $depsToCheck = ($_REQUEST['departmentsDN'] != '')? explode('|', $_REQUEST['departmentsDN']) : [];
$depsToCheck = array_map("urldecode", $depsToCheck); $depsToCheck = array_map("urldecode", $depsToCheck);
$depsToUncheck = getDepartmentsToUncheck($depsToCheck); $depsToUncheck = getDepartmentsToUncheck($depsToCheck);
$RBAC =& RBAC::getSingleton(); $RBAC =& RBAC::getSingleton();
$authenticationSource = $RBAC->authSourcesObj->load($_REQUEST["authUid"]); $authenticationSource = $RBAC->authSourcesObj->load($_REQUEST["authUid"]);
$ldapAdvanced = getLDAPAdvanceInstance($_REQUEST["authUid"]); $ldapAdvanced = getLDAPAdvanceInstance($_REQUEST["authUid"]);
foreach ($depsToCheck as $departmentDN) { foreach ($depsToCheck as $departmentDn) {
$baseDN = str_replace($authenticationSource["AUTH_SOURCE_BASE_DN"], "", $departmentDN); $departmentUid = $ldapAdvanced->getDepUidIfExistsDN($departmentDn);
$ous = custom_ldap_explode_dn($departmentDN);
$currentDep = array_shift($ous);
$parentDN = implode(",", $ous);
//$ous = custom_ldap_explode_dn($baseDN); if ($departmentUid == '') {
//$currentDep = array_shift($ous); if (strcasecmp($departmentDn, $authenticationSource['AUTH_SOURCE_BASE_DN']) == 0) {
$departmentTitle = 'ROOT (' . $authenticationSource['AUTH_SOURCE_BASE_DN'] . ')';
foreach ($ous as $key => $val) { $parentUid = '';
$aux = explode("=", $val);
if (isset($aux[0]) && strtolower(trim($aux[0])) != "ou") {
unset($ous[$key]);
}
}
if ($currentDep == "") {
$depTitle = "ROOT " . $authenticationSource["AUTH_SOURCE_BASE_DN"];
} else {
$depAux = explode("=", $currentDep);
$depTitle = trim($depAux[1]);
}
$departmentUID = $ldapAdvanced->getDepUidIfExistsDN($departmentDN);
if ($departmentUID == "") {
if (count($ous) == 0) {
$parentUid = "";
} else { } else {
$parentUid = $ldapAdvanced->getDepUidIfExistsDN($parentDN); $arrayAux = custom_ldap_explode_dn($departmentDn);
$departmentCurrent = array_shift($arrayAux);
$parentDn = implode(',', $arrayAux);
if ($parentUid == "") { $arrayAux = explode('=', $departmentCurrent);
$response = new stdclass(); $departmentTitle = trim($arrayAux[1]);
$response->status = "ERROR"; $parentUid = $ldapAdvanced->getDepUidIfExistsDN($parentDn);
$response->message = "Parent departments are needed before create this sub department " . $parentDN;
die($json->encode($response)); if (str_ireplace($authenticationSource['AUTH_SOURCE_BASE_DN'], '', $parentDn) != '' &&
$parentUid == ''
) {
$response = new stdClass();
$response->status = 'ERROR';
$response->message = G::LoadTranslation(
'ID_DEPARTMENT_CHECK_PARENT_DEPARTMENT', [$parentDn, $departmentTitle]
);
echo $json->encode($response);
exit(0);
} }
} }
$department = new department(); $department = new Department();
$row["DEP_TITLE"] = stripslashes($depTitle);
$row["DEP_PARENT"] = $parentUid;
$row["DEP_LDAP_DN"] = $departmentDN;
$row["DEP_REF_CODE"] = "";
$departmentUID = $department->create($row);
if ($departmentUID == false) { $departmentUid = $department->create([
$response = new stdclass(); 'DEP_TITLE' => stripslashes($departmentTitle),
$response->status = "ERROR"; 'DEP_PARENT' => $parentUid,
$response->message = "Error creating department"; 'DEP_LDAP_DN' => $departmentDn,
die($json->encode($response)); 'DEP_REF_CODE' => ''
]);
if ($departmentUid === false) {
$response = new stdClass();
$response->status = 'ERROR';
$response->message = G::LoadTranslation('ID_DEPARTMENT_ERROR_CREATE');
echo $json->encode($response);
exit(0);
} }
} }
} }
if (count($depsToUncheck) > 0) { if (!empty($depsToUncheck)) {
foreach ($depsToUncheck as $departmentDN) { $baseDnLength = strlen($authenticationSource['AUTH_SOURCE_BASE_DN']);
$departmentUID = $ldapAdvanced->getDepUidIfExistsDN($departmentDN);
if ($departmentUID != "") { foreach ($depsToUncheck as $departmentDn) {
$department = new department(); $departmentUid = $ldapAdvanced->getDepUidIfExistsDN($departmentDn);
$departmentInfo = $department->Load($departmentUID);
$arrayAux1 = custom_ldap_explode_dn($departmentDN); if ($departmentUid != '' &&
strcasecmp(
substr($departmentDn, strlen($departmentDn) - $baseDnLength),
$authenticationSource['AUTH_SOURCE_BASE_DN']
) == 0
) {
$department = new Department();
foreach ($arrayAux1 as $index => $value) { $arrayDepartmentData = $department->Load($departmentUid);
$arrayAux2 = explode("=", $value); $arrayDepartmentData['DEP_LDAP_DN'] = '';
if (isset($arrayAux2[0]) && strtolower(trim($arrayAux2[0])) == "ou") { $result = $department->update($arrayDepartmentData);
unset($arrayAux1[$index]);
} if (!isset($authenticationSource['AUTH_SOURCE_DATA']['DEPARTMENTS_TO_UNASSIGN'])) {
$authenticationSource['AUTH_SOURCE_DATA']['DEPARTMENTS_TO_UNASSIGN'] = [];
} }
$departmentBaseDn = implode(",", $arrayAux1); $authenticationSource['AUTH_SOURCE_DATA']['DEPARTMENTS_TO_UNASSIGN'][] = $departmentUid;
if (strtolower($departmentBaseDn) == strtolower($authenticationSource["AUTH_SOURCE_BASE_DN"])) {
$departmentInfo["DEP_LDAP_DN"] = "";
$department->update($departmentInfo);
if (!isset($authenticationSource["AUTH_SOURCE_DATA"]["DEPARTMENTS_TO_UNASSIGN"])) {
$authenticationSource["AUTH_SOURCE_DATA"]["DEPARTMENTS_TO_UNASSIGN"] = array();
}
$authenticationSource["AUTH_SOURCE_DATA"]["DEPARTMENTS_TO_UNASSIGN"][] = $departmentUID;
}
} }
} }