From 107091159bf400768eca74d3f0825c4158047e8c Mon Sep 17 00:00:00 2001 From: Hugo Loza Date: Tue, 11 Jan 2011 16:26:02 +0000 Subject: [PATCH] Fix error introduced in commit 209 in users_Ajax when the params are sent via GET Users assigment --- workflow/engine/methods/users/users_Ajax.php | 252 +++++++++---------- 1 file changed, 125 insertions(+), 127 deletions(-) diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php index b2f66fe58..962283151 100644 --- a/workflow/engine/methods/users/users_Ajax.php +++ b/workflow/engine/methods/users/users_Ajax.php @@ -26,140 +26,138 @@ try { global $RBAC; switch ($RBAC->userCanAccess('PM_LOGIN')) { - case -2: - G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels'); - G::header('location: ../login/login'); - die; - break; - case -1: - G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels'); - G::header('location: ../login/login'); - die; - break; + case -2: + G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels'); + G::header('location: ../login/login'); + die; + break; + case -1: + G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels'); + G::header('location: ../login/login'); + die; + break; } G::LoadInclude('ajax'); if (isset($_POST['form'])) { - $_POST = $_POST['form']; + $_POST = $_POST['form']; } - if(isset($_POST['function'])) - {$value= $_POST['function']; - $value = get_ajax_value('function');} - else - {$value= $_POST['functions']; - $value = get_ajax_value('functions');} - - - switch ($value) - { - case 'verifyUsername': - //print_r($_POST); die; - $_POST['sOriginalUsername'] = get_ajax_value('sOriginalUsername'); - $_POST['sUsername'] = get_ajax_value('sUsername'); - if ($_POST['sOriginalUsername'] == $_POST['sUsername']) - { - echo '0'; - } - else - { - require_once 'classes/model/Users.php'; - G::LoadClass('Users'); - $oUser = new Users(); - $oCriteria=$oUser->loadByUsername($_POST['sUsername']); - $oDataset = UsersPeer::doSelectRS($oCriteria); - $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $oDataset->next(); - $aRow = $oDataset->getRow(); - //print_r($aRow); die; - //if (!$aRow) - if (!is_array($aRow)) - { - echo '0'; - } - else - { - echo '1'; - } - } - break; - case 'availableUsers': - G::LoadClass('processMap'); - $oProcessMap = new ProcessMap(); - global $G_PUBLISH; - $G_PUBLISH = new Publisher(); - $G_PUBLISH->AddContent('propeltable', 'paged-table', 'users/users_AvailableUsers', $oProcessMap->getAvailableUsersCriteria($_GET['sTask'], $_GET['iType'])); - G::RenderPage('publish', 'raw'); - break; - case 'assign': - G::LoadClass('tasks'); - $oTasks = new Tasks(); - switch ((int)$_POST['TU_RELATION']) { - case 1: - echo $oTasks->assignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']); - break; - case 2: - echo $oTasks->assignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']); - break; - } - break; - case 'ofToAssign': - G::LoadClass('tasks'); - $oTasks = new Tasks(); - switch ((int)$_POST['TU_RELATION']) { - case 1: - echo $oTasks->ofToAssignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']); - break; - case 2: - echo $oTasks->ofToAssignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']); - break; - } - break; - case 'changeView': - $_SESSION['iType'] = $_POST['TU_TYPE']; - break; - - case 'deleteGroup': - G::LoadClass('groups'); - $oGroup = new Groups(); - $oGroup->removeUserOfGroup($_POST['GRP_UID'], $_POST['USR_UID']); - $_GET['sUserUID'] = $_POST['USR_UID']; - $G_PUBLISH = new Publisher; - $G_PUBLISH->AddContent('view', 'users/users_Tree' ); - G::RenderPage('publish', 'raw'); - break; - - case 'showUserGroupInterface': - $_GET['sUserUID'] = $_POST['sUserUID']; - $G_PUBLISH = new Publisher; - $G_PUBLISH->AddContent('view', 'users/users_AssignGroup' ); - G::RenderPage('publish', 'raw'); - break; - - case 'showUserGroups': - $_GET['sUserUID'] = $_POST['sUserUID']; - $G_PUBLISH = new Publisher; - $G_PUBLISH->AddContent('view', 'users/users_Tree' ); - G::RenderPage('publish', 'raw'); - break; - - case 'assignUserToGroup': - G::LoadClass('groups'); - $oGroup = new Groups(); - $oGroup->addUserToGroup($_POST['GRP_UID'], $_POST['USR_UID']); - echo '

'.G::LoadTranslation('ID_MSG_ASSIGN_DONE').'

'; - break; - - case 'usersGroup': - G::LoadClass('groups'); - $oGroup = new Groups(); - $aGroup = $oGroup->getUsersOfGroup($_POST['GRP_UID']); - foreach ($aGroup as $iIndex => $aValues) { - echo $aValues['USR_FIRSTNAME'] . ' ' . $aValues['USR_LASTNAME'] . '
'; - } - break; + if(isset($_REQUEST['function'])){ + //$value= $_POST['function']; + $value = get_ajax_value('function'); + }else{ + //$value= $_POST['functions']; + $value = get_ajax_value('functions'); } + switch ($value){ + case 'verifyUsername': + //print_r($_POST); die; + $_POST['sOriginalUsername'] = get_ajax_value('sOriginalUsername'); + $_POST['sUsername'] = get_ajax_value('sUsername'); + if ($_POST['sOriginalUsername'] == $_POST['sUsername']) + { + echo '0'; + } + else + { + require_once 'classes/model/Users.php'; + G::LoadClass('Users'); + $oUser = new Users(); + $oCriteria=$oUser->loadByUsername($_POST['sUsername']); + $oDataset = UsersPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $oDataset->next(); + $aRow = $oDataset->getRow(); + //print_r($aRow); die; + //if (!$aRow) + if (!is_array($aRow)) + { + echo '0'; + } + else + { + echo '1'; + } + } + break; + case 'availableUsers': + G::LoadClass('processMap'); + $oProcessMap = new ProcessMap(); + global $G_PUBLISH; + $G_PUBLISH = new Publisher(); + $G_PUBLISH->AddContent('propeltable', 'paged-table', 'users/users_AvailableUsers', $oProcessMap->getAvailableUsersCriteria($_GET['sTask'], $_GET['iType'])); + G::RenderPage('publish', 'raw'); + break; + case 'assign': + G::LoadClass('tasks'); + $oTasks = new Tasks(); + switch ((int)$_POST['TU_RELATION']) { + case 1: + echo $oTasks->assignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']); + break; + case 2: + echo $oTasks->assignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']); + break; + } + break; + case 'ofToAssign': + G::LoadClass('tasks'); + $oTasks = new Tasks(); + switch ((int)$_POST['TU_RELATION']) { + case 1: + echo $oTasks->ofToAssignUser($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']); + break; + case 2: + echo $oTasks->ofToAssignGroup($_POST['TAS_UID'], $_POST['USR_UID'], $_POST['TU_TYPE']); + break; + } + break; + case 'changeView': + $_SESSION['iType'] = $_POST['TU_TYPE']; + break; + + case 'deleteGroup': + G::LoadClass('groups'); + $oGroup = new Groups(); + $oGroup->removeUserOfGroup($_POST['GRP_UID'], $_POST['USR_UID']); + $_GET['sUserUID'] = $_POST['USR_UID']; + $G_PUBLISH = new Publisher; + $G_PUBLISH->AddContent('view', 'users/users_Tree' ); + G::RenderPage('publish', 'raw'); + break; + + case 'showUserGroupInterface': + $_GET['sUserUID'] = $_POST['sUserUID']; + $G_PUBLISH = new Publisher; + $G_PUBLISH->AddContent('view', 'users/users_AssignGroup' ); + G::RenderPage('publish', 'raw'); + break; + + case 'showUserGroups': + $_GET['sUserUID'] = $_POST['sUserUID']; + $G_PUBLISH = new Publisher; + $G_PUBLISH->AddContent('view', 'users/users_Tree' ); + G::RenderPage('publish', 'raw'); + break; + + case 'assignUserToGroup': + G::LoadClass('groups'); + $oGroup = new Groups(); + $oGroup->addUserToGroup($_POST['GRP_UID'], $_POST['USR_UID']); + echo '

'.G::LoadTranslation('ID_MSG_ASSIGN_DONE').'

'; + break; + + case 'usersGroup': + G::LoadClass('groups'); + $oGroup = new Groups(); + $aGroup = $oGroup->getUsersOfGroup($_POST['GRP_UID']); + foreach ($aGroup as $iIndex => $aValues) { + echo $aValues['USR_FIRSTNAME'] . ' ' . $aValues['USR_LASTNAME'] . '
'; + } + break; + } } catch (Exception $oException) { - die($oException->getMessage()); + die($oException->getMessage()); } ?> \ No newline at end of file