fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #946 from brayanpereyra/BUG-9717

Browse Source 
BUG 9717 I add attribute USR_STATUS SOLVED
This commit is contained in:
julceslauhub
2012-11-13 06:39:21 -08:00
parent 5ec14d29ec e06a6dda48
commit 58ee8b2fe8
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/authSources/authSources_Edit.php
View File

@@ -88,7 +88,7 @@ if ($fields['AUTH_SOURCE_PROVIDER'] == 'ldap') {
// The attributes the users
G::loadClass('pmFunctions');
$data = executeQuery('DESCRIBE USERS');
$fieldSet = array('USR_UID', 'USR_USERNAME', 'USR_PASSWORD', 'USR_EMAIL', 'USR_CREATE_DATE', 'USR_UPDATE_DATE', 'USR_STATUS', 'USR_COUNTRY', 'USR_CITY', 'USR_LOCATION', 'DEP_UID', 'USR_RESUME', 'USR_ROLE', 'USR_REPORTS_TO', 'USR_REPLACED_BY', 'USR_UX');
$fieldSet = array('USR_UID', 'USR_USERNAME', 'USR_PASSWORD', 'USR_EMAIL', 'USR_CREATE_DATE', 'USR_UPDATE_DATE', 'USR_COUNTRY', 'USR_CITY', 'USR_LOCATION', 'DEP_UID', 'USR_RESUME', 'USR_ROLE', 'USR_REPORTS_TO', 'USR_REPLACED_BY', 'USR_UX');
$attributes = '';
foreach ($data as $value) {
if (!(in_array($value['Field'], $fieldSet))) {

16
workflow/engine/methods/authSources/authSources_ImportUsers.php
View File

@@ -72,6 +72,22 @@ foreach ($_POST['aUsers'] as $sUser) {
foreach ($aAttributes as $value) {
if (isset($aUser[$value['attributeUser']])) {
$aData[$value['attributeUser']] = str_replace( "*", "'", $aUser[$value['attributeUser']] );
if ($value['attributeUser'] == 'USR_STATUS') {
$evalValue = $aData[$value['attributeUser']];
$statusValue = 'INACTIVE';
if (is_string($evalValue) && G::toUpper($evalValue) == 'ACTIVE') {
$statusValue = 'ACTIVE';
}
if (is_bool($evalValue) && $evalValue == true) {
$statusValue = 'ACTIVE';
}
if ( (is_float($evalValue) || is_int($evalValue) ||
is_integer($evalValue) || is_numeric($evalValue)) && (int)$evalValue != 0) {
$statusValue = 'ACTIVE';
}
$aData[$value['attributeUser']] = $statusValue;
}
}
}
}