diff --git a/ajax/asynchronousdatas.php b/ajax/asynchronousdatas.php index aee7bc7..0bbd633 100644 --- a/ajax/asynchronousdatas.php +++ b/ajax/asynchronousdatas.php @@ -3,7 +3,6 @@ if (strpos($_SERVER['PHP_SELF'],"asynchronousdatas.php")) { $AJAX_INCLUDE = 1; define('GLPI_ROOT','../../..'); include (GLPI_ROOT."/inc/includes.php"); - //header("Content-Type: text/html; charset=UTF-8"); Html::header_nocache(); } diff --git a/ajax/dropdownProcesses.php b/ajax/dropdownProcesses.php index 84636b6..9348ed5 100644 --- a/ajax/dropdownProcesses.php +++ b/ajax/dropdownProcesses.php @@ -13,7 +13,7 @@ if (strpos($_SERVER['PHP_SELF'], "dropdownProcesses.php")) { } if (!defined('GLPI_ROOT')) { - die("Can not acces directly to this file"); + die("Can not access directly to this file"); } @@ -24,6 +24,7 @@ if (isset($_REQUEST["entity_restrict"]) && (substr($_REQUEST["entity_restrict"], 0, 1) === '[') && (substr($_REQUEST["entity_restrict"], -1) === ']')) { $_REQUEST["entity_restrict"] = json_decode($_REQUEST["entity_restrict"]); + $_REQUEST["entity_restrict"] = $_REQUEST["entity_restrict"][0]; } // Security @@ -62,10 +63,11 @@ if (empty($_REQUEST['searchText'])) { $result = PluginProcessmakerProcess::getSqlSearchResult(false, $search); if ($DB->numrows($result)) { - while ($data=$DB->fetch_array($result)) { - if (in_array( $_REQUEST["entity_restrict"], PluginProcessmakerProcess::getEntitiesForProfileByProcess( $data["id"], $_SESSION['glpiactiveprofile']['id'], true) )) { - array_push( $processes, array( 'id' => $data["id"], - 'text' => $data["name"] )); + while ($data = $DB->fetch_array($result)) { + $process_entities = PluginProcessmakerProcess::getEntitiesForProfileByProcess($data["id"], $_SESSION['glpiactiveprofile']['id'], true); + if (in_array( $_REQUEST["entity_restrict"], $process_entities)) { + array_push( $processes, array( 'id' => $data["id"], + 'text' => $data["name"] )); $count++; } } diff --git a/ajax/dropdownTaskcategories.php b/ajax/dropdownTaskcategories.php index 70ec498..4fbd0dc 100644 --- a/ajax/dropdownTaskcategories.php +++ b/ajax/dropdownTaskcategories.php @@ -13,7 +13,7 @@ //} //if (!defined('GLPI_ROOT')) { -// die("Can not acces directly to this file"); +// die("Can not access directly to this file"); //} diff --git a/ajax/dropdownUsers.php b/ajax/dropdownUsers.php index 4967f43..d26a3c3 100644 --- a/ajax/dropdownUsers.php +++ b/ajax/dropdownUsers.php @@ -16,11 +16,9 @@ if (strpos($_SERVER['PHP_SELF'], "dropdownUsers.php")) { } if (!defined('GLPI_ROOT')) { - die("Can not acces directly to this file"); + die("Can not access directly to this file"); } -//include_once dirname(__FILE__)."/../inc/users.class.php" ; - Session::checkLoginUser(); @@ -58,7 +56,7 @@ if (!isset($_REQUEST['page'])) { if ($one_item < 0) { $start = ($_REQUEST['page']-1)*$_REQUEST['page_limit']; $LIMIT = "LIMIT $start,".$_REQUEST['page_limit']; - $result = PluginProcessmakerUser::getSqlSearchResult( $_REQUEST['specific_tags']['pmTaskId'], false, $_REQUEST['right'], $_REQUEST["entity_restrict"], + $result = PluginProcessmakerUser::getSqlSearchResult( $_REQUEST['specific_tags']['taskGuid'], false, $_REQUEST['right'], $_REQUEST["entity_restrict"], $_REQUEST['value'], $used, $_REQUEST['searchText'], $LIMIT); } else { $query = "SELECT DISTINCT `glpi_users`.* diff --git a/ajax/task_users.php b/ajax/task_users.php index 2a1ade8..add1883 100644 --- a/ajax/task_users.php +++ b/ajax/task_users.php @@ -13,7 +13,7 @@ if (strpos($_SERVER['PHP_SELF'], "task_users.php")) { } if (!defined('GLPI_ROOT')) { - die("Can not acces directly to this file"); + die("Can not access directly to this file"); } Session::checkLoginUser(); @@ -24,22 +24,23 @@ $rand = rand(); echo "
"; echo $LANG['processmaker']['item']['reassigncase']." "; echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; -echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; PluginProcessmakerUser::dropdown( array('name' => 'users_id_recipient', - 'value' => PluginProcessmakerUser::getGLPIUserId( $_REQUEST['userId'] ), + 'value' => $_REQUEST['users_id'], + 'used' => [$_REQUEST['users_id']], 'entity' => 0, //$item->fields["entities_id"], // not used, as any user can be assigned to any tasks 'entity_sons' => false, // not used, as any user can be assigned to any tasks 'right' => 'all', 'rand' => $rand, 'width' => '', - 'specific_tags' => array('pmTaskId' => $_REQUEST['taskId']))); + 'specific_tags' => array('taskGuid' => $_REQUEST['taskGuid']))); echo "  "; echo ""; Html::closeForm(true); diff --git a/front/case.form.php b/front/case.form.php new file mode 100644 index 0000000..f4d6139 --- /dev/null +++ b/front/case.form.php @@ -0,0 +1,69 @@ +config; + echo ""; +} + + +// check if it is from PM pages +if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'route' && isset( $_REQUEST['UID'] ) && isset( $_REQUEST['APP_UID'] ) && isset( $_REQUEST['__DynaformName__'] )) { + // then get item id from DB + if ($locCase->getFromGUID($_REQUEST['APP_UID'])) { + + if (isset( $_REQUEST['form'] )) { + $PM_SOAP->derivateCase($locCase, $_REQUEST); + } + } + glpi_processmaker_case_reload_page(); + +} else +if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete') { + // delete case from case table, this will also delete the tasks + if ($locCase->getFromDB($_POST['cases_id']) && $locCase->deleteCase()) { + Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['deleted'], true, INFO); + } else { + Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['errordeleted'], true, ERROR); + } + // will redirect to item or to list if no item + $locCase->redirectToList(); + +} else +if (isset( $_REQUEST['form'] ) && isset( $_REQUEST['form']['BTN_CATCH'] ) && isset( $_REQUEST['form']['APP_UID'])) { + // Claim task management + // here we are in a Claim request + $myCase = new PluginProcessmakerCase; + if ($myCase->getFromGUID( $_REQUEST['form']['APP_UID'] )) { + + $pmClaimCase = $PM_SOAP->claimCase($myCase->fields['case_guid'], $_REQUEST['DEL_INDEX'] ); + + // now manage tasks associated with item + $PM_SOAP->claimTask($myCase->getID(), $_REQUEST['DEL_INDEX']); + } + glpi_processmaker_case_reload_page(); + +} else +if (isset($_REQUEST['id']) && $_REQUEST['id'] > 0) { + + Html::header(__('Process cases', 'processmaker'), $_SERVER['PHP_SELF'], "helpdesk", "PluginProcessmakerCase", "cases"); + if ($locCase->getFromDB($_REQUEST['id'])) { + + $locCase->display($_REQUEST); + + Html::footer(); + } +} + + + diff --git a/front/case.front.php b/front/case.front.php index bf8831a..d036ef4 100644 --- a/front/case.front.php +++ b/front/case.front.php @@ -1,40 +1,39 @@ getFromDB( $_REQUEST['APP_UID'] )) { - $myProcessMaker = new PluginProcessmakerProcessmaker(); - $myProcessMaker->login( ); +//// check if it is from PM pages +//if (isset( $_REQUEST['UID'] ) && isset( $_REQUEST['APP_UID'] ) && isset( $_REQUEST['__DynaformName__'] )) { +// // then get item id from DB +// $myCase = new PluginProcessmakerCase; +// if ($myCase->getFromGUID($_REQUEST['APP_UID'])) { +// //$PM_SOAP = new PluginProcessmakerProcessmaker(); +// //$PM_SOAP->login( ); - if (isset( $_REQUEST['form'] )) { - $myProcessMaker->derivateCase( $myCase, $_REQUEST); //, $_SERVER['HTTP_COOKIE'] ) ; - } - } +// if (isset( $_REQUEST['form'] )) { +// $PM_SOAP->derivateCase($myCase, $_REQUEST); //, $_SERVER['HTTP_COOKIE'] ) ; +// } +// } -} else if (isset( $_REQUEST['form'] ) && isset( $_REQUEST['form']['BTN_CATCH'] ) && isset( $_REQUEST['form']['APP_UID'])) { - // Claim task management - // here we are in a Claim request - $myCase = new PluginProcessmakerCase; - if ($myCase->getFromDB( $_REQUEST['form']['APP_UID'] )) { - $myProcessMaker = new PluginProcessmakerProcessmaker(); - $myProcessMaker->login( ); +//} else +// if (isset( $_REQUEST['form'] ) && isset( $_REQUEST['form']['BTN_CATCH'] ) && isset( $_REQUEST['form']['APP_UID'])) { +// // Claim task management +// // here we are in a Claim request +// $myCase = new PluginProcessmakerCase; +// if ($myCase->getFromGUID( $_REQUEST['form']['APP_UID'] )) { +// //$PM_SOAP = new PluginProcessmakerProcessmaker(); +// //$PM_SOAP->login( ); - $pmClaimCase = $myProcessMaker->claimCase( $myCase->getID(), $_REQUEST['DEL_INDEX'] ); - - // now manage tasks associated with item - $myProcessMaker->claimTask( $myCase->getID(), $_REQUEST['DEL_INDEX'] ); - } -} - -// now redirect to item form page -$config = PluginProcessmakerConfig::getInstance(); -echo ""; +// $pmClaimCase = $PM_SOAP->claimCase($myCase->fields['case_guid'], $_REQUEST['DEL_INDEX'] ); +// // now manage tasks associated with item +// $PM_SOAP->claimTask($myCase->getID(), $_REQUEST['DEL_INDEX']); +// } +//} +//// now redirect to item form page +//$config = $PM_SOAP->config; // PluginProcessmakerConfig::getInstance(); +//echo ""; \ No newline at end of file diff --git a/front/case.php b/front/case.php new file mode 100644 index 0000000..277496f --- /dev/null +++ b/front/case.php @@ -0,0 +1,23 @@ +refresh(); + // Html::back(); + //} + + //$process->title(); + + Search::show('PluginProcessmakerCase'); + +} else { + Html::displayRightError(); +} +Html::footer(); + diff --git a/front/process.form.php b/front/process.form.php index 930f9c6..c25cbfb 100644 --- a/front/process.form.php +++ b/front/process.form.php @@ -2,7 +2,7 @@ include_once ("../../../inc/includes.php"); -Plugin::load('processmaker', true); +Plugin::load('processmaker', true); // ??? if (!isset($_REQUEST["id"])) { $_REQUEST["id"] = ""; diff --git a/front/process_profile.form.php b/front/process_profile.form.php index 55c2472..c273793 100644 --- a/front/process_profile.form.php +++ b/front/process_profile.form.php @@ -4,36 +4,14 @@ include_once ("../../../inc/includes.php"); Session::checkCentralAccess(); -$profile = new Profile(); $right = new PluginProcessmakerProcess_Profile(); -$process = new PluginProcessmakerProcess(); if (isset($_POST["add"])) { $right->check(-1, UPDATE, $_POST); if ($right->add($_POST)) { - //Event::log($_POST["processes_id"], "PluginProcessMakerProcess", 4, "setup", - // $_SESSION["glpiname"]." ".$LANG['log'][61]); } Html::back(); - -} else if (isset($_POST["delete"])) { - - if (isset($_POST["item"]) && count($_POST["item"])) { - foreach ($_POST["item"] as $key => $val) { - if ($val == 1) { - if ($right->can($key, UPDATE)) { - $right->delete(array('id' => $key)); - } - } - } - //if (isset($_POST["processes_id"])) { - // Event::log($_POST["processes_id"], "users", 4, "setup", - // $_SESSION["glpiname"]." ".$LANG['log'][62]); - // } - } - Html::back(); - -} +} Html::displayErrorAndDie("lost"); diff --git a/front/processmaker.form.php b/front/processmaker.form.php index fab2cd0..849f478 100644 --- a/front/processmaker.form.php +++ b/front/processmaker.form.php @@ -3,17 +3,34 @@ include_once ("../../../inc/includes.php"); switch ($_POST["action"]) { case 'newcase': - if (isset($_POST['id']) && $_POST['id'] > 0) { // then this case will be bound to an item - // we must check if a case is not already existing + if (isset($_POST['items_id']) && $_POST['items_id'] > 0) { // then this case will be bound to an item + // TODO: we must check if a case is not already existing // to manage the problem of F5 (Refresh) - $hasCase = PluginProcessmakerProcessmaker::getCaseIdFromItem( $_POST['itemtype'], $_POST['id'] ); - if ($hasCase === false && $_POST['plugin_processmaker_process_id'] > 0) { //$DB->numrows($res) == 0) { - $myProcessMaker = new PluginProcessmakerProcessmaker(); - $myProcessMaker->login(); //openSession(); - $resultCase = $myProcessMaker->startNewCase( $_POST['plugin_processmaker_process_id'], $_POST['itemtype'], $_POST['id'], Session::getLoginUserID() ); + //$hasCase = PluginProcessmakerCase::getIDFromItem($_POST['itemtype'], $_POST['items_id']); + //if ($hasCase === false && $_POST['plugin_processmaker_processes_id'] > 0) { + if ($_POST['plugin_processmaker_processes_id'] > 0) { + + $resultCase = $PM_SOAP->startNewCase($_POST['plugin_processmaker_processes_id'], $_POST['itemtype'], $_POST['items_id'], Session::getLoginUserID()); if ($resultCase->status_code == 0) { + $case = new PluginProcessmakerCase; + if ($case->getFromGUID($resultCase->caseId)) { + $link = $case->getLinkURL(); + $task = new PluginProcessmakerTask(); + $task->getFromDBByQuery(" WHERE `plugin_processmaker_cases_id`=".$case->getID()); // normally there is only one and only one first task + //$link .= '&forcetab=PluginProcessmakerTask$'.$task->getID(); + Session::setActiveTab('PluginProcessmakerCase', 'PluginProcessmakerTask$'.$task->getID()); + $item = new $_POST['itemtype']; + $item->getFromDB($_POST['items_id']); + unset($_SERVER['REQUEST_URI']); // to prevent use of processmaker.form.php in NavigateList + Session::initNavigateListItems('PluginProcessmakerCase', + //TRANS : %1$s is the itemtype name, + // %2$s is the name of the item (used for headings of a list) + sprintf(__('%1$s = %2$s'), + $_POST['itemtype']::getTypeName(1), $item->fields["name"])); + Html::redirect($link); + } Html::back(); } else { Session::addMessageAfterRedirect($LANG['processmaker']['item']['error'][$resultCase->status_code]."
".$resultCase->message." (".$resultCase->status_code.")", true, ERROR); @@ -22,19 +39,17 @@ switch ($_POST["action"]) { Html::back(); } } else { // the case is created before the ticket (used for post-only case creation before ticket creation) - $myProcessMaker = new PluginProcessmakerProcessmaker(); - $myProcessMaker->login(); - $resultCase = $myProcessMaker->newCase( $_POST['plugin_processmaker_process_id'], + $resultCase = $PM_SOAP->newCase( $_POST['plugin_processmaker_processes_id'], array( 'GLPI_ITEM_CAN_BE_SOLVED' => 0, 'GLPI_SELFSERVICE_CREATED' => '1', 'GLPI_ITEM_TYPE' => 'Ticket', - 'GLPI_URL' => $CFG_GLPI['url_base'].$CFG_GLPI['root_doc']) ); + 'GLPI_URL' => $CFG_GLPI['url_base']) ); if ($resultCase->status_code == 0) { // case is created // Must show it... // $rand = rand( ); - Html::redirect($CFG_GLPI['root_doc']."/plugins/processmaker/front/processmaker.helpdesk.form.php?process_id=".$_POST['plugin_processmaker_process_id']."&case_id=".$resultCase->caseId."&rand=$rand&itilcategories_id=".$_POST["itilcategories_id"]."&type=".$_REQUEST["type"]."&entities_id=".$_REQUEST['entities_id']); + Html::redirect($CFG_GLPI['root_doc']."/plugins/processmaker/front/processmaker.helpdesk.form.php?processes_id=".$_POST['plugin_processmaker_processes_id']."&case_guid=".$resultCase->caseId."&rand=$rand&itilcategories_id=".$_POST["itilcategories_id"]."&type=".$_REQUEST["type"]."&entities_id=".$_REQUEST['entities_id']); } else { Session::addMessageAfterRedirect($LANG['processmaker']['item']['error'][$resultCase->status_code]."
$resultCase->message ($resultCase->status_code)", true, ERROR); //echo "Error creating case: $resultCase->message \n"; @@ -45,36 +60,28 @@ switch ($_POST["action"]) { break; case 'unpausecase_or_reassign_or_delete' : - if (isset( $_POST['unpause'] )) { - $myProcessMaker = new PluginProcessmakerProcessmaker(); - $myProcessMaker->login(); //openSession(); - $pmResultUnpause = $myProcessMaker->unpauseCase( $_POST['plugin_processmaker_caseId'], $_POST['plugin_processmaker_delIndex'], $_POST['plugin_processmaker_userId'] ); + if (isset($_POST['unpause'])) { + $locCase = new PluginProcessmakerCase; + $locCase->getFromDB($_POST['cases_id']); + $pmResultUnpause = $locCase->unpauseCase($_POST['delIndex'], $_POST['users_id']); if ($pmResultUnpause->status_code == 0) { Html::back(); } else { echo "Error unpausing case: ".$pmResultUnpause->message." \n"; } - } else if (isset( $_POST['reassign'] )) { - // here we should re-assign the current task to $_POST['users_id_recipient'] - $GLPINewPMUserId = PluginProcessmakerUser::getPMUserId( $_POST['users_id_recipient'] ); - if ($_POST['plugin_processmaker_userId'] != $GLPINewPMUserId) { - $locPM = new PluginProcessmakerProcessmaker(); - $locPM->login( ); + } else if (isset($_POST['reassign'])) { + // here we should re-assign the current task to $_POST['users_id_recipient'] + //$GLPINewPMUserId = PluginProcessmakerUser::getPMUserId( $_POST['users_id_recipient'] ); + if ($_POST['users_id'] != $_POST['users_id_recipient']) { // normally should be different as of the dropdown prevents already used + $locCase = new PluginProcessmakerCase; + $locCase->getFromDB($_POST['cases_id']); - $pmResponse = $locPM->reassignCase( $_POST['plugin_processmaker_caseId'], $_POST['plugin_processmaker_delIndex'], $_POST['plugin_processmaker_userId'], $GLPINewPMUserId ); - if ($pmResponse->status_code == 0) { - // we need to change the delindex of the glpi task and the assigned tech to prevent creation of new tasks - // we need the delindex of the current glpi task, and the delindex of the new one - // search for new delindex - $newCaseInfo = $locPM->getCaseInfo( $_POST['plugin_processmaker_caseId'] ); - $newDelIndex = 0; - foreach ($newCaseInfo->currentUsers as $newCaseUser) { - if ($newCaseUser->taskId == $_POST['plugin_processmaker_taskId'] && $newCaseUser->delThread == $_POST['plugin_processmaker_delThread']) { - $newDelIndex = $newCaseUser->delIndex; - break; - } - } - $locPM->reassignTask( $_POST['plugin_processmaker_caseId'], $_POST['plugin_processmaker_delIndex'], $newDelIndex, $_POST['users_id_recipient'] ); + $pmResponse = $locCase->reassignCase($_POST['delIndex'], + $_POST['taskGuid'], + $_POST['delThread'], + $_POST['users_id'], + $_POST['users_id_recipient']); + if ($pmResponse) { Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['reassigned'], true, INFO); } else { Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['notreassigned'].$pmResponse->message, true, ERROR); @@ -82,39 +89,51 @@ switch ($_POST["action"]) { } else { Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['assignedtoyou'], true, ERROR); // Html::back(); } - } else if (isset($_POST['delete'])) { - // delete case from case table, this will also delete the tasks - $locCase = new PluginProcessmakerCase; - $locCase->getFromDB( $_POST['plugin_processmaker_caseId'] ); - if ($locCase->deleteCase()) { - // request delete from pm itself - $myProcessMaker = new PluginProcessmakerProcessmaker(); - $myProcessMaker->login(true); - $resultPM = $myProcessMaker->deleteCase( $_POST['plugin_processmaker_caseId'] ); + //} else if (isset($_POST['delete'])) { + // // delete case from case table, this will also delete the tasks + // $locCase = new PluginProcessmakerCase; + // if ($locCase->getFromDB($_POST['cases_id']) && $locCase->deleteCase()) { + // // request delete from pm itself + // $PM_SOAP->login(true); - if ($resultPM->status_code == 0) { - Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['deleted'], true, INFO); - } else { - Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['errordeleted'], true, ERROR); - } - } else { - Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['errordeleted'], true, ERROR); - } + // $resultPM = $PM_SOAP->deleteCase($locCase->fields['case_guid']); + + // if ($resultPM->status_code == 0) { + // Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['deleted'], true, INFO); + // } else { + // Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['errordeleted'], true, ERROR); + // } + // } else { + // Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['errordeleted'], true, ERROR); + // } } else if (isset($_POST['cancel'])) { // cancel case from PM - $myProcessMaker = new PluginProcessmakerProcessmaker(); - $myProcessMaker->login(); - $resultPM = $myProcessMaker->cancelCase( $_POST['plugin_processmaker_caseId'] ); //, $_POST['plugin_processmaker_delIndex'], $_POST['plugin_processmaker_userId'] ) ; + $locCase = new PluginProcessmakerCase; + $locCase->getFromDB($_POST['cases_id']); + $resultPM = $PM_SOAP->cancelCase($locCase->fields['case_guid']); //, $_POST['plugin_processmaker_del_index'], $_POST['plugin_processmaker_users_id'] ) ; if ($resultPM->status_code === 0) { - $locCase = new PluginProcessmakerCase; - $locCase->getFromDB( $_POST['plugin_processmaker_caseId'] ); + //$locCase = new PluginProcessmakerCase; + //$locCase->getFromDB($_POST['cases_id']); if ($locCase->cancelCase()) { Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['cancelled'], true, INFO); } else { Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['errorcancelled'], true, ERROR); } } else { - Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['errorcancelled'], true, ERROR); + if ($resultPM->status_code == 100 && $locCase->deleteCase()) { // case is draft then delete it + // request delete from pm itself + $PM_SOAP->login(true); + + $resultPM = $PM_SOAP->deleteCase($locCase->fields['case_guid']); + + if ($resultPM->status_code == 0) { + Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['deleted'], true, INFO); + } else { + Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['errordeleted'], true, ERROR); + } + } else { + Session::addMessageAfterRedirect($LANG['processmaker']['item']['case']['errorcancelled']. " " . $resultPM->message, true, ERROR); + } } } @@ -122,6 +141,6 @@ switch ($_POST["action"]) { } -// to return to ticket +// to return to item Html::back(); diff --git a/front/processmaker.helpdesk.form.php b/front/processmaker.helpdesk.form.php index 9f88c29..5e4b145 100644 --- a/front/processmaker.helpdesk.form.php +++ b/front/processmaker.helpdesk.form.php @@ -1,6 +1,13 @@ "; - echo "
"; - echo ""; + $rand = rand(); + echo ""; + echo "
".$LANG['processmaker']['item']['tab']."
"; + echo ""; - echo ""; + echo ""; - echo "
".$LANG['processmaker']['item']['tab']."
"; - echo $LANG['processmaker']['item']['selectprocess']." "; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - PluginProcessmakerProcess::dropdown( array( 'value' => 0, 'entity' => $_SESSION['glpiactive_entity'], 'name' => 'plugin_processmaker_process_id' )); - echo ""; - echo ""; - echo "
"; + echo $LANG['processmaker']['item']['selectprocess']." "; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + PluginProcessmakerProcess::dropdown( array( 'value' => 0, 'entity' => $_SESSION['glpiactive_entity'], 'name' => 'plugin_processmaker_processes_id' )); + echo ""; + echo ""; + echo "
"; - Html::closeForm(); + echo ""; + Html::closeForm(); + + return true; } -//function showFormHelpdesk($ID, $pmItem, $caseInfo, $ticket_template=false) { -// global $DB, $CFG_GLPI; - -// if (!Ticket::canCreate()) { -// return false; -// } - -// if (!$ticket_template -// && Session::haveRightsOr('ticketvalidation', TicketValidation::getValidateRights())) { - -// $opt = array(); -// $opt['reset'] = 'reset'; -// $opt['criteria'][0]['field'] = 55; // validation status -// $opt['criteria'][0]['searchtype'] = 'equals'; -// $opt['criteria'][0]['value'] = CommonITILValidation::WAITING; -// $opt['criteria'][0]['link'] = 'AND'; - -// $opt['criteria'][1]['field'] = 59; // validation aprobator -// $opt['criteria'][1]['searchtype'] = 'equals'; -// $opt['criteria'][1]['value'] = Session::getLoginUserID(); -// $opt['criteria'][1]['link'] = 'AND'; - -// $url_validate = $CFG_GLPI["root_doc"]."/front/ticket.php?".Toolbox::append_params($opt, -// '&'); - -// if (TicketValidation::getNumberToValidate(Session::getLoginUserID()) > 0) { -// echo "". -// __('Tickets awaiting approval')."

"; -// } -// } - -// $email = UserEmail::getDefaultForUser($ID); -// $default_use_notif = Entity::getUsedConfig('is_notif_enable_default', $_REQUEST['entities_id'], '', 1); - -// // Set default values... -// $default_values = array('_users_id_requester_notif' -// => array('use_notification' -// => (($email == "")?0:$default_use_notif)), -// 'nodelegate' => 1, -// '_users_id_requester' => 0, -// '_users_id_observer' => array(0), -// '_users_id_observer_notif' -// => array('use_notification' => $default_use_notif), -// 'name' => '', -// 'content' => '', -// 'itilcategories_id' => 0, -// 'locations_id' => 0, -// 'urgency' => 3, - -// 'items_id' => 0, -// 'entities_id' => $_REQUEST['entities_id'], -// 'plan' => array(), -// 'global_validation' => CommonITILValidation::NONE, -// '_add_validation' => 0, -// 'type' => Entity::getUsedConfig('tickettype', -// $_REQUEST['entities_id'], -// '', Ticket::INCIDENT_TYPE), -// '_right' => "id", -// '_filename' => array(), -// '_tag_filename' => array()); - -// // Get default values from posted values on reload form -// if (!$ticket_template) { -// if (isset($_POST)) { -// $values = Html::cleanPostForTextArea($_POST); -// } -// } - -// $ticket = new Ticket(); -// // Restore saved value or override with page parameter -// if (!function_exists('restoreInput')) { -// function restoreInput(Array $default=array()) { - -// if (isset($_SESSION['saveInput']['Ticket'])) { -// $saved = Html::cleanPostForTextArea($_SESSION['saveInput']['Ticket']); - -// // clear saved data when restored (only need once) -// unset($_SESSION['saveInput']['Ticket']); - -// return $saved; -// } - -// return $default; -// } -// } -// $saved = restoreInput(); -// foreach ($default_values as $name => $value) { -// if (!isset($values[$name])) { -// if (isset($saved[$name])) { -// $values[$name] = $saved[$name]; -// } else { -// $values[$name] = $value; -// } -// } -// } - -// // Check category / type validity -// if ($values['itilcategories_id']) { -// $cat = new ITILCategory(); -// if ($cat->getFromDB($values['itilcategories_id'])) { -// switch ($values['type']) { -// case Ticket::INCIDENT_TYPE : -// if (!$cat->getField('is_incident')) { -// $values['itilcategories_id'] = 0; -// } -// break; - -// case Ticket::DEMAND_TYPE : -// if (!$cat->getField('is_request')) { -// $values['itilcategories_id'] = 0; -// } -// break; - -// default : -// break; -// } -// } -// } - -// if (!$ticket_template) { -// echo ""; -// } - -// $delegating = User::getDelegateGroupsForUser($values['entities_id']); - -// if (count($delegating)) { -// echo "
"; -// echo ""; -// echo ""; - -// echo "
".__('This ticket concerns me')." "; - -// $rand = Dropdown::showYesNo("nodelegate", $values['nodelegate']); - -// $params = array('nodelegate' => '__VALUE__', -// 'rand' => $rand, -// 'right' => "delegate", -// '_users_id_requester' -// => $values['_users_id_requester'], -// '_users_id_requester_notif' -// => $values['_users_id_requester_notif'], -// 'use_notification' -// => $values['_users_id_requester_notif']['use_notification'], -// 'entity_restrict' -// => $_REQUEST['entities_id']); - -// Ajax::UpdateItemOnSelectEvent("dropdown_nodelegate".$rand, "show_result".$rand, -// $CFG_GLPI["root_doc"]."/ajax/dropdownDelegationUsers.php", -// $params); - -// $class = 'right'; -// if ($CFG_GLPI['use_check_pref'] && $values['nodelegate']) { -// echo "".__('Check your personnal information'); -// $class = 'center'; -// } - -// echo "
"; -// echo "
"; - -// $self = $ticket; // new self(); -// if ($values["_users_id_requester"] == 0) { -// $values['_users_id_requester'] = Session::getLoginUserID(); -// } else { -// $values['_right'] = "delegate"; -// } -// $self->showActorAddFormOnCreate(CommonITILActor::REQUESTER, $values); -// echo "
"; -// if ($CFG_GLPI['use_check_pref'] && $values['nodelegate']) { -// echo "		"; -// User::showPersonalInformation(Session::getLoginUserID()); -// } -// echo "
"; -// echo ""; - -// } else { -// // User as requester -// $values['_users_id_requester'] = Session::getLoginUserID(); - -// if ($CFG_GLPI['use_check_pref']) { -// echo "
"; -// echo ""; -// echo ""; -// echo "
".__('Check your personnal information')."
"; -// User::showPersonalInformation(Session::getLoginUserID()); -// echo "
"; -// } -// } - -// echo ""; -// echo ""; - -// // Load ticket template if available : -// $tt = $ticket->getTicketTemplateToUse($ticket_template, $values['type'], -// $values['itilcategories_id'], -// $_REQUEST['entities_id']); - -// // Predefined fields from template : reset them -// if (isset($values['_predefined_fields'])) { -// $values['_predefined_fields'] -// = Toolbox::decodeArrayFromInput($values['_predefined_fields']); -// } else { -// $values['_predefined_fields'] = array(); -// } - -// // Store predefined fields to be able not to take into account on change template -// $predefined_fields = array(); - -// if (isset($tt->predefined) && count($tt->predefined)) { -// foreach ($tt->predefined as $predeffield => $predefvalue) { -// if (isset($values[$predeffield]) && isset($default_values[$predeffield])) { -// // Is always default value : not set -// // Set if already predefined field -// // Set if ticket template change -// if (((count($values['_predefined_fields']) == 0) -// && ($values[$predeffield] == $default_values[$predeffield])) -// || (isset($values['_predefined_fields'][$predeffield]) -// && ($values[$predeffield] == $values['_predefined_fields'][$predeffield])) -// || (isset($values['_tickettemplates_id']) -// && ($values['_tickettemplates_id'] != $tt->getID()))) { -// $values[$predeffield] = $predefvalue; -// $predefined_fields[$predeffield] = $predefvalue; -// } -// } else { // Not defined options set as hidden field -// echo ""; -// } -// } -// // All predefined override : add option to say predifined exists -// if (count($predefined_fields) == 0) { -// $predefined_fields['_all_predefined_override'] = 1; -// } -// } else { // No template load : reset predefined values -// if (count($values['_predefined_fields'])) { -// foreach ($values['_predefined_fields'] as $predeffield => $predefvalue) { -// if ($values[$predeffield] == $predefvalue) { -// $values[$predeffield] = $default_values[$predeffield]; -// } -// } -// } -// } - -// if (($CFG_GLPI['urgency_mask'] == (1<<3)) -// || $tt->isHiddenField('urgency')) { -// // Dont show dropdown if only 1 value enabled or field is hidden -// echo ""; -// } - -// // Display predefined fields if hidden -// if ($tt->isHiddenField('items_id')) { - -// if (!empty($values['items_id'])) { -// foreach ($values['items_id'] as $itemtype => $items) { -// foreach ($items as $items_id) { -// echo ""; -// } -// } -// } -// } -// if ($tt->isHiddenField('locations_id')) { -// echo ""; -// } -// echo ""; -// echo ""; -// echo "
"; - -// echo ""; - -// echo ""; -// echo ""; -// echo ""; - -// echo ""; -// echo ""; -// echo ""; - -// if ($CFG_GLPI['urgency_mask'] != (1<<3)) { -// if (!$tt->isHiddenField('urgency')) { -// echo ""; -// echo ""; -// echo ""; -// } -// } - -// if (empty($delegating) -// && NotificationTargetTicket::isAuthorMailingActivatedForHelpdesk()) { -// echo ""; -// echo ""; -// echo ""; -// } -// if (($_SESSION["glpiactiveprofile"]["helpdesk_hardware"] != 0) -// && (count($_SESSION["glpiactiveprofile"]["helpdesk_item_type"]))) { -// if (!$tt->isHiddenField('itemtype')) { -// echo ""; -// echo ""; -// echo ""; -// } -// } - -// if (!$tt->isHiddenField('locations_id')) { -// echo ""; -// } - -// if (!$tt->isHiddenField('_users_id_observer') -// || $tt->isPredefinedField('_users_id_observer')) { -// echo ""; -// echo ""; -// echo ""; -// } - -// if (!$tt->isHiddenField('name') -// || $tt->isPredefinedField('name')) { -// echo ""; -// echo ""; -// } - -// if (!$tt->isHiddenField('content') -// || $tt->isPredefinedField('content')) { -// echo ""; -// echo ""; -// } - -// echo ""; -// echo ""; - -// // File upload system -// $width = '100%'; -// if ($CFG_GLPI['use_rich_text']) { -// $width = '50%'; -// } -// echo ""; -// echo ""; -// echo ""; -// echo ""; - -// echo ""; -// echo ""; -// echo ""; - -// if (!$ticket_template) { -// echo ""; -// echo ""; -// } - -// echo "
".$caseInfo->processName.""; - -// if (Session::isMultiEntitiesMode()) { -// echo "(".Dropdown::getDropdownName("glpi_entities", $_REQUEST['entities_id']).")"; -// } -// echo "
".sprintf(__('%1$s%2$s'), __('Urgency'), $tt->getMandatoryMark('urgency')). -// ""; -// Ticket::dropdownUrgency(array('value' => $values["urgency"])); -// echo "
".__('Inform me about the actions taken').""; -// if ($values["_users_id_requester"] == 0) { -// $values['_users_id_requester'] = Session::getLoginUserID(); -// } -// $_POST['value'] = $values['_users_id_requester']; -// $_POST['field'] = '_users_id_requester_notif'; -// $_POST['use_notification'] = $values['_users_id_requester_notif']['use_notification']; -// include (GLPI_ROOT."/ajax/uemailUpdate.php"); - -// echo "
".sprintf(__('%1$s%2$s'), _n('Watcher', 'Watchers', 2), -// $tt->getMandatoryMark('_users_id_observer')).""; -// $values['_right'] = "groups"; - -// if (!$tt->isHiddenField('_users_id_observer')) { -// // Observer - -// if ($tt->isPredefinedField('_users_id_observer') -// && !is_array($values['_users_id_observer'])) { - -// //convert predefined value to array -// $values['_users_id_observer'] = array($values['_users_id_observer']); -// $values['_users_id_observer_notif']['use_notification'] = -// array($values['_users_id_observer_notif']['use_notification']); - -// // add new line to permit adding more observers -// $values['_users_id_observer'][1] = 0; -// $values['_users_id_observer_notif']['use_notification'][1] = 1; -// } - -// echo "
"; -// if (isset($values['_users_id_observer'])) { -// $observers = $values['_users_id_observer']; -// foreach ($observers as $index_observer => $observer) { -// $options = array_merge($values, array('_user_index' => $index_observer)); -// Ticket::showFormHelpdeskObserver($options); -// } -// } -// echo "
"; - -// } else { // predefined value -// if (isset($values["_users_id_observer"]) && $values["_users_id_observer"]) { -// echo Ticket::getActorIcon('user', CommonITILActor::OBSERVER)." "; -// echo Dropdown::getDropdownName("glpi_users", $values["_users_id_observer"]); -// echo ""; - -// } -// } -// echo "
"; -// $rand = rand(); -// $pmCaseUser = $caseInfo->currentUsers[0]; // by default -// $paramsURL = "DEL_INDEX=".$pmCaseUser->delIndex."&action=".$caseInfo->caseStatus; -// echo ""; -// echo "
".sprintf(__('%1$s (%2$s)'), __('File'), Document::getMaxUploadSize()); -// DocumentType::showAvailableTypesLink(); -// echo ""; -// echo "
"; -// echo "
"; -// echo ""; -// echo ""; -// if ($CFG_GLPI['use_rich_text']) { -// echo ""; -// } -// echo "
"; - -// echo Html::file(array('multiple' => true, -// 'values' => array('filename' => $values['_filename'], -// 'tag' => $values['_tag_filename']) -// )); -// // "
"; -// echo "		"; -// if (!isset($rand)) { -// $rand = mt_rand(); -// } - -// echo Html::initImagePasteSystem($content_id, $rand); -// echo "
"; - -// echo "
"; -// if (!$ticket_template) { -// Html::closeForm(); -// } -//} - - - - +/** + * Summary of processMakerShowCase + * @param mixed $ID + * @param mixed $from_helpdesk + */ function processMakerShowCase( $ID, $from_helpdesk ) { - global $CFG_GLPI; + global $CFG_GLPI, $PM_SOAP; - $pmItem = new PluginProcessmakerProcessmaker( ); - $pmItem->login( ); - - $caseInfo = $pmItem->getCaseInfo( $_REQUEST['case_id'] ); + $caseInfo = $PM_SOAP->getCaseInfo( $_REQUEST['case_guid'] ); if ($caseInfo->status_code == 0) { // case is created // Must show it... @@ -606,14 +108,19 @@ function processMakerShowCase( $ID, $from_helpdesk ) { $elt->setAttribute( 'style', 'display:none;'); } - // add an input for processId in the form - // echo ""; + // add an input for processguid in the form $res = $xpath->query('//form[@name="helpdeskform"]'); $input = $res->item(0)->appendChild(new DOMElement('input')); - $input->setAttribute('name', 'processId'); + $input->setAttribute('name', 'processmaker_process_guid'); $input->setAttribute('type', 'hidden'); $input->setAttribute('value', $caseInfo->processId); + // add an input for processid in the form + $input = $res->item(0)->appendChild(new DOMElement('input')); + $input->setAttribute('name', 'processmaker_processes_id'); + $input->setAttribute('type', 'hidden'); + $input->setAttribute('value', $_REQUEST['processes_id']); + // special case for content textarea which is in the same tr than the file upload $res = $xpath->query('//*[@name="content"]/ancestor::div[1] | //*[@name="content"]/ancestor::tr[1]/td[1]'); foreach($res as $elt) { @@ -645,7 +152,7 @@ function processMakerShowCase( $ID, $from_helpdesk ) { $iframe->setAttribute('onload', "onLoadFrame( event, '{$caseInfo->caseId}', {$pmCaseUser->delIndex}, {$caseInfo->caseNumber}, '{$caseInfo->processName}') ;" ) ; $iframe->setAttribute('width', '100%' ) ; $iframe->setAttribute('style', 'border:none;' ) ; - $iframe->setAttribute('src', "{$pmItem->serverURL}/cases/cases_Open?sid={$_SESSION["pluginprocessmaker"]["session"]["id"]}&APP_UID={$caseInfo->caseId}&{$paramsURL}&rand=$rand&glpi_domain={$pmItem->config->fields['domain']}" ) ; + $iframe->setAttribute('src', "{$PM_SOAP->serverURL}/cases/cases_Open?sid={$PM_SOAP->getPMSessionID()}&APP_UID={$caseInfo->caseId}&{$paramsURL}&rand=$rand&glpi_domain={$PM_SOAP->config->fields['domain']}" ) ; // set the width and the title of the first table th $th = $xpath->query('//*[@name="add"]/ancestor::table[1]/*/th[1]'); @@ -679,22 +186,6 @@ function in_array_recursive($needle, $haystack) { } -//// redirect if no create ticket right -//if (!Session::haveRight('ticket', CREATE )) { -// if (Session::haveRight('observe_ticket', 1) || Session::haveRight('validate_ticket', 1)) { -// Html::redirect($CFG_GLPI['root_doc']."/front/ticket.php"); -// } else if (Session::haveRight('reservation_helpdesk', 1)) { -// Html::redirect($CFG_GLPI['root_doc']."/front/reservationitem.php"); -// } else if (Session::haveRight('faq', READ)) { -// Html::redirect($CFG_GLPI['root_doc']."/front/helpdesk.faq.php"); -// } -//} - -//Session::checkHelpdeskAccess(); - -//Html::helpHeader($LANG['job'][13], $_SERVER['PHP_SELF'], $_SESSION["glpiname"]); - - // Change profile system if (isset($_POST['newprofile'])) { if (isset($_SESSION["glpiprofiles"][$_POST['newprofile']])) { @@ -752,8 +243,8 @@ Session::checkHelpdeskAccess(); Html::helpHeader(__('New ticket'), $_SERVER['PHP_SELF'], $_SESSION["glpiname"]); -if (isset($_REQUEST['case_id'])) { - $query = "SELECT * FROM glpi_plugin_processmaker_cases WHERE id='".$_REQUEST['case_id']."'"; +if (isset($_REQUEST['case_guid'])) { + $query = "SELECT * FROM glpi_plugin_processmaker_cases WHERE case_guid='".$_REQUEST['case_guid']."'"; $res = $DB->query( $query ); if ($DB->numrows( $res )) { // a ticket already exists for this case, then show new cases processMakerShowProcessList(Session::getLoginUserID(), 1); @@ -761,7 +252,7 @@ if (isset($_REQUEST['case_id'])) { // before showing the case, we must check the rights for this user to view it, if entity has been changed in the meanwhile // and must check if entity of the ticket is in the tree of authorized entities for current profile $processList = PluginProcessmakerProcessmaker::getProcessesWithCategoryAndProfile( $_REQUEST["itilcategories_id"], $_REQUEST["type"], $_SESSION['glpiactiveprofile']['id'], $_REQUEST['entities_id'] ); - if (in_array( $_REQUEST['entities_id'], $_SESSION['glpiactiveentities']) && in_array_recursive( $_REQUEST['process_id'], $processList )) { + if (in_array( $_REQUEST['entities_id'], $_SESSION['glpiactiveentities']) && in_array_recursive( $_REQUEST['processes_id'], $processList )) { processMakerShowCase(Session::getLoginUserID(), 1); } else { Html::redirect($CFG_GLPI["root_doc"]."/front/helpdesk.public.php?create_ticket=1"); diff --git a/front/tracking.injector.php b/front/tracking.injector.php index 9534fb8..0ff12ae 100644 --- a/front/tracking.injector.php +++ b/front/tracking.injector.php @@ -39,7 +39,7 @@ if( isset($_POST["_from_helpdesk"]) && $_POST["_from_helpdesk"] == 1 $processQt = count( $processList ) ; if( $processQt == 1 ) { $_POST['action']='newcase'; - $_POST['plugin_processmaker_process_id'] = $processList[0]['id']; + $_POST['plugin_processmaker_processes_id'] = $processList[0]['id']; include (GLPI_ROOT . "/plugins/processmaker/front/processmaker.form.php"); die() ; } elseif( $processQt > 1 ) { diff --git a/hook.php b/hook.php index 0b42a9e..5dbb141 100644 --- a/hook.php +++ b/hook.php @@ -29,15 +29,20 @@ function plugin_processmaker_MassiveActions($type) { switch ($type) { case 'PluginProcessmakerProcess' : - if (plugin_processmaker_haveRight('config', UPDATE )) { + if (plugin_processmaker_haveRight('config', UPDATE)) { return array('plugin_processmaker_taskrefresh' => $LANG['processmaker']['config']['refreshtasklist']); } break; case 'PluginProcessmakerProcess_Profile' : - if (plugin_processmaker_haveRight('config', UPDATE )) { + if (plugin_processmaker_haveRight('config', UPDATE)) { return array('purge' => $LANG['processmaker']['process']['profile']); } break; + //case 'PluginProcessmakerCase' : + // if (plugin_processmaker_haveRight("case", DELETE)) { + // return array('purge' => __('Delete permanently')); + // } + //break; } return array(); } @@ -48,16 +53,16 @@ function plugin_processmaker_MassiveActionsDisplay($options) { switch ($options['itemtype']) { case 'PluginProcessmakerProcess' : + //case 'PluginProcessmakerCase' : switch ($options['action']) { - // No case for add_document : use GLPI core one case "plugin_processmaker_taskrefresh" : + //case "plugin_processmaker_purgecase" : echo ""; break; } break; - } return ""; } @@ -77,18 +82,29 @@ function plugin_processmaker_MassiveActionsProcess($data) { } } } - break; - case 'plugin_processmaker_process_profile_delete' : - if ($data['itemtype'] == 'PluginProcessmakerProcess_Profile') { - foreach ($data["item"] as $key => $val) { - if ($val == 1) { - $process_profile = new PluginProcessmakerProcess_Profile; - $process_profile->delete( array( 'id' => $key ), true ); + break; + //case "plugin_processmaker_purgecase": + // if ($data['itemtype'] == 'PluginProcessmakerCase') { + // foreach ($data["item"] as $key => $val) { + // if ($val == 1) { + // $locCase= new PluginProcessmakerCase; + // //$locCase->( array( 'id' => $key ) ); - } - } - } - break; + // } + // } + // } + // break; + //case 'plugin_processmaker_process_profile_delete' : + // if ($data['itemtype'] == 'PluginProcessmakerProcess_Profile') { + // foreach ($data["item"] as $key => $val) { + // if ($val == 1) { + // $process_profile = new PluginProcessmakerProcess_Profile; + // $process_profile->delete( array( 'id' => $key ), true ); + + // } + // } + // } + // break; } } @@ -127,7 +143,7 @@ function plugin_processmaker_install() { } function plugin_processmaker_uninstall() { - global $DB; + //global $DB; CronTask::Unregister('PluginProcessmakerProcessmaker'); @@ -136,9 +152,10 @@ function plugin_processmaker_uninstall() { function plugin_processmaker_getAddSearchOptions($itemtype) { - global $LANG; + global $LANG; - $sopt = array(); + $sopt = array(); + // TODO add Change and Problem + other fields to the search if ($itemtype == 'Ticket') { $sopt[10001]['table'] = 'glpi_plugin_processmaker_cases'; $sopt[10001]['field'] = 'case_status'; @@ -195,50 +212,51 @@ function plugin_processmaker_addLeftJoin($type,$ref_table,$new_table,$linkfield, * @return void */ function plugin_pre_item_update_processmaker(CommonITILObject $parm) { - global $DB; + global $DB;//, $PM_SOAP; - if (isset($_SESSION['glpiname']) && $parm->getType() == 'Ticket') { - $locCase = new PluginProcessmakerCase; + if (isset($_SESSION['glpiname'])) { // && $parm->getType() == 'Ticket') { + $locVar = array( ); + foreach ($parm->input as $key => $val) { + switch ($key) { + case 'global_validation' : + $locVar[ 'GLPI_TICKET_GLOBAL_VALIDATION' ] = $val; + break; + case 'itilcategories_id' : + $locVar[ 'GLPI_ITEM_ITIL_CATEGORY_ID' ] = $val; + break; + case 'due_date' : + $locVar[ 'GLPI_TICKET_DUE_DATE' ] = $val; + $locVar[ 'GLPI_ITEM_DUE_DATE' ] = $val; + break; + case 'urgency' : + $locVar[ 'GLPI_TICKET_URGENCY' ] = $val; + $locVar[ 'GLPI_ITEM_URGENCY' ] = $val; + break; + case 'impact' : + $locVar[ 'GLPI_ITEM_IMPACT' ] = $val; + break; + case 'priority' : + $locVar[ 'GLPI_ITEM_PRIORITY' ] = $val; + break; + } + } $itemId = $parm->getID(); $itemType = $parm->getType(); - if ($locCase->getCaseFromItemTypeAndItemId( $itemType, $itemId )) { - $locPM = new PluginProcessmakerProcessmaker; - $locPM->login(); + $locCase = new PluginProcessmakerCase; + foreach(PluginProcessmakerCase::getIDsFromItem($itemType, $itemId ) as $cases_id){ + $locCase->getFromDB($cases_id); + $locCase->sendVariables($locVar); - // case is existing for this item - // beware to empty injection when not modified!!! - $locVar = array( ); - foreach ($parm->input as $key => $val) { - switch ($key) { - case 'global_validation' : - $locVar[ 'GLPI_TICKET_GLOBAL_VALIDATION' ] = $val; - break; - case 'itilcategories_id' : - $locVar[ 'GLPI_ITEM_ITIL_CATEGORY_ID' ] = $val; - break; - case 'due_date' : - $locVar[ 'GLPI_TICKET_DUE_DATE' ] = $val; - $locVar[ 'GLPI_ITEM_DUE_DATE' ] = $val; - break; - case 'urgency' : - $locVar[ 'GLPI_TICKET_URGENCY' ] = $val; - $locVar[ 'GLPI_ITEM_URGENCY' ] = $val; - break; - case 'impact' : - $locVar[ 'GLPI_ITEM_IMPACT' ] = $val; - break; - case 'priority' : - $locVar[ 'GLPI_ITEM_PRIORITY' ] = $val; - break; - } + // if entities_id of item has been changed, then must update case + if (isset($parm->input['entities_id']) && $parm->input['entities_id'] != $parm->fields['entities_id']) { + $locCase->update(['id' => $cases_id, 'entities_id' => $parm->input['entities_id']]); } - - $pmResponse = $locPM->sendVariables( $locCase->getID(), $locVar); } } + } /** @@ -250,7 +268,7 @@ function plugin_item_update_processmaker_satisfaction($parm) { global $DB, $GLOBALS; $locCase = new PluginProcessmakerCase; - if ($locCase->getCaseFromItemTypeAndItemId( 'Ticket', $parm->fields['tickets_id'] )) { + if ($locCase->getFromItem( 'Ticket', $parm->fields['tickets_id'] )) { // case is existing for this item $locPM = new PluginProcessmakerProcessmaker; @@ -273,7 +291,7 @@ function plugin_pre_item_purge_processmaker ( $parm ) { $itemType = 'Ticket'; $technicians = PluginProcessmakerProcessmaker::getItemUsers( $itemType, $itemId, 2 ); // 2 for technicians - if (PluginProcessmakerCase::getCaseIdFromItemTypeAndItemId( $itemType, $itemId ) && count($technicians) == 1) { + if (PluginProcessmakerCase::getIDFromItem($itemType, $itemId) && count($technicians) == 1) { $parm->input = null; // to cancel deletion of the last tech in the ticket } } @@ -284,7 +302,7 @@ function plugin_pre_item_purge_processmaker ( $parm ) { * @param mixed $parm is the object */ function plugin_item_purge_processmaker($parm) { - global $DB; + global $DB, $PM_SOAP; //$objects = ['Ticket', 'Change', 'Problem']; $object_users = ['Ticket_User', 'Change_User', 'Problem_User']; @@ -299,11 +317,11 @@ function plugin_item_purge_processmaker($parm) { $itemId = $parm->fields['tickets_id']; $itemType = explode('_', $parm->getType())[0]; // 'Ticket'; - if ($locCase->getCaseFromItemTypeAndItemId( $itemType, $itemId )) { + if ($locCase->getFromItem( $itemType, $itemId )) { // case is existing for this item - $technicians = PluginProcessmakerProcessmaker::getItemUsers( $itemType, $itemId, 2 ); // 2 for technicians - $locPM = new PluginProcessmakerProcessmaker; - $locPM->login(); + $technicians = PluginProcessmakerProcessmaker::getItemUsers( $itemType, $itemId, CommonITILActor::ASSIGN ); // 2 for technicians + //$locPM = new PluginProcessmakerProcessmaker; + //$locPM->login(); $locVars = array( 'GLPI_TICKET_TECHNICIAN_GLPI_ID' => $technicians[0]['glpi_id'], 'GLPI_ITEM_TECHNICIAN_GLPI_ID' => $technicians[0]['glpi_id'], 'GLPI_TICKET_TECHNICIAN_PM_ID' => $technicians[0]['pm_id'], @@ -311,34 +329,38 @@ function plugin_item_purge_processmaker($parm) { ); // and we must find all tasks assigned to this former user and re-assigned them to new user (if any :))! - $caseInfo = $locPM->getCaseInfo( $locCase->getID() ); + //$caseInfo = $locPM->getCaseInfo( $locCase->getID() ); + $caseInfo = $locCase->getCaseInfo( $locCase->getID() ); if ($caseInfo !== false) { - $locPM->sendVariables( $locCase->getID( ), $locVars ); + //$locPM->sendVariables( $locCase->getID( ), $locVars ); + $locCase->sendVariables( $locCase->getID( ), $locVars); // need to get info on the thread of the GLPI current user // we must retreive currentGLPI user from this array $GLPICurrentPMUserId = PluginProcessmakerUser::getPMUserId( $parm->fields['users_id'] ); if (isset( $caseInfo->currentUsers ) && is_array( $caseInfo->currentUsers )) { foreach ($caseInfo->currentUsers as $caseUser) { if ($caseUser->userId == $GLPICurrentPMUserId && in_array( $caseUser->delThreadStatus, array('DRAFT', 'OPEN', 'PAUSE' ) )) { - $pmResponse = $locPM->reassignCase( $locCase->getID(), $caseUser->delIndex, $GLPICurrentPMUserId, $technicians[0]['pm_id'] ); - // now should managed GLPI Tasks previously assigned to the $GLPICurrentPMUserId - if ($pmResponse->status_code == 0) { - // ATTENTION: should be aware of: ticket tech == task tech - // In this particular flow due to 'Change Management' - // we need to change the delindex of the glpi task and the assigned tech to prevent creation of new tasks - // we need the delindex of the current glpi task, and the delindex of the new one - // search for new delindex - $newCaseInfo = $locPM->getCaseInfo( $locCase->getID() ); - $newDelIndex = 0; - foreach ($newCaseInfo->currentUsers as $newCaseUser) { - if ($newCaseUser->taskId == $caseUser->taskId && $newCaseUser->delThread == $caseUser->delThread) { - $newDelIndex = $newCaseUser->delIndex; - break; - } - } - $locPM->reassignTask( $locCase->getID(), $caseUser->delIndex, $newDelIndex, $technicians[0]['glpi_id'] ); - } + //$pmResponse = $locPM->reassignCase( $locCase->getID(), $caseUser->delIndex, $GLPICurrentPMUserId, $technicians[0]['pm_id'] ); + $locCase->reassignCase($caseUser->delIndex, $caseUser->taskId, $caseUser->delThread, $parm->fields['users_id'], $technicians[0]['pm_id'] ); + //// now should managed GLPI Tasks previously assigned to the $GLPICurrentPMUserId + //if ($pmResponse->status_code == 0) { + // // ATTENTION: should be aware of: ticket tech == task tech + // // In this particular flow due to 'Change Management' + + // // we need to change the delindex of the glpi task and the assigned tech to prevent creation of new tasks + // // we need the delindex of the current glpi task, and the delindex of the new one + // // search for new delindex + // $newCaseInfo = $locPM->getCaseInfo( $locCase->getID() ); + // $newDelIndex = 0; + // foreach ($newCaseInfo->currentUsers as $newCaseUser) { + // if ($newCaseUser->taskId == $caseUser->taskId && $newCaseUser->delThread == $caseUser->delThread) { + // $newDelIndex = $newCaseUser->delIndex; + // break; + // } + // } + // $locPM->reassignTask( $locCase->getID(), $caseUser->delIndex, $newDelIndex, $technicians[0]['glpi_id'] ); + //} } } } @@ -349,8 +371,17 @@ function plugin_item_purge_processmaker($parm) { } function plugin_processmaker_post_init() { - global $PM_DB; - $PM_DB = new PluginProcessmakerDB; + global $PM_DB, $PM_SOAP; + if (!isset($PM_DB)) { + $PM_DB = new PluginProcessmakerDB; + } + if (!isset($PM_SOAP)) { + $PM_SOAP = new PluginProcessmakerProcessmaker; + // and default login is current running user if any + if (Session::getLoginUserID() ) { + $PM_SOAP->login(); + } + } } @@ -359,13 +390,19 @@ function plugin_processmaker_giveItem($itemtype,$ID,$data,$num) { return; } +function plugin_processmaker_change_profile($parm) { + if ($_SESSION['glpiactiveprofile']['interface'] == "helpdesk") { + // must add the rights for simplified interface + $_SESSION['glpiactiveprofile']['plugin_processmaker_case'] = READ; + } +} /** * Summary of plugin_item_add_update_processmaker_tasks * @param mixed $parm */ function plugin_item_update_processmaker_tasks($parm) { - global $DB, $CFG_GLPI; + global $DB, $CFG_GLPI, $PM_SOAP; // we need to test if a specific case is completed, and if so // we should complete the linked cases (via linked tickets) @@ -376,9 +413,14 @@ function plugin_item_update_processmaker_tasks($parm) { $itemtype = str_replace( 'Task', '', $parm->getType() ); - foreach ($DB->request( 'glpi_plugin_processmaker_caselinks', "is_active = 1 AND sourcetask_guid='".$pmTaskCat->fields['pm_task_guid']."'") as $targetTask) { + $pmTask = new PluginProcessmakerTask($parm->getType()); + $pmTask->getFromDB($parm->fields['id']); - $srcCaseId = PluginProcessmakerProcessmaker::getCaseIdFromItem( $itemtype, $parm->fields['tickets_id']); + $locCase = new PluginProcessmakerCase; + $locCase->getFromDB($pmTask->fields['plugin_processmaker_cases_id']); //Item($itemtype, $parm->fields['tickets_id']); + $srccase_guid = $locCase->fields['case_guid']; + + foreach ($DB->request( 'glpi_plugin_processmaker_caselinks', "is_active = 1 AND sourcetask_guid='".$pmTaskCat->fields['pm_task_guid']."'") as $targetTask) { // Must check the condition $casevariables = array(); @@ -412,10 +454,10 @@ function plugin_item_update_processmaker_tasks($parm) { } // ask for those case variables - $myProcessMaker = new PluginProcessmakerProcessmaker(); - $myProcessMaker->login( ); + //$PM_SOAP = new PluginProcessmakerProcessmaker(); + //$PM_SOAP->login( ); // now tries to get the variables to check condition - $infoForTasks = $myProcessMaker->getVariables( $srcCaseId, $casevariables ); + $infoForTasks = $locCase->getVariables($casevariables); foreach ($infoForTasks as $casevar => $varval) { $infoForTasks[ "@@$casevar" ] = "'$varval'"; unset( $infoForTasks[ $casevar ] ); @@ -442,7 +484,7 @@ function plugin_item_update_processmaker_tasks($parm) { foreach ($externalapplication['params'] as $paramname => $variable) { $externalapplicationparams[$paramname] = eval( "return ".str_replace( array_keys($infoForTasks), $infoForTasks, $variable)." ;" ); } - $externalapplicationparams['callback']="http://".$_SERVER['SERVER_NAME' ].$CFG_GLPI['root_doc']."/plugins/processmaker/ajax/asynchronousdatas.php"; + $externalapplicationparams['callback'] = $CFG_GLPI["url_base"]."/plugins/processmaker/ajax/asynchronousdatas.php"; $ch = curl_init(); $externalapplication['url'] = eval( "return '".str_replace( array_keys($infoForTasks), $infoForTasks, $externalapplication['url'])."' ;" ); // '??? curl_setopt($ch, CURLOPT_URL, $externalapplication['url'] ); @@ -460,7 +502,7 @@ function plugin_item_update_processmaker_tasks($parm) { //$res = $DB->query($query) ; //if( $res && $DB->numrows($res) > 0 && $case=$DB->fetch_assoc($res) && isset($case['id']) && isset($case['del_index']) ) { //foreach( $DB->request($query) as $case ) { - $taskCase = $myProcessMaker->taskCase( $srcCaseId ); + $taskCase = $PM_SOAP->taskCase( $srccase_guid ); foreach ($taskCase as $task) { // search for target task guid if ($task->guid == $targetTask['targettask_guid']) { @@ -468,16 +510,17 @@ function plugin_item_update_processmaker_tasks($parm) { } } - $postdata['APP_UID'] = $srcCaseId; + $postdata['APP_UID'] = $srccase_guid; $postdata['DEL_INDEX'] = $task->delegate; //need to get the 'ProcessMaker' user - $pmconfig = PluginProcessmakerConfig::getInstance(); + $pmconfig = $PM_SOAP->config; //PluginProcessmakerConfig::getInstance(); $cronaction = new PluginProcessmakerCrontaskaction; $cronaction->add( array( 'plugin_processmaker_caselinks_id' => $targetTask['id'], - 'itemtype' => $itemtype, - 'items_id' => $parm->fields['tickets_id'], + 'plugin_processmaker_cases_id' => $locCase->getID(), + //'itemtype' => $itemtype, + //'items_id' => $parm->fields['tickets_id'], 'users_id' => $pmconfig->fields['users_id'], 'is_targettoclaim' => $targetTask['is_targettoclaim'], 'state' => ($targetTask['is_externaldata'] ? PluginProcessmakerCrontaskaction::WAITING_DATA : PluginProcessmakerCrontaskaction::DATA_READY), @@ -528,8 +571,9 @@ function plugin_item_update_processmaker_tasks($parm) { $cronaction = new PluginProcessmakerCrontaskaction; $cronaction->add( array( 'plugin_processmaker_caselinks_id' => $targetTask['id'], - 'itemtype' => $itemtype, - 'items_id' => $parm->fields['tickets_id'], + 'plugin_processmaker_cases_id' => $locCase->getID(), + //'itemtype' => $itemtype, + //'items_id' => $parm->fields['tickets_id'], 'users_id' => Session::getLoginUserID(), 'is_targettoclaim' => $targetTask['is_targettoclaim'], 'state' => ($targetTask['is_externaldata'] ? PluginProcessmakerCrontaskaction::WAITING_DATA : PluginProcessmakerCrontaskaction::DATA_READY), diff --git a/inc/case.class.php b/inc/case.class.php index d31a007..358f1c7 100644 --- a/inc/case.class.php +++ b/inc/case.class.php @@ -1,15 +1,66 @@ canDeleteItem(); + } + /** * Summary of getTabNameForItem * @param CommonGLPI $item is the item @@ -18,141 +69,408 @@ class PluginProcessmakerCase extends CommonDBTM { */ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { global $LANG; - - $item_id = $item->getID(); - $item_type = $item->getType(); - if (self::getCaseFromItemTypeAndItemId($item_type, $item_id )) { - return array( 'processmakercases' => $LANG['processmaker']['item']['tab']." ".$this->fields['case_status']."" ); + if ($item->getType() == __CLASS__) { + // get tab name for a case itself + return [ __CLASS__ => __('Case')." ".$LANG['processmaker']['case']['statuses'][$item->fields['case_status']].""]; } else { - return array( 'processmakercases' => $LANG['processmaker']['item']['tab'] ); - } + $items_id = $item->getID(); + $itemtype = $item->getType(); + // count how many cases are on this item + $cnt = count(self::getIDsFromItem($itemtype, $items_id)); + if ($cnt == 0) { + return ['processmakercases' => __('Process case', 'processmaker')]; + } + return ['processmakercases' => _n('Process case', 'Process cases', $cnt, 'processmaker')."$cnt"]; + } } - /** - * Summary of getCaseIdFromItemTypeAndItemId - * @param mixed $itemType is the item type - * @param mixed $itemId is the item id - * @return mixed case id - */ - static function getCaseIdFromItemTypeAndItemId( $itemType, $itemId) { + + /** + * Summary of getName + * @param mixed $options + * @return mixed + */ + function getName($options = array()){ + return $this->fields['name']; + } + + + /** + * Summary of getIDFromItem + * @param string $itemtype is the item type + * @param integer $items_id is the item id + * @return integer cases_id + */ + static function getIDFromItem($itemtype, $items_id) { + $tmp = New self; + if ($tmp->getFromDBByQuery(" WHERE items_id=$items_id and itemtype='$itemtype'")) { + return $tmp->getID(); + } + return false; + } + + + /** + * Summary of getIDsFromItem + * returns an array of the case ids linked to the item + * @param string $itemtype is the item type of the item (Ticket, Problem, Change) + * @param mixed $items_id is the GLPI id of the item in the type + * @return array + */ + static function getIDsFromItem($itemtype, $items_id) { + $ret = []; + foreach(getAllDatasFromTable( self::getTable(), "items_id=$items_id AND itemtype='$itemtype'") as $case) { + $ret[] = $case['id']; + } + return $ret; + } + + /** + * Summary of getFromItem + * @param mixed $itemtype is the item type + * @param mixed $items_id is the item id + * @return mixed: returns false when there is no case associated with the item, else fills in the item fields from DB, and returns true + */ + function getFromItem($itemtype, $items_id) { + return $this->getFromDBByQuery(" WHERE items_id=$items_id and itemtype='$itemtype'"); + } + + + /** + * Summary of getFromGUID + * @param mixed $case_guid + * @return boolean + */ + function getFromGUID($case_guid) { + return $this->getFromDBByQuery(" WHERE case_guid='$case_guid'"); + } + + + /** + * Summary of getVariables + * @param mixed $vars + * @return mixed + */ + function getVariables($vars=array()) { + global $PM_SOAP; + return $PM_SOAP->getVariables($this->fields['case_guid'], $vars); + } + + + /** + * Summary of sendVariables + * @param mixed $vars + * @return A + */ + function sendVariables($vars = array()) { + global $PM_SOAP; + return $PM_SOAP->sendVariables($this->fields['case_guid'], $vars); + } + + + /** + * Summary of getCaseInfo + * @param mixed $delIndex + * @return stdClass, a getCaseInfoResponse object, or false exception occured + */ + function getCaseInfo($delIndex='') { + global $PM_SOAP; + return $PM_SOAP->getCaseInfo($this->fields['case_guid'], $delIndex); + } + + + /** + * Summary of unpauseCase + * @param mixed $delIndex + * @param mixed $userGuid + * @return an + */ + function unpauseCase($delIndex, $userGuid) { + global $PM_SOAP; + return $PM_SOAP->unpauseCase($this->fields['case_guid'], $delIndex, $userGuid); + } + + + /** + * Summary of reassignCase + * @param mixed $delIndex + * @param mixed $taskGuid + * @param mixed $delThread + * @param mixed $users_id_source + * @param mixed $users_id_target + * @return mixed + */ + function reassignCase($delIndex, $taskGuid, $delThread, $users_id_source, $users_id_target) { + global $PM_SOAP; + $users_guid_source = PluginProcessmakerUser::getPMUserId($users_id_source); + $users_guid_target = PluginProcessmakerUser::getPMUserId($users_id_target); + $pmResponse = $PM_SOAP->reassignCase($this->fields['case_guid'], $delIndex, $users_guid_source, $users_guid_target); + // now should managed GLPI Tasks previously assigned to the $users_guid_source + if ($pmResponse->status_code == 0) { + // we need to change the delindex of the glpi task and the assigned tech to prevent creation of new tasks + // we need the delindex of the current glpi task, and the delindex of the new one + // search for new delIndex and new delThread + $newCaseInfo = $this->getCaseInfo( ); + $newDelIndex = 0; + $newDelThread = 0; + foreach ($newCaseInfo->currentUsers as $newCaseUser) { + if ($newCaseUser->taskId == $taskGuid && $newCaseUser->delThread == $delThread) { + $newDelIndex = $newCaseUser->delIndex; + $newDelThread = $newCaseUser->delThread; + break; + } + } + $this->reassignTask($delIndex, $newDelIndex, $delThread, $newDelThread, $users_id_target ); + return true; + } + return false; + } + + + /** + * Summary of reassignTask + * @param mixed $delIndex + * @param mixed $newDelIndex + * @param mixed $newTech + */ + public function reassignTask ($delIndex, $newDelIndex, $delThread, $newDelThread, $newTech) { global $DB; - $query = "SELECT * FROM glpi_plugin_processmaker_cases WHERE items_id=$itemId and itemtype='$itemType';"; - if (($res = $DB->query($query) ) && $DB->numrows($res) > 0) { - $row = $DB->fetch_array($res); - return $row['id']; + $query = "SELECT * FROM glpi_plugin_processmaker_tasks WHERE plugin_processmaker_cases_id={$this->getID()} AND del_index=$delIndex AND del_thread=$delThread; "; + $res = $DB->query($query); + if ($DB->numrows($res) > 0) { + $row = $DB->fetch_array( $res ); + $glpi_task = new $row['itemtype']; + $glpi_task->getFromDB( $row['items_id'] ); + + $itilobject_itemtype = $this->fields['itemtype']; //str_replace( 'Task', '', $row['itemtype'] ); + $foreignkey = getForeignKeyFieldForItemType( $itilobject_itemtype ); + + PluginProcessmakerProcessmaker::addWatcher( $itilobject_itemtype, $glpi_task->fields[ $foreignkey ], $newTech ); + + $glpi_task->update( array( 'id' => $row['items_id'], $foreignkey => $glpi_task->fields[ $foreignkey ], 'users_id_tech' => $newTech )); + + // then update the delIndex and delThread + $query = "UPDATE glpi_plugin_processmaker_tasks SET del_index = $newDelIndex, del_thread = $newDelThread WHERE id={$row['id']}; "; + $res = $DB->query($query); } - return false; } - /** - * Summary of getCaseFromItemTypeAndItemId - * @param mixed $itemType is the item type - * @param mixed $itemId is the item id - * @return mixed: returns false when there is no case associated with the item, else fills in the item fields from DB, and returns true - */ - function getCaseFromItemTypeAndItemId($itemType, $itemId) { + /** + * Summary of showCaseInfoTab + * Will show information about the current case + * @param CommonGLPI $item is a PluginProcessmakerCase object + * @param mixed $tabnum + * @param mixed $withtemplate + */ + static function showCaseInfoTab(CommonGLPI $item, $tabnum=1, $withtemplate=0) { + echo 'The idea is to show here the GLPI ITIL item to which it is linked, and to give a resume of the current case status, and to give possibility to delete or cancel the case.'; - if ($caseId = self::getCaseIdFromItemTypeAndItemId( $itemType, $itemId)) { - return $this->getFromDB( $caseId ); + $rand = rand(); + // will not show delete button if case is a sub-process + // will show it if it is also a draft or if current glpi user has the right to delete cases and session is central + if ($item->fields['plugin_processmaker_cases_id'] == 0 + && ($item->fields['case_status'] == self::DRAFT + || (plugin_processmaker_haveRight("case", DELETE) + && $_SESSION['glpiactiveprofile']['interface'] == 'central'))) { + // then propose a button to delete case + echo ""; + echo "
"; + echo ""; + + echo ""; + echo ""; + echo "
".__('Case Deletion', 'processmaker')."
 "; + echo ""; + echo ""; + echo ""; + echo "
"; + + Html::closeForm(); } - return false; - } - - /** - * Summary of getFromDB - * @param mixed $ID id of needed object - * @return mixed object if found, else false - */ - function getFromDB($ID) { - global $DB; - // Search for object in database and fills 'fields' - - // != 0 because 0 is consider as empty - if (strlen($ID)==0) { - return false; - } - - $query = "SELECT * - FROM `".$this->getTable()."` - WHERE `".$this->getIndexName()."` = '".$ID."'"; - - if (($result = $DB->query($query)) && $DB->numrows($result)==1) { - $this->fields = $DB->fetch_assoc($result); - $this->post_getFromDB(); - - return true; - } - - return false; + return; } - /** - * Summary of getVariables - * Gets variables from a case. - * @param array $vars an array of variable name that will be read from the case as case variables - * @return array an associative array (variable_name => value). The returned array can be empty if requested variables are not found. - */ - function getVariables( $vars = array() ) { - global $PM_DB; + /** + * Summary of showForItem + * Shows list of cases attached to an item + * @param CommonITILObject $item + */ + static function showForItem(CommonITILObject $item) { + global $DB, $CFG_GLPI, $LANG; - $locVars = array( ); - $app_data = array(); // by default + $items_id = $item->getField('id'); + $itemtype = $item->getType(); + //if (!Session::haveRight("problem", Problem::READALL) + // || !$item->can($ID, READ)) { - $caseId = $this->getID(); + // return false; + //} - $query = "SELECT APP_DATA FROM APPLICATION WHERE APP_UID='$caseId';"; + $canupdate = $item->can($items_id, UPDATE); - if (($res = $PM_DB->query($query)) && $PM_DB->numrows($res) > 0) { - $row = $PM_DB->fetch_assoc($res); - $app_data = unserialize($row['APP_DATA'] ); - $locVars = array_intersect_key( $app_data, array_flip($vars) ); + $rand = mt_rand(); + + $query = "SELECT gppc.`id` AS assocID, gppc.`id` as id, gppp.name as pname, gppc.`case_status`, gppc.`plugin_processmaker_cases_id` + FROM `glpi_plugin_processmaker_cases` as gppc + LEFT JOIN `glpi_plugin_processmaker_processes` AS gppp ON gppp.`id`=gppc.`plugin_processmaker_processes_id` + WHERE gppc.`itemtype` = '$itemtype' + AND gppc.`items_id` = $items_id + "; + $result = $DB->query($query); + + $cases = array(); + $used = array(); + if ($numrows = $DB->numrows($result)) { + while ($data = $DB->fetch_assoc($result)) { + $cases[$data['id']] = $data; + $used[$data['id']] = $data['id']; + } } - return $locVars; + $columns = array('pname' => 'Process', + 'name' => 'Name', + 'status' => 'Status', + 'sub' => 'Subcase of' + ); + + // check if item is not solved nor closed + if ($canupdate + && $item->fields['status'] != CommonITILObject::SOLVED + && $item->fields['status'] != CommonITILObject::CLOSED + && $_SESSION['glpiactiveprofile']['interface'] != 'helpdesk') { + echo "
"; + echo ""; + echo ""; + echo ""; + echo ""; + + echo ""; + echo ""; + + echo "
".__('Add a new case')."
"; + echo $LANG['processmaker']['item']['selectprocess']." "; + echo ""; + PluginProcessmakerProcess::dropdown(array( 'value' => 0, 'entity' => $item->fields['entities_id'], 'name' => 'plugin_processmaker_processes_id', 'condition' => "is_active=1")); + echo ""; + echo ""; + echo "
"; + Html::closeForm(); + echo "
"; + } + + echo "
"; + if ($canupdate && $numrows) { + Html::openMassiveActionsForm('mass'.__CLASS__.$rand); + $massiveactionparams = array('num_displayed' => $numrows, + 'container' => 'mass'.__CLASS__.$rand); + Html::showMassiveActions($massiveactionparams); + } + echo ""; + echo ""; + echo ""; + if ($numrows) { + $header_begin = ""; + $header_top = ''; + $header_bottom = ''; + $header_end = ''; + if ($canupdate + && $numrows) { + $header_top .= ""; + $header_bottom .= ""; + } + + foreach ($columns as $key => $val) { + $header_end .= ""; + } + + $header_end .= ""; + echo $header_begin.$header_top.$header_end; + + //Session::initNavigateListItems('PluginProcessmakerCase', + // //TRANS : %1$s is the itemtype name, + // // %2$s is the name of the item (used for headings of a list) + // sprintf(__('%1$s = %2$s'), + // $itemtype::getTypeName(1), $item->fields["name"])); + + $i = 0; + foreach ($cases as $data) { + Session::addToNavigateListItems('PluginProcessmakerCase', $data["id"]); + $link = NOT_AVAILABLE; + $case = new self; + if ($case->getFromDB($data["id"])) { + $link = $case->getLink(); + } + + echo ""; + if ($canupdate) { + echo ""; + } + echo ""; + echo ""; + echo ""; + echo ""; + //echo ""; + echo ""; + + $i++; + } + echo $header_begin.$header_top.$header_end; + + } + + echo "
".PluginProcessmakerCase::getTypeName($numrows)."
".Html::getCheckAllAsCheckbox('mass'.__CLASS__.$rand); + $header_top .= "".Html::getCheckAllAsCheckbox('mass'.__CLASS__.$rand); + $header_bottom .= "$val
"; + // prevent massiveaction on subprocess + if ($data['plugin_processmaker_cases_id'] == 0) { + Html::showMassiveActionCheckBox(__CLASS__, $data["assocID"]); + } + echo "".$data['pname']."".$link."".self::getStatus($data['case_status']).""; + if ($data['plugin_processmaker_cases_id'] > 0) { + // then this is a subprocess of + $maincase = new self; + if ($maincase->getFromDB($data['plugin_processmaker_cases_id'])) { + echo $maincase->getLink(); + } + } else { + echo '-'; + } + echo "".Html::convDateTime($data["date_creation"])."
"; + if ($canupdate && $numrows) { + $massiveactionparams['ontop'] = false; + Html::showMassiveActions($massiveactionparams); + Html::closeForm(); + } + echo "
"; } - /** - * Summary of sendVariables - * Sends variables to a case. - * BEWARE that this will not work correctly for values containning special chars like \ - * instead use the web service function from PluginProcessmakerProcessmaker class - * @param array $vars an array of associative variables (name => value) that will be injected into the case as case variables - * @return true if variables have been saved to the case, false otherwise - */ - function sendVariables( $vars = array() ) { - global $PM_DB; + /** + * Summary of displayTabContentForItem + * @param CommonGLPI $item + * @param mixed $tabnum + * @param mixed $withtemplate + */ + static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtemplate=0) { + global $LANG, $DB, $CFG_GLPI, $PM_SOAP; - $variablesSent = false; // be default - $app_data = array(); // by default + if ($item->getType() == __CLASS__) { + // we are in a case viewing the main tab + // the 'Case infos' tab + self::showCaseInfoTab($item, $tabnum, $withtemplate); - $caseId = $this->getID(); + } else { - $query = "SELECT APP_DATA FROM APPLICATION WHERE APP_UID='$caseId';"; - - if (($res = $PM_DB->query($query)) && $PM_DB->numrows($res) > 0) { - $row = $PM_DB->fetch_assoc($res); - $app_data = unserialize($row['APP_DATA'] ); + // the idea is to show a list of cases attached to the $item ITIL object + // TODO give possibility to start a new case if needed + self::showForItem($item); } - - $app_data = array_replace( $app_data, $vars ); - $serialized = serialize( $app_data ); - - $query = "UPDATE APPLICATION SET APP_DATA='$serialized' WHERE APP_UID='$caseId';"; - $res = $PM_DB->query( $query ); - - if ($PM_DB->affected_rows() == 1) { - $variablesSent = true; - } - - return $variablesSent; } - /** * Summary of displayTabContentForItem * @param CommonGLPI $item is the item @@ -160,20 +478,16 @@ class PluginProcessmakerCase extends CommonDBTM { * @param mixed $withtemplate has template * @return mixed */ - static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtemplate=0) { - global $LANG, $DB, $CFG_GLPI; + static function displayTabContentForItem_old(CommonGLPI $item, $tabnum=1, $withtemplate=0) { + global $LANG, $DB, $CFG_GLPI, $PM_SOAP; - $config = PluginProcessmakerConfig::getInstance(); + $config = $PM_SOAP->config; //PluginProcessmakerConfig::getInstance(); if ($config->fields['maintenance'] == 0) { - $item_id = $item->getID(); - $item_type = $item->getType(); - ////retrieve container for current tab - //$container = new self; - //$found_c = $container->find("`itemtype` = '$item_type' AND `items_id` = $item_id "); + $items_id = $item->getID(); + $itemtype = $item->getType(); - //echo "Show the frame"; $rand = rand(); echo ""; echo "
"; @@ -182,14 +496,15 @@ class PluginProcessmakerCase extends CommonDBTM { $pmCaseUser = false; // initial value: no user // first search for the case - if (self::getCaseIdFromItemTypeAndItemId($item_type, $item_id )) { - $myProcessMaker = new PluginProcessmakerProcessmaker( ); - $myProcessMaker->login(); - $caseInfo = $myProcessMaker->getCaseFromItem( $item_type, $item_id ); + $locCase = new self; + if ($locCase->getFromItem($itemtype, $items_id)) { + $GLPICurrentPMUserId=0; + $paramsURL=''; + $caseInfo = $locCase->getCaseInfo(); if ($caseInfo->caseStatus != 'CANCELLED' && $caseInfo->caseStatus != 'COMPLETED') { // need to get info on the thread of the GLPI current user // we must retreive currentGLPI user from this array - $GLPICurrentPMUserId = PluginProcessmakerUser::getPMUserId( Session::getLoginUserID() ); + $GLPICurrentPMUserId = PluginProcessmakerUser::getPMUserId(Session::getLoginUserID()); $pmCaseUser = $caseInfo->currentUsers[0]; // by default currently manage only one task at a time, must define tab management for several tasks foreach ($caseInfo->currentUsers as $caseUser) { if ($caseUser->userId == $GLPICurrentPMUserId) { @@ -215,25 +530,27 @@ class PluginProcessmakerCase extends CommonDBTM { echo ""; if ($GLPICurrentPMUserId == $pmCaseUser->userId) { - // then propose a button to cancel case only when assigned user is == to glpi current user + // then propose a button to cancel case only when assigned user is == to glpi current user echo ""; } - if ($caseInfo->caseStatus == "DRAFT" || (plugin_processmaker_haveRight("deletecase", DELETE) && $_SESSION['glpiactiveprofile']['interface'] == 'central')) { + if ($caseInfo->caseStatus == "DRAFT" || (plugin_processmaker_haveRight("case", DELETE) && $_SESSION['glpiactiveprofile']['interface'] == 'central')) { // then propose a button to delete case echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; + echo "
"; echo $LANG['processmaker']['item']['cancelcase']; echo ""; echo ""; - echo ""; - //echo ""; - //echo ""; + echo ""; + //echo ""; + //echo ""; + //echo ""; echo ""; echo ""; echo $LANG['processmaker']['item']['deletecase']; echo ""; echo ""; - echo ""; + //echo ""; + echo ""; echo ""; @@ -254,23 +571,9 @@ class PluginProcessmakerCase extends CommonDBTM { } $proj = new PluginProcessmakerProcess; - $proj->getFromDBbyExternalID( $caseInfo->processId ); + $proj->getFromGUID( $caseInfo->processId ); $project_type = $proj->fields['project_type']; - // then propose a button to view case history - //echo "
"; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo "
"; echo ""; //?rand=$rand' @@ -325,7 +628,7 @@ class PluginProcessmakerCase extends CommonDBTM { if (!$caseUser->userId) { // current task is to claimed // get task user list - $query = "SELECT items_id, itemtype FROM glpi_plugin_processmaker_tasks WHERE case_id = '".$caseInfo->caseId."' AND del_index =".$caseUser->delIndex; + $query = "SELECT items_id, itemtype FROM glpi_plugin_processmaker_tasks WHERE plugin_processmaker_cases_id = '".$locCase->getID()."' AND del_index =".$caseUser->delIndex; foreach ($DB->request($query) as $row) { // normally there is only one task $task = getItemForItemtype( $row['itemtype'] ); @@ -340,17 +643,17 @@ class PluginProcessmakerCase extends CommonDBTM { // to load users for task re-assign only when task is not to be 'claimed' if ($caseUser->userId) { echo "
Loading...
"; - echo ""; + echo ""; } echo "
"; } } else { // no user means CANCELLED or COMPLETED // then create artificial panel to host case infos echo "
"; - $url = $myProcessMaker->serverURL."/cases/cases_Open?sid=".$_SESSION["pluginprocessmaker"]["session"]["id"]."&APP_UID=".$caseInfo->caseId."&".$paramsURL."&action=TO_DO"; + $url = $PM_SOAP->serverURL."/cases/cases_Open?sid=".$PM_SOAP->getPMSessionID()."&APP_UID=".$caseInfo->caseId."&".$paramsURL."&action=TO_DO"; echo "
"; } // default panels @@ -368,7 +671,7 @@ class PluginProcessmakerCase extends CommonDBTM { } else { $activePanel = 'caseInfo'; } - $caseMapUrl = $myProcessMaker->serverURL.($project_type=='bpmn' ? "/designer?prj_uid=".$caseInfo->processId."&prj_readonly=true&app_uid=".$caseInfo->caseId : "/cases/ajaxListener?action=processMap&rand=$rand")."&glpi_domain={$config->fields['domain']}"; + $caseMapUrl = $PM_SOAP->serverURL.($project_type=='bpmn' ? "/designer?prj_uid=".$caseInfo->processId."&prj_readonly=true&app_uid=".$caseInfo->caseId : "/cases/ajaxListener?action=processMap&rand=$rand")."&glpi_domain={$config->fields['domain']}"; echo ""; //?rand=$rand' + + echo ""; + } + + function getTabNameForItem(CommonGLPI $case, $withtemplate = 0){ + global $LANG; + return $LANG['processmaker']['item']['case']['changelog']; + } +} \ No newline at end of file diff --git a/inc/casehistory.class.php b/inc/casehistory.class.php new file mode 100644 index 0000000..59f658d --- /dev/null +++ b/inc/casehistory.class.php @@ -0,0 +1,34 @@ +config; + $rand = rand(); + + $proj = new PluginProcessmakerProcess; + $proj->getFromDB($case->fields['plugin_processmaker_processes_id']); + + $caseHistoryURL = $PM_SOAP->serverURL + ."/cases/ajaxListener?action=caseHistory&rand=$rand&glpi_domain={$config->fields['domain']}&GLPI_APP_UID={$case->fields['case_guid']}&GLPI_PRO_UID={$proj->fields['process_guid']}"; + + echo ""; + + echo ""; + } + + function getTabNameForItem(CommonGLPI $case, $withtemplate = 0){ + global $LANG; + return $LANG['processmaker']['item']['case']['viewcasehistory']; + } +} \ No newline at end of file diff --git a/inc/casemap.class.php b/inc/casemap.class.php new file mode 100644 index 0000000..4a6739b --- /dev/null +++ b/inc/casemap.class.php @@ -0,0 +1,41 @@ +config; + $rand = rand(); + + $proj = new PluginProcessmakerProcess; + $proj->getFromDB($case->fields['plugin_processmaker_processes_id']); + $project_type = $proj->fields['project_type']; + + $caseMapUrl = $PM_SOAP->serverURL.( + $project_type=='bpmn' ? + "/designer?sid=".$PM_SOAP->getPMSessionID()."&prj_uid=".$proj->fields['process_guid']."&prj_readonly=true&app_uid=".$case->fields['case_guid'] + : + "/cases/ajaxListener?sid=".$PM_SOAP->getPMSessionID()."&action=processMap" //&GLPI_PRO_UID={$proj->fields['process_guid']}" + )."&glpi_domain={$config->fields['domain']}&rand=$rand&GLPI_APP_UID={$case->fields['case_guid']}&GLPI_PRO_UID={$proj->fields['process_guid']}"; + + echo ""; //?rand=$rand' + + echo ""; + } + + function getTabNameForItem(CommonGLPI $case, $withtemplate = 0){ + global $LANG; + return $LANG['processmaker']['item']['case']['viewcasemap']; + } + +} \ No newline at end of file diff --git a/inc/config.class.php b/inc/config.class.php index d701dff..64f7ca7 100644 --- a/inc/config.class.php +++ b/inc/config.class.php @@ -4,6 +4,8 @@ class PluginProcessmakerConfig extends CommonDBTM { + static $rightname = ''; + static private $_instance = NULL; /** @@ -141,7 +143,7 @@ class PluginProcessmakerConfig extends CommonDBTM { * @return boolean */ static function showConfigForm($item) { - global $LANG, $PM_DB, $CFG_GLPI; + global $LANG, $PM_DB, $CFG_GLPI, $PM_SOAP; $setup_ok = false; @@ -183,7 +185,7 @@ class PluginProcessmakerConfig extends CommonDBTM { cglpi = glpi.pop() ; cpm = pm.pop() ; } - if( domain != '' ) { + if (domain != '' && domain.split('.').length > 1) { // common domain must be at least 'domain.com' and not 'com', otherwise some browser will not accept the CORS javascript $('div[name=domain]').text(domain) ; $('div[name=domain]').parent().attr('color', 'green'); return; @@ -215,16 +217,18 @@ class PluginProcessmakerConfig extends CommonDBTM { echo ""; echo "".$LANG['processmaker']['config']['connectionstatus'].""; - $pm = new PluginProcessmakerProcessmaker; + //$pm = new PluginProcessmakerProcessmaker; if ($config->fields['pm_server_URL'] != '' && $config->fields['pm_workspace'] != '' && $config->fields["pm_admin_user"] != '' - && ($pm->login(true))) { +// && ($pm->login(true))) { + && ($PM_SOAP->login(true))) { echo "".__('Test successful'); $setup_ok = true; } else { - echo "".__('Test failed')."
".print_r($pm->lasterror, true); +// echo "".__('Test failed')."
".print_r($pm->lasterror, true); + echo "".__('Test failed')."
".print_r($PM_SOAP->lasterror, true); } echo "\n"; @@ -237,7 +241,7 @@ class PluginProcessmakerConfig extends CommonDBTM { echo ""; echo "" . __('Database name') . ""; - echo ""; + echo ""; echo "\n"; echo ""; @@ -253,7 +257,7 @@ class PluginProcessmakerConfig extends CommonDBTM { echo ""; echo "".$LANG['processmaker']['config']['connectionstatus'].""; - if ($PM_DB->connected) { + if ($PM_DB->connected && isset($PM_DB->dbdefault) && $PM_DB->dbdefault != '') { echo "".__('Test successful'); } else { echo "".__('Test failed'); @@ -322,7 +326,8 @@ class PluginProcessmakerConfig extends CommonDBTM { echo "".__('Processmaker system information').""; if ($setup_ok) { - $info = $pm->systemInformation( ); +// $info = $pm->systemInformation( ); + $info = $PM_SOAP->systemInformation( ); echo ''._('Version').''.$info->version.''; echo ''._('Web server').''.$info->webServer.''; echo ''._('Server name').''.$info->serverName.''; diff --git a/inc/db.class.php b/inc/db.class.php index 6b03342..01f507c 100644 --- a/inc/db.class.php +++ b/inc/db.class.php @@ -18,7 +18,7 @@ class PluginProcessmakerDB extends DBmysql { $this->dbhost = $config->fields['pm_dbserver_name']; $this->dbuser = $config->fields['pm_dbserver_user']; $this->dbpassword = Toolbox::decrypt($config->fields['pm_dbserver_passwd'], GLPIKEY); - $this->dbdefault = $config->fields['pm_dbname']; + $this->dbdefault = isset($config->fields['pm_dbname']) ? $config->fields['pm_dbname'] : ''; parent::__construct(); } } diff --git a/inc/process.class.php b/inc/process.class.php index eec9960..1fb0828 100644 --- a/inc/process.class.php +++ b/inc/process.class.php @@ -14,6 +14,9 @@ if (!defined('GLPI_ROOT')) { */ class PluginProcessmakerProcess extends CommonDBTM { + static $rightname = 'plugin_processmaker_config'; + + static function canCreate() { return Session::haveRight('plugin_processmaker_config', UPDATE); } @@ -62,18 +65,20 @@ class PluginProcessmakerProcess extends CommonDBTM { foreach ($CFG_GLPI['languages'] as $key => $valArray) { $lg = locale_get_primary_language( $key ); $mapLangs[$lg][] = $key; + $mapLangs[$key][] = $key; // also add complete lang } //} $lang = locale_get_primary_language( $CFG_GLPI['language'] ); - $query = "SELECT TASK.TAS_UID, TASK.TAS_START, CONTENT.CON_LANG, CONTENT.CON_CATEGORY, CONTENT.CON_VALUE FROM TASK + $query = "SELECT TASK.TAS_UID, TASK.TAS_START, TASK.TAS_TYPE, CONTENT.CON_LANG, CONTENT.CON_CATEGORY, CONTENT.CON_VALUE FROM TASK INNER JOIN CONTENT ON CONTENT.CON_ID=TASK.TAS_UID WHERE (TASK.TAS_TYPE = 'NORMAL' OR TASK.TAS_TYPE = 'SUBPROCESS') AND TASK.PRO_UID = '".$this->fields['process_guid']."' AND CONTENT.CON_CATEGORY IN ('TAS_TITLE', 'TAS_DESCRIPTION') ".($translates ? "" : " AND CONTENT.CON_LANG='$lang'")." ;"; $taskArray = []; $defaultLangTaskArray = []; foreach ($PM_DB->request( $query ) as $task) { if ($task['CON_LANG'] == $lang) { - $defaultLangTaskArray[ $task['TAS_UID'] ][ $task['CON_CATEGORY'] ] = $task['CON_VALUE']; - $defaultLangTaskArray[ $task['TAS_UID'] ]['start']=($task['TAS_START']=='TRUE'?true:false); + $defaultLangTaskArray[$task['TAS_UID']][$task['CON_CATEGORY']] = $task['CON_VALUE']; + $defaultLangTaskArray[$task['TAS_UID']]['is_start'] = ($task['TAS_START'] == 'TRUE' ? 1 : 0); + $defaultLangTaskArray[$task['TAS_UID']]['is_subprocess'] = ($task['TAS_TYPE'] == 'SUBPROCESS' ? 1 : 0); } else { foreach ($mapLangs[ $task['CON_LANG'] ] as $valL) { $taskArray[ $task['TAS_UID'] ][ $valL ][ $task['CON_CATEGORY'] ] = $task['CON_VALUE']; @@ -82,7 +87,7 @@ class PluginProcessmakerProcess extends CommonDBTM { } $pmtask = new PluginProcessmakerTaskCategory; - $currentasksinprocess = getAllDatasFromTable($pmtask->getTable(), 'is_active = 1 AND processes_id = '.$this->getID()); + $currentasksinprocess = getAllDatasFromTable($pmtask->getTable(), '`is_active` = 1 AND `plugin_processmaker_processes_id` = '.$this->getID()); $tasks=[]; foreach($currentasksinprocess as $task){ $tasks[$task['pm_task_guid']] = $task; @@ -96,7 +101,7 @@ class PluginProcessmakerProcess extends CommonDBTM { $countElt += countElementsInTable( getTableForItemType($obj), "taskcategories_id = ".$task['taskcategories_id'] ); if ($countElt != 0) { // just set 'is_active' to 0 - $pmtask->Update( array( 'id' => $task['id'], 'start' => 0, 'is_active' => 0 ) ); + $pmtask->Update( array( 'id' => $task['id'], 'is_start' => 0, 'is_active' => 0 ) ); break; } } @@ -112,28 +117,34 @@ class PluginProcessmakerProcess extends CommonDBTM { foreach ($defaultLangTaskArray as $taskGUID => $task) { $pmTaskCat = new PluginProcessmakerTaskCategory; $taskCat = new TaskCategory; - if ($pmTaskCat->getFromDBbyExternalID( $taskGUID )) { + if ($pmTaskCat->getFromGUID( $taskGUID )) { // got it then check names, and if != update if ($taskCat->getFromDB( $pmTaskCat->fields['taskcategories_id'] )) { // found it must test if should be updated if ($taskCat->fields['name'] != $task['TAS_TITLE'] || $taskCat->fields['comment'] != $task['TAS_DESCRIPTION']) { $taskCat->update( array( 'id' => $taskCat->getID(), 'name' => $PM_DB->escape($task['TAS_TITLE']), 'comment' => $PM_DB->escape($task['TAS_DESCRIPTION']), 'taskcategories_id' => $this->fields['taskcategories_id'] ) ); } - if ($pmTaskCat->fields['start'] != $task['start']) { - $pmTaskCat->update( array( 'id' => $pmTaskCat->getID(), 'start' => $task['start'] ) ); + if ($pmTaskCat->fields['is_start'] != $task['is_start']) { + $pmTaskCat->update( array( 'id' => $pmTaskCat->getID(), 'is_start' => $task['is_start'] ) ); } } else { // taskcat must be created $taskCat->add( array( 'is_recursive' => true, 'name' => $PM_DB->escape($task['TAS_TITLE']), 'comment' => $PM_DB->escape($task['TAS_DESCRIPTION']), 'taskcategories_id' => $this->fields['taskcategories_id'] ) ); // update pmTaskCat - $pmTaskCat->update( array( 'id' => $pmTaskCat->getID(), 'taskcategories_id' => $taskCat->getID(), 'start' => $task['start'] ) ); + $pmTaskCat->update( array( 'id' => $pmTaskCat->getID(), 'taskcategories_id' => $taskCat->getID(), 'is_start' => $task['is_start'] ) ); } } else { // should create a new one // taskcat must be created $taskCat->add( array( 'is_recursive' => true, 'name' => $PM_DB->escape($task['TAS_TITLE']), 'comment' => $PM_DB->escape($task['TAS_DESCRIPTION']), 'taskcategories_id' => $this->fields['taskcategories_id'] ) ); // pmTaskCat must be created too - $pmTaskCat->add( array( 'processes_id' => $this->getID(), 'pm_task_guid' => $taskGUID, 'taskcategories_id' => $taskCat->getID(), 'start' => $task['start'], 'is_active' => 1 ) ); + $pmTaskCat->add( ['plugin_processmaker_processes_id' => $this->getID(), + 'pm_task_guid' => $taskGUID, + 'taskcategories_id' => $taskCat->getID(), + 'is_start' => $task['is_start'], + 'is_active' => 1, + 'is_subprocess' => $task['is_subprocess'] + ] ); } // here we should take into account translations if any if ($translates && isset($taskArray[ $taskGUID ])) { @@ -205,10 +216,13 @@ class PluginProcessmakerProcess extends CommonDBTM { * @return void */ function refresh( ) { + global $DB, $PM_SOAP; + + $pmCurrentProcesses = []; + // then refresh list of available process from PM to inner table - $pm = new PluginProcessmakerProcessmaker; - $pm->login( true ); - $pmProcessList = $pm->processList(); + $PM_SOAP->login( true ); + $pmProcessList = $PM_SOAP->processList(); $config = PluginProcessmakerConfig::getInstance(); $pmMainTaskCat = $config->fields['taskcategories_id']; @@ -217,7 +231,7 @@ class PluginProcessmakerProcess extends CommonDBTM { if ($pmProcessList) { foreach ($pmProcessList as $process) { $glpiprocess = new PluginProcessmakerProcess; - if ($glpiprocess->getFromDBbyExternalID($process->guid)) { + if ($glpiprocess->getFromGUID($process->guid)) { // then update it only if name has changed if ($glpiprocess->fields['name'] != $process->name) { $glpiprocess->update( array( 'id' => $glpiprocess->getID(), 'name' => $process->name) ); @@ -242,10 +256,51 @@ class PluginProcessmakerProcess extends CommonDBTM { $glpiprocess->addTaskCategory( $pmMainTaskCat ); } } + $pmCurrentProcesses[$glpiprocess->getID()] = $glpiprocess->getID(); } } // should de-activate other + $glpiCurrentProcesses = getAllDatasFromTable(self::getTable()); + // get difference between PM and GLPI + foreach( array_diff_key($glpiCurrentProcesses, $pmCurrentProcesses) as $key => $process){ + $proc = new PluginProcessmakerProcess; + $proc->getFromDB($key); + + // check if at least one case is existing for this process + $query = "SELECT * FROM `".PluginProcessmakerCase::getTable()."` WHERE `plugin_processmaker_processes_id` = ".$key; + $res = $DB->query($query); + if ($DB->numrows($res) === 0) { + // and if no will delete the process + $proc->delete(['id' => $key]); + // delete main taskcat + $tmp = new TaskCategory; + $tmp->delete(['id' => $proc->fields['taskcategories_id']]); + + // must delete processes_profiles if any + $tmp = new PluginProcessmakerProcess_Profile; + $tmp->deleteByCriteria(['plugin_processmaker_processes_id' => $key]); + + // must delete any taskcategory and translations + $pmtaskcategories = getAllDatasFromTable( PluginProcessmakerTaskCategory::getTable(), "plugin_processmaker_processes_id = $key"); + foreach($pmtaskcategories as $pmcat){ + // delete taskcat + $tmp = new TaskCategory; + $tmp->delete(['id' => $pmcat['taskcategories_id']]); + + // delete pmtaskcat + $tmp = new PluginProcessmakerTaskCategory; + $tmp->delete(['id' => $pmcat['id']]); + + // delete any translations + $tmp = new DropdownTranslation; + $tmp->deleteByCriteria(['itemtype' => 'TaskCategory', 'items_id' => $pmcat['taskcategories_id']]); + } + } else { + // set it as inactive + $proc->update(['id' => $key, 'is_active' => 0]); + } + } } @@ -302,15 +357,15 @@ class PluginProcessmakerProcess extends CommonDBTM { /** * Retrieve a Process from the database using its external id (unique index): process_guid - * @param string $extid guid of the process + * @param string $process_guid guid of the process * @return bool true if succeed else false **/ - public function getFromDBbyExternalID($extid) { + public function getFromGUID($process_guid) { global $DB; $query = "SELECT * FROM `".$this->getTable()."` - WHERE `process_guid` = '$extid'"; + WHERE `process_guid` = '$process_guid'"; if ($result = $DB->query($query)) { if ($DB->numrows($result) != 1) { @@ -467,7 +522,6 @@ class PluginProcessmakerProcess extends CommonDBTM { //$options['canedit'] = $canedit ; $this->initForm($ID, $options); - //$this->showTabs($options); $this->showFormHeader($options); echo ""; @@ -489,11 +543,6 @@ class PluginProcessmakerProcess extends CommonDBTM { Dropdown::showYesNo("is_active", $this->fields["is_active"]); echo ""; - //echo ""; - //echo "".$LANG['tracking'][39]." :"; - //Dropdown::showYesNo("is_helpdeskvisible",$this->fields["is_helpdeskvisible"]); - //echo ""; - echo ""; echo "".$LANG['processmaker']['process']['hide_case_num_title']." :"; Dropdown::showYesNo("hide_case_num_title", $this->fields["hide_case_num_title"]); @@ -508,7 +557,7 @@ class PluginProcessmakerProcess extends CommonDBTM { echo "".$LANG['processmaker']['process']['type']." :"; if (true) { // $canupdate || !$ID $idticketcategorysearch = mt_rand(); $opt = array('value' => $this->fields["type"]); - $rand = $idtype = Ticket::dropdownType('type', $opt, array(), array('toupdate' => "search_".$idticketcategorysearch )); + $rand = Ticket::dropdownType('type', $opt, array(), array('toupdate' => "search_".$idticketcategorysearch )); $opt = array('value' => $this->fields["type"]); $params = array('type' => '__VALUE__', //'entity_restrict' => -1, //$this->fields['entities_id'], @@ -561,9 +610,7 @@ class PluginProcessmakerProcess extends CommonDBTM { echo Html::convDateTime($this->fields["date_mod"]); echo ""; - $this->showFormButtons($options ); - //$this->addDivForTabs(); - + $this->showFormButtons($options); } @@ -649,7 +696,7 @@ class PluginProcessmakerProcess extends CommonDBTM { $query = "SELECT `entities_id`, `is_recursive` FROM `glpi_plugin_processmaker_processes_profiles` - WHERE `processes_id` = '$processes_id' + WHERE `plugin_processmaker_processes_id` = '$processes_id' AND `profiles_id` = '$profiles_id'"; $entities = array(); diff --git a/inc/process_profile.class.php b/inc/process_profile.class.php index dd27d4b..6e9706a 100644 --- a/inc/process_profile.class.php +++ b/inc/process_profile.class.php @@ -10,6 +10,9 @@ */ class PluginProcessmakerProcess_Profile extends CommonDBTM { + + static $rightname = ''; + function can($ID, $right, array &$input = NULL) { switch ($right) { case DELETE : @@ -43,7 +46,7 @@ class PluginProcessmakerProcess_Profile extends CommonDBTM echo "".$LANG['processmaker']['title'][4].""; echo ""; - echo ""; + echo ""; Entity::Dropdown( array('entity' => $_SESSION['glpiactiveentities'])); echo "".Profile::getTypeName(1).""; Profile::dropdownUnder(array('value' => Profile::getDefault())); @@ -58,18 +61,18 @@ class PluginProcessmakerProcess_Profile extends CommonDBTM echo "
"; } - $query = "SELECT DISTINCT `glpi_plugin_processmaker_processes_profiles`.`id` AS linkID, + $query = "SELECT DISTINCT gpp.`id` AS linkID, `glpi_profiles`.`id`, `glpi_profiles`.`name`, - `glpi_plugin_processmaker_processes_profiles`.`is_recursive`, + `gpp`.`is_recursive`, `glpi_entities`.`completename`, - `glpi_plugin_processmaker_processes_profiles`.`entities_id` - FROM `glpi_plugin_processmaker_processes_profiles` + `gpp`.`entities_id` + FROM `". self::getTable() ."` as gpp LEFT JOIN `glpi_profiles` - ON (`glpi_plugin_processmaker_processes_profiles`.`profiles_id` = `glpi_profiles`.`id`) + ON (`gpp`.`profiles_id` = `glpi_profiles`.`id`) LEFT JOIN `glpi_entities` - ON (`glpi_plugin_processmaker_processes_profiles`.`entities_id` = `glpi_entities`.`id`) - WHERE `glpi_plugin_processmaker_processes_profiles`.`processes_id` = '$ID' + ON (`gpp`.`entities_id` = `glpi_entities`.`id`) + WHERE `gpp`.`plugin_processmaker_processes_id` = '$ID' ORDER BY `glpi_profiles`.`name`, `glpi_entities`.`completename`"; $result = $DB->query($query); $num = $DB->numrows($result); @@ -133,16 +136,8 @@ class PluginProcessmakerProcess_Profile extends CommonDBTM $entname = $data["name"]; } - // if ($data["is_dynamic"] || $data["is_recursive"]) { if ($data["is_recursive"]) { $entname = sprintf(__('%1$s %2$s'), $entname, "("); - //if ($data["is_dynamic"]) { - // //TRANS: letter 'D' for Dynamic - // $entname = sprintf(__('%1$s%2$s'), $entname, __('D')); - //} - //if ($data["is_dynamic"] && $data["is_recursive"]) { - // $entname = sprintf(__('%1$s%2$s'), $entname, ", "); - //} if ($data["is_recursive"]) { //TRANS: letter 'R' for Recursive $entname = sprintf(__('%1$s%2$s'), $entname, __('R')); @@ -168,28 +163,25 @@ class PluginProcessmakerProcess_Profile extends CommonDBTM echo "
"; } - //static function processMassiveActionsForOneItemtype(MassiveAction $ma, CommonDBTM $item, array $ids) { - // global $CFG_GLPI; - // $action = $ma->getAction(); + /** + * Summary of prepareInputForAdd + * @param mixed $input + * @return mixed + */ + function prepareInputForAdd($input) { + $tmp = new self; + if ($tmp->getFromDBByQuery(" WHERE `plugin_processmaker_processes_id` = ".$input['plugin_processmaker_processes_id']." + AND `entities_id` = ".$input['entities_id']." + AND `profiles_id` = ".$input['profiles_id'])) { + //// then update existing + //$tmp->update(['id' => $tmp->getID(), + // 'is_recursive' => $input['is_recursive']]); + Session::addMessageAfterRedirect(__('Authorization not added: already existing!', 'processmaker'), true, WARNING); - // switch ($action) { - // case 'profile_delete' : - // foreach ($ids as $id) { - // if ($item->can($id, DELETE)) { - // if ($item->delete(array("id" => $id))) { - // $ma->itemDone($item->getType(), $id, MassiveAction::ACTION_OK); - // } else { - // $ma->itemDone($item->getType(), $id, MassiveAction::ACTION_KO); - // $ma->addMessage($item->getErrorMessage(ERROR_ON_ACTION)); - // } - // } else { - // $ma->itemDone($item->getType(), $id, MassiveAction::ACTION_NORIGHT); - // $ma->addMessage($item->getErrorMessage(ERROR_RIGHT)); - // } - // } - // break ; - // } - //} + return []; // to cancel add + } + return $input; + } } diff --git a/inc/processmaker.class.php b/inc/processmaker.class.php index 0d38528..9bd7edd 100644 --- a/inc/processmaker.class.php +++ b/inc/processmaker.class.php @@ -89,12 +89,14 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { var $lasterror; var $lang; + static $rightname = ''; - /** - * Return the table used to store this object - * - * @return string - **/ + + ///** + //* Return the table used to store this object + //* + //* @return string + //**/ static function getTable($classname = null) { return "glpi_plugin_processmaker_processes"; @@ -144,7 +146,11 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $this->serverURL = trim($this->config->fields['pm_server_URL'], '/').'/sys'.$this->config->fields['pm_workspace'].'/'.$this->lang.'/'.$this->config->fields['pm_theme']; $this->taskWriter = $this->config->fields['users_id']; $this->pm_group_guid = $this->config->fields['pm_group_guid']; - $this->pmSoapClient = new SoapClient($this->serverURL."/services/wsdl2", array( 'soap_version' => SOAP_1_2, 'compression' => SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP) ); + $this->pmSoapClient = new SoapClient($this->serverURL."/services/wsdl2", [ 'soap_version' => SOAP_1_2, + 'compression' => SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP, + // 'proxy_host' => 'localhost', + // 'proxy_port' => 8888 + ] ); } return true; @@ -156,13 +162,22 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } + /** + * Summary of getPMSessionID + * @param mixed $case_guid + * @return mixed + */ + function getPMSessionID() { + return $_SESSION["pluginprocessmaker"]["session"]['id']; + } + /** * Summary of login * @param mixed $admin_or_user if true will be admin, otherwise is user name (or user id), or current user * @return true if login has been correctly done with current GLPI user, or if a PM session was already open * false if an exception occured (like SOAP error or PM login error) */ - function login( $admin_or_user=false ) { + function login( $admin_or_user=false, $case_guid='default' ) { global $DB, $PM_DB; try { $locSession = new stdClass; // by default empty object @@ -192,17 +207,16 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } else { $gusr->getFromDBbyName( $admin_or_user !== false ? $admin_or_user : $_SESSION["glpiname"]); } - $pmusr->getFromDB( $gusr->getID() ); + $pmusr->getFromDB($gusr->getID()); //if (!isset($pmusr->fields['password']) || $pmusr->fields['password'] == "") { $pass = md5(Toolbox::encrypt( $gusr->getID().$gusr->getName().time(), GLPIKEY) ); - $pmusr->update( array('id' => $pmusr->getID(), 'password' => $pass) ); - //$DB->query( "UPDATE glpi_plugin_processmaker_users SET password = '".$pass."' WHERE glpi_users_id = ".$pmusr->getID().";" ) ; - //$pmusr->update( array( $pmusr->getIndexName() => $pmusr->getID(), 'password' => $pass) ) ; + //$pmusr->update( array('id' => $pmusr->getID(), 'password' => $pass) ); // and must be updated also in PM db $PM_DB->query("UPDATE RBAC_USERS SET USR_PASSWORD='".$pass."' WHERE USR_UID='".$pmusr->fields['pm_users_id']."' "); $PM_DB->query("UPDATE USERS SET USR_PASSWORD='".$pass."' WHERE USR_UID='".$pmusr->fields['pm_users_id']."' "); //} - $locSession = $this->pmSoapClient->login( array( 'userid' => $gusr->fields['name'], 'password' => 'md5:'.$pmusr->fields['password']) ); + //$locSession = $this->pmSoapClient->login( array( 'userid' => $gusr->fields['name'], 'password' => 'md5:'.$pmusr->fields['password']) ); + $locSession = $this->pmSoapClient->login( ['userid' => $gusr->fields['name'], 'password' => 'md5:'.$pass] ); if (is_object( $locSession ) && $locSession->status_code == 0) { $_SESSION["pluginprocessmaker"]["session"]["id"] = $locSession->message; $_SESSION["pluginprocessmaker"]["session"]["date"] = $locSession->timestamp; @@ -239,7 +253,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { */ function processList( ) { try { - $pmProcessList = $this->pmSoapClient->processList( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"]) ); + $pmProcessList = $this->pmSoapClient->processList( array( 'sessionId' => $this->getPMSessionID()) ); if (isset( $pmProcessList->processes )) { if (is_array( $pmProcessList->processes )) { return $pmProcessList->processes; @@ -263,13 +277,13 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * A session must be open before with login() * Normalizes output of currentUsers to an array, even when only one element is returned by PM, * Note: currentUsers field doesn't exist when case is CANCELLED - * @param $caseId: The case ID, which can be obtained with the caseList() function + * @param $caseGuid: The case GUID, which can be obtained with the caseList() function * @param $delIndex: The delegation index, which is a positive integer to identify the current task of the case. If empty then use current delIndex. * @return a getCaseInfoResponse object, or false exception occured */ - function getCaseInfo( $caseId, $delIndex='') { + function getCaseInfo($caseGuid, $delIndex='') { try { - $pmCaseInfo = $this->pmSoapClient->getCaseInfo( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], 'caseId' => $caseId, 'delIndex' => $delIndex) ); + $pmCaseInfo = $this->pmSoapClient->getCaseInfo( array( 'sessionId' => $this->getPMSessionID(), 'caseId' => $caseGuid, 'delIndex' => $delIndex) ); switch ($pmCaseInfo->caseStatus) { case 'DRAFT' : case 'TO_DO': @@ -295,13 +309,13 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * routes a case (i.e., moves the case to the next task in the process according to its routing rules). * Embedded routeCase() PM web service call (definition: http://wiki.processmaker.com/index.php/2.0/ProcessMaker_WSDL_Web_Services#routeCase.28.29) * A session must be open before with login() - * @param $caseId The case ID, which can be obtained with the caseList() function + * @param $case_guid The case ID, which can be obtained with the caseList() function * @param $delIndex The delegation index, which is a positive integer to identify the current task of the case. If empty then use current delIndex. * @return a routeCaseResponse object, or false exception occured. routing is normalized to be always an array of routeListStruct */ - function routeCase( $caseId, $delIndex) { + function routeCase($case_guid, $delIndex) { try { - $pmRouteCaseResponse = $this->pmSoapClient->routeCase( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], 'caseId' => $caseId, 'delIndex' => $delIndex) ); + $pmRouteCaseResponse = $this->pmSoapClient->routeCase( array( 'sessionId' => $this->getPMSessionID(), 'caseId' => $case_guid, 'delIndex' => $delIndex) ); if ($pmRouteCaseResponse->status_code != 0) { Toolbox::logDebug( 'routeCase res:', $pmRouteCaseResponse ); } @@ -327,7 +341,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { */ function triggerList( ) { try { - $pmTriggerList = $this->pmSoapClient->triggerList( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"]) ); + $pmTriggerList = $this->pmSoapClient->triggerList( array( 'sessionId' => $this->getPMSessionID()) ); if (is_array( $pmTriggerList->triggers )) { return $pmTriggerList->triggers; } else { @@ -349,7 +363,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { */ function taskList( ) { try { - $pmTaskList = $this->pmSoapClient->taskList( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"]) ); + $pmTaskList = $this->pmSoapClient->taskList( array( 'sessionId' => $this->getPMSessionID()) ); if (is_array( $pmTaskList->tasks )) { return $pmTaskList->tasks; @@ -371,9 +385,9 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * Normalizes output to an array, even when only one element is returned by PM * @return array of taskListStruct objects, or false when exception occured */ - function taskCase( $caseId ) { + function taskCase($case_guid) { try { - $pmTaskCase = $this->pmSoapClient->taskCase( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], 'caseId' => $caseId ) ); + $pmTaskCase = $this->pmSoapClient->taskCase( array( 'sessionId' => $this->getPMSessionID(), 'caseId' => $case_guid ) ); if (is_array( $pmTaskCase->taskCases )) { return $pmTaskCase->taskCases; @@ -388,13 +402,13 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { /** * Summary of claimCase - * @param mixed $caseId + * @param mixed $case_guid * @param mixed $delIndex * @return mixed */ - function claimCase( $caseId, $delIndex) { + function claimCase($case_guid, $delIndex) { try { - $pmClaimCase = $this->pmSoapClient->claimCase( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], 'guid' => $caseId, 'delIndex' => $delIndex) ); + $pmClaimCase = $this->pmSoapClient->claimCase( array( 'sessionId' => $this->getPMSessionID(), 'guid' => $case_guid, 'delIndex' => $delIndex) ); return $pmClaimCase; } catch (Exception $e) { Toolbox::logDebug( $e ); @@ -408,14 +422,14 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * Embedded UnpauseCase() PM web service call (definition: http://wiki.processmaker.com/index.php/2.0/ProcessMaker_WSDL_Web_Services#UnpauseCase.28.29) * A session must be open before with login() * Normalizes output to an array, even when only one element is returned by PM - * @param $caseId The unique ID of the case. + * @param $caseGuid The unique ID of the case. * @param $delIndex The delegation index of the current task in the case. - * @param $userId The unique ID of the user who will unpause the case. + * @param $userGuid The unique ID of the user who will unpause the case. * @return an array of UnpauseCaseStruct, or false when exception occured */ - function unpauseCase( $caseId, $delIndex, $userId ) { + function unpauseCase( $caseGuid, $delIndex, $userGuid ) { try { - $pmUnpauseCase = $this->pmSoapClient->unpauseCase( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], 'caseUid' => $caseId, 'delIndex' => $delIndex, 'userUid' => $userId) ); + $pmUnpauseCase = $this->pmSoapClient->unpauseCase( array( 'sessionId' => $this->getPMSessionID(), 'caseUid' => $caseGuid, 'delIndex' => $delIndex, 'userUid' => $userGuid) ); if (is_array( $pmUnpauseCase->processes )) { return $pmUnpauseCase->processes; @@ -438,7 +452,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { */ function caseList( ) { try { - $pmCaseList = $this->pmSoapClient->caseList( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"]) ); + $pmCaseList = $this->pmSoapClient->caseList( array( 'sessionId' => $this->getPMSessionID()) ); if (is_array( $pmCaseList->cases )) { return $pmCaseList->cases; @@ -460,7 +474,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { */ function systemInformation( ) { try { - $pmSystemInfo = $this->pmSoapClient->systemInformation( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"]) ); + $pmSystemInfo = $this->pmSoapClient->systemInformation( array( 'sessionId' => $this->getPMSessionID()) ); return $pmSystemInfo; } catch (Exception $e) { @@ -474,15 +488,19 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * reassigns a case to a different user. Note that the logged-in user needs to have the PM_REASSIGNCASE permission in his/her role in order to be able to reassign the case. * Embedded caseList() PM web service call (definition: http://wiki.processmaker.com/index.php/2.0/ProcessMaker_WSDL_Web_Services#reassignCase.28.29) * A session must be open before with login() - * @param $caseId The case ID, which can be obtained with the caseList() function. + * @param $caseGuid The case GUID, which can be obtained with the caseList() function. * @param $delIndex The current delegation index number of the case, which can be obtained with the caseList() function. - * @param $userIdSource The user who is currently assigned the case, which can be obtained with the caseList() function. - * @param $userIdTarget The target user who will be newly assigned to the case, which can be obtained with userList(). The case can only be reassigned to a user who is one of the assigned users or ad-hoc users to the current task in the case. - * @return A pmResponse object, or false when exception occured + * @param $userGuidSource The PM user GUID who is currently assigned the case, which can be obtained with the caseList() function. + * @param $userGuidTarget The PM target user GUID who will be newly assigned to the case, which can be obtained with userList(). The case can only be reassigned to a user who is one of the assigned users or ad-hoc users to the current task in the case. + * @return stdClass, a pmResponse object, or false when exception occured */ - function reassignCase( $caseId, $delIndex, $userIdSource, $userIdTarget ) { + function reassignCase($caseGuid, $delIndex, $userGuidSource, $userGuidTarget) { try { - $pmResults = $this->pmSoapClient->reassignCase( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], 'caseId' => $caseId, 'delIndex' => $delIndex, 'userIdSource' => $userIdSource, 'userIdTarget'=> $userIdTarget) ); + $pmResults = $this->pmSoapClient->reassignCase( ['sessionId' => $this->getPMSessionID(), + 'caseId' => $caseGuid, + 'delIndex' => $delIndex, + 'userIdSource' => $userGuidSource, + 'userIdTarget'=> $userGuidTarget] ); return $pmResults; } catch (Exception $e) { Toolbox::logDebug( $e ); @@ -502,7 +520,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { */ function deleteCase( $caseUid ) { try { - $deleteCaseResponse = $this->pmSoapClient->deleteCase( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], 'caseUid' => $caseUid) ); + $deleteCaseResponse = $this->pmSoapClient->deleteCase( array( 'sessionId' => $this->getPMSessionID(), 'caseUid' => $caseUid) ); return $deleteCaseResponse; } catch (Exception $e) { Toolbox::logDebug( $e ); @@ -526,7 +544,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { */ function cancelTask( $caseUid, $delIndex, $userUid ) { try { - $cancelTaskResponse = $this->pmSoapClient->cancelCase( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], 'caseUid' => $caseUid, 'delIndex' => $delIndex, 'userUid' => $userUid) ); + $cancelTaskResponse = $this->pmSoapClient->cancelCase( array( 'sessionId' => $this->getPMSessionID(), 'caseUid' => $caseUid, 'delIndex' => $delIndex, 'userUid' => $userUid) ); return $cancelTaskResponse; } catch (Exception $e) { Toolbox::logDebug( $e ); @@ -575,14 +593,14 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * New case is started with DRAFT status. * Embedded newCaseImpersonate() PM web service call (definition: http://wiki.processmaker.com/index.php/2.0/ProcessMaker_WSDL_Web_Services#newCaseImpersonate.28.29) * A session must be open before with login(), in order to call this function. - * @param $processId The ID of the process where the case should start, which can be obtained with processList() + * @param $processes_id integer: The GLPI ID of the process that must be used to start a new case * @param $userId The ID of the user who initiates the case, which can be obtained with userList(). * @param $vars an array of associative variables (name => value) that will be injected into the case as case variables * @return A newCaseResponse object, or false when exception occured */ - function newCaseImpersonate( $processId, $userId, $vars = null ) { + function newCaseImpersonate($processes_id, $userId, $vars = null ) { try { - $this->getFromDB( $processId ); + $this->getFromDB($processes_id); if ($vars !== null) { $aVars = array(); @@ -596,7 +614,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $aVars = ''; } - $newCaseResponse = $this->pmSoapClient->newCaseImpersonate( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], 'processId'=> $this->fields['process_guid'], 'userId' => $userId, 'taskId'=>'', 'variables'=> $aVars) ); + $newCaseResponse = $this->pmSoapClient->newCaseImpersonate( array( 'sessionId' => $this->getPMSessionID(), 'processId'=> $this->fields['process_guid'], 'userId' => $userId, 'taskId'=>'', 'variables'=> $aVars) ); return $newCaseResponse; } catch (Exception $e) { Toolbox::logDebug( $e ); @@ -612,13 +630,13 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * New case is started with DRAFT status. * Embedded newCase() PM web service call (definition: http://wiki.processmaker.com/index.php/2.0/ProcessMaker_WSDL_Web_Services#newCase.28.29) * A session must be open before with login() - * @param string $processId The ID of the process which will be instantied into a case, which can be obtained with processList() + * @param $processes_id integer: the GLPI ID of the process which will be instantied into a case * @param array $vars an array of associative variables (name => value) that will be injected into the case as case variables - * @return A newCaseResponse object, or false when exception occured + * @return boolean|newCaseResponse: false when exception occured */ - function newCase( $processId, $vars = array() ) { + function newCase($processes_id, $vars = array()) { try { - $this->getFromDB( $processId ); + $this->getFromDB($processes_id); $aVars = array(); foreach ($vars as $key => $val) { @@ -628,7 +646,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $aVars[] = $obj; } - $newCaseResponse = $this->pmSoapClient->newCase( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], 'processId'=> $this->fields['process_guid'], 'taskId'=>'', 'variables'=> $aVars) ); + $newCaseResponse = $this->pmSoapClient->newCase( array( 'sessionId' => $this->getPMSessionID(), 'processId'=> $this->fields['process_guid'], 'taskId'=>'', 'variables'=> $aVars) ); return $newCaseResponse; } catch (Exception $e) { @@ -642,11 +660,11 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * Sends variables to a case. * Embedded sendVariables() PM web service call (definition: http://wiki.processmaker.com/index.php/2.0/ProcessMaker_WSDL_Web_Services#sendVariables.28.29) * A session must be open before with login() - * @param string $caseId The uID of the case + * @param string $caseGuid The GUID of the case * @param array $vars an array of associative variables (name => value) that will be injected into the case as case variables * @return A pmResponse object, or false when exception occured */ - function sendVariables( $caseId, $vars = array() ) { + function sendVariables($caseGuid, $vars = array()) { if (count( $vars ) == 0) { // nothing to send return true; } @@ -663,7 +681,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $aVars[] = $obj; } - $pmResponse = $this->pmSoapClient->sendVariables( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], 'caseId' => $caseId, 'variables'=> $aVars) ); + $pmResponse = $this->pmSoapClient->sendVariables( array( 'sessionId' => $this->getPMSessionID(), 'caseId' => $caseGuid, 'variables'=> $aVars) ); return $pmResponse; } catch (Exception $e) { @@ -679,12 +697,12 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * Gets variables from a case. * Embedded getVariables() PM web service call (definition: http://wiki.processmaker.com/index.php/2.0/ProcessMaker_WSDL_Web_Services#getVariables.28.29) * A session must be open before with login() - * @param string $caseId The uID of the case + * @param string $case_guid The uID of the case * @param array $vars an array of variable name that will be read from the case as case variables Normalizes output to an array, even when only one element is returned by PM Normalizes output to an array, even when only one element is returned by PM * Normalizes output to an array, even when only one element is returned by PM * @return array: an associative array (variable_name => value), or false when exception occured. The return array can be empty if requested variables are not found. */ - function getVariables( $caseId, $vars = array() ) { + function getVariables( $case_guid, $vars = array() ) { try { $aVars = array(); foreach ($vars as $key => $name) { @@ -693,7 +711,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $aVars[] = $obj; } - $pmvariableListResponse = $this->pmSoapClient->getVariables( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], 'caseId' => $caseId, 'variables'=> $aVars) ); + $pmvariableListResponse = $this->pmSoapClient->getVariables( array( 'sessionId' => $this->getPMSessionID(), 'caseId' => $case_guid, 'variables'=> $aVars) ); $variablesArray = array(); @@ -723,7 +741,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { */ function groupList( ) { try { - $pmGroupList = $this->pmSoapClient->groupList( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"]) ); + $pmGroupList = $this->pmSoapClient->groupList( array( 'sessionId' => $this->getPMSessionID()) ); if (is_array( $pmGroupList->groups )) { return $pmGroupList->groups; @@ -747,7 +765,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { */ function assignUserToGroup( $userId, $groupId) { try { - $pmResults = $this->pmSoapClient->assignUserToGroup(array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], + $pmResults = $this->pmSoapClient->assignUserToGroup(array( 'sessionId' => $this->getPMSessionID(), 'userId' => $userId, 'groupId' => $groupId ) ); @@ -769,7 +787,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { */ function createGroup( $name ) { try { - $pmResults = $this->pmSoapClient->createGroup(array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], + $pmResults = $this->pmSoapClient->createGroup(array( 'sessionId' => $this->getPMSessionID(), 'name' => $name ) ); return $pmResults; } catch (Exception $e) { @@ -806,7 +824,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { */ function userList( ) { try { - $pmUserList = $this->pmSoapClient->userList( array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"]) ); + $pmUserList = $this->pmSoapClient->userList( array( 'sessionId' => $this->getPMSessionID()) ); if (is_array( $pmUserList->users )) { return $pmUserList->users; @@ -845,7 +863,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $email = $userId."@DoNotReply.com"; } - $pmResults = $this->pmSoapClient->createUser(array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], + $pmResults = $this->pmSoapClient->createUser(array( 'sessionId' => $this->getPMSessionID(), 'userId' => $userId, 'firstname'=> $firstname, 'lastname' => $lastname, @@ -882,7 +900,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $lastName = $userName; } - $pmResults = $this->pmSoapClient->updateUser(array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], + $pmResults = $this->pmSoapClient->updateUser(array( 'sessionId' => $this->getPMSessionID(), 'userUid' => $userUid, 'userName' => $userName, 'firstName'=> $firstName, @@ -909,7 +927,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { */ function executeTrigger( $caseId, $triggerIndex, $delIndex ) { try { - $pmResults = $this->pmSoapClient->executeTrigger(array( 'sessionId' => $_SESSION["pluginprocessmaker"]["session"]["id"], 'caseId' => $caseId, 'triggerIndex'=> $triggerIndex, 'delIndex' => $delIndex ) ); + $pmResults = $this->pmSoapClient->executeTrigger(array( 'sessionId' => $this->getPMSessionID(), 'caseId' => $caseId, 'triggerIndex'=> $triggerIndex, 'delIndex' => $delIndex ) ); return $pmResults; } catch (Exception $e) { Toolbox::logDebug( $e ); @@ -949,103 +967,104 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * 0 : nothing to do */ static function cronPMTaskActions($task) { - global $DB, $PM_DB; + global $DB, $PM_DB, $PM_SOAP; - $usr = false; // by default - if (!isset($PM_DB)) { - $PM_DB = new PluginProcessmakerDB; + //plugin_processmaker_post_init(); - // also create a GLPI session with the processmaker task writer - $usr = new User; - $config = PluginProcessmakerConfig::getInstance(); - $usr->getFromDB($config->fields['users_id']); - $save_session = $_SESSION; - $usr->loadMinimalSession(0, true); - $_SESSION['glpiparententities'] = []; - } + // also create a GLPI session with the processmaker task writer + $usr = new User; + $config = PluginProcessmakerConfig::getInstance(); + $usr->getFromDB($config->fields['users_id']); + $save_session = $_SESSION; + $usr->loadMinimalSession(0, true); + $_SESSION['glpiparententities'] = []; $actionCode = 0; // by default $error = false; $task->setVolume(0); // start with zero - $pm = new self; + //$pm = new self; $existingpmsession = isset($_SESSION["pluginprocessmaker"]["session"]); $formerusers_id = 0; // get the list of taskactions to be done + $locCase = new PluginProcessmakerCase; foreach ($DB->request( getTableForItemType('PluginProcessmakerCrontaskaction'), ' `state` = '.PluginProcessmakerCrontaskaction::DATA_READY ) as $taskaction) { + if ($locCase->getFromDB($taskaction['plugin_processmaker_cases_id'])) { + // there is an existing case for this crontaskaction. + try { - try { + if ($formerusers_id != $taskaction['users_id']) { + unset($_SESSION["pluginprocessmaker"]["session"]); // to reset previous user login if any + } - if ($formerusers_id != $taskaction['users_id']) { - unset($_SESSION["pluginprocessmaker"]["session"]); // to reset previous user login if any - } + $PM_SOAP->login($taskaction['users_id']); - $pm->login($taskaction['users_id']); + $postdata = json_decode($taskaction['postdata'], true); - $postdata = json_decode($taskaction['postdata'], true); - - // must filter arrays as arrays are grids and index must start at 1 instead of 0 like in json - foreach($postdata['form'] as &$field) { - if (is_array($field)) { - if (count($field) > 0){ - // then must reindex the array starting to 1 instead of 0 - array_unshift($field, ''); - unset($field[0]); - } else { - $field[] = ""; + // must filter arrays as arrays are grids and index must start at 1 instead of 0 like in json + // TODO: to check if it would be possible to do this in a more generic way + foreach($postdata['form'] as &$field) { + if (is_array($field)) { + if (count($field) > 0){ + // then must reindex the array starting to 1 instead of 0 + array_unshift($field, ''); + unset($field[0]); + } else { + $field[] = ""; + } } } - } - if ($taskaction['is_targettoclaim']) { - // must do a claim before solving task - if (!$pm->claimCase( $postdata['APP_UID'], $postdata['DEL_INDEX'] )) { - throw new Exception("Can't claim case"); + if ($taskaction['is_targettoclaim']) { + // must do a claim before solving task + if (!$PM_SOAP->claimCase( $postdata['APP_UID'], $postdata['DEL_INDEX'] )) { + throw new Exception("Can't claim case"); + } + + // do not send notifications + $donotif = self::saveNotification(false); + + // now manage tasks associated with item + $PM_SOAP->claimTask( $postdata['APP_UID'], $postdata['DEL_INDEX'], $taskaction['users_id'] ); + + self::restoreNotification($donotif); + } + //$myCase = new PluginProcessmakerCase; + //if ($myCase->getFromGUID( $postdata['APP_UID'] )) { - // do not send notifications - $donotif = self::saveNotification(false); + //$cookies = json_decode($taskaction['cookies'], true) ; + //$pm->derivateCase( $myCase, $postdata, $taskaction['users_id'] ); + $PM_SOAP->derivateCase($locCase, $postdata, $taskaction['users_id'] ); + //} - // now manage tasks associated with item - $pm->claimTask( $postdata['APP_UID'], $postdata['DEL_INDEX'], $taskaction['users_id'] ); + $tkaction = new PluginProcessmakerCrontaskaction; + $tkaction->update( array( 'id' => $taskaction['id'], 'state' => PluginProcessmakerCrontaskaction::DONE ) ); - self::restoreNotification($donotif); + $task->addVolume(1); + $task->log( "Applied task action id: '".$taskaction['id']."'" ); } - $myCase = new PluginProcessmakerCase; - if ($myCase->getFromDB( $postdata['APP_UID'] )) { - - //$cookies = json_decode($taskaction['cookies'], true) ; - $pm->derivateCase( $myCase, $postdata, $taskaction['users_id'] ); + catch (Exception $e) { + $task->log( "Can't apply task action id: '".$taskaction['id']."'" ); + $error = true; } - $tkaction = new PluginProcessmakerCrontaskaction; - $tkaction->update( array( 'id' => $taskaction['id'], 'state' => PluginProcessmakerCrontaskaction::DONE ) ); - - $task->addVolume(1); - $task->log( "Applied task action id: '".$taskaction['id']."'" ); - - } catch (Exception $e) { - $task->log( "Can't apply task action id: '".$taskaction['id']."'" ); - $error = true; + $formerusers_id = $taskaction['users_id']; } - - $formerusers_id = $taskaction['users_id']; } if ($existingpmsession) { unset($_SESSION["pluginprocessmaker"]["session"]); // reset the one created during the foreach if (!Session::isCron()) { - $pm->login(); // re-log default user + $PM_SOAP->login(); // re-log default user } } - if ($usr) { - // restore previous session - Session::destroy(); - Session::start(); - $_SESSION = $save_session; - } + // restore previous session + Session::destroy(); + Session::start(); + $_SESSION = $save_session; if ($error) { return -1; @@ -1054,6 +1073,8 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } } + + /** * summary of cronPMOrphanCases * Execute 1 task managed by the plugin @@ -1064,13 +1085,11 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * 0 : nothing to do */ static function cronPMOrphanCases($task) { - global $PM_DB, $DB; + global $PM_DB, $DB, $PM_SOAP; - if (!isset($PM_DB)) { - $PM_DB = new PluginProcessmakerDB; - } + //plugin_processmaker_post_init(); - // get list of case assigned to GLPi items + // get list of case assigned to GLPI items $draftCases = array(0); $query = "SELECT case_num FROM glpi_plugin_processmaker_cases WHERE case_status = 'DRAFT';"; foreach ($DB->request( $query ) as $row) { @@ -1082,8 +1101,8 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $task->setVolume(0); // start with zero if (count($draftCases) > 0) { - $pm = new self; - $pm->login(true); + //$PM_SOAP = new self; + $PM_SOAP->login(true); $query = "SELECT * FROM APPLICATION WHERE APP_DATA LIKE '%s:24:\"GLPI_SELFSERVICE_CREATED\";s:1:\"1\"%' AND APP_STATUS = 'DRAFT' @@ -1091,7 +1110,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { AND APP_NUMBER NOT IN (".implode(',', $draftCases)."); "; foreach ($PM_DB->request( $query ) as $row) { - $ret = $pm->deleteCase( $row['APP_UID'] ); + $ret = $PM_SOAP->deleteCase( $row['APP_UID'] ); $task->addVolume(1); if ($ret !== false) { $task->log( "Deleted case num: '".$row['APP_NUMBER']."'" ); @@ -1121,32 +1140,30 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * 0 : nothing to do */ static function cronPMUsers($task) { - global $DB, $PM_DB; + global $DB, $PM_DB, $PM_SOAP; - if (!isset($PM_DB)) { - $PM_DB = new PluginProcessmakerDB; - } + //plugin_processmaker_post_init(); $actionCode = 0; // by default $error = false; $task->setVolume(0); // start with zero // start a processmaker session - $myProcessMaker = new PluginProcessmakerProcessmaker(); - if (!$myProcessMaker->login( true )) { - $task->log( "Error PM: '".print_r($myProcessMaker->lasterror, true)."'" ); + //$PM_SOAP = new PluginProcessmakerProcessmaker(); + if (!$PM_SOAP->login( true )) { + $task->log( "Error PM: '".print_r($PM_SOAP->lasterror, true)."'" ); return -1; } - $pmGroupList = $myProcessMaker->groupList( ); + $pmGroupList = $PM_SOAP->groupList( ); foreach ($pmGroupList as $pmGroup) { - if ($pmGroup->guid == $myProcessMaker->pm_group_guid) { + if ($pmGroup->guid == $PM_SOAP->pm_group_guid) { break; // to get the name :) } } $pmUserList = array(); - foreach ($myProcessMaker->userList() as $pmuser) { + foreach ($PM_SOAP->userList() as $pmuser) { $pmUserList[ strtolower($pmuser->name)] = array( 'name' => $pmuser->name, 'guid' => $pmuser->guid, 'status' => $pmuser->status ); } @@ -1166,12 +1183,12 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $status = "ACTIVE"; $task->addVolume(1); $pass = substr( Toolbox::encrypt($user['id'].$user['name'].time(), GLPIKEY), 0, 20); - $pmResult = $myProcessMaker->createUser( $user['name'], $user['firstname'], $user['realname'], "", "PROCESSMAKER_OPERATOR", $pass, $status); + $pmResult = $PM_SOAP->createUser( $user['name'], $user['firstname'], $user['realname'], "", "PROCESSMAKER_OPERATOR", $pass, $status); if ($pmResult->status_code == 0) { $task->log( "Added user: '".$user['name']."'" ); // then assign user to group - $pmResult2 = $myProcessMaker->assignUserToGroup( $pmResult->userUID, $pmGroup->guid ); + $pmResult2 = $PM_SOAP->assignUserToGroup( $pmResult->userUID, $pmGroup->guid ); if ($pmResult2->status_code == 0) { $task->log( "Added user: '".$user['name']."' to '".$pmGroup->name."' group" ); } else { @@ -1226,7 +1243,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } if ($status != $pmUserList[strtolower($user['name'])]['status']) { $task->addVolume(1); - $pmResult = $myProcessMaker->updateUser( $pmUserList[strtolower($user['name'])]['guid'], $user['name'], $user['firstname'], $user['realname'], $status ); + $pmResult = $PM_SOAP->updateUser( $pmUserList[strtolower($user['name'])]['guid'], $user['name'], $user['firstname'], $user['realname'], $status ); if ($pmResult->status_code == 0) { $task->log( "Updated user: '".$user['name']."', status: '".$pmUserList[strtolower($user['name'])]['status']."' -> '".$status."'" ); $actionCode = 1; @@ -1277,7 +1294,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { foreach ($arrayDiff as $group) { // it is not existing in PM // then create - $pmResult = $myProcessMaker->createGroup( $group['name'] ); + $pmResult = $PM_SOAP->createGroup( $group['name'] ); if ($pmResult->status_code == 0) { $task->addVolume(1); $task->log( "Added group: '".$group['name']."'" ); @@ -1323,15 +1340,15 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { public static function plugin_pre_item_add_processmaker($parm) { global $PM_DB; - if (isset($parm->input['processmaker_caseid'])) { + if (isset($parm->input['processmaker_caseguid'])) { // a case is already started for this ticket, then change ticket title and ticket type and ITILCategory $myProcessMaker = new PluginProcessmakerProcessmaker( ); $myProcessMaker->login( ); - $caseInfo = $myProcessMaker->getCaseInfo( $parm->input['processmaker_caseid'], $parm->input['processmaker_delindex']); + $caseInfo = $myProcessMaker->getCaseInfo( $parm->input['processmaker_caseguid'], $parm->input['processmaker_delindex']); $parm->input['name'] = $PM_DB->escape($caseInfo->caseName ); - $caseInitialDueDate = $myProcessMaker->getVariables( $parm->input['processmaker_caseid'], array( 'GLPI_ITEM_TITLE', 'GLPI_ITEM_INITIAL_DUE_DATE' )); + $caseInitialDueDate = $myProcessMaker->getVariables( $parm->input['processmaker_caseguid'], array( 'GLPI_ITEM_TITLE', 'GLPI_ITEM_INITIAL_DUE_DATE' )); if (array_key_exists( 'GLPI_ITEM_INITIAL_DUE_DATE', $caseInitialDueDate )) { $parm->input['due_date'] = $caseInitialDueDate[ 'GLPI_ITEM_INITIAL_DUE_DATE' ]." 23:59:59"; } @@ -1339,12 +1356,12 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { if (array_key_exists( 'GLPI_ITEM_TITLE', $caseInitialDueDate )) { $txtItemTitle = $caseInitialDueDate[ 'GLPI_ITEM_TITLE' ]; // reset those variables - $resultSave = $myProcessMaker->sendVariables( $parm->input['processmaker_caseid'], array( "GLPI_ITEM_TITLE" => '') ); + $resultSave = $myProcessMaker->sendVariables( $parm->input['processmaker_caseguid'], array( "GLPI_ITEM_TITLE" => '') ); } $parm->input['name'] = $PM_DB->escape($txtItemTitle ); $procDef = new PluginProcessmakerProcess; - $procDef->getFromDBbyExternalID( $caseInfo->processId ); + $procDef->getFromGUID( $caseInfo->processId ); if (isset($parm->input['type'])) { $parm->input['type'] = $procDef->fields['type']; } @@ -1357,51 +1374,49 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } public static function plugin_item_add_processmaker($parm) { - global $DB, $GLOBALS; + global $DB, $GLOBALS, $PM_SOAP; - if (isset($parm->input['processmaker_caseid'])) { + if (isset($parm->input['processmaker_caseguid'])) { // a case is already started for this ticket, then bind them together - $itemType = $parm->getType(); - $itemId = $parm->fields['id']; - $caseId = $parm->input['processmaker_caseid']; + $itemtype = $parm->getType(); + $items_id = $parm->fields['id']; + $case_guid = $parm->input['processmaker_caseguid']; + + $caseInfo = $PM_SOAP->getCaseInfo($case_guid);//$parm->input['processmaker_delindex']); $myCase = new PluginProcessmakerCase; - - //can't use std add due to forced case id - $process = new PluginProcessmakerProcess; - $process->getFromDBbyExternalID( $parm->input['processId'] ); - $query = "INSERT INTO glpi_plugin_processmaker_cases (items_id, itemtype, id, case_num, processes_id) VALUES ($itemId, '$itemType', '$caseId', ".$parm->input['processmaker_casenum'].", '".$process->getID()."');"; - $res = $DB->query($query); - - $myCase->getFromDB( $caseId ); // reloads case from DB - - $myProcessMaker = new PluginProcessmakerProcessmaker( ); - $myProcessMaker->login( ); - - $caseInfo = $myProcessMaker->getCaseInfo( $myCase->getID(), $parm->input['processmaker_delindex']); + $myCase->add(['id' => $parm->input['processmaker_casenum'], + 'itemtype' => $itemtype, + 'items_id' => $items_id, + 'entities_id' => $parm->fields['entities_id'], + 'name' => $caseInfo->caseName, + 'case_guid' => $case_guid, + 'case_status' => $caseInfo->caseStatus, + 'plugin_processmaker_processes_id' => $parm->input['processmaker_processes_id'] + ]); // here we create a fake task that will be used to store the creator of the case // this is due for traceability only - $myProcessMaker->add1stTask( $myCase->fields['itemtype'], $myCase->fields['items_id'], $caseInfo, array( 'notif' => false) ); // no notif + $PM_SOAP->add1stTask($myCase->getID(), $myCase->fields['itemtype'], $myCase->fields['items_id'], $caseInfo, array( 'notif' => false) ); // no notif // before routing, send items_id and itemtype // as this information was not available at case creation - $resultSave = $myProcessMaker->sendVariables( $myCase->getID(), array( "GLPI_TICKET_ID" => $itemId ) ); + $myCase->sendVariables( array( "GLPI_TICKET_ID" => $items_id ) ); // route case - $pmRouteCaseResponse = $myProcessMaker->routeCase( $myCase->getID(), $parm->input['processmaker_delindex'] ); + $pmRouteCaseResponse = $PM_SOAP->routeCase($case_guid, $parm->input['processmaker_delindex'] ); // gets new case status - $caseInfo = $myProcessMaker->getCaseInfo( $myCase->getID(), $parm->input['processmaker_delindex']); + $caseInfo = $myCase->getCaseInfo();//$parm->input['processmaker_delindex']); // now manage tasks associated with item // create new tasks if (property_exists( $pmRouteCaseResponse, 'routing' )) { // now tries to get some variables to setup content for new task and to append text to solved task - $txtForTasks = $myProcessMaker->getVariables( $myCase->getID(), array( "GLPI_ITEM_APPEND_TO_TASK", - "GLPI_ITEM_SET_STATUS", - "GLPI_TICKET_FOLLOWUP_CONTENT", - "GLPI_TICKET_FOLLOWUP_IS_PRIVATE", - "GLPI_TICKET_FOLLOWUP_REQUESTTYPES_ID" ) ); + $txtForTasks = $myCase->getVariables( array( "GLPI_ITEM_APPEND_TO_TASK", + "GLPI_ITEM_SET_STATUS", + "GLPI_TICKET_FOLLOWUP_CONTENT", + "GLPI_TICKET_FOLLOWUP_IS_PRIVATE", + "GLPI_TICKET_FOLLOWUP_REQUESTTYPES_ID" ) ); $itemSetStatus = ''; if (array_key_exists( 'GLPI_ITEM_SET_STATUS', $txtForTasks )) { $itemSetStatus = $txtForTasks[ 'GLPI_ITEM_SET_STATUS' ]; @@ -1417,55 +1432,61 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } // reset those variables - $resultSave = $myProcessMaker->sendVariables( $myCase->getID(), array( "GLPI_ITEM_APPEND_TO_TASK" => '', - "GLPI_ITEM_SET_STATUS" => '', - "GLPI_TICKET_FOLLOWUP_CONTENT" => '', - "GLPI_TICKET_FOLLOWUP_IS_PRIVATE" => '', - "GLPI_TICKET_FOLLOWUP_REQUESTTYPES_ID" => '' ) ); + $resultSave = $myCase->sendVariables( array( "GLPI_ITEM_APPEND_TO_TASK" => '', + "GLPI_ITEM_SET_STATUS" => '', + "GLPI_TICKET_FOLLOWUP_CONTENT" => '', + "GLPI_TICKET_FOLLOWUP_IS_PRIVATE" => '', + "GLPI_TICKET_FOLLOWUP_REQUESTTYPES_ID" => '' ) ); // routing has been done, then solve 1st task - $myProcessMaker->solveTask( $myCase->getID(), $parm->input['processmaker_delindex'], array( 'txtToAppend' => $txtToAppendToTask, 'notif' => false) ); + $PM_SOAP->solveTask($myCase->getID(), $parm->input['processmaker_delindex'], array( 'txtToAppend' => $txtToAppendToTask, 'notif' => false) ); // create a followup if requested - if ($createFollowup && $itemType == 'Ticket') { - $myProcessMaker->addTicketFollowup( $itemId, $txtForTasks ); + if ($createFollowup && $itemtype == 'Ticket') { + $PM_SOAP->addTicketFollowup( $items_id, $txtForTasks ); } // and create GLPI tasks for the newly created PM tasks. foreach ($pmRouteCaseResponse->routing as $route) { - $myProcessMaker->addTask( $myCase->fields['itemtype'], - $myCase->fields['items_id'], - $caseInfo, $route->delIndex, - PluginProcessmakerUser::getGLPIUserId( $route->userId ), - 0, - $route->taskId ); + $PM_SOAP->addTask( $myCase->getID(), + $myCase->fields['itemtype'], + $myCase->fields['items_id'], + $caseInfo, + $route->delIndex, + PluginProcessmakerUser::getGLPIUserId( $route->userId ), + 0, + $route->taskId, + $route->delThread ); } if ($itemSetStatus != '') { - $myProcessMaker->setItemStatus($myCase->fields['itemtype'], $myCase->fields['items_id'], $itemSetStatus ); + $PM_SOAP->setItemStatus($myCase->fields['itemtype'], $myCase->fields['items_id'], $itemSetStatus ); } } // evolution of case status: DRAFT, TO_DO, COMPLETED, CANCELLED - $myCase->update( array( 'id' => $myCase->getID(), 'case_status' => $caseInfo->caseStatus ) ); - } else {//if( array_key_exists('_head', $parm->input) ) { - // this ticket have been created via email receiver. + $myCase->update( ['id' => $myCase->getID(), + 'case_status' => $caseInfo->caseStatus, + 'name' => $caseInfo->caseName + ]); + + } else {//if( array_key_exists('_head', $parm->input) ) { // this ticket have been created via email receiver. $ptnProcessToStart = "/##TicketProcess:\s*#([0-9a-f]{32})\s*##/i"; $str = $parm->input['content']; if (preg_match($ptnProcessToStart, $str, $matches) > 0) { // and it is requested to start a case of process - $processId = $matches[1]; + $processGuid = $matches[1]; $hasCase = self::getCaseIdFromItem( 'Ticket', $parm->fields['id'] ); - if ($hasCase === false && $processId > 0) { + if ($hasCase === false) { // check writer $writer = new User; $writer->getFromDB( $parm->fields['users_id_recipient'] ); - $myProcessMaker = new PluginProcessmakerProcessmaker(); - $myProcessMaker->login( $writer->fields['name'] ); + //$PM_SOAP = new PluginProcessmakerProcessmaker(); + $PM_SOAP->login( $writer->fields['name'] ); $locProcess = new PluginProcessmakerProcess; - if ($locProcess->getFromDBbyExternalID( $processId )) { + if ($locProcess->getFromGUID( $processGuid )) { $found = false; - // check rights of writer to start this $processId on the Ticket entity + // check rights of writer to start this $processGuid on the Ticket entity foreach (Profile_User::getUserProfiles( $writer->getID() ) as $profID) { if (in_array( $parm->fields['entities_id'], PluginProcessmakerProcess::getEntitiesForProfileByProcess( $locProcess->getID(), $profID, true) )) { $found=true; @@ -1473,7 +1494,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } } if ($found) { - $resultCase = $myProcessMaker->startNewCase( $locProcess->getID(), 'Ticket', $parm->fields['id'], $writer->getID() ); + $PM_SOAP->startNewCase( $locProcess->getID(), 'Ticket', $parm->fields['id'], $writer->getID() ); } } } @@ -1523,17 +1544,17 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } - /** * Summary of addTask * adds a GLPI task to given item + * @param $cases_id integer the GLPI id of the case * @param $itemType string item type to which a task will be added - * @param $itemId integer item id to which a task will be added + * @param $items_id integer item id to which a task will be added * @param $caseInfo mixed getCaseInfoResponse object (see: getCaseInfo() function) * @param $delIndex integer index of the delegation * @param $techId integer GLPI user id to which a task must be assigned, if == 0 will use $groupId and/or $pmTaskId - * @param groupId string PM group guid to assign to task, used when $techId == 0 - * @param pmTaskId string PM task guid, used when $groupId == 0 AND $techID == 0 + * @param $groupId string PM group guid to assign to task, used when $techId == 0 + * @param $pmTaskId string PM task guid, used when $groupId == 0 AND $techID == 0 * @param $options array of options, default values are * 'txtTaskContent' => '', * 'start_date' => '', @@ -1541,7 +1562,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * 'notif' => true * @return */ - public function addTask( $itemType, $itemId, $caseInfo, $delIndex, $techId, $groupId, $pmTaskId, $options=array() ) { + public function addTask($cases_id, $itemType, $items_id, $caseInfo, $delIndex, $techId, $groupId, $pmTaskId, $delThread, $options=array() ) { global $DB, $PM_DB, $LANG, $_SESSION; $default_options = array( @@ -1561,15 +1582,15 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $input = array(); // will contain all data for the Task - $input[getForeignKeyFieldForItemType($itemType)] = $itemId; + $input[getForeignKeyFieldForItemType($itemType)] = $items_id; // search for task category // $pmtaskcat = new PluginProcessmakerTaskCategory; - $pmtaskcat->getFromDBbyExternalID( $pmTaskId ); + $pmtaskcat->getFromGUID( $pmTaskId ); $input['taskcategories_id'] = $pmtaskcat->fields['taskcategories_id']; // load process information $pmProcess = new PluginProcessmakerProcess; - $pmProcess->getFromDB( $pmtaskcat->fields['processes_id'] ); + $pmProcess->getFromDB( $pmtaskcat->fields['plugin_processmaker_processes_id'] ); if ($options['start_date'] == '') { $options['start_date'] = new DateTime( $_SESSION["glpi_currenttime"] ); @@ -1624,7 +1645,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } else { // adds the user tech to ticket watcher if neccessary - self::addWatcher( $itemType, $itemId, $techId ); + self::addWatcher( $itemType, $items_id, $techId ); } // manage task description @@ -1658,7 +1679,14 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { if ($glpi_task->getId() > 0) { // stores link to task in DB - $query = "INSERT INTO glpi_plugin_processmaker_tasks (items_id, itemtype, case_id, del_index) VALUES (".$glpi_task->getId().", '".$glpi_task->getType()."', '".$caseInfo->caseId."', ".$delIndex.");"; + //$tmp = new PluginProcessmakerTask($glpi_task->getType()); + //$tmp->add([ 'itemtype' => $glpi_task->getType(), + // 'items_id' => $glpi_task->getId(), + // 'plugin_processmaker_cases_id' => $cases_id, + // 'del_index' => $delIndex + // ], [], false); + $query = "INSERT INTO glpi_plugin_processmaker_tasks (items_id, itemtype, plugin_processmaker_cases_id, plugin_processmaker_taskcategories_id, del_index, del_thread) + VALUES ({$glpi_task->getId()}, '{$glpi_task->getType()}', $cases_id, {$pmtaskcat->fields['id']}, $delIndex, $delThread);"; $DB->query( $query ); } } @@ -1684,7 +1712,8 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { /** * Summary of add1stTask * adds a GLPI task to ticket - * @param $intemType string itemtype of object (Ticket, Problem, ....) + * @param $cases_id integer the GLPI id of the case + * @param $itemType string itemtype of object (Ticket, Problem, ....) * @param $itemId integer item id to which a task will be added * @param $caseInfo mixed getCaseInfoResponse object (see: getCaseInfo() function) * @param $options array of options, defaults are: @@ -1693,7 +1722,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { * 'notif' => true, if true notifications will be sent * @return */ - public function add1stTask ( $itemType, $itemId, $caseInfo, $options=array() ) { + public function add1stTask ($cases_id, $itemType, $itemId, $caseInfo, $options=array() ) { $default_options = array( 'txtTaskContent' => '', @@ -1711,13 +1740,15 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $userId = $options['userId'] ? $options['userId'] : Session::getLoginUserID(); unset($options['userId']); // unset it as it's not in the options of addTask - $this->addTask( $itemType, + $this->addTask( $cases_id, + $itemType, $itemId, $caseInfo, $caseInfo->currentUsers[0]->delIndex, $userId, 0, $caseInfo->currentUsers[0]->taskId, + $caseInfo->currentUsers[0]->delThread, $options ); $_SESSION["glpi_currenttime"] = $official_date_time; @@ -1748,16 +1779,16 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { public function setItemTitle( $itemtype, $itemId, $newtitle ) { $item = getItemForItemtype( $itemtype ); if ($item->getFromDB( $itemId )) { - $item->update( ['id' => $itemId, 'name' => $txtItemTitle] ); + $item->update( ['id' => $itemId, 'name' => $newtitle] ); } } /** * Summary of setItemSolution - * @param mixed $itemType - * @param mixed $itemId - * @param mixed $casevariablevalues + * @param mixed $itemType + * @param mixed $itemId + * @param mixed $casevariablevalues */ public function setItemSolution($itemType, $itemId, $casevariablevalues) { $item = getItemForItemtype( $itemType ); @@ -1766,6 +1797,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $solutiontemplates_id = 0; $solutiontypes_id = 0; $solution = ''; + $to_update = false; // check solution template if (array_key_exists( 'GLPI_ITEM_SET_SOLUTION_TEMPLATE_ID', $casevariablevalues ) @@ -1780,6 +1812,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $solutiontemplates_id = $template->getID(); $solutiontypes_id = $template->fields['solutiontypes_id']; $solution = $template->fields['content']; + $to_update = true; } } @@ -1794,6 +1827,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { // and check entities if (in_array($item->getEntityID(), $entities)) { $solutiontypes_id = $type->getID(); + $to_update = true; } } @@ -1804,9 +1838,12 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $solution .= "\n"; } $solution .= $casevariablevalues[ 'GLPI_ITEM_APPEND_TO_SOLUTION_DESCRIPTION' ] ; + $to_update = true; } - $item->update( ['id' => $itemId, 'solutiontemplates_id' => $solutiontemplates_id, 'solutiontypes_id' => $solutiontypes_id, 'solution' => $solution] ); + if ($to_update) { + $item->update( ['id' => $itemId, 'solutiontemplates_id' => $solutiontemplates_id, 'solutiontypes_id' => $solutiontypes_id, 'solution' => $solution] ); + } } } @@ -1834,54 +1871,18 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { return 0; } - /** - * Summary of reassignTask - * @param mixed $caseId - * @param mixed $delIndex - * @param mixed $newDelIndex - * @param mixed $newTech - */ - public function reassignTask ( $caseId, $delIndex, $newDelIndex, $newTech) { - global $DB; - $query = "SELECT * FROM glpi_plugin_processmaker_tasks WHERE case_id='$caseId' and del_index=$delIndex; "; - $res = $DB->query($query); - if ($DB->numrows($res) > 0) { - $row = $DB->fetch_array( $res ); - $glpi_task = new $row['itemtype']; - $glpi_task->getFromDB( $row['items_id'] ); - - $itemType = str_replace( 'Task', '', $row['itemtype'] ); - $foreignkey = getForeignKeyFieldForItemType( $itemType ); - - self::addWatcher( $itemType, $glpi_task->fields[ $foreignkey ], $newTech ); - - $glpi_task->update( array( 'id' => $row['items_id'], $foreignkey => $glpi_task->fields[ $foreignkey ], 'users_id_tech' => $newTech )); - - // this is now done into GLPI core - //if( !$user_can_view ) { - // // to cheat the entity rigths, passes default user_entity to raiseEvent(), to be sure that task_tech will receive a notification. - // // drawback: notifications that are entity based could be missing. - // // tip: $user_entities[0] is the user's default entity - // NotificationEvent::raiseEvent('update_task', $glpi_item, array( 'entities_id' => $user_entities[0], 'task_id' => $glpi_task->getId(), 'is_private' => 0 ) ) ; - //} - - // then update the delIndex - $query = "UPDATE glpi_plugin_processmaker_tasks SET del_index = $newDelIndex WHERE case_id='$caseId' and del_index=$delIndex; "; - $res = $DB->query($query); - } - } /** * Summary of solveTask - * @param string $caseId + * @param string $cases_id GLPI case id * @param int $delIndex * @param array $options * 'txtToAppend' => '' : text to append to solved task * 'notif' => true : if true will send notifications * 'users_id_tech' => is the users_id of the tech that solved the task */ - public function solveTask( $caseId, $delIndex, $options=array() ) { + public function solveTask($cases_id, $delIndex, $options=array()) { global $DB; // change current glpi_currenttime to be sure that date_mode for solved task will not be identical than date_mode of the newly started task @@ -1900,7 +1901,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } } - $query = "SELECT * FROM glpi_plugin_processmaker_tasks WHERE case_id='$caseId' and del_index=$delIndex; "; + $query = "SELECT * FROM glpi_plugin_processmaker_tasks WHERE plugin_processmaker_cases_id=$cases_id and del_index=$delIndex; "; $res = $DB->query($query); if ($DB->numrows($res) > 0) { $row = $DB->fetch_array( $res ); @@ -1926,6 +1927,9 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $donotif = self::saveNotification($options['notif']); $glpi_task->update( $params ); self::restoreNotification($donotif); + + // Close the task + $DB->query("UPDATE glpi_plugin_processmaker_tasks SET del_thread_status = 'CLOSED' WHERE id = {$row['id']}"); } // restore current glpi time @@ -1936,15 +1940,15 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { /** * Summary of claimTask * will unassign group, and assign tech - * @param mixed $caseId + * @param mixed $cases_id GLPI case id * @param mixed $delIndex * @param mixed $users_id_tech optional is the id of the tech * who's claimed the task, default current logged-in user */ - public function claimTask( $caseId, $delIndex, $users_id_tech=null ) { + public function claimTask($cases_id, $delIndex, $users_id_tech=null) { global $DB; - $query = "SELECT * FROM glpi_plugin_processmaker_tasks WHERE case_id='$caseId' and del_index=$delIndex; "; + $query = "SELECT * FROM glpi_plugin_processmaker_tasks WHERE plugin_processmaker_cases_id='$cases_id' and del_index=$delIndex; "; $res = $DB->query($query); if ($DB->numrows($res) > 0) { $row = $DB->fetch_array( $res ); @@ -1976,7 +1980,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $query = "SELECT * FROM glpi_plugin_processmaker_cases WHERE `itemtype` = '$item_type' AND `items_id` = $item_id ;"; $res = $DB->query($query); if ($DB->numrows($res) > 0) { - // case is existing for this ticket + // case is existing for this item // then get info from db $row = $DB->fetch_array($res); @@ -1986,6 +1990,29 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { return false; } + /** + * Summary of getCaseGuidFromItem + * get case id for an id item_id of type item_type (if a case if attached to it) + * @param string $item_type, the type for the item ("Ticket", "Problem", ...) + * @param integer $item_id, the id for the item + * @return string the case guid, false if no case is attached to item, or if an error occurred + */ + public static function getCaseGuidFromItem ($item_type, $item_id ) { + global $DB; + + $query = "SELECT * FROM glpi_plugin_processmaker_cases WHERE `itemtype` = '$item_type' AND `items_id` = $item_id ;"; + $res = $DB->query($query); + if ($DB->numrows($res) > 0) { + // case is existing for this item + // then get info from db + $row = $DB->fetch_array($res); + + return $row['case_guid']; + } + + return false; + } + /** * Summary of getCaseFromItem * get case infos for an id item_id of type item_type (if a case if attached to it) @@ -1996,7 +2023,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { public function getCaseFromItem( $item_type, $item_id ) { global $DB; - $caseId = self::getCaseIdFromItem( $item_type, $item_id ); + $caseId = self::getCaseGuidFromItem( $item_type, $item_id ); if ($caseId !== false) { $caseInfo = $this->getCaseInfo( $caseId ); if ($caseInfo !== false && $caseInfo->status_code == 0) { @@ -2023,15 +2050,15 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } /** - * Summary of pre_show_item_processmakerticket + * Summary of pre_show_item_processmaker * @param $params */ - public static function pre_show_item_processmakerticket($params) { + public static function pre_show_item_processmaker($params) { if (!is_array($params['item']) && is_subclass_of( $params['item'], 'CommonITILTask')) { // must check if Task is bound to a PM task $pmTask = new PluginProcessmakerTask($params['item']->getType()); - if ($pmTask->getFromDBByQuery("WHERE itemtype='".$params['item']->getType()."' and items_id=".$params['item']->getId())) { + if ($pmTask->getFromDB($params['item']->getId())) {//$pmTask->getFromDBByQuery("WHERE itemtype='".$params['item']->getType()."' and items_id=".$params['item']->getId())) { $params['item']->fields['can_edit'] = false; // to prevent task edition // replace ##ticket.url##_PluginProcessmakerCase$processmakercases by a setActiveTab to the Case panel @@ -2052,19 +2079,25 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { $params['item']->fields['content'] = str_ireplace('
', '

', $params['item']->fields['content']).'

'; } + $tmpCase = new PluginProcessmakerCase; + $tmpCase->getFromDB($pmTask->fields['plugin_processmaker_cases_id']); + $urlLink = $tmpCase->getLinkURL().'&forcetab=PluginProcessmakerTask$'.$pmTask->fields['items_id']; + echo Html::scriptBlock( " $('#$taskJSId').find('.item_content').children().not('.read_more').on('click', function ( ) { //debugger; - var tabindex = $('#tabspanel').next('div').find('a[href*=\"_glpi_tab=PluginProcessmaker\"]').parent().index(); - $('#tabspanel').next('div').tabs( 'option', 'active', tabindex ); + document.location='$urlLink' } ).css('cursor', 'pointer') ; "); $params['item']->fields['content'] = str_replace( "\n##ticket.url##_PluginProcessmakerCase\$processmakercases", "", $params['item']->fields['content'] ); - if (isset( $params['item']->fields['tr_id'] )) { - $trID = $params['item']->fields['tr_id']; - } + // in order to set NavigationList + Session::initNavigateListItems('PluginProcessmakerCase', + //TRANS : %1$s is the itemtype name, + // %2$s is the name of the item (used for headings of a list) + sprintf(__('%1$s = %2$s'), + $params['options']['parent']->getTypeName(1), $params['options']['parent']->fields["name"])); } } } @@ -2195,99 +2228,6 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } - ///** - // * Summary of post_show_item_processmakerticket - // * @param $parm - // */ - //public static function post_show_item_processmakerticket($parm) { - // global $LANG, $pmHideSolution; - // if( ($plug = new Plugin) && !$plug->isActivated('arbehaviours') ) { - // if ($parm->getID() && in_array($parm->getType(), array('Ticket'))) { - // // then we are in a ticket - // if (isset($_REQUEST['glpi_tab']) && $_SESSION['glpiactiveprofile']['interface'] != "helpdesk" ) { - // $data = explode('$', $_REQUEST['glpi_tab']); - // $itemtype = $data[0]; - // // Default set - // $tabnum = 1; - // if (isset($data[1])) { - // $tabnum = $data[1]; - // } - // elseif ($itemtype == -1 ) - // $tabnum = -1 ; - - // if( $tabnum == 2 || $tabnum == -1 ) { - // // then we are showing the Solution tab - // // if a case is running - // // then we must prevent solution to be input - // if( $pmHideSolution ) { //isset($pmVar['GLPI_ITEM_CAN_BE_SOLVED']) && $pmVar['GLPI_ITEM_CAN_BE_SOLVED'] != 1 ) { //if( $pmInfo !== null && ( $pmInfo->caseStatus != 'COMPLETED' && $pmInfo->caseStatus != 'CANCELLED' )) { - - // echo ""; - // if( $tabnum == -1 ) - // echo ""; - // echo "
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //

- // ".$LANG['processmaker']['item']['preventsolution'][1]." - //
- // - //

- //

- // ".$LANG['processmaker']['item']['preventsolution'][2]." - // - //

- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
"; - // } - // } - // } - // } - // } - //} - - ///** - // * Summary of canedit_item_processmakertickettask - // * @param $parm - // */ - //public static function canedit_item_processmakertickettask($parm) { - // global $DB, $LANG, $_SESSION ; - // // must check if Task is bound to a PM task - // $query = "SELECT * FROM glpi_plugin_processmaker_tasks WHERE itemtype='".$parm->getType()."' and items_id=".$parm->getId().";" ; - // $res = $DB->query($query) ; - // if( $DB->numrows($res) > 0) { - // $parm->fields['plugin_canedit'] = false ; // to prevent task edition - // // replace ##ticket.url##_PluginProcessmakerCase$processmakercases by a setActiveTab to the Case panel - // $taskCat = new TaskCategory ; - // $taskCat->getFromDB( $parm->fields['taskcategories_id'] ) ; - // $taskComment = (isset($taskCat->fields['comment'])?$taskCat->fields['comment']:'') ; - // if( Session::haveTranslations('TaskCategory', 'comment') ) { - // $parm->fields['content'] = str_replace( '##processmaker.taskcomment##', DropdownTranslation::getTranslatedValue( $taskCat->getID(), 'TaskCategory', 'comment', $_SESSION['glpilanguage'], $taskComment ), $parm->fields['content'] ) ; - // } else { - // $parm->fields['content'] = str_replace( '##processmaker.taskcomment##', $taskComment, $parm->fields['content'] ) ; - // } - // $parm->fields['content'] = str_replace( '##ticket.url##_PluginProcessmakerCase$processmakercases', "".$LANG['processmaker']['item']['task']['manage_text']."", $parm->fields['content'] ) ; - // if( isset( $parm->fields['tr_id'] ) ) { - // $trID = $parm->fields['tr_id'] ; - // $parm->fields['content'] .= ""; - // } - // } - //} - /** * Summary of getItemUsers * returns an array of glpi ids and pm ids for each user type assigned to given ticket @@ -2358,9 +2298,9 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($ch, CURLOPT_URL, $this->serverURL."/cases/cases_Open?sid=".$_SESSION["pluginprocessmaker"]["session"]["id"]."&APP_UID=".$request['APP_UID']."&DEL_INDEX=".$request['DEL_INDEX']."&action=TO_DO" ); + curl_setopt($ch, CURLOPT_URL, $this->serverURL."/cases/cases_Open?sid=".$this->getPMSessionID()."&APP_UID=".$request['APP_UID']."&DEL_INDEX=".$request['DEL_INDEX']."&action=TO_DO" ); $response = curl_exec ($ch); - //Toolbox::logInFile( "pmtrace", "URL:\n".$this->serverURL."/cases/cases_Open?sid=".$_SESSION["pluginprocessmaker"]["session"]["id"]."\nResponse:\n".$response."\n\n\n" ) ; + //Toolbox::logInFile( "pmtrace", "URL:\n".$this->serverURL."/cases/cases_Open?sid=".$this->getPMSession()."\nResponse:\n".$response."\n\n\n" ) ; curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_POSTFIELDS, $data); @@ -2445,7 +2385,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } $query ="SELECT DISTINCT glpi_plugin_processmaker_processes.id, glpi_plugin_processmaker_processes.name FROM glpi_plugin_processmaker_processes - INNER JOIN glpi_plugin_processmaker_processes_profiles ON glpi_plugin_processmaker_processes_profiles.processes_id=glpi_plugin_processmaker_processes.id + INNER JOIN glpi_plugin_processmaker_processes_profiles ON glpi_plugin_processmaker_processes_profiles.plugin_processmaker_processes_id=glpi_plugin_processmaker_processes.id WHERE is_active = 1 AND itilcategories_id = $category AND `type` = $type AND profiles_id = $profile AND (entities_id = $entity $entityAncestors)"; foreach ($DB->request( $query ) as $row) { @@ -2456,39 +2396,47 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { } - public function startNewCase( $processId, $itemType, $itemId, $userId=null ) { + /** + * Summary of startNewCase + * @param mixed $processes_id integer: GLPI process id + * @param mixed $itemType string: item type 'Ticket', 'Change' or 'Problem' + * @param mixed $items_id integer: id to thte item + * @param mixed $users_id integer: GLPI user id + * @return mixed + */ + public function startNewCase( $processes_id, $itemType, $items_id, $users_id=null ) { global $DB, $CFG_GLPI; - $requesters = PluginProcessmakerProcessmaker::getItemUsers( $itemType, $itemId, CommonITILActor::REQUESTER); // 1 for requesters + $requesters = PluginProcessmakerProcessmaker::getItemUsers( $itemType, $items_id, CommonITILActor::REQUESTER); // 1 for requesters if (!key_exists( 0, $requesters )) { $requesters[0]['glpi_id'] = 0; $requesters[0]['pm_id'] = 0; } - $impersonateCase = false; - if (!$userId) { - // then we are going to take the item creator to set it as case creator and - $impersonateCase = true; + //$impersonateCase = false; + //if (!$users_id) { + // // then we are going to take the item creator to set it as case creator and + // $impersonateCase = true; - } + //} // get item info to retreive title, description and duedate $locItem = new $itemType; // $_POST['itemtype'] ; //Ticket(); - $locItem->getFromDB( $itemId ); // $_POST['id'] ) ; + $locItem->getFromDB( $items_id ); // $_POST['id'] ) ; if ($locItem->countUsers(CommonITILActor::ASSIGN) == 0 - || !$locItem->isUser(CommonITILActor::ASSIGN, $userId) ) { - $locItem->update( array( 'id' => $itemId, '_itil_assign' => array( '_type' => 'user', 'users_id' => $userId ) ) ); + || !$locItem->isUser(CommonITILActor::ASSIGN, $users_id) ) { + $locItem->update( array( 'id' => $items_id, '_itil_assign' => array( '_type' => 'user', 'users_id' => $users_id ) ) ); } if (!isset($locItem->fields['due_date']) || $locItem->fields['due_date'] == null) { $locItem->fields['due_date'] = ""; } - $resultCase = $this->newCase( $processId, + $resultCase = $this->newCase( $processes_id, array('GLPI_ITEM_CAN_BE_SOLVED' => 0, - 'GLPI_TICKET_ID' => $itemId, - 'GLPI_ITEM_ID' => $itemId, + 'GLPI_TICKET_ID' => $items_id, + 'GLPI_ITEM_ID' => $items_id, 'GLPI_ITEM_TYPE' => $itemType, 'GLPI_TICKET_REQUESTER_GLPI_ID' => $requesters[0]['glpi_id'], 'GLPI_ITEM_REQUESTER_GLPI_ID' => $requesters[0]['glpi_id'], @@ -2506,31 +2454,31 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { 'GLPI_ITEM_IMPACT' => $locItem->fields['impact'], 'GLPI_ITEM_PRIORITY' => $locItem->fields['priority'], 'GLPI_TICKET_GLOBAL_VALIDATION' => $locItem->fields['global_validation'] , - 'GLPI_TICKET_TECHNICIAN_GLPI_ID' => $userId, - 'GLPI_ITEM_TECHNICIAN_GLPI_ID' => $userId, - 'GLPI_TICKET_TECHNICIAN_PM_ID' => PluginProcessmakerUser::getPMUserId( $userId ), - 'GLPI_ITEM_TECHNICIAN_PM_ID' => PluginProcessmakerUser::getPMUserId( $userId ), - 'GLPI_URL' => $CFG_GLPI['url_base'].$CFG_GLPI['root_doc'] + 'GLPI_TICKET_TECHNICIAN_GLPI_ID' => $users_id, + 'GLPI_ITEM_TECHNICIAN_GLPI_ID' => $users_id, + 'GLPI_TICKET_TECHNICIAN_PM_ID' => PluginProcessmakerUser::getPMUserId( $users_id ), + 'GLPI_ITEM_TECHNICIAN_PM_ID' => PluginProcessmakerUser::getPMUserId( $users_id ), + 'GLPI_URL' => $CFG_GLPI['url_base'] ) ); if ($resultCase->status_code === 0) { - $caseInfo = $this->getCaseInfo( $resultCase->caseId ); + $caseInfo = $this->getCaseInfo( $resultCase->caseId ); - //$query = "UPDATE APPLICATION SET APP_STATUS='TO_DO' WHERE APP_UID='".$resultCase->caseId."' AND APP_STATUS='DRAFT'" ; - //$res = $DB->query($query) ; - // save info to DB - $locCase = new PluginProcessmakerCase; - $locCase->add( array( 'id' => $resultCase->caseId, - 'items_id' => $itemId, - 'itemtype' => $itemType, - 'case_num' => $resultCase->caseNumber, - 'case_status' => $caseInfo->caseStatus, - 'processes_id' => $processId //$caseInfo->processId - ), true ); - //$query = "INSERT INTO glpi_plugin_processmaker_cases (items_id, itemtype, id, case_num, case_status, processes_id) VALUES ($itemId, '$itemType', '".$resultCase->caseId."', ".$resultCase->caseNumber.", '".$caseInfo->caseStatus."', '".$caseInfo->processId."');" ; - //$res = $DB->query($query) ; + // save info to DB + $locCase = new PluginProcessmakerCase; + $locCase->add( ['id' => $resultCase->caseNumber, + 'itemtype' => $itemType, + 'items_id' => $items_id, + 'case_guid' => $resultCase->caseId, + 'case_status' => $caseInfo->caseStatus, + 'name' => $caseInfo->caseName, + 'entities_id' => $locItem->fields['entities_id'], + 'plugin_processmaker_processes_id' => $processes_id, + 'plugin_processmaker_cases_id' => 0 + ] + , [], true ); - $this->add1stTask($itemType, $itemId, $caseInfo, array( 'userId' => $userId ) ); + $this->add1stTask($locCase->getID(), $itemType, $items_id, $caseInfo, ['userId' => $users_id] ); } return $resultCase; @@ -2550,11 +2498,69 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { //$cookies, global $PM_DB; - // save the case variables + $itemtype = $myCase->getField('itemtype'); + $items_id = $myCase->getField('items_id'); + $item = new $itemtype; + $item->getFromDB($items_id); + + // save the dynaform variables into the current case $resultSave = $this->saveForm( $request ); // now derivate the case !!! - $pmRouteCaseResponse = $this->routeCase( $myCase->getID(), $request['DEL_INDEX']); + $pmRouteCaseResponse = $this->routeCase($myCase->fields['case_guid'], $request['DEL_INDEX']); + + //if (property_exists($pmRouteCaseResponse, 'routing')) { + // // must check if case has started a sub-process + // // we may have several new cases for this case + // // must check if all child cases are existing in GLPI + // $locTaskCat = new PluginProcessmakerTaskCategory; + // foreach($pmRouteCaseResponse->routing as $route) { + // if ($locTaskCat->getFromGUID($route->taskId) && $locTaskCat->fields['is_subprocess']) { + // // look for APP_UID + // foreach($PM_DB->request("SELECT APP_UID FROM SUB_APPLICATION WHERE APP_PARENT='{$myCase->fields['case_guid']}' AND DEL_INDEX_PARENT={$route->delIndex} AND DEL_THREAD_PARENT={$route->delThread} AND SA_STATUS='ACTIVE'") as $subCase) { + // // normally only one case for this delIndex and delThread + // // now need to get the PRO_UID + // $sub_caseInfo = self::getCaseInfo($subCase['APP_UID']); + + // $locProc = new PluginProcessmakerProcess; + // $locProc->getFromGUID($sub_caseInfo->processId); + // $locCase = new PluginProcessmakerCase; + // $locCase->add(['id' => $sub_caseInfo->caseNumber, + // 'case_guid'=> $sub_caseInfo->caseId, + // 'itemtype' => $itemtype, + // 'items_id' => $items_id, + // 'name' => $sub_caseInfo->caseName, + // 'entities_id' => $item->fields['entities_id'], + // 'case_status' => $sub_caseInfo->caseStatus, + // 'plugin_processmaker_processes_id' => $locProc->getID(), + // 'plugin_processmaker_cases_id' => $myCase->getID()]); + + // // then create associated task + // if (property_exists( $sub_caseInfo, 'currentUsers' )) { + // foreach ($sub_caseInfo->currentUsers as $sub_route) { + // $this->addTask($locCase->getID(), $itemtype, + // $items_id, + // $sub_caseInfo, + // $sub_route->delIndex, + // PluginProcessmakerUser::getGLPIUserId($sub_route->userId), + // 0, + // $sub_route->taskId, + // $sub_route->delThread, + // [] + // //array( 'txtTaskContent' => $txtTaskContent, + // // 'start_date' => $taskStartDate, + // // 'end_date' => $taskEndDate) + // ); + + // } + // } + + // } + + // } + // } + + //} $casevariables = ["GLPI_ITEM_TASK_CONTENT", "GLPI_ITEM_APPEND_TO_TASK", @@ -2572,7 +2578,7 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { ]; // now tries to get some variables to setup content for new task and to append text to solved task - $casevariablevalues = $this->getVariables($myCase->getID(), $casevariables); + $casevariablevalues = $myCase->getVariables($casevariables); $itemSetStatus = ''; if (array_key_exists( 'GLPI_ITEM_SET_STATUS', $casevariablevalues )) { @@ -2624,62 +2630,196 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { foreach($casevariables as $val) { $resetcasevariables[$val] = ''; } - $resultSave = $this->sendVariables($myCase->getID(), $resetcasevariables); + $resultSave = $myCase->sendVariables($resetcasevariables); // print_r( $pmRouteCaseResponse ) ; // die() ; // now manage tasks associated with item - $itemType = $myCase->getField('itemtype'); - $itemId = $myCase->getField('items_id'); - // switch own task to 'done' and create a new one - $this->solveTask( $myCase->getID(), $request['DEL_INDEX'], array( 'txtToAppend' => $txtToAppendToTask, 'users_id_tech' => $users_id ) ); + $this->solveTask($myCase->getID(), $request['DEL_INDEX'], array( 'txtToAppend' => $txtToAppendToTask, 'users_id_tech' => $users_id ) ); // create a followup if requested - if ($createFollowup && $itemType == 'Ticket') { - $this->addTicketFollowup( $itemId, $casevariablevalues ); - } - $caseInfo = $this->getCaseInfo( $myCase->getID(), $request['DEL_INDEX']); - if (property_exists( $pmRouteCaseResponse, 'routing' )) { - foreach ($pmRouteCaseResponse->routing as $route) { - $this->addTask( $itemType, - $itemId, - $caseInfo, - $route->delIndex, - PluginProcessmakerUser::getGLPIUserId( $route->userId ), - $groupId, - $route->taskId, - array( 'txtTaskContent' => $txtTaskContent, - 'start_date' => $taskStartDate, - 'end_date' => $taskEndDate) - ); - - // if end date was specified, then must change due date of the PM task - if ($taskEndDate != '') { - $PM_DB->query( "UPDATE APP_DELEGATION SET DEL_TASK_DUE_DATE='$taskEndDate' WHERE APP_UID='".$caseInfo->caseId."' AND DEL_INDEX=".$route->delIndex); - } - } + if ($createFollowup && $itemtype == 'Ticket') { + $this->addTicketFollowup( $items_id, $casevariablevalues ); } if ($txtItemTitle != '') { // we are going to change the title of current GLPI Item - $this->setItemTitle($itemType, $itemId, $txtItemTitle); + $this->setItemTitle($itemtype, $items_id, $txtItemTitle); } if ($itemSetStatus != '') { - $this->setItemStatus($itemType, $itemId, $itemSetStatus ); + $this->setItemStatus($itemtype, $items_id, $itemSetStatus ); } if (array_key_exists( 'GLPI_ITEM_SET_SOLUTION_TEMPLATE_ID', $casevariablevalues ) || array_key_exists( 'GLPI_ITEM_SET_SOLUTION_TYPE_ID', $casevariablevalues ) || array_key_exists( 'GLPI_ITEM_APPEND_TO_SOLUTION_DESCRIPTION', $casevariablevalues )) { // case requests to add a solution to ticket - $this->setItemSolution($itemType, $itemId, $casevariablevalues); + $this->setItemSolution($itemtype, $items_id, $casevariablevalues); + } + + // get the new case info + $caseInfo = $myCase->getCaseInfo($request['DEL_INDEX']); // not sure that it should passed this + + // now create the new tasks if any + if (property_exists( $pmRouteCaseResponse, 'routing' )) { + + // we may have several task to create + foreach ($pmRouteCaseResponse->routing as $route) { + + // must check if task has started a sub-process + $locTaskCat = new PluginProcessmakerTaskCategory; + if ($locTaskCat->getFromGUID($route->taskId) && $locTaskCat->fields['is_subprocess']) { + // look for APP_UID + $res = $PM_DB->query("SELECT APP_UID FROM SUB_APPLICATION WHERE APP_PARENT='{$myCase->fields['case_guid']}' AND DEL_INDEX_PARENT={$route->delIndex} AND SA_STATUS='ACTIVE'"); // AND DEL_THREAD_PARENT={$route->delThread} seems like it is not set to correct threadIndex + if ($res && $PM_DB->numrows($res) == 1) { + // then new task is a sub-process, + $row = $PM_DB->fetch_assoc($res); + + // now need to get the PRO_UID + $sub_caseInfo = self::getCaseInfo($row['APP_UID']); + + $locProc = new PluginProcessmakerProcess; + $locProc->getFromGUID($sub_caseInfo->processId); + $subCase = new PluginProcessmakerCase; + $subCase->add(['id' => $sub_caseInfo->caseNumber, + 'case_guid'=> $sub_caseInfo->caseId, + 'itemtype' => $itemtype, + 'items_id' => $items_id, + 'name' => $sub_caseInfo->caseName, + 'entities_id' => $item->fields['entities_id'], + 'case_status' => $sub_caseInfo->caseStatus, + 'plugin_processmaker_processes_id' => $locProc->getID(), + 'plugin_processmaker_cases_id' => $myCase->getID()]); + + // then create associated task + if (property_exists( $sub_caseInfo, 'currentUsers' )) { + // there should be only one task + $sub_route = $sub_caseInfo->currentUsers[0]; + $this->addTask($subCase->getID(), $itemtype, + $items_id, + $sub_caseInfo, + $sub_route->delIndex, + PluginProcessmakerUser::getGLPIUserId($sub_route->userId), + 0, + $sub_route->taskId, + $sub_route->delThread, + array( 'txtTaskContent' => $txtTaskContent, + 'start_date' => $taskStartDate, + 'end_date' => $taskEndDate) + ); + + // if end date was specified, then must change due date of the PM task + if ($taskEndDate != '') { + $PM_DB->query( "UPDATE APP_DELEGATION SET DEL_TASK_DUE_DATE='$taskEndDate' WHERE APP_UID='".$sub_caseInfo->caseId."' AND DEL_INDEX=".$sub_route->delIndex); + } + + } + + // must also send to new sub-process some GLPI variables + // like any newly started cases + // get the value of GLPI_ITEM_CAN_BE_SOLVED to transmit it to sub-case + //$canBeSolved = $myCase->getVariables(['GLPI_ITEM_CAN_BE_SOLVED']); + //$glpi_variables = ['GLPI_ITEM_CAN_BE_SOLVED' => isset($canBeSolved['GLPI_CAN_BE_SOLVED']) ? $canBeSolved['GLPI_CAN_BE_SOLVED'] : 0, + // 'GLPI_TICKET_ID' => $items_id, + // 'GLPI_ITEM_ID' => $items_id, + // 'GLPI_ITEM_TYPE' => $itemtype, + // 'GLPI_TICKET_REQUESTER_GLPI_ID' => $requesters[0]['glpi_id'], + // 'GLPI_ITEM_REQUESTER_GLPI_ID' => $requesters[0]['glpi_id'], + // 'GLPI_TICKET_REQUESTER_PM_ID' => $requesters[0]['pm_id'], + // 'GLPI_ITEM_REQUESTER_PM_ID' => $requesters[0]['pm_id'], + // 'GLPI_TICKET_TITLE' => $locItem->fields['name'], + // 'GLPI_ITEM_TITLE' => $locItem->fields['name'], + // 'GLPI_TICKET_DESCRIPTION' => $locItem->fields['content'], + // 'GLPI_ITEM_DESCRIPTION' => $locItem->fields['content'], + // 'GLPI_TICKET_DUE_DATE' => $locItem->fields['due_date'], + // 'GLPI_ITEM_DUE_DATE' => $locItem->fields['due_date'], + // 'GLPI_ITEM_ITIL_CATEGORY_ID' => $locItem->fields['itilcategories_id'], + // 'GLPI_TICKET_URGENCY' => $locItem->fields['urgency'], + // 'GLPI_ITEM_URGENCY' => $locItem->fields['urgency'], + // 'GLPI_ITEM_IMPACT' => $locItem->fields['impact'], + // 'GLPI_ITEM_PRIORITY' => $locItem->fields['priority'], + // 'GLPI_TICKET_GLOBAL_VALIDATION' => $locItem->fields['global_validation'] , + // 'GLPI_TICKET_TECHNICIAN_GLPI_ID' => $users_id, + // 'GLPI_ITEM_TECHNICIAN_GLPI_ID' => $users_id, + // 'GLPI_TICKET_TECHNICIAN_PM_ID' => PluginProcessmakerUser::getPMUserId( $users_id ), + // 'GLPI_ITEM_TECHNICIAN_PM_ID' => PluginProcessmakerUser::getPMUserId( $users_id ), + // 'GLPI_URL' => $CFG_GLPI['url_base'] + // ]; + //$subCase->sendVariables($glpi_variables); + + // evolution of case status: DRAFT, TO_DO, COMPLETED, CANCELLED + $subCase->update( array( 'id' => $subCase->getID(), 'case_status' => $sub_caseInfo->caseStatus, 'name' => $sub_caseInfo->caseName ) ); + + } + } else { + + $this->addTask( $myCase->getID(), $itemtype, + $items_id, + $caseInfo, + $route->delIndex, + PluginProcessmakerUser::getGLPIUserId( $route->userId ), + $groupId, + $route->taskId, + $route->delThread, + array( 'txtTaskContent' => $txtTaskContent, + 'start_date' => $taskStartDate, + 'end_date' => $taskEndDate) + ); + // if end date was specified, then must change due date of the PM task + if ($taskEndDate != '') { + $PM_DB->query( "UPDATE APP_DELEGATION SET DEL_TASK_DUE_DATE='$taskEndDate' WHERE APP_UID='".$caseInfo->caseId."' AND DEL_INDEX=".$route->delIndex); + } + } + + } + + } else + // must check if current case is a sub-process, and if it has ended, then must reflect parent case into the current item. + if ($myCase->fields['plugin_processmaker_cases_id'] != 0) { + // current case is a sub-case of $myCase->fields['plugin_processmaker_cases_id'] + $parentCase = new PluginProcessmakerCase; + $parentCase->getFromDB($myCase->fields['plugin_processmaker_cases_id']); + $parentCaseInfo = $parentCase->getCaseInfo(); + // then create associated task + if (property_exists( $parentCaseInfo, 'currentUsers' )) { + // we may have several new task + foreach ($parentCaseInfo->currentUsers as $open_task) { + // must check if $open_task is not is_subprocess and is not already existing in the item + $locTaskCat = new PluginProcessmakerTaskCategory; + $locTask = new PluginProcessmakerTask(); + if ($locTaskCat->getFromGUID($open_task->taskId) + && !$locTaskCat->fields['is_subprocess'] + && !$locTask->getFromDBByQuery("WHERE `plugin_processmaker_cases_id`={$parentCase->getID()} AND `plugin_processmaker_taskcategories_id`={$locTaskCat->getID()} AND `del_index`={$open_task->delIndex}")) { + $this->addTask($parentCase->getID(), $itemtype, + $items_id, + $parentCaseInfo, + $open_task->delIndex, + PluginProcessmakerUser::getGLPIUserId($open_task->userId), + 0, + $open_task->taskId, + $open_task->delThread, + array( 'txtTaskContent' => $txtTaskContent, + 'start_date' => $taskStartDate, + 'end_date' => $taskEndDate) + ); + + // if end date was specified, then must change due date of the PM task + if ($taskEndDate != '') { + $PM_DB->query( "UPDATE APP_DELEGATION SET DEL_TASK_DUE_DATE='$taskEndDate' WHERE APP_UID='".$sub_caseInfo->caseId."' AND DEL_INDEX=".$open_task->delIndex); + } + } + } + } + // evolution of case status: DRAFT, TO_DO, COMPLETED, CANCELLED + $parentCase->update( array( 'id' => $parentCase->getID(), 'case_status' => $parentCaseInfo->caseStatus, 'name' => $parentCaseInfo->caseName ) ); } // evolution of case status: DRAFT, TO_DO, COMPLETED, CANCELLED - $myCase->update( array( 'id' => $myCase->getID(), 'case_status' => $caseInfo->caseStatus ) ); + $myCase->update( array( 'id' => $myCase->getID(), 'case_status' => $caseInfo->caseStatus, 'name' => $caseInfo->caseName ) ); + } @@ -2783,21 +2923,4 @@ class PluginProcessmakerProcessmaker extends CommonDBTM { echo Html::scriptBlock($scriptblock); } - //static protected $saved_ob_level; - - //static function pre_item_form_processmakerticket($item) { - // self::$saved_ob_level = ob_get_level(); - // ob_start(); - - //} - - //static function post_item_form_processmakerticket($item) { - // $buffer = ob_get_clean(); - // // 9.1 only: hack to fix an issue with the initEditorSystem which calls scriptStart without calling scriptEnd - // if (ob_get_level() > self::$saved_ob_level) { - // $buffer = ob_get_clean().$buffer; - // } - // echo $buffer; - //} - } diff --git a/inc/profile.class.php b/inc/profile.class.php index bdc45bb..1db0cb1 100644 --- a/inc/profile.class.php +++ b/inc/profile.class.php @@ -21,9 +21,9 @@ class PluginProcessmakerProfile extends CommonDBTM { 'field' => 'plugin_processmaker_config', 'rights' => array(READ => __('Read'), UPDATE => __('Update'))), array('itemtype' => 'PluginProcessmakerConfig', - 'label' => $LANG['processmaker']['profile']['case_delete'], - 'field' => 'plugin_processmaker_deletecase', - 'rights' => array(DELETE => __('Delete'))) + 'label' => $LANG['processmaker']['profile']['case'], + 'field' => 'plugin_processmaker_case', + 'rights' => array(READ => __('Read'), DELETE => __('Delete'))) ); return $rights; diff --git a/inc/task.class.php b/inc/task.class.php index ef93d9c..995f4b2 100644 --- a/inc/task.class.php +++ b/inc/task.class.php @@ -11,11 +11,24 @@ class PluginProcessmakerTask extends CommonITILTask { private $itemtype; - function __construct($itemtype) { + function __construct($itemtype='TicketTask') { parent::__construct(); $this->itemtype=$itemtype; } + /** + * Name of the type + * + * @param $nb : number of item in the type (default 0) + **/ + static function getTypeName($nb=0) { + return _n('Process case task', 'Process case tasks', $nb); + + } + + function getItilObjectItemType() { + return str_replace('Task', '', $this->itemtype); + } /** * Summary of getFromDB * @param mixed $items_id @@ -42,24 +55,6 @@ class PluginProcessmakerTask extends CommonITILTask } } - //$query = "SELECT * FROM ".self::getTable()." WHERE itemtype='".$this->itemtype."' AND items_id=$items_id;" ; - - //$ret = $DB->query( $query ) ; - //if( $ret && $DB->numrows( $ret ) == 1 ) { - // $row = $DB->fetch_assoc( $ret ) ; - // $task = new $this->itemtype; - // if( $task->getFromDB( $row['items_id'] ) ) { - // // then we should add our own fields - // unset( $row['id'] ) ; - // unset( $row['items_id'] ) ; - // unset( $row['itemtype'] ) ; - // foreach( $row as $field => $val) { - // $task->fields[ $field ] = $val ; - // } - // $this->fields = $task->fields ; - // return true ; - // } - //} return false; } @@ -107,7 +102,10 @@ class PluginProcessmakerTask extends CommonITILTask $pmTask = new self('TicketTask'); if ($pmTask->getFromDB( $event['tickettasks_id'] )) { // $pmTask->getFromDBByQuery( " WHERE itemtype = 'TicketTask' AND items_id = ". $event['tickettasks_id'] ) ) { $event['editable'] = false; - $event['url'] .= '&forcetab=PluginProcessmakerCase$processmakercases'; + //$event['url'] .= '&forcetab=PluginProcessmakerCase$processmakercases'; + $tmpCase = new PluginProcessmakerCase; + $tmpCase->getFromDB($pmTask->fields['plugin_processmaker_cases_id']); + $event['url'] = $tmpCase->getLinkURL().'&forcetab=PluginProcessmakerTask$'.$pmTask->fields['items_id']; $taskCat = new TaskCategory; $taskCat->getFromDB( $pmTask->fields['taskcategories_id'] ); @@ -131,4 +129,118 @@ class PluginProcessmakerTask extends CommonITILTask } + function getTabNameForItem(CommonGLPI $case, $withtemplate = 0){ + global $DB, $LANG; + + $caseInfo = $case->getCaseInfo(); + $GLPICurrentPMUserId = PluginProcessmakerUser::getPMUserId(Session::getLoginUserID()); + + $tasks = []; + $query = "SELECT * FROM `glpi_plugin_processmaker_tasks` WHERE `plugin_processmaker_cases_id`={$case->fields['id']} AND `del_thread_status`='OPEN'"; + foreach($DB->request($query) as $task) { + $tasks[$task['del_index']] = $task; + } + $tab = []; + if (property_exists($caseInfo, 'currentUsers')) { + foreach ($caseInfo->currentUsers as $caseUser) { + $title = $caseUser->taskName; + if (isset($tasks[$caseUser->delIndex])) { + $hide_claim_button = false; + if ($caseUser->userId == '') { // task to be claimed + $itemtask = getItemForItemtype($tasks[$caseUser->delIndex]['itemtype']); + $itemtask->getFromDB($tasks[$caseUser->delIndex]['items_id']); + // check if this group can be found in the current user's groups + if (!isset($_SESSION['glpigroups']) || !in_array( $itemtask->fields['groups_id_tech'], $_SESSION['glpigroups'] )) { + $hide_claim_button = true; + } + } + $tab[$tasks[$caseUser->delIndex]['id']] = ($caseUser->userId != '' && $caseUser->userId != $GLPICurrentPMUserId) || $hide_claim_button ? "$title" : $title; + //} else { + // // it's a sub case + // // then add a tab that will point to the sub-case + // $tab['sb-'.$caseUser->delIndex] = $title; // "$title"; + } + } + } + + return $tab; + + } + + + /** + * Summary of displayTabContentForItem + * @param CommonGLPI $case the PluginProcessmakerCase + * @param integer $tabnum contains the id the PluginProcessmakerTask + * @param mixed $withtemplate + */ + static function displayTabContentForItem(CommonGLPI $case, $tabnum=1, $withtemplate=0) { + global $CFG_GLPI, $PM_SOAP; + + $hide_claim_button = false; + $config = $PM_SOAP->config; + $rand = rand(); + + // get infos for the current task + $task = getAllDatasFromTable('glpi_plugin_processmaker_tasks', "id = $tabnum"); + + // shows the re-assign form + $caseInfo = $case->getCaseInfo(); + $currentUser = null; + foreach ($caseInfo->currentUsers as $locTask) { + if ($locTask->delIndex == $task[$tabnum]['del_index']) { + $currentUser = $locTask; + break; + } + } + + if (isset($currentUser)) { + if ($currentUser->userId && $task[$tabnum]['del_index']) { + // to load users for task re-assign only when task is not to be 'claimed' and if task is not a sub-case + + echo "
".__('Loading...')."
"; + echo ""; + } else { + // manages the claim + // current task is to be claimed + // get the assigned group to the item task + $itemtask = getItemForItemtype( $task[$tabnum]['itemtype'] ); + $itemtask->getFromDB( $task[$tabnum]['items_id'] ); + // check if this group can be found in the current user's groups + if (!isset($_SESSION['glpigroups']) || !in_array( $itemtask->fields['groups_id_tech'], $_SESSION['glpigroups'] )) { + $hide_claim_button=true; + } + } + } + + echo ""; + + $csrf = Session::getNewCSRFToken(); + + echo ""; + + } + + } diff --git a/inc/taskcategory.class.php b/inc/taskcategory.class.php index 9c6bce7..1683504 100644 --- a/inc/taskcategory.class.php +++ b/inc/taskcategory.class.php @@ -30,36 +30,36 @@ class PluginProcessmakerTaskCategory extends CommonDBTM self::title($item); echo "

"; - echo ""; + echo ""; echo "". "" . - "" . + "" . "" . "" . "" . + "" . ""; - $query = "SELECT pm.pm_task_guid, pm.taskcategories_id, pm.`start`, gl.name, gl.completename, gl.`comment`, pm.is_active FROM glpi_plugin_processmaker_taskcategories AS pm + $query = "SELECT pm.pm_task_guid, pm.taskcategories_id, pm.`is_start`, gl.name, gl.completename, gl.`comment`, pm.is_active, pm.is_subprocess FROM glpi_plugin_processmaker_taskcategories AS pm LEFT JOIN glpi_taskcategories AS gl ON pm.taskcategories_id=gl.id - WHERE pm.processes_id=".$item->getID().";"; + WHERE pm.plugin_processmaker_processes_id=".$item->getID().";"; foreach ($DB->request($query) as $taskCat) { echo ""; echo ""; - echo ""; //str_replace(" ", " ", $taskCat['completename']).""; + echo ""; echo ""; @@ -72,7 +72,16 @@ class PluginProcessmakerTaskCategory extends CommonDBTM echo "\""."; } - echo ""; + echo ""; + + echo ""; + + echo ""; } echo "
".$LANG['processmaker']['title'][3]."
".$LANG['processmaker']['title'][3]."
".$LANG['processmaker']['process']['taskcategories']['name']."".$LANG['processmaker']['process']['taskcategories']['completename']."".$LANG['processmaker']['process']['taskcategories']['start']."".$LANG['processmaker']['process']['taskcategories']['is_start']."".$LANG['processmaker']['process']['taskcategories']['guid']."".$LANG['processmaker']['process']['taskcategories']['comment']."".$LANG['processmaker']['process']['taskcategories']['is_active']."".$LANG['processmaker']['process']['taskcategories']['is_subprocess']."
".$taskCat['name']; //str_replace(" ", " ", $taskCat['name']); + Toolbox::getItemTypeFormURL('TaskCategory') . "?id=" . $taskCat['taskcategories_id'] . "'>" . $taskCat['name']; if ($_SESSION["glpiis_ids_visible"]) { - echo " (".$taskCat['taskcategories_id'].")"; + echo " (" . $taskCat['taskcategories_id'] . ")"; } echo "".$taskCat['completename']."" . $taskCat['completename'] . ""; - if ($taskCat['start']) { + if ($taskCat['is_start']) { echo "\""."; + $LANG['processmaker']['process']['taskcategories']['is_start']."\">"; } echo "
"; + if ($taskCat['is_subprocess']) { + echo "\""."; + } + echo "
"; @@ -109,16 +118,16 @@ class PluginProcessmakerTaskCategory extends CommonDBTM /** * Retrieve a TaskCat from the database using its external id (unique index): pm_task_guid * - * @param $extid string externalid + * @param $task_guid string externalid * * @return true if succeed else false **/ - function getFromDBbyExternalID($extid) { + function getFromGUID($task_guid) { global $DB; $query = "SELECT * FROM `".$this->getTable()."` - WHERE `pm_task_guid` = '$extid'"; + WHERE `pm_task_guid` = '$task_guid'"; if ($result = $DB->query($query)) { if ($DB->numrows($result) != 1) { diff --git a/inc/user.class.php b/inc/user.class.php index 999d558..1000dcc 100644 --- a/inc/user.class.php +++ b/inc/user.class.php @@ -20,7 +20,7 @@ class PluginProcessmakerUser extends CommonDBTM { * @param $right limit user who have specific right * @param $entity_restrict Restrict to a defined entity * @param $value default value - * @param $used Already used items ID: not to display in dropdown + * @param $used array: Already used items ID: not to display in dropdown * @param $search pattern * * @return mysql result set. @@ -33,12 +33,16 @@ class PluginProcessmakerUser extends CommonDBTM { //$db_pm = PluginProcessmakerConfig::getInstance()->getProcessMakerDB(); $pmQuery = "SELECT GROUP_USER.USR_UID AS pm_user_id FROM TASK_USER JOIN GROUP_USER ON GROUP_USER.GRP_UID=TASK_USER.USR_UID AND TASK_USER.TU_RELATION = 2 AND TASK_USER.TU_TYPE=1 - WHERE TAS_UID = '$taskId'; "; + WHERE TAS_UID = '$taskId' + UNION + SELECT TASK_USER.USR_UID AS pm_user_id FROM TASK_USER + WHERE TAS_UID = '$taskId' AND TASK_USER.TU_RELATION = 1 AND TASK_USER.TU_TYPE=1 ; "; $pmUsers = array( ); foreach ($PM_DB->request( $pmQuery ) as $pmUser) { $pmUsers[ ] = $pmUser[ 'pm_user_id' ]; } + $where = ''; $joinprofile = false; switch ($right) { case "id" : diff --git a/install/mysql/3.3.0-empty.sql b/install/mysql/3.3.0-empty.sql index 0c150b8..3049ca9 100644 --- a/install/mysql/3.3.0-empty.sql +++ b/install/mysql/3.3.0-empty.sql @@ -39,20 +39,21 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_processmaker_caselinks` ( -- Dumping structure for table glpi.glpi_plugin_processmaker_cases CREATE TABLE IF NOT EXISTS `glpi_plugin_processmaker_cases` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, + `id` INT(11) NOT NULL, `itemtype` VARCHAR(10) NOT NULL DEFAULT 'Ticket', `items_id` INT(11) NOT NULL, - `case_guid` VARCHAR(32) NOT NULL, - `case_num` INT(11) NOT NULL, + `entities_id` INT(11) NOT NULL DEFAULT '0', + `name` MEDIUMTEXT NOT NULL DEFAULT '', + `case_guid` VARCHAR(32) NOT NULL, `case_status` VARCHAR(20) NOT NULL DEFAULT 'DRAFT', `plugin_processmaker_processes_id` INT(11) NULL DEFAULT NULL, - `is_subprocess` TINYINT(1) NOT NULL DEFAULT '0', + `plugin_processmaker_cases_id` INT(11) NULL DEFAULT NULL, INDEX `items` (`itemtype`, `items_id`), INDEX `case_status` (`case_status`), PRIMARY KEY (`id`), UNIQUE INDEX `case_guid` (`case_guid`), - UNIQUE INDEX `case_num` (`case_num`), - INDEX `plugin_processmaker_processes_id` (`plugin_processmaker_processes_id`) + INDEX `plugin_processmaker_processes_id` (`plugin_processmaker_processes_id`), + INDEX `plugin_processmaker_cases_id` (`plugin_processmaker_cases_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -85,8 +86,7 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_processmaker_configs` ( CREATE TABLE IF NOT EXISTS `glpi_plugin_processmaker_crontaskactions` ( `id` int(11) NOT NULL AUTO_INCREMENT, `plugin_processmaker_caselinks_id` int(11) DEFAULT NULL, - `itemtype` varchar(100) NOT NULL, - `items_id` int(11) NOT NULL DEFAULT '0', + `plugin_processmaker_cases_id` int(11) DEFAULT '0', `users_id` int(11) NOT NULL DEFAULT '0', `is_targettoclaim` tinyint(1) NOT NULL DEFAULT '0', `postdata` mediumtext, @@ -117,16 +117,17 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_processmaker_processes` ( -- Dumping structure for table glpi.glpi_plugin_processmaker_processes_profiles -CREATE TABLE IF NOT EXISTS `glpi_plugin_processmaker_profiles` ( +CREATE TABLE `glpi_plugin_processmaker_processes_profiles` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `processes_id` int(11) NOT NULL DEFAULT '0', - `plugin_processmaker_processes_id` int(11) NOT NULL DEFAULT '0', - `entities_id` int(11) NOT NULL DEFAULT '0', - `is_recursive` tinyint(1) NOT NULL DEFAULT '1', + `plugin_processmaker_processes_id` int(11) NOT NULL, + `profiles_id` int(11) NOT NULL, + `entities_id` int(11) NOT NULL, + `is_recursive` tinyint(1) NOT NULL, PRIMARY KEY (`id`), + UNIQUE INDEX `plugin_processmaker_processes_id_profiles_id_entities_id` (`plugin_processmaker_processes_id`, `profiles_id`, `entities_id`), KEY `entities_id` (`entities_id`), KEY `profiles_id` (`profiles_id`), - KEY `processes_id` (`processes_id`), + KEY `plugin_processmaker_processes_id` (`plugin_processmaker_processes_id`), KEY `is_recursive` (`is_recursive`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ; @@ -152,12 +153,15 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_processmaker_tasks` ( `id` int(11) NOT NULL AUTO_INCREMENT, `items_id` int(11) NOT NULL, `itemtype` varchar(32) NOT NULL, - `case_id` varchar(32) NOT NULL, + `plugin_processmaker_cases_id` int(11) NOT NULL, + `plugin_processmaker_taskcategories_id` int(11) NOT NULL, `del_index` int(11) NOT NULL, - `thread_index` INT(11) NOT NULL, + `del_thread` INT(11) NOT NULL, + `del_thread_status` varchar(32) NOT NULL DEFAULT 'OPEN', PRIMARY KEY (`id`), - UNIQUE KEY `case_id` (`case_id`,`del_index`), - UNIQUE KEY `items` (`itemtype`,`items_id`) + UNIQUE KEY `tasks` (`plugin_processmaker_cases_id`,`del_index`), + UNIQUE KEY `items` (`itemtype`,`items_id`), + KEY `del_thread_status` (`del_thread_status`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -165,7 +169,6 @@ CREATE TABLE IF NOT EXISTS `glpi_plugin_processmaker_tasks` ( CREATE TABLE IF NOT EXISTS `glpi_plugin_processmaker_users` ( `id` int(11) NOT NULL AUTO_INCREMENT, `pm_users_id` varchar(32) NOT NULL, - `password` varchar(32) DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `pm_users_id` (`pm_users_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/install/update_3_2_9_to_3_3_0.php b/install/update_3_2_9_to_3_3_0.php index dc8e5b2..c338cf0 100644 --- a/install/update_3_2_9_to_3_3_0.php +++ b/install/update_3_2_9_to_3_3_0.php @@ -1,9 +1,12 @@ query($query) or die("error normalizing glpi_plugin_processmaker_cases table step 2" . $DB->error()); $query = "ALTER TABLE `glpi_plugin_processmaker_cases` - ADD COLUMN `id` INT(11) NOT NULL AUTO_INCREMENT FIRST, + CHANGE COLUMN `case_num` `id` INT(11) NOT NULL FIRST, CHANGE COLUMN `itemtype` `itemtype` VARCHAR(10) NOT NULL DEFAULT 'Ticket' AFTER `id`, - CHANGE COLUMN `processes_id` `plugin_processmaker_processes_id` INT(11) NULL DEFAULT NULL AFTER `case_status`, - ADD COLUMN `is_subprocess` TINYINT(1) NOT NULL DEFAULT '0' AFTER `plugin_processmaker_processes_id`, + ADD COLUMN `entities_id` INT(11) NOT NULL DEFAULT '0' AFTER `items_id`, + ADD COLUMN `name` MEDIUMTEXT NOT NULL DEFAULT '' AFTER `entities_id`, + CHANGE COLUMN `processes_id` `plugin_processmaker_processes_id` INT(11) NULL DEFAULT NULL AFTER `case_status`, + ADD COLUMN `plugin_processmaker_cases_id` INT(11) NOT NULL DEFAULT '0' AFTER `plugin_processmaker_processes_id`, DROP INDEX `items`, ADD INDEX `items` (`itemtype`, `items_id`), ADD PRIMARY KEY (`id`), ADD UNIQUE INDEX `case_guid` (`case_guid`), - ADD UNIQUE INDEX `case_num` (`case_num`), + ADD INDEX `plugin_processmaker_cases_id` (`plugin_processmaker_cases_id`), ADD INDEX `plugin_processmaker_processes_id` (`plugin_processmaker_processes_id`);"; - $DB->query($query) or die("error normalizing glpi_plugin_processmaker_cases table step 3" . $DB->error()); + $DB->query($query) or die("error normalizing glpi_plugin_processmaker_cases table step 3 " . $DB->error()); + + // needs to set entities_id and name fields + // for this needs to browse all cases and do a getCaseInfo for each and to get entities_id from itemtype(items_id) + foreach($DB->request(PluginProcessmakerCase::getTable()) as $row) { + $tmp = new $row['itemtype']; + $entities_id = 0; + if ($tmp->getFromDB($row['items_id'])) { + $entities_id = $tmp->fields['entities_id']; + } + foreach($PM_DB->request("SELECT CON_VALUE FROM CONTENT WHERE CON_CATEGORY='APP_TITLE' AND CON_LANG='en' AND CON_ID='{$row['case_guid']}'") as $name) { + // there is only one record :) + $name = $PM_DB->escape($name['CON_VALUE']); + $query = "UPDATE ".PluginProcessmakerCase::getTable()." SET `name` = '{$name}', `entities_id` = $entities_id WHERE `id` = {$row['id']};"; + $DB->query($query) or die("error normalizing glpi_plugin_processmaker_cases table step 4 " . $DB->error()); + } + } } - if (!arTableExists("glpi_plugin_processmaker_profiles")) { - $query = "RENAME TABLE `glpi_plugin_processmaker_processes_profiles` TO `glpi_plugin_processmaker_profiles`;"; - $DB->query($query) or die("error renaming glpi_plugin_processmaker_processes_profiles to glpi_plugin_processmaker_profiles" . $DB->error()); - } + if (!arFieldExists("glpi_plugin_processmaker_processes_profiles", "plugin_processmaker_processes_id")) { + $query = "ALTER TABLE `glpi_plugin_processmaker_processes_profiles` + CHANGE COLUMN `processes_id` `plugin_processmaker_processes_id` INT(11) NOT NULL DEFAULT '0' AFTER `id`, + DROP INDEX `processes_id`, + ADD INDEX `plugin_processmaker_processes_id` (`plugin_processmaker_processes_id`);"; + $DB->query($query) or die("error on glpi_plugin_processmaker_processes_profiles table when renaming processes_id into plugin_processmaker_processes_id " . $DB->error()); - if (!arFieldExists("glpi_plugin_processmaker_profiles", "plugin_processmaker_processes_id")) { - $query = "ALTER TABLE `glpi_plugin_processmaker_profiles` - CHANGE COLUMN `processes_id` `plugin_processmaker_processes_id` INT(11) NOT NULL DEFAULT '0' AFTER `id`;"; - $DB->query($query) or die("error renaming processes_id into plugin_processmaker_processes_id" . $DB->error()); + // must clean the table in case there would be duplicate entries for a process + $query = "SELECT gpp.id, gpp.plugin_processmaker_processes_id, gpp.profiles_id, gpp.entities_id, MAX(gpp.is_recursive) AS is_recursive + FROM glpi_plugin_processmaker_processes_profiles AS gpp + GROUP BY gpp.plugin_processmaker_processes_id, gpp.profiles_id, gpp.entities_id + HAVING COUNT(id) > 1;"; + + foreach($DB->request($query) as $rec){ + // there we have one rec per duplicates + // so we may delete all records in the table, and a new one + $del_query = "DELETE FROM glpi_plugin_processmaker_processes_profiles WHERE plugin_processmaker_processes_id=".$rec['plugin_processmaker_processes_id']." + AND profiles_id = ".$rec['profiles_id']." + AND entities_id = ".$rec['entities_id'].";"; + $DB->query($del_query) or die("error when deleting duplicated process_profiles in glpi_plugin_processmaker_processes_profiles table ". $DB->error()); + + $add_query = "INSERT INTO `glpi_plugin_processmaker_processes_profiles` (`id`, `plugin_processmaker_processes_id`, `profiles_id`, `entities_id`, `is_recursive`) + VALUES (".$rec['id'].", ".$rec['plugin_processmaker_processes_id'].", ".$rec['profiles_id'].", ".$rec['entities_id'].", ".$rec['is_recursive'].");"; + $DB->query($add_query) or die("error when inserting singletons of duplicated process_profiles in glpi_plugin_processmaker_processes_profiles table ". $DB->error()); + } + + $query = "ALTER TABLE `glpi_plugin_processmaker_processes_profiles` + ADD UNIQUE INDEX `plugin_processmaker_processes_id_profiles_id_entities_id` (`plugin_processmaker_processes_id`, `profiles_id`, `entities_id`);"; + $DB->query($query) or die("error when adding new index on glpi_plugin_processmaker_processes_profiles table " . $DB->error()); } if (!arFieldExists("glpi_plugin_processmaker_tasks", "plugin_processmaker_cases_id" )) { $query = "ALTER TABLE `glpi_plugin_processmaker_tasks` ALTER `itemtype` DROP DEFAULT;"; $DB->query($query) or die("error normalizing glpi_plugin_processmaker_tasks table step 1" . $DB->error()); + $query = "ALTER TABLE `glpi_plugin_processmaker_tasks` CHANGE COLUMN `itemtype` `itemtype` VARCHAR(32) NOT NULL AFTER `id`, ADD COLUMN `plugin_processmaker_cases_id` INT(11) NULL AFTER `case_id`, - ADD COLUMN `thread_index` INT(11) NOT NULL AFTER `del_index`, + ADD COLUMN `plugin_processmaker_taskcategories_id` INT(11) NULL AFTER `plugin_processmaker_cases_id`, + ADD COLUMN `del_thread` INT(11) NOT NULL AFTER `del_index`, + ADD COLUMN `del_thread_status` VARCHAR(32) NOT NULL DEFAULT 'OPEN' AFTER `del_thread`, DROP INDEX `case_id`, - ADD INDEX `plugin_processmaker_cases_id` (`plugin_processmaker_cases_id`, `del_index`);"; + ADD UNIQUE INDEX `tasks` (`plugin_processmaker_cases_id`, `del_index`), + ADD INDEX `del_thread_status` (`del_thread_status`);"; $DB->query($query) or die("error normalizing glpi_plugin_processmaker_tasks table step 2" . $DB->error()); // transform case_id (=GUID) into plugin_processmaker_cases_id @@ -61,6 +106,48 @@ function update_3_2_9_to_3_3_0(){ $query = "ALTER TABLE `glpi_plugin_processmaker_tasks` DROP COLUMN `case_id`;"; $DB->query($query) or die("error deleting case_id column in glpi_plugin_processmaker_tasks table" . $DB->error()); + + // set real thread status get it from APP_DELEGATION + $query = "SELECT APP_UID, DEL_INDEX, DEL_THREAD, DEL_THREAD_STATUS FROM APP_DELEGATION WHERE DEL_THREAD_STATUS = 'CLOSED';"; + $locThreads = []; + foreach($PM_DB->request($query) as $thread){ + $locThreads[$thread['APP_UID']][] = $thread; + } + $locCase = new PluginProcessmakerCase; + foreach($locThreads as $key => $threads){ + // get GLPI case id + $locCase->getFromGUID($key); + $del_indexes = []; + foreach($threads as $thread){ + $del_indexes[] = $thread['DEL_INDEX']; + } + $del_indexes = implode(", ", $del_indexes); + $query = "UPDATE glpi_plugin_processmaker_tasks SET del_thread_status = 'CLOSED' WHERE plugin_processmaker_cases_id = {$locCase->getID()} AND del_index IN ($del_indexes)"; + $DB->query($query) or die("error updating del_thread_status in glpi_plugin_processmaker_tasks table" . $DB->error()); + } + + // set the plugin_processmaker_taskcategories_id + $app_delegation = []; + $query = "SELECT CONCAT(APPLICATION.APP_NUMBER, '-', APP_DELEGATION.DEL_INDEX) AS 'key', APP_DELEGATION.TAS_UID FROM APP_DELEGATION + LEFT JOIN APPLICATION ON APPLICATION.APP_UID=APP_DELEGATION.APP_UID"; + foreach($PM_DB->request($query) as $row) { + $app_delegation[$row['key']]=$row['TAS_UID']; + } + + $taskcats = []; + $query = "SELECT * FROM glpi_plugin_processmaker_taskcategories"; + foreach($DB->request($query) as $row) { + $taskcats[$row['pm_task_guid']] = $row['id']; + } + + $query = "SELECT * FROM glpi_plugin_processmaker_tasks"; + foreach($DB->request($query) as $row) { + $key = $row['plugin_processmaker_cases_id']."-".$row['del_index']; + if (isset($app_delegation[$key]) && isset($taskcats[$app_delegation[$key]])) { + $DB->query("UPDATE glpi_plugin_processmaker_tasks SET plugin_processmaker_taskcategories_id={$taskcats[$app_delegation[$key]]} WHERE id={$row['id']}") or + die("error updating plugin_processmaker_taskcategories_id in glpi_plugin_processmaker_tasks table" . $DB->error()); + } + } } if (!arFieldExists("glpi_plugin_processmaker_taskcategories", "is_subprocess" )) { @@ -77,5 +164,33 @@ function update_3_2_9_to_3_3_0(){ $DB->query($query) or die("error normalizing glpi_plugin_processmaker_taskcategories step 2" . $DB->error()); } + + if (arFieldExists("glpi_plugin_processmaker_users", "password" )) { + $query = "ALTER TABLE `glpi_plugin_processmaker_users` + DROP COLUMN `password`; + "; + $DB->query($query) or die("error deleting password col from glpi_plugin_processmaker_users" . $DB->error()); + } + + if (!arFieldExists("glpi_plugin_processmaker_crontaskactions", "plugin_processmaker_cases_id" )) { + $query = "ALTER TABLE `glpi_plugin_processmaker_crontaskactions` + ADD COLUMN `plugin_processmaker_cases_id` INT(11) DEFAULT '0' AFTER `plugin_processmaker_caselinks_id`;" ; + $DB->query($query) or die("error adding plugin_processmaker_cases_id col into glpi_plugin_processmaker_crontaskactions" . $DB->error()); + + // data migration + // before the 3.3.0 release there was one and only one case per item + $query ="UPDATE `glpi_plugin_processmaker_crontaskactions` + LEFT JOIN `glpi_plugin_processmaker_cases` ON `glpi_plugin_processmaker_cases`.`itemtype` = `glpi_plugin_processmaker_crontaskactions`.`itemtype` + AND `glpi_plugin_processmaker_cases`.`items_id` = `glpi_plugin_processmaker_crontaskactions`.`items_id` + SET `glpi_plugin_processmaker_crontaskactions`.`plugin_processmaker_cases_id` = `glpi_plugin_processmaker_cases`.`id`;"; + $DB->query($query) or die("error migrating itemtype and items_id into a plugin_processmaker_cases_id col in glpi_plugin_processmaker_crontaskactions" . $DB->error()); + // end of migration + + $query = "ALTER TABLE `glpi_plugin_processmaker_crontaskactions` + DROP COLUMN `itemtype`, + DROP COLUMN `items_id`;"; + $DB->query($query) or die("error deleting adding itemtype and items_id cols from glpi_plugin_processmaker_crontaskactions" . $DB->error()); + } + return '3.3.0'; } diff --git a/install/update_to_3_2_8.php b/install/update_to_3_2_8.php index db031fe..0637266 100644 --- a/install/update_to_3_2_8.php +++ b/install/update_to_3_2_8.php @@ -38,6 +38,8 @@ function update_to_3_2_8(){ ADD COLUMN `pm_dbname` VARCHAR(50) NULL DEFAULT 'wf_workflow' AFTER `pm_dbserver_name`; ;"; $DB->query($query) or die("error adding field pm_dbname to glpi_plugin_processmaker_configs" . $DB->error()); + + $DB->query("UPDATE glpi_plugin_processmaker_configs SET `pm_dbname` = CONCAT('wf_', `pm_workspace`) WHERE `id` = 1"); } if (arTableExists("glpi_plugin_processmaker_profiles")) { @@ -59,7 +61,7 @@ function update_to_3_2_8(){ $proc = new PluginProcessmakerProcess; $case = new PluginProcessmakerCase; foreach ($DB->request("SELECT * FROM glpi_plugin_processmaker_cases WHERE LENGTH( processes_id ) = 32") as $row) { - $proc->getFromDBbyExternalID( $row['processes_id'] ); + $proc->getFromGUID( $row['processes_id'] ); $case->update(array( 'id' => $row['id'], 'processes_id' => $proc->getID() ) ); } $query = "ALTER TABLE `glpi_plugin_processmaker_cases` diff --git a/js/cases.helpdesk.js b/js/cases.helpdesk.js index de125ae..b846e59 100644 --- a/js/cases.helpdesk.js +++ b/js/cases.helpdesk.js @@ -72,7 +72,7 @@ function onLoadFrame( evt, caseId, delIndex, caseNumber, processName ) { submitButton = $("input[name='add'][type=submit]")[0]; submitButton.insertAdjacentHTML('beforebegin', ""); - submitButton.insertAdjacentHTML('beforebegin', ""); + submitButton.insertAdjacentHTML('beforebegin', ""); submitButton.insertAdjacentHTML('beforebegin', ""); submitButton.insertAdjacentHTML('beforebegin', ""); diff --git a/js/cases.js b/js/cases.js index 6647857..4908bfb 100644 --- a/js/cases.js +++ b/js/cases.js @@ -1,7 +1,6 @@ //debugger; // To manage submits to case.front.php -var loc_split = window.location.href.split('/'); -var GLPI_HTTP_CASE_FORM = window.location.href.split('/', loc_split.length-2 ).join('/') + '/plugins/processmaker/front/case.front.php'; // http://hostname/glpi/... +var GLPI_HTTP_CASE_FORM = window.location.href.replace(window.location.search, ''); //window.location.href.split('/', loc_split.length - 2).join('/') + '/plugins/processmaker/front/case.front.php'; // http://hostname/glpi/... // to manage reloads var GLPI_RELOAD_PARENT = window; //.location; var GLPI_DURING_RELOAD = false; @@ -85,7 +84,7 @@ function onTaskFrameLoad(event, delIndex, hideClaimButton, csrf) { var node = formList[0]; // must have one element in list: in a dynaform there is one and only one HTML form node.setAttribute('actionBackup', node.action); var action = node.action.split('?'); - node.action = GLPI_HTTP_CASE_FORM + '?' + action[1] + '&DEL_INDEX=' + delIndex; + node.action = GLPI_HTTP_CASE_FORM + '?' + action[1] + '&DEL_INDEX=' + delIndex + '&action=route'; // add an element that will be the csrf data code for the POST //debugger; diff --git a/locales/en_GB.php b/locales/en_GB.php index d9f7579..fe79ada 100644 --- a/locales/en_GB.php +++ b/locales/en_GB.php @@ -10,13 +10,13 @@ $LANG['processmaker']['title'][7]="Case-links"; $LANG['processmaker']['profile']['rightmgt']="Rights Management"; $LANG['processmaker']['profile']['process_config']="Process configuration"; -$LANG['processmaker']['profile']['case_delete']="Delete cases"; +$LANG['processmaker']['profile']['case']="Cases"; $LANG['processmaker']['process']['process_guid']="Process GUID"; $LANG['processmaker']['process']['project_type_short']="Project type" ; $LANG['processmaker']['process']['project_type']="Project type (to be changed if not up-to-date)" ; -$LANG['processmaker']['process']['project_type_bpmn']='bpmn'; -$LANG['processmaker']['process']['project_type_classic']='classic' ; +$LANG['processmaker']['process']['project_type_bpmn']='BPMN'; +$LANG['processmaker']['process']['project_type_classic']='Classic' ; $LANG['processmaker']['process']['hide_case_num_title_short']="Hide case number and title"; $LANG['processmaker']['process']['hide_case_num_title']="Hide case number and title in task descriptions"; $LANG['processmaker']['process']['insert_task_comment_short']="Insert Task Category"; @@ -26,9 +26,10 @@ $LANG['processmaker']['process']['itilcategory']="ITIL Category (self-service)"; $LANG['processmaker']['process']['taskcategories']['guid']="Task GUID"; $LANG['processmaker']['process']['taskcategories']['name']="Task name"; $LANG['processmaker']['process']['taskcategories']['completename']="Complete name"; -$LANG['processmaker']['process']['taskcategories']['start']="Start"; +$LANG['processmaker']['process']['taskcategories']['is_start']="Start"; $LANG['processmaker']['process']['taskcategories']['comment']="Comment"; $LANG['processmaker']['process']['taskcategories']['is_active']="Active"; +$LANG['processmaker']['process']['taskcategories']['is_subprocess']="Sub-process"; $LANG['processmaker']['process']['profile']="Delete permanently"; $LANG['processmaker']['config']['name']="Name"; @@ -44,7 +45,7 @@ $LANG['processmaker']['config']['refreshprocesslist']="Synchronize Process List" $LANG['processmaker']['config']['refreshtasklist']="Synchronize Task List"; $LANG['processmaker']['config']['main_task_category']="Main Task Category (edit to change name)"; $LANG['processmaker']['config']['taskwriter']="Task Writer (edit to change name)"; -$LANG['processmaker']['config']['pm_group_name']="Group in ProcessMaker which will contain all GLPi users"; +$LANG['processmaker']['config']['pm_group_name']="Group in ProcessMaker which will contain all GLPI users"; $LANG['processmaker']['config']['maintenance']="Maintenance mode" ; $LANG['processmaker']['config']['undermaintenance']="Under maintenance, please try again later." ; $LANG['processmaker']['config']['empty_pm_group_name']="To select group, input ProcessMaker config first!"; @@ -59,7 +60,7 @@ $LANG['processmaker']['item']['pausedtask']="Status: Task is paused - unpause it $LANG['processmaker']['item']['completedcase']="Status: Completed"; $LANG['processmaker']['item']['nocase']="No case for this item!"; $LANG['processmaker']['item']['startone']="Start one?"; -$LANG['processmaker']['item']['selectprocess']="Select the process you want to start:"; +$LANG['processmaker']['item']['selectprocess']="Select the process you want to add:"; $LANG['processmaker']['item']['start']="Start"; $LANG['processmaker']['item']['unpause']="Unpause"; $LANG['processmaker']['item']['deletecase']="Delete case?" ; @@ -82,11 +83,11 @@ $LANG['processmaker']['item']['case']['casemap']="Case map"; $LANG['processmaker']['item']['case']['casehistory']='Case history' ; $LANG['processmaker']['item']['case']['dynaforms']='Dynaforms'; $LANG['processmaker']['item']['case']['changelog']='Change log'; -$LANG['processmaker']['item']['case']['caseinfo']='Case info'; -$LANG['processmaker']['item']['case']['viewcasemap']='View: case map'; -$LANG['processmaker']['item']['case']['viewcasehistory']='View: case history'; -$LANG['processmaker']['item']['case']['viewdynaforms']='View: dynaforms'; -$LANG['processmaker']['item']['case']['viewcasechangeloghistory']='View: change log' ; +$LANG['processmaker']['item']['case']['caseinfo']='Case'; +$LANG['processmaker']['item']['case']['viewcasemap']='Map'; +$LANG['processmaker']['item']['case']['viewcasehistory']='History'; +$LANG['processmaker']['item']['case']['viewdynaforms']='Dynaforms'; +$LANG['processmaker']['item']['case']['viewcasechangeloghistory']='Change log' ; $LANG['processmaker']['item']['case']['casechangeloghistory']='Change log history' ; $LANG['processmaker']['item']['error'][11]="Error creating case!"; @@ -103,10 +104,10 @@ $LANG['processmaker']['item']['task']['comment']="##processmaker.taskcomment##" $LANG['processmaker']['item']['task']['manage']="##ticket.url##_PluginProcessmakerCase\$processmakercases" ; $LANG['processmaker']['item']['task']['manage_text']= "" ; //"Process - Case tab"; -$LANG['processmaker']['case']['statuses']['TO_DO'] = "Processing"; +$LANG['processmaker']['case']['statuses']['TO_DO'] = "To do"; $LANG['processmaker']['case']['statuses']['CANCELLED'] = "Cancelled"; -$LANG['processmaker']['case']['statuses']['DRAFT'] = "New"; -$LANG['processmaker']['case']['statuses']['COMPLETED'] = "Closed"; +$LANG['processmaker']['case']['statuses']['DRAFT'] = "Draft"; +$LANG['processmaker']['case']['statuses']['COMPLETED'] = "Completed"; $LANG['processmaker']['search']['case']="Case"; $LANG['processmaker']['search']['status']="Status"; diff --git a/locales/fr_FR.php b/locales/fr_FR.php index be01aa9..6a0c8f2 100644 --- a/locales/fr_FR.php +++ b/locales/fr_FR.php @@ -26,9 +26,10 @@ $LANG['processmaker']['process']['type']="Type de ticket (self-service)"; $LANG['processmaker']['process']['itilcategory']="Catégorie ITIL (self-service)"; $LANG['processmaker']['process']['taskcategories']['name']="Nom de la Tâche"; $LANG['processmaker']['process']['taskcategories']['completename']="Nom complet"; -$LANG['processmaker']['process']['taskcategories']['start']="Début"; +$LANG['processmaker']['process']['taskcategories']['is_start']="Début"; $LANG['processmaker']['process']['taskcategories']['comment']="Commentaire"; $LANG['processmaker']['process']['taskcategories']['is_active']="Active"; +$LANG['processmaker']['process']['taskcategories']['is_subprocess']="Sous-process"; $LANG['processmaker']['process']['profile']="Effacer définitivement"; $LANG['processmaker']['config']['name']="Nom"; @@ -44,7 +45,7 @@ $LANG['processmaker']['config']['refreshprocesslist']="Synchroniser la liste des $LANG['processmaker']['config']['refreshtasklist']="Synchroniser la liste des Tâches"; $LANG['processmaker']['config']['main_task_category']="Categorie principale des tâches (editer pour changer le nom)"; $LANG['processmaker']['config']['taskwriter']="Auteur des tâches (editer pour changer le nom)"; -$LANG['processmaker']['config']['pm_group_name']="Groupe dans ProcessMaker qui contiendra les utilisateurs de GLPi"; +$LANG['processmaker']['config']['pm_group_name']="Groupe dans ProcessMaker qui contiendra les utilisateurs de GLPI"; $LANG['processmaker']['config']['maintenance']="Mode maintenance" ; $LANG['processmaker']['config']['undermaintenance']="En maintenance, veuillez réessayer plus tard." ; $LANG['processmaker']['config']['empty_pm_group_name']="Pour sélectionner un groupe, renseigner d'abord la config de ProcessMaker !"; @@ -103,9 +104,9 @@ $LANG['processmaker']['item']['task']['comment']="##processmaker.taskcomment##" $LANG['processmaker']['item']['task']['manage']="##ticket.url##_PluginProcessmakerCase\$processmakercases" ; $LANG['processmaker']['item']['task']['manage_text']=""; //"l'onglet Processus - Cas"; -$LANG['processmaker']['case']['statuses']['TO_DO'] = "En cours"; +$LANG['processmaker']['case']['statuses']['TO_DO'] = "A faire"; $LANG['processmaker']['case']['statuses']['CANCELLED'] = "Annulé"; -$LANG['processmaker']['case']['statuses']['DRAFT'] = "Nouveau"; +$LANG['processmaker']['case']['statuses']['DRAFT'] = "Brouillon"; $LANG['processmaker']['case']['statuses']['COMPLETED'] = "Achevé"; $LANG['processmaker']['search']['case']="Cas"; diff --git a/setup.php b/setup.php index 3cee134..d329476 100644 --- a/setup.php +++ b/setup.php @@ -12,7 +12,7 @@ function plugin_init_processmaker() { Plugin::registerClass('PluginProcessmakerProcessmaker'); - Plugin::registerClass('PluginProcessmakerCase', array('addtabon' => array('Ticket'))); + Plugin::registerClass('PluginProcessmakerCase', array('addtabon' => $objects)); Plugin::registerClass('PluginProcessmakerTaskCategory'); @@ -30,7 +30,7 @@ function plugin_init_processmaker() { $PLUGIN_HOOKS['csrf_compliant']['processmaker'] = true; $PLUGIN_HOOKS['pre_show_item']['processmaker'] - = array('PluginProcessmakerProcessmaker', 'pre_show_item_processmakerticket'); + = array('PluginProcessmakerProcessmaker', 'pre_show_item_processmaker'); //$PLUGIN_HOOKS['pre_item_form']['processmaker'] // = array('PluginProcessmakerProcessmaker', 'pre_item_form_processmakerticket'); @@ -44,7 +44,8 @@ function plugin_init_processmaker() { // Display a menu entry ? if (Session::haveRightsOr('plugin_processmaker_config', [READ, UPDATE])) { - $PLUGIN_HOOKS['menu_toadd']['processmaker'] = ['tools' => 'PluginProcessmakerMenu']; + // tools and helpdesk + $PLUGIN_HOOKS['menu_toadd']['processmaker'] = ['tools' => 'PluginProcessmakerMenu', 'helpdesk' => 'PluginProcessmakerCase']; } Plugin::registerClass('PluginProcessmakerProcess', array( 'massiveaction_nodelete_types' => true) ); @@ -111,13 +112,18 @@ function plugin_init_processmaker() { $CFG_GLPI['planning_types'][] = 'PluginProcessmakerTask'; $PLUGIN_HOOKS['post_init']['processmaker'] = 'plugin_processmaker_post_init'; + // in order to set rights when in helpdesk interface + // otherwise post-only users can't see cases and then can't act on a case task. + $PLUGIN_HOOKS['change_profile']['processmaker'] = 'plugin_processmaker_change_profile'; + + } // Get the name and the version of the plugin - Needed function plugin_version_processmaker() { global $LANG; - return array ('name' => 'Process Maker', + return array ('name' => 'Process Maker', 'version' => '3.3.0', 'author' => 'Olivier Moron', 'homepage' => 'https://github.com/tomolimo/processmaker',