HOR-3700

Fix Tree ambiguos class. Resolved renaming Tree to PmTree

gulliver/system/class.tree.php

@@ -1,38 +1,10 @@
 <?php
 
-/**
- * class.tree.php
- *
- * @package gulliver.system
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2011 Colosa Inc.
- *
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * <20>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
 /**
  *
  * @package gulliver.system
  */
-
+class PmTree extends Xml_Node
-
-class Tree 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));
     }
 }
-

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";
 

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;

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;

workflow/engine/templates/cases/cases_KTTree.php

@@ -23,7 +23,7 @@
  * 
  */
 
-$oTree           = new Tree();
+$oTree           = new PmTree();
 $oTree->name     = 'KT';
 $oTree->showSign = false;
 

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;

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";

workflow/engine/templates/roles/roles_AssignPermissions.php

@@ -35,7 +35,7 @@
 	$oDataset = $RBAC->getAllPermissions($ROL_UID,$RBAC->sSystem);
 	$roleCode = $RBAC->getRoleCode($ROL_UID);
 	
-	$tree = new Tree();
+	$tree = new PmTree();
 	$tree->name = 'Users';
 	$tree->nodeType = "base";
 	$tree->width = "350px";

workflow/engine/templates/roles/roles_AssignRole.php

@@ -35,7 +35,7 @@
 	$oDataset = $RBAC->getAllUsers($ROL_UID);
 	$roleCode = $RBAC->getRoleCode($ROL_UID);
 
-	$tree = new Tree();
+	$tree = new PmTree();
 	$tree->name = 'Users';
 	$tree->nodeType = "base";
 	$tree->width = "350px";

workflow/engine/templates/roles/roles_Tree.php

@@ -35,7 +35,7 @@
 	$oDataset = $RBAC->getRoleUsers($ROL_UID);
 	$roleCode = $RBAC->getRoleCode($ROL_UID);
 
-	$tree = new Tree();
+	$tree = new PmTree();
 	$tree->name = 'Users';
 	$tree->nodeType = "base";
 	$tree->width = "350px";

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";

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";

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;

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());

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;

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";

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";