fernando/luos
1
0
Fork 0
Code Releases Activity

fixed the issue related to USR_AUTH_USER_DN

Browse Source
This commit is contained in:
girish
2011-02-18 16:19:41 +00:00
parent 9e491ee8ed
commit caee5a5e10
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.Installer_mssql.php
View File

@@ -62,7 +62,7 @@ class Installer
function setServerData($psServer, $psPort, $psUserName, $psPassword ) function setServerData($psServer, $psPort, $psUserName, $psPassword )
{ {
$this->server = $psServer; $this->server = $psServer.':'.$psPort;
$this->port = $psPort; $this->port = $psPort;
$this->userName = $psUserName; $this->userName = $psUserName;
$this->password = $psPassword; $this->password = $psPassword;

2
workflow/engine/methods/users/users_New.php
View File

@@ -91,7 +91,7 @@ try {
$_SESSION['_DBArray'] = $_DBArray; $_SESSION['_DBArray'] = $_DBArray;
///////////////////////////// /////////////////////////////
//var_dump($aFields);
$G_PUBLISH = new Publisher; $G_PUBLISH = new Publisher;
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_New.xml', '', $aFields, 'users_Save'); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_New.xml', '', $aFields, 'users_Save');
G::RenderPage('publish','blank'); G::RenderPage('publish','blank');

8
workflow/engine/methods/users/users_Save.php
View File

@@ -73,6 +73,9 @@ try {
if (!isset($form['USR_LOCATION'])) { if (!isset($form['USR_LOCATION'])) {
$form['USR_LOCATION'] = ''; $form['USR_LOCATION'] = '';
} }
if (!isset($form['USR_AUTH_USER_DN'])) {
$form['USR_AUTH_USER_DN'] = '';
}
if ($form['USR_UID'] == '') { if ($form['USR_UID'] == '') {
$aData['USR_USERNAME'] = $form['USR_USERNAME']; $aData['USR_USERNAME'] = $form['USR_USERNAME'];
$aData['USR_PASSWORD'] = $form['USR_PASSWORD']; $aData['USR_PASSWORD'] = $form['USR_PASSWORD'];
@@ -83,6 +86,7 @@ try {
$aData['USR_CREATE_DATE'] = date('Y-m-d H:i:s'); $aData['USR_CREATE_DATE'] = date('Y-m-d H:i:s');
$aData['USR_UPDATE_DATE'] = date('Y-m-d H:i:s'); $aData['USR_UPDATE_DATE'] = date('Y-m-d H:i:s');
$aData['USR_BIRTHDAY'] = date('Y-m-d'); $aData['USR_BIRTHDAY'] = date('Y-m-d');
$aData['USR_AUTH_USER_DN'] = $form['USR_AUTH_USER_DN'];
//fixing bug in inactive user when the admin create a new user. //fixing bug in inactive user when the admin create a new user.
$statusWF = $form['USR_STATUS']; $statusWF = $form['USR_STATUS'];
$aData['USR_STATUS'] = $form['USR_STATUS'] == 'ACTIVE' ? 1 : 0; $aData['USR_STATUS'] = $form['USR_STATUS'] == 'ACTIVE' ? 1 : 0;
@@ -100,6 +104,7 @@ try {
$aData['USR_RESUME'] = $form['USR_RESUME']; $aData['USR_RESUME'] = $form['USR_RESUME'];
$aData['USR_ROLE'] = $form['USR_ROLE']; $aData['USR_ROLE'] = $form['USR_ROLE'];
$aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY']; $aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY'];
require_once 'classes/model/Users.php'; require_once 'classes/model/Users.php';
$oUser = new Users(); $oUser = new Users();
@@ -231,6 +236,9 @@ try {
if(isset($form['USR_REPLACED_BY'])){ if(isset($form['USR_REPLACED_BY'])){
$aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY']; $aData['USR_REPLACED_BY'] = $form['USR_REPLACED_BY'];
} }
if(isset($form['USR_AUTH_USER_DN'])){
$aData['USR_AUTH_USER_DN'] = $form['USR_AUTH_USER_DN'];
}
require_once 'classes/model/Users.php'; require_once 'classes/model/Users.php';
$oUser = new Users(); $oUser = new Users();

2
workflow/engine/xmlform/users/users_New.xml
View File

@@ -80,7 +80,7 @@ SELECT CALENDAR_UID, CALENDAR_NAME FROM availableCalendars
</en> </en>
</USR_STATUS> </USR_STATUS>
<USR_ROLE type="dropdown" defaultvalue="" required="0" group="1" dependentfields="" readonly="0" sqlconnection="rbac" noshowingrid="0" readonlyingrid="0"> <USR_ROLE type="dropdown" defaultvalue="" required="0" group="1" dependentfields="" readonly="0" sqlconnection="rbac" noshowingrid="0" readonlyingrid="0">
SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '00000000000000000000000000000002' AND ROL_STATUS = 1 ORDER BY FIELD(ROL_CODE,'@#DEFAULT_ROLE') DESC SELECT ROL_CODE AS USR_ROLE, ROL_CODE AS CODE FROM ROLES WHERE ROL_SYSTEM = '00000000000000000000000000000002' AND ROL_STATUS = 1 ORDER BY ROL_CODE
<en>Role</en> <en>Role</en>
</USR_ROLE> </USR_ROLE>
<TITLE2 type="title" group="1"> <TITLE2 type="title" group="1">