From bfe2b7ec389216c73659ed838e2109461d3818d7 Mon Sep 17 00:00:00 2001 From: David Callizaya Date: Mon, 21 Aug 2017 10:39:10 -0400 Subject: [PATCH] HOR-3700 Fix Tree ambiguos class. Resolved renaming Tree to PmTree --- gulliver/system/class.tree.php | 37 +--- .../methods/appFolder/appFolderAjax.php | 2 +- .../templates/cases/cases_ActionsTree.php | 2 +- .../templates/cases/cases_InformationTree.php | 2 +- .../engine/templates/cases/cases_KTTree.php | 2 +- .../templates/cases/cases_StepsTree.php | 2 +- .../engine/templates/cases/cases_toRevise.php | 2 +- .../roles/roles_AssignPermissions.php | 156 ++++++++-------- .../templates/roles/roles_AssignRole.php | 156 ++++++++-------- .../engine/templates/roles/roles_Tree.php | 168 +++++++++--------- .../templates/roles/roles_permissionsTree.php | 2 +- .../templates/setup/webServicesTree.php | 2 +- .../engine/templates/steps/triggers_Tree.php | 2 +- .../templates/tools/methodsPermissions.php | 2 +- .../templates/triggers/triggersTree.php | 2 +- .../templates/users/users_AssignGroup.php | 2 +- .../engine/templates/users/users_Tree.php | 2 +- 17 files changed, 257 insertions(+), 286 deletions(-) diff --git a/gulliver/system/class.tree.php b/gulliver/system/class.tree.php index 14a1ced8d..1dac4016c 100644 --- a/gulliver/system/class.tree.php +++ b/gulliver/system/class.tree.php @@ -1,38 +1,10 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ /** * * @package gulliver.system */ - - -class Tree extends Xml_Node +class PmTree extends Xml_Node { public $template = 'tree.html'; @@ -55,7 +27,7 @@ class Tree extends Xml_Node * * @return none */ - public function Tree($xmlnode = null) + public function PmTree($xmlnode = null) { if (!isset($xmlnode)) { return; @@ -66,7 +38,7 @@ class Tree extends Xml_Node foreach ($xmlnode as $key => $value) { if ($key === 'children') { foreach ($xmlnode->children as $key => $value) { - $this->children[$key] = new Tree($value->toTree()); + $this->children[$key] = new PmTree($value->toTree()); } } elseif ($key === 'attributes') { foreach ($xmlnode->attributes as $key => $value) { @@ -89,7 +61,7 @@ class Tree extends Xml_Node */ public function &addChild($name, $label, $attributes = array()) { - $newNode = new Tree(new Xml_Node($name, 'open', $label, $attributes)); + $newNode = new PmTree(new Xml_Node($name, 'open', $label, $attributes)); $this->children[] = & $newNode; return $newNode; } @@ -156,4 +128,3 @@ class Tree extends Xml_Node return $obj->printObject(array('node' => &$this)); } } - diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php index 6c7d1a1e7..66908f22a 100644 --- a/workflow/engine/methods/appFolder/appFolderAjax.php +++ b/workflow/engine/methods/appFolder/appFolderAjax.php @@ -745,7 +745,7 @@ function openPMFolder() exit (); } - $tree = new Tree (); + $tree = new PmTree (); $tree->name = 'DMS'; $tree->nodeType = "blank"; diff --git a/workflow/engine/templates/cases/cases_ActionsTree.php b/workflow/engine/templates/cases/cases_ActionsTree.php index f0b3175b5..dd64b5498 100644 --- a/workflow/engine/templates/cases/cases_ActionsTree.php +++ b/workflow/engine/templates/cases/cases_ActionsTree.php @@ -32,7 +32,7 @@ $c->add(AppThreadPeer::APP_UID, $APP_UID ); $c->add(AppThreadPeer::APP_THREAD_STATUS , 'OPEN' ); $cant = AppThreadPeer::doCount($c); -$oTree = new Tree(); +$oTree = new PmTree(); $oTree->nodeType = "blank"; $oTree->name = 'Actions'; $oTree->showSign = false; diff --git a/workflow/engine/templates/cases/cases_InformationTree.php b/workflow/engine/templates/cases/cases_InformationTree.php index 404e60517..de8b65f33 100644 --- a/workflow/engine/templates/cases/cases_InformationTree.php +++ b/workflow/engine/templates/cases/cases_InformationTree.php @@ -23,7 +23,7 @@ * */ -$oTree = new Tree(); +$oTree = new PmTree(); $oTree->nodeType ="blank"; $oTree->name = 'Information'; $oTree->showSign = false; diff --git a/workflow/engine/templates/cases/cases_KTTree.php b/workflow/engine/templates/cases/cases_KTTree.php index f5535f56b..38dbc2275 100644 --- a/workflow/engine/templates/cases/cases_KTTree.php +++ b/workflow/engine/templates/cases/cases_KTTree.php @@ -23,7 +23,7 @@ * */ -$oTree = new Tree(); +$oTree = new PmTree(); $oTree->name = 'KT'; $oTree->showSign = false; diff --git a/workflow/engine/templates/cases/cases_StepsTree.php b/workflow/engine/templates/cases/cases_StepsTree.php index c64aa0f7b..0bce771e7 100644 --- a/workflow/engine/templates/cases/cases_StepsTree.php +++ b/workflow/engine/templates/cases/cases_StepsTree.php @@ -33,7 +33,7 @@ use ProcessMaker\Plugins\PluginRegistry; $oPluginRegistry = PluginRegistry::loadSingleton(); $externalSteps = $oPluginRegistry->getSteps(); - $oTree = new Tree(); + $oTree = new PmTree(); $oTree->nodeType = "blank"; $oTree->name = 'Steps'; $oTree->showSign = false; diff --git a/workflow/engine/templates/cases/cases_toRevise.php b/workflow/engine/templates/cases/cases_toRevise.php index 74f80d1ab..f65e04bcc 100644 --- a/workflow/engine/templates/cases/cases_toRevise.php +++ b/workflow/engine/templates/cases/cases_toRevise.php @@ -23,7 +23,7 @@ * */ -$tree = new Tree(); +$tree = new PmTree(); $tree->name = 'Groups'; $tree->nodeType = "base"; $tree->width = "200px"; diff --git a/workflow/engine/templates/roles/roles_AssignPermissions.php b/workflow/engine/templates/roles/roles_AssignPermissions.php index 3c423e33b..92068b50a 100644 --- a/workflow/engine/templates/roles/roles_AssignPermissions.php +++ b/workflow/engine/templates/roles/roles_AssignPermissions.php @@ -1,78 +1,78 @@ -. - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ - - /** - * @Description This is the View of all groups from a determinated user - * @author Erik Amaru Ortiz - * @Date 24/04/2008 - * @LastModification none - */ - - $ROL_UID = $_GET['ROL_UID']; - global $RBAC; - $oDataset = $RBAC->getAllPermissions($ROL_UID,$RBAC->sSystem); - $roleCode = $RBAC->getRoleCode($ROL_UID); - - $tree = new Tree(); - $tree->name = 'Users'; - $tree->nodeType = "base"; - $tree->width = "350px"; - $tree->value = ' -
-
- - - - -
' . G::LoadTranslation('ID_ASSIGN_THE_ROLE') . ': '.$roleCode.'
-
-
-
' . G::LoadTranslation('ID_BACK_PERMISSIONS_LIST').'
'; - - $tree->showSign = false; - - $oDataset->next(); - while ($aRow = $oDataset->getRow()) { - $ID_ASSIGN = G::LoadTranslation('ID_ASSIGN'); - - $CODE = $aRow['PER_CODE']; - $UID = $aRow['PER_UID']; - - $html = " - - - - - -
{$CODE}[{$ID_ASSIGN}]
"; - - $ch = &$tree->addChild('', $html, array('nodeType' => 'child')); - $ch->point = ''; - - $oDataset->next(); - } - - - print ($tree->render()); +. + * + * For more information, contact Colosa Inc, 2566 Le Jeune Rd., + * Coral Gables, FL, 33134, USA, or email info@colosa.com. + * + */ + + /** + * @Description This is the View of all groups from a determinated user + * @author Erik Amaru Ortiz + * @Date 24/04/2008 + * @LastModification none + */ + + $ROL_UID = $_GET['ROL_UID']; + global $RBAC; + $oDataset = $RBAC->getAllPermissions($ROL_UID,$RBAC->sSystem); + $roleCode = $RBAC->getRoleCode($ROL_UID); + + $tree = new PmTree(); + $tree->name = 'Users'; + $tree->nodeType = "base"; + $tree->width = "350px"; + $tree->value = ' +
+
+ + + + +
' . G::LoadTranslation('ID_ASSIGN_THE_ROLE') . ': '.$roleCode.'
+
+
+
' . G::LoadTranslation('ID_BACK_PERMISSIONS_LIST').'
'; + + $tree->showSign = false; + + $oDataset->next(); + while ($aRow = $oDataset->getRow()) { + $ID_ASSIGN = G::LoadTranslation('ID_ASSIGN'); + + $CODE = $aRow['PER_CODE']; + $UID = $aRow['PER_UID']; + + $html = " + + + + + +
{$CODE}[{$ID_ASSIGN}]
"; + + $ch = &$tree->addChild('', $html, array('nodeType' => 'child')); + $ch->point = ''; + + $oDataset->next(); + } + + + print ($tree->render()); diff --git a/workflow/engine/templates/roles/roles_AssignRole.php b/workflow/engine/templates/roles/roles_AssignRole.php index f33b95879..1512f3663 100644 --- a/workflow/engine/templates/roles/roles_AssignRole.php +++ b/workflow/engine/templates/roles/roles_AssignRole.php @@ -1,78 +1,78 @@ -. - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ - - /** - * @Description This is the View of all groups from a determinated user - * @author Erik Amaru Ortiz - * @Date 24/04/2008 - * @LastModification none - */ - - $ROL_UID = $_GET['ROL_UID']; - global $RBAC; - $oDataset = $RBAC->getAllUsers($ROL_UID); - $roleCode = $RBAC->getRoleCode($ROL_UID); - - $tree = new Tree(); - $tree->name = 'Users'; - $tree->nodeType = "base"; - $tree->width = "350px"; - $tree->value = ' -
-
- - - - -
' . G::LoadTranslation('ID_ASSIGN_THE_ROLE') . ': '.$roleCode.'
-
-
-
' . G::LoadTranslation('ID_BACK_TO_USERS_LIST') . '
'; - - $tree->showSign = false; - - $oDataset->next(); - while ($aRow = $oDataset->getRow()) { - $ID_ASSIGN = G::LoadTranslation('ID_ASSIGN'); - - $user = '['.$aRow['USR_USERNAME'].'] '.$aRow['USR_FIRSTNAME'].' '.$aRow['USR_LASTNAME']; - $USR_UID = $aRow['USR_UID']; - - $html = " - - - - - -
{$user}[{$ID_ASSIGN}]
"; - - $ch = &$tree->addChild('', $html, array('nodeType' => 'child')); - $ch->point = ''; - - $oDataset->next(); - } - - - print ($tree->render()); +. + * + * For more information, contact Colosa Inc, 2566 Le Jeune Rd., + * Coral Gables, FL, 33134, USA, or email info@colosa.com. + * + */ + + /** + * @Description This is the View of all groups from a determinated user + * @author Erik Amaru Ortiz + * @Date 24/04/2008 + * @LastModification none + */ + + $ROL_UID = $_GET['ROL_UID']; + global $RBAC; + $oDataset = $RBAC->getAllUsers($ROL_UID); + $roleCode = $RBAC->getRoleCode($ROL_UID); + + $tree = new PmTree(); + $tree->name = 'Users'; + $tree->nodeType = "base"; + $tree->width = "350px"; + $tree->value = ' +
+
+ + + + +
' . G::LoadTranslation('ID_ASSIGN_THE_ROLE') . ': '.$roleCode.'
+
+
+
' . G::LoadTranslation('ID_BACK_TO_USERS_LIST') . '
'; + + $tree->showSign = false; + + $oDataset->next(); + while ($aRow = $oDataset->getRow()) { + $ID_ASSIGN = G::LoadTranslation('ID_ASSIGN'); + + $user = '['.$aRow['USR_USERNAME'].'] '.$aRow['USR_FIRSTNAME'].' '.$aRow['USR_LASTNAME']; + $USR_UID = $aRow['USR_UID']; + + $html = " + + + + + +
{$user}[{$ID_ASSIGN}]
"; + + $ch = &$tree->addChild('', $html, array('nodeType' => 'child')); + $ch->point = ''; + + $oDataset->next(); + } + + + print ($tree->render()); diff --git a/workflow/engine/templates/roles/roles_Tree.php b/workflow/engine/templates/roles/roles_Tree.php index 15963d400..a64104572 100644 --- a/workflow/engine/templates/roles/roles_Tree.php +++ b/workflow/engine/templates/roles/roles_Tree.php @@ -1,84 +1,84 @@ -. - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ - - /** - * @Description This is the View of all groups from a determinated user - * @author Erik Amaru Ortiz - * @Date 24/04/2008 - * @LastModification none - */ - - $ROL_UID = $_GET['ROL_UID']; - global $RBAC; - $oDataset = $RBAC->getRoleUsers($ROL_UID); - $roleCode = $RBAC->getRoleCode($ROL_UID); - - $tree = new Tree(); - $tree->name = 'Users'; - $tree->nodeType = "base"; - $tree->width = "350px"; - $tree->value = ' -
-
- - - - -
' . G::LoadTranslation('ID_USER_WITH_ROLE') . ': '.$roleCode.'
-
-
-
'.G::LoadTranslation('ID_ASSIGN_ROLE').'
'; - - $tree->showSign = false; - - $oDataset->next(); - while ($aRow = $oDataset->getRow()) { - $ID_DELETE = G::LoadTranslation('ID_REMOVE'); - $un = ($aRow['USR_USERNAME'] != '')?$aRow['USR_USERNAME']:'none'; - $user = '['.$un.'] '.$aRow['USR_FIRSTNAME'].' '.$aRow['USR_LASTNAME']; - $USR_UID = $aRow['USR_UID']; - - if($USR_UID != "00000000000000000000000000000001") { #because the admin remove rol it doesn't posible - $refer = "{$ID_DELETE}"; - } else { - $refer = "{$ID_DELETE}"; - } - - $html = " - - - - - -
{$user}[$refer]
"; - - $ch = &$tree->addChild('', $html, array('nodeType' => 'child')); - $ch->point = ''; - - $oDataset->next(); - } - - - print ($tree->render()); +. + * + * For more information, contact Colosa Inc, 2566 Le Jeune Rd., + * Coral Gables, FL, 33134, USA, or email info@colosa.com. + * + */ + + /** + * @Description This is the View of all groups from a determinated user + * @author Erik Amaru Ortiz + * @Date 24/04/2008 + * @LastModification none + */ + + $ROL_UID = $_GET['ROL_UID']; + global $RBAC; + $oDataset = $RBAC->getRoleUsers($ROL_UID); + $roleCode = $RBAC->getRoleCode($ROL_UID); + + $tree = new PmTree(); + $tree->name = 'Users'; + $tree->nodeType = "base"; + $tree->width = "350px"; + $tree->value = ' +
+
+ + + + +
' . G::LoadTranslation('ID_USER_WITH_ROLE') . ': '.$roleCode.'
+
+
+
'.G::LoadTranslation('ID_ASSIGN_ROLE').'
'; + + $tree->showSign = false; + + $oDataset->next(); + while ($aRow = $oDataset->getRow()) { + $ID_DELETE = G::LoadTranslation('ID_REMOVE'); + $un = ($aRow['USR_USERNAME'] != '')?$aRow['USR_USERNAME']:'none'; + $user = '['.$un.'] '.$aRow['USR_FIRSTNAME'].' '.$aRow['USR_LASTNAME']; + $USR_UID = $aRow['USR_UID']; + + if($USR_UID != "00000000000000000000000000000001") { #because the admin remove rol it doesn't posible + $refer = "{$ID_DELETE}"; + } else { + $refer = "{$ID_DELETE}"; + } + + $html = " + + + + + +
{$user}[$refer]
"; + + $ch = &$tree->addChild('', $html, array('nodeType' => 'child')); + $ch->point = ''; + + $oDataset->next(); + } + + + print ($tree->render()); diff --git a/workflow/engine/templates/roles/roles_permissionsTree.php b/workflow/engine/templates/roles/roles_permissionsTree.php index 79e6b8ba1..6fd42eb4a 100644 --- a/workflow/engine/templates/roles/roles_permissionsTree.php +++ b/workflow/engine/templates/roles/roles_permissionsTree.php @@ -36,7 +36,7 @@ $roleCode = $RBAC->getRoleCode($ROL_UID); - $tree = new Tree(); + $tree = new PmTree(); $tree->name = 'Users'; $tree->nodeType = "base"; $tree->width = "350px"; diff --git a/workflow/engine/templates/setup/webServicesTree.php b/workflow/engine/templates/setup/webServicesTree.php index 17edd2eab..f9ae5e77b 100644 --- a/workflow/engine/templates/setup/webServicesTree.php +++ b/workflow/engine/templates/setup/webServicesTree.php @@ -51,7 +51,7 @@ $defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVE $wsdl = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint; -$tree = new Tree ( ); +$tree = new PmTree ( ); $tree->name = 'WebServices'; $tree->nodeType = "base"; $tree->contentWidth = "310"; diff --git a/workflow/engine/templates/steps/triggers_Tree.php b/workflow/engine/templates/steps/triggers_Tree.php index 1fe564249..edd758cbb 100644 --- a/workflow/engine/templates/steps/triggers_Tree.php +++ b/workflow/engine/templates/steps/triggers_Tree.php @@ -32,7 +32,7 @@ try { $externalSteps = $oPluginRegistry->getSteps(); $oProcessMap = new ProcessMap(); - $oTree = new Tree(); + $oTree = new PmTree(); $oTree->nodeType = 'blank'; $oTree->name = 'Triggers'; $oTree->showSign = false; diff --git a/workflow/engine/templates/tools/methodsPermissions.php b/workflow/engine/templates/tools/methodsPermissions.php index 376d7fa5e..4fb7dcbc6 100644 --- a/workflow/engine/templates/tools/methodsPermissions.php +++ b/workflow/engine/templates/tools/methodsPermissions.php @@ -26,7 +26,7 @@ /* * Esto no deberias borrarlo */ -$tree = new Tree(); +$tree = new PmTree(); reView(PATH_TRUNK, $tree); print( $tree->render()); diff --git a/workflow/engine/templates/triggers/triggersTree.php b/workflow/engine/templates/triggers/triggersTree.php index 3e190c8d7..7f88d9f2f 100644 --- a/workflow/engine/templates/triggers/triggersTree.php +++ b/workflow/engine/templates/triggers/triggersTree.php @@ -28,7 +28,7 @@ try { $triggerLibrary = TriggerLibrary::getSingleton(); $triggerLibraryO = $triggerLibrary->getRegisteredClasses(); - $oTree = new Tree(); + $oTree = new PmTree(); $oTree->nodeType = "blank"; $oTree->name = "Triggers"; $oTree->showSign = false; diff --git a/workflow/engine/templates/users/users_AssignGroup.php b/workflow/engine/templates/users/users_AssignGroup.php index b66a82568..0abc7d67d 100644 --- a/workflow/engine/templates/users/users_AssignGroup.php +++ b/workflow/engine/templates/users/users_AssignGroup.php @@ -43,7 +43,7 @@ $groups = new Groups(); - $tree = new Tree(); + $tree = new PmTree(); $tree->name = 'Users'; $tree->nodeType = "base"; $tree->width = "350px"; diff --git a/workflow/engine/templates/users/users_Tree.php b/workflow/engine/templates/users/users_Tree.php index 49adaf88c..6de60afcf 100644 --- a/workflow/engine/templates/users/users_Tree.php +++ b/workflow/engine/templates/users/users_Tree.php @@ -43,7 +43,7 @@ $groups = new Groups(); - $tree = new Tree(); + $tree = new PmTree(); $tree->name = 'Users'; $tree->nodeType = "base"; $tree->width = "350px";