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

Add catch in create user and change propel to elloquent

Browse Source
This commit is contained in:
Brayan Pereyra
2025-10-08 01:50:43 +00:00
parent c96920a30a
commit 6211c48e44
2 changed files with 66 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/bin/tasks/cliAuthSources.php
View File

@@ -743,7 +743,7 @@ function initWorkspace($workspace) {
define('PATH_IMAGES_ENVIRONMENT_FILES', PATH_DATA_SITE . 'usersFiles' . PATH_SEP);
define('PATH_IMAGES_ENVIRONMENT_USERS', PATH_DATA_SITE . 'usersPhotographies' . PATH_SEP);
if (is_file(PATH_DATA_SITE . PATH_SEP . '.server_info')) {
if (is_file(PATH_DATA_SITE . '.server_info')) {
$SERVER_INFO = file_get_contents(PATH_DATA_SITE . PATH_SEP . '.server_info');
$SERVER_INFO = unserialize($SERVER_INFO);
@@ -757,7 +757,7 @@ function initWorkspace($workspace) {
define('REQUEST_SCHEME', $SERVER_INFO['REQUEST_SCHEME']);
}
} else {
CLI::logging('WARNING! No server info found!', 'red');
CLI::logging('WARNING! No server info found!', null, 'red');
}
//load Processmaker translations
Bootstrap::LoadTranslationObject(SYS_LANG);

52
workflow/engine/classes/LdapSource.php
View File

@@ -1050,34 +1050,17 @@ class LdapSource
public function deactivateUser($userUid)
{
if (!class_exists('RbacUsers')) {
require_once(PATH_RBAC . 'model/RbacUsers.php');
}
$rbacUser = new RbacUsers();
$rbacUser->updateData(
['USR_STATUS' => '0'],
[['USR_USERNAME', '=', $userUid]]
);
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
// select set
$c1 = new Criteria('rbac');
$c1->add(RbacUsersPeer::USR_USERNAME, $userUid);
// update set
$c2 = new Criteria('rbac');
$c2->add(RbacUsersPeer::USR_STATUS, '0');
BasePeer::doUpdate($c1, $c2, $con);
if (!class_exists('Users')) {
require_once('classes/model/Users.php');
}
$con = Propel::getConnection(UsersPeer::DATABASE_NAME);
// select set
$c1 = new Criteria('workflow');
$c1->add(UsersPeer::USR_USERNAME, $userUid);
// update set
$c2 = new Criteria('workflow');
$c2->add(UsersPeer::USR_STATUS, 'INACTIVE');
$c2->add(UsersPeer::DEP_UID, '');
BasePeer::doUpdate($c1, $c2, $con);
$users = new User();
$users->updateData(
['USR_STATUS' => 'INACTIVE', 'DEP_UID' => ''],
[['USR_USERNAME', '=', $userUid]]
);
}
public function userIsTerminated($userUid, $sOuTerminated)
@@ -1091,7 +1074,6 @@ class LdapSource
break;
}
}
return $terminated;
}
@@ -1762,6 +1744,7 @@ class LdapSource
public function createUserAndActivate($user, $depUid)
{
try {
$rbac = RBAC::getSingleton();
if ($rbac->userObj == null) {
@@ -1810,6 +1793,9 @@ class LdapSource
$users->create($data);
return $userUid;
} catch (Exception $errorException) {
throw $errorException;
}
}
public function getDepUidIfExistsDN($currentDN)
@@ -2374,11 +2360,8 @@ class LdapSource
public function clearManager($usersUIDs)
{
try {
$criteriaSet = new Criteria('workflow');
$criteriaSet->add(UsersPeer::USR_REPORTS_TO, '');
$criteriaWhere = new Criteria('workflow');
$criteriaWhere->add(UsersPeer::USR_UID, $usersUIDs, Criteria::IN);
BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection('workflow'));
$user = new User();
$user->updateDataFromListUsersUids(['USR_REPORTS_TO' => ''], $usersUIDs);
} catch (Exception $error) {
$this->log($this->ldapcnn, $error->getMessage());
}
@@ -2421,7 +2404,8 @@ class LdapSource
$p = (int) (($count * 100) / $total);
$n = (int) ($p / 2);
return "[" . str_repeat("|", $n) . str_repeat(" ", 50 - $n) . "] $p%";
$times = ((50 - (int)$n) < 0) ? 0 : (50 - (int)$n);
return "[" . str_repeat("|", $n) . str_repeat(" ", $times) . "] $p%";
} catch (Exception $e) {
throw $e;
}