From 63ff2011c4c4c5fcf4caa7f2c6b56503f08cecaf Mon Sep 17 00:00:00 2001
From: dheeyi william <dheeyi@gmail.com>
Date: Wed, 14 Sep 2016 18:02:12 -0400
Subject: [PATCH] HOR-1843 "Default Main Menu Option" does not work correctly
 when you select the option ADMIN in users of type Manager

HOR-1835
"Default Main Menu Option" does not work correctly when creating a new user

HOR-1835
"Default Main Menu Option" does not work correctly when creating a new user
---
 .../engine/classes/model/UsersProperties.php  |  2 +-
 workflow/engine/methods/users/usersAjax.php   | 35 ++++++++-----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/workflow/engine/classes/model/UsersProperties.php b/workflow/engine/classes/model/UsersProperties.php
index 0187fb8fa..4ff1b175b 100644
--- a/workflow/engine/classes/model/UsersProperties.php
+++ b/workflow/engine/classes/model/UsersProperties.php
@@ -409,7 +409,7 @@ class UsersProperties extends BaseUsersProperties
 
             switch ($oConf->aConfig['DEFAULT_MENU']) {
                 case 'PM_SETUP':
-                    if ($RBAC->userCanAccess( 'PM_SETUP' ) == 1) {
+                    if ($RBAC->userCanAccess( 'PM_SETUP' ) == 1 || $RBAC->userCanAccess('PM_USERS') == 1) {
                         $url = 'setup/main';
                     }
                     break;
diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php
index 54522a62c..8911cfc55 100644
--- a/workflow/engine/methods/users/usersAjax.php
+++ b/workflow/engine/methods/users/usersAjax.php
@@ -158,12 +158,11 @@ switch ($_POST['action']) {
             }
 
             $userUid = '';
-
+            $auditLogType = '';
             if ($form['USR_UID'] == '') {
                 $arrayUserData = $user->create($form);
                 $userUid = $arrayUserData['USR_UID'];
-
-                $user->auditLog('INS', array_merge(['USR_UID' => $userUid, 'USR_USERNAME' => $arrayUserData['USR_USERNAME']], $form));
+                $auditLogType = 'INS';
             } else {
                 if (array_key_exists('USR_NEW_PASS', $form) && $form['USR_NEW_PASS'] == '') {
                     unset($form['USR_NEW_PASS']);
@@ -171,25 +170,21 @@ switch ($_POST['action']) {
 
                 $result = $user->update($form['USR_UID'], $form, $_SESSION['USER_LOGGED']);
                 $userUid = $form['USR_UID'];
-
                 $arrayUserData = $user->getUserRecordByPk($userUid, [], false);
-
-                $user->auditLog('UPD', array_merge(['USR_UID' => $userUid, 'USR_USERNAME' => $arrayUserData['USR_USERNAME']], $form));
-
-                /* Saving preferences */
-                $def_lang = isset($form['PREF_DEFAULT_LANG']) ? $form['PREF_DEFAULT_LANG'] : '';
-                $def_menu = isset($form['PREF_DEFAULT_MENUSELECTED']) ? $form['PREF_DEFAULT_MENUSELECTED'] : '';
-                $def_cases_menu = isset($form['PREF_DEFAULT_CASES_MENUSELECTED']) ? $form['PREF_DEFAULT_CASES_MENUSELECTED'] : '';
-
-                G::loadClass('configuration');
-
-                $oConf = new Configurations();
-                $aConf = Array('DEFAULT_LANG' => $def_lang, 'DEFAULT_MENU' => $def_menu, 'DEFAULT_CASES_MENU' => $def_cases_menu);
-
-                $oConf->aConfig = $aConf;
-                $oConf->saveConfig('USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED']);
+                $auditLogType = 'UPD';
             }
 
+            $user->auditLog($auditLogType, array_merge(['USR_UID' => $userUid, 'USR_USERNAME' => $arrayUserData['USR_USERNAME']], $form));
+            /* Saving preferences */
+            G::loadClass('configuration');
+            $def_lang = isset($form['PREF_DEFAULT_LANG']) ? $form['PREF_DEFAULT_LANG'] : '';
+            $def_menu = isset($form['PREF_DEFAULT_MENUSELECTED']) ? $form['PREF_DEFAULT_MENUSELECTED'] : '';
+            $def_cases_menu = isset($form['PREF_DEFAULT_CASES_MENUSELECTED']) ? $form['PREF_DEFAULT_CASES_MENUSELECTED'] : '';
+            $oConf = new Configurations();
+            $aConf = Array('DEFAULT_LANG' => $def_lang, 'DEFAULT_MENU' => $def_menu, 'DEFAULT_CASES_MENU' => $def_cases_menu);
+            $oConf->aConfig = $aConf;
+            $oConf->saveConfig('USER_PREFERENCES', '', '', $userUid);
+
             if ($user->checkPermission($userUid, 'PM_EDIT_USER_PROFILE_PHOTO')) {
                 try {
                     $user->uploadImage($userUid);
@@ -236,7 +231,7 @@ switch ($_POST['action']) {
         #verifying if it has any preferences on the configurations table
         G::loadClass('configuration');
         $oConf = new Configurations();
-        $oConf->loadConfig($x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '');
+        $oConf->loadConfig($x, 'USER_PREFERENCES', '', '', $aFields['USR_UID'], '');
 
         $aFields['PREF_DEFAULT_MENUSELECTED'] = '';
         $aFields['PREF_DEFAULT_CASES_MENUSELECTED'] = '';