From 3a8194a4124e836bd912a3c9eead67e2caa04cb5 Mon Sep 17 00:00:00 2001
From: hjonathan <jonathan.quispe@processmaker.com>
Date: Fri, 4 Aug 2017 11:54:39 -0400
Subject: [PATCH 1/2] Path of third party, report tables, triggers

---
 composer.json                                      |  1 +
 .../classes/org/active-link/doc/PHPClass.php       |  1 -
 workflow/engine/classes/class.reportTables.php     | 14 +++-----------
 workflow/engine/classes/model/Dynaform.php         |  4 +++-
 workflow/public_html/sysGeneric.php                |  2 +-
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 3310df4a6..202b95cc8 100644
--- a/composer.json
+++ b/composer.json
@@ -57,6 +57,7 @@
             "thirdparty/jsmin/jsmin.php",
             "thirdparty/libchart/classes/",
             "thirdparty/pear",
+            "thirdparty/html2ps_pdf",
             "rbac/engine/classes/"
         ],
         "files": [
diff --git a/thirdparty/html2ps_pdf/classes/org/active-link/doc/PHPClass.php b/thirdparty/html2ps_pdf/classes/org/active-link/doc/PHPClass.php
index 4795f39d2..efaff865f 100644
--- a/thirdparty/html2ps_pdf/classes/org/active-link/doc/PHPClass.php
+++ b/thirdparty/html2ps_pdf/classes/org/active-link/doc/PHPClass.php
@@ -22,7 +22,6 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-import("org.active-link.doc.Method");
 
 /**
   *	PHPClass class provides a structural definition for a class
diff --git a/workflow/engine/classes/class.reportTables.php b/workflow/engine/classes/class.reportTables.php
index 55c759c2e..5674367f7 100644
--- a/workflow/engine/classes/class.reportTables.php
+++ b/workflow/engine/classes/class.reportTables.php
@@ -811,20 +811,12 @@ class ReportTables
      */
     public function tableExist ()
     {
-        /*
-        $bExists  = true;
-        $oConnection = mysql_connect(DB_HOST, DB_USER, DB_PASS);
-        mysql_select_db(DB_NAME);
-        $oDataset = mysql_query('SELECT COUNT(*) FROM REPORT_TABLE') || ($bExists = false);
-        return $bExists;
-        */
         $bExists = true;
         $sDataBase = 'database_' . strtolower( DB_ADAPTER );
-        if (G::LoadSystemExist( $sDataBase )) {
 
-            $oDataBase = new database();
-            $bExists = $oDataBase->reportTableExist();
-        }
+        $oDataBase = new database();
+        $bExists = $oDataBase->reportTableExist();
+
         return $bExists;
     }
 
diff --git a/workflow/engine/classes/model/Dynaform.php b/workflow/engine/classes/model/Dynaform.php
index 67498cc8b..f7dfc5197 100644
--- a/workflow/engine/classes/model/Dynaform.php
+++ b/workflow/engine/classes/model/Dynaform.php
@@ -37,7 +37,9 @@
  *
  * @package workflow.engine.classes.model
  */
-class Dynaform extends BaseDynaform
+class Dynaform
+
+    extends BaseDynaform
 {
     /**
      * This value goes in the content table
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 254df367a..8c2e0961f 100644
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -187,7 +187,7 @@ define( 'PATH_GULLIVER_HOME', PATH_TRUNK . 'gulliver' . PATH_SEP );
 define( 'PATH_GULLIVER', PATH_GULLIVER_HOME . 'system' . PATH_SEP ); //gulliver system classes
 define( 'PATH_GULLIVER_BIN', PATH_GULLIVER_HOME . 'bin' . PATH_SEP ); //gulliver bin classes
 define( 'PATH_TEMPLATE', PATH_GULLIVER_HOME . 'templates' . PATH_SEP );
-define( 'PATH_THIRDPARTY', PATH_GULLIVER_HOME . 'thirdparty' . PATH_SEP );
+define( 'PATH_THIRDPARTY', PATH_TRUNK . 'thirdparty' . PATH_SEP );
 define( 'PATH_RBAC', PATH_RBAC_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP ); //to enable rbac version 2
 define( 'PATH_RBAC_CORE', PATH_RBAC_HOME . 'engine' . PATH_SEP );
 

From 17a256072382a9f9935085335b668d6e0c6c1b96 Mon Sep 17 00:00:00 2001
From: hjonathan <jonathan.quispe@processmaker.com>
Date: Fri, 4 Aug 2017 13:45:19 -0400
Subject: [PATCH 2/2] fix the extend class

---
 workflow/engine/classes/model/Dynaform.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/workflow/engine/classes/model/Dynaform.php b/workflow/engine/classes/model/Dynaform.php
index f7dfc5197..67498cc8b 100644
--- a/workflow/engine/classes/model/Dynaform.php
+++ b/workflow/engine/classes/model/Dynaform.php
@@ -37,9 +37,7 @@
  *
  * @package workflow.engine.classes.model
  */
-class Dynaform
-
-    extends BaseDynaform
+class Dynaform extends BaseDynaform
 {
     /**
      * This value goes in the content table