diff --git a/composer.json b/composer.json
index 43604ee38..b835decff 100644
--- a/composer.json
+++ b/composer.json
@@ -27,12 +27,13 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
+        "php": ">=5.6",
         "laravel/framework": "5.4.*",
         "luracast/restler": "^3.0",
         "bshaffer/oauth2-server-php": "v1.0",
-        "colosa/pmUI": "release/3.2.3-dev",
-        "colosa/MichelangeloFE": "release/3.2.3-dev",
-        "colosa/pmdynaform": "release/3.2.3-dev",
+        "colosa/pmUI": "release/3.2.4-dev",
+        "colosa/MichelangeloFE": "release/3.2.4-dev",
+        "colosa/pmdynaform": "release/3.2.4-dev",
         "google/apiclient": "1.1.6",
         "dapphp/securimage": "^3.6",
         "psr/log":"1.0.0",
@@ -43,9 +44,11 @@
         "pear/archive_tar": "1.4.*",
         "pear/console_getopt": "1.4.*",
         "TYPO3/class-alias-loader": "^1.0",
-        "ralouphie/getallheaders": "^2.0"
+        "ralouphie/getallheaders": "^2.0",
+        "smarty/smarty": "2.6.30"
     },
     "require-dev": {
+        "fzaninotto/faker": "^1.7",
         "guzzle/guzzle": "~3.1.1",
         "phpunit/phpunit": "~5.7",
         "lmc/steward": "^2.2",
@@ -59,7 +62,8 @@
             "ProcessMaker\\": "workflow/engine/src"
         },
         "psr-4": {
-            "Maveriks\\": "framework/src/Maveriks/"
+          "Maveriks\\": "framework/src/Maveriks/",
+          "Tests\\": "tests/"
         },
         "classmap": [
             "gulliver/system/",
@@ -68,7 +72,6 @@
             "workflow/engine/classes/",
             "workflow/engine/controllers/",
             "workflow/engine/includes/",
-            "thirdparty/smarty/libs/Smarty.class.php",
             "thirdparty/jsmin/jsmin.php",
             "thirdparty/pear",
             "thirdparty/html2ps_pdf",
@@ -79,7 +82,6 @@
         "files": [
             "gulliver/includes/inc.ajax.php",
             "gulliver/includes/smarty_plugins/function.pmos.php",
-            "thirdparty/pear/PEAR.php",
             "thirdparty/pake/pakeFunction.php",
             "thirdparty/HTMLPurifier/HTMLPurifier.auto.php",
             "workflow/engine/classes/class.pmFunctions.php",
diff --git a/composer.lock b/composer.lock
index 19a726d6e..afbf635f3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "41742709993d30b70991d5277781b2d8",
+    "content-hash": "f3bce83c3f2a3d02dfff261dd88a5072",
     "packages": [
         {
             "name": "bshaffer/oauth2-server-php",
@@ -51,14 +51,14 @@
         },
         {
             "name": "colosa/MichelangeloFE",
-            "version": "dev-release/3.2.3",
+            "version": "dev-release/3.2.4",
             "source": {
                 "type": "git",
                 "url": "git@bitbucket.org:colosa/michelangelofe.git",
-                "reference": "a44fbc3e9d0c9c1ce1f0e7697cedc809f8a3a220"
+                "reference": "1780c624132004aa13d80882937f61527adafad5"
             },
             "require": {
-                "colosa/pmui": "release/3.2.3-dev"
+                "colosa/pmui": "release/3.2.4-dev"
             },
             "type": "library",
             "description": "ProcessMaker Michelangelo Front End",
@@ -66,15 +66,15 @@
             "keywords": [
                 "js app ProcessMaker"
             ],
-            "time": "2018-04-27T20:10:38+00:00"
+            "time": "2018-05-04T18:33:23+00:00"
         },
         {
             "name": "colosa/pmDynaform",
-            "version": "dev-release/3.2.3",
+            "version": "dev-release/3.2.4",
             "source": {
                 "type": "git",
                 "url": "git@bitbucket.org:colosa/pmdynaform.git",
-                "reference": "fa6a9eb4520a090aaf50e46c90e49596b0794f04"
+                "reference": "d22d2d185cac311fb803e0b6891160804091bac1"
             },
             "type": "library",
             "description": "JS Library to render ProcessMaker Dynaforms",
@@ -82,11 +82,11 @@
             "keywords": [
                 "js lib ProcessMaker Dynaforms"
             ],
-            "time": "2018-04-16T15:41:04+00:00"
+            "time": "2018-04-23T18:36:59+00:00"
         },
         {
             "name": "colosa/pmUI",
-            "version": "dev-release/3.2.3",
+            "version": "dev-release/3.2.4",
             "source": {
                 "type": "git",
                 "url": "git@bitbucket.org:colosa/pmui.git",
@@ -102,21 +102,21 @@
         },
         {
             "name": "dapphp/securimage",
-            "version": "3.6.5",
+            "version": "3.6.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dapphp/securimage.git",
-                "reference": "3f5a84fd80b1a35d58332896c944142713a7e802"
+                "reference": "1ecb884797c66e01a875c058def46c85aecea45b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dapphp/securimage/zipball/3f5a84fd80b1a35d58332896c944142713a7e802",
-                "reference": "3f5a84fd80b1a35d58332896c944142713a7e802",
+                "url": "https://api.github.com/repos/dapphp/securimage/zipball/1ecb884797c66e01a875c058def46c85aecea45b",
+                "reference": "1ecb884797c66e01a875c058def46c85aecea45b",
                 "shasum": ""
             },
             "require": {
                 "ext-gd": "*",
-                "php": ">=5.2.0"
+                "php": ">=5.4"
             },
             "suggest": {
                 "ext-pdo": "For database storage support",
@@ -131,7 +131,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
@@ -142,10 +142,12 @@
             "description": "PHP CAPTCHA Library",
             "homepage": "https://www.phpcaptcha.org",
             "keywords": [
+                "Forms",
+                "anti-spam",
                 "captcha",
                 "security"
             ],
-            "time": "2016-12-04T17:45:57+00:00"
+            "time": "2018-03-09T06:07:41+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -216,21 +218,25 @@
         },
         {
             "name": "erusev/parsedown",
-            "version": "1.6.3",
+            "version": "1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/erusev/parsedown.git",
-                "reference": "728952b90a333b5c6f77f06ea9422b94b585878d"
+                "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown/zipball/728952b90a333b5c6f77f06ea9422b94b585878d",
-                "reference": "728952b90a333b5c6f77f06ea9422b94b585878d",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
+                "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1",
                 "shasum": ""
             },
             "require": {
+                "ext-mbstring": "*",
                 "php": ">=5.3.0"
             },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35"
+            },
             "type": "library",
             "autoload": {
                 "psr-0": {
@@ -254,7 +260,7 @@
                 "markdown",
                 "parser"
             ],
-            "time": "2017-05-14T14:47:48+00:00"
+            "time": "2018-03-08T01:11:30+00:00"
         },
         {
             "name": "geshi/geshi",
@@ -262,12 +268,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/GeSHi/geshi-1.0.git",
-                "reference": "ec918ac67f6d3e9008e1d41c4d22610a96f78755"
+                "reference": "ed9f49a7c7a195f6ed2bc864f5ce03b990b5867d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GeSHi/geshi-1.0/zipball/ec918ac67f6d3e9008e1d41c4d22610a96f78755",
-                "reference": "ec918ac67f6d3e9008e1d41c4d22610a96f78755",
+                "url": "https://api.github.com/repos/GeSHi/geshi-1.0/zipball/ed9f49a7c7a195f6ed2bc864f5ce03b990b5867d",
+                "reference": "ed9f49a7c7a195f6ed2bc864f5ce03b990b5867d",
                 "shasum": ""
             },
             "require-dev": {
@@ -294,7 +300,7 @@
             ],
             "description": "Generic Syntax Highlighter",
             "homepage": "http://qbnz.com/highlighter/",
-            "time": "2017-07-30T00:08:49+00:00"
+            "time": "2018-03-09T20:04:39+00:00"
         },
         {
             "name": "google/apiclient",
@@ -328,7 +334,7 @@
                     "src/"
                 ]
             },
-            "notification-url": "http://packagist.org/downloads/",
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "Apache-2.0"
             ],
@@ -470,16 +476,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.41",
+            "version": "1.0.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "f400aa98912c561ba625ea4065031b7a41e5a155"
+                "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f400aa98912c561ba625ea4065031b7a41e5a155",
-                "reference": "f400aa98912c561ba625ea4065031b7a41e5a155",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a99f94e63b512d75f851b181afcdf0ee9ebef7e6",
+                "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6",
                 "shasum": ""
             },
             "require": {
@@ -490,12 +496,13 @@
             },
             "require-dev": {
                 "ext-fileinfo": "*",
-                "mockery/mockery": "~0.9",
-                "phpspec/phpspec": "^2.2",
-                "phpunit/phpunit": "~4.8"
+                "phpspec/phpspec": "^3.4",
+                "phpunit/phpunit": "^5.7"
             },
             "suggest": {
                 "ext-fileinfo": "Required for MimeType",
+                "ext-ftp": "Allows you to use FTP server storage",
+                "ext-openssl": "Allows you to use FTPS server storage",
                 "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
                 "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
                 "league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
@@ -549,7 +556,7 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2017-08-06T17:41:04+00:00"
+            "time": "2018-05-07T08:44:23+00:00"
         },
         {
             "name": "libchart/libchart",
@@ -577,7 +584,7 @@
             ],
             "authors": [
                 {
-                    "name": "Jean-Marc Tr??meaux",
+                    "name": "Jean-Marc Trémeaux",
                     "homepage": "http://naku.dohcrew.com/",
                     "role": "Developer"
                 },
@@ -603,12 +610,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Luracast/Restler.git",
-                "reference": "cd0c21b4f7c0a99261ad618e90a5263483e78007"
+                "reference": "188968f6a15796077350f1be9c461f8d02c559a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Luracast/Restler/zipball/cd0c21b4f7c0a99261ad618e90a5263483e78007",
-                "reference": "cd0c21b4f7c0a99261ad618e90a5263483e78007",
+                "url": "https://api.github.com/repos/Luracast/Restler/zipball/188968f6a15796077350f1be9c461f8d02c559a8",
+                "reference": "188968f6a15796077350f1be9c461f8d02c559a8",
                 "shasum": ""
             },
             "require": {
@@ -674,7 +681,7 @@
                 "rest",
                 "server"
             ],
-            "time": "2017-01-11T03:42:36+00:00"
+            "time": "2018-03-16T05:08:02+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -756,7 +763,7 @@
         },
         {
             "name": "mtdowling/cron-expression",
-            "version": "v1.2.0",
+            "version": "v1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mtdowling/cron-expression.git",
@@ -800,35 +807,30 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "1.22.1",
+            "version": "1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc"
+                "reference": "ef81c39b67200dcd7401c24363dcac05ac3a4fe9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc",
-                "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ef81c39b67200dcd7401c24363dcac05ac3a4fe9",
+                "reference": "ef81c39b67200dcd7401c24363dcac05ac3a4fe9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0",
-                "symfony/translation": "~2.6 || ~3.0"
+                "php": ">=5.3.9",
+                "symfony/translation": "~2.6 || ~3.0 || ~4.0"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "~2",
-                "phpunit/phpunit": "~4.0 || ~5.0"
+                "phpunit/phpunit": "^4.8.35 || ^5.7"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.23-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Carbon\\": "src/Carbon/"
+                    "": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -849,20 +851,20 @@
                 "datetime",
                 "time"
             ],
-            "time": "2017-01-16T07:55:07+00:00"
+            "time": "2018-04-23T09:02:57+00:00"
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.10",
+            "version": "v2.0.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d"
+                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d",
-                "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
+                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
                 "shasum": ""
             },
             "require": {
@@ -897,7 +899,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2017-03-13T16:27:32+00:00"
+            "time": "2018-04-04T21:24:14+00:00"
         },
         {
             "name": "pear/archive_tar",
@@ -1244,16 +1246,16 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "3.7.0",
+            "version": "3.7.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "0ef23d1b10cf1bc576e9d865a7e9c47982c5715e"
+                "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/0ef23d1b10cf1bc576e9d865a7e9c47982c5715e",
-                "reference": "0ef23d1b10cf1bc576e9d865a7e9c47982c5715e",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
+                "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
                 "shasum": ""
             },
             "require": {
@@ -1264,17 +1266,15 @@
                 "rhumsaa/uuid": "self.version"
             },
             "require-dev": {
-                "apigen/apigen": "^4.1",
-                "codeception/aspect-mock": "^1.0 | ^2.0",
+                "codeception/aspect-mock": "^1.0 | ~2.0.0",
                 "doctrine/annotations": "~1.2.0",
                 "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
                 "ircmaxell/random-lib": "^1.1",
                 "jakub-onderka/php-parallel-lint": "^0.9.0",
-                "mockery/mockery": "^0.9.4",
+                "mockery/mockery": "^0.9.9",
                 "moontoast/math": "^1.1",
                 "php-mock/php-mock-phpunit": "^0.3|^1.1",
-                "phpunit/phpunit": "^4.7|>=5.0 <5.4",
-                "satooshi/php-coveralls": "^0.6.1",
+                "phpunit/phpunit": "^4.7|^5.0",
                 "squizlabs/php_codesniffer": "^2.3"
             },
             "suggest": {
@@ -1322,20 +1322,71 @@
                 "identifier",
                 "uuid"
             ],
-            "time": "2017-08-04T13:39:04+00:00"
+            "time": "2018-01-20T00:28:24+00:00"
         },
         {
-            "name": "swiftmailer/swiftmailer",
-            "version": "v5.4.8",
+            "name": "smarty/smarty",
+            "version": "v2.6.30",
             "source": {
                 "type": "git",
-                "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517"
+                "url": "https://github.com/smarty-php/smarty.git",
+                "reference": "c5c9d6514ceaf15fe35345886668726829560f93"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/9a06dc570a0367850280eefd3f1dc2da45aef517",
-                "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/c5c9d6514ceaf15fe35345886668726829560f93",
+                "reference": "c5c9d6514ceaf15fe35345886668726829560f93",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "libs/Smarty.class.php",
+                    "libs/Smarty_Compiler.class.php",
+                    "libs/Config_File.class.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Monte Ohrt",
+                    "email": "monte@ohrt.com"
+                },
+                {
+                    "name": "Uwe Tews",
+                    "email": "uwe.tews@googlemail.com"
+                }
+            ],
+            "description": "Smarty - the compiling PHP template engine",
+            "homepage": "http://www.smarty.net",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2016-07-19T18:31:12+00:00"
+        },
+        {
+            "name": "swiftmailer/swiftmailer",
+            "version": "v5.4.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/swiftmailer/swiftmailer.git",
+                "reference": "7ffc1ea296ed14bf8260b6ef11b80208dbadba91"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/7ffc1ea296ed14bf8260b6ef11b80208dbadba91",
+                "reference": "7ffc1ea296ed14bf8260b6ef11b80208dbadba91",
                 "shasum": ""
             },
             "require": {
@@ -1370,54 +1421,55 @@
                 }
             ],
             "description": "Swiftmailer, free feature-rich PHP mailer",
-            "homepage": "http://swiftmailer.org",
+            "homepage": "https://swiftmailer.symfony.com",
             "keywords": [
                 "email",
                 "mail",
                 "mailer"
             ],
-            "time": "2017-05-01T15:54:03+00:00"
+            "time": "2018-01-23T07:37:21+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "d6596cb5022b6a0bd940eae54a1de78646a5fda6"
+                "reference": "5b1fdfa8eb93464bcc36c34da39cedffef822cdf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/d6596cb5022b6a0bd940eae54a1de78646a5fda6",
-                "reference": "d6596cb5022b6a0bd940eae54a1de78646a5fda6",
+                "url": "https://api.github.com/repos/symfony/console/zipball/5b1fdfa8eb93464bcc36c34da39cedffef822cdf",
+                "reference": "5b1fdfa8eb93464bcc36c34da39cedffef822cdf",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
-                "symfony/debug": "~2.8|~3.0",
+                "symfony/debug": "~2.8|~3.0|~4.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<3.3"
+                "symfony/dependency-injection": "<3.4",
+                "symfony/process": "<3.3"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~3.3",
-                "symfony/dependency-injection": "~3.3",
-                "symfony/event-dispatcher": "~2.8|~3.0",
-                "symfony/filesystem": "~2.8|~3.0",
-                "symfony/process": "~2.8|~3.0"
+                "symfony/config": "~3.3|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+                "symfony/lock": "~3.4|~4.0",
+                "symfony/process": "~3.3|~4.0"
             },
             "suggest": {
-                "psr/log": "For using the console logger",
+                "psr/log-implementation": "For using the console logger",
                 "symfony/event-dispatcher": "",
-                "symfony/filesystem": "",
+                "symfony/lock": "",
                 "symfony/process": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1444,20 +1496,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-08-27T14:52:21+00:00"
+            "time": "2018-04-30T01:22:56+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "c5f5263ed231f164c58368efbce959137c7d9488"
+                "reference": "519a80d7c1d95c6cc0b67f686d15fe27c6910de0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/c5f5263ed231f164c58368efbce959137c7d9488",
-                "reference": "c5f5263ed231f164c58368efbce959137c7d9488",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/519a80d7c1d95c6cc0b67f686d15fe27c6910de0",
+                "reference": "519a80d7c1d95c6cc0b67f686d15fe27c6910de0",
                 "shasum": ""
             },
             "require": {
@@ -1466,7 +1518,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1483,7 +1535,7 @@
             ],
             "authors": [
                 {
-                    "name": "Jean-Fran??ois Simon",
+                    "name": "Jean-François Simon",
                     "email": "jeanfrancois.simon@sensiolabs.com"
                 },
                 {
@@ -1497,20 +1549,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2018-03-19T22:32:39+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "084d804fe35808eb2ef596ec83d85d9768aa6c9d"
+                "reference": "1b95888cfd996484527cb41e8952d9a5eaf7454f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/084d804fe35808eb2ef596ec83d85d9768aa6c9d",
-                "reference": "084d804fe35808eb2ef596ec83d85d9768aa6c9d",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/1b95888cfd996484527cb41e8952d9a5eaf7454f",
+                "reference": "1b95888cfd996484527cb41e8952d9a5eaf7454f",
                 "shasum": ""
             },
             "require": {
@@ -1521,12 +1573,12 @@
                 "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
             },
             "require-dev": {
-                "symfony/http-kernel": "~2.8|~3.0"
+                "symfony/http-kernel": "~2.8|~3.0|~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1553,20 +1605,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2017-08-27T14:52:21+00:00"
+            "time": "2018-04-30T16:53:52+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "54ca9520a00386f83bca145819ad3b619aaa2485"
+                "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/54ca9520a00386f83bca145819ad3b619aaa2485",
-                "reference": "54ca9520a00386f83bca145819ad3b619aaa2485",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fdd5abcebd1061ec647089c6c41a07ed60af09f8",
+                "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8",
                 "shasum": ""
             },
             "require": {
@@ -1577,10 +1629,10 @@
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/dependency-injection": "~3.3",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/stopwatch": "~2.8|~3.0"
+                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/dependency-injection": "~3.3|~4.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/stopwatch": "~2.8|~3.0|~4.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -1589,7 +1641,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1616,20 +1668,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2018-04-06T07:35:25+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e"
+                "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/b2260dbc80f3c4198f903215f91a1ac7fe9fe09e",
-                "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/bd14efe8b1fabc4de82bf50dce62f05f9a102433",
+                "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433",
                 "shasum": ""
             },
             "require": {
@@ -1638,7 +1690,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1665,33 +1717,34 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2018-04-04T05:07:11+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "14bacad23a4f075bfd3fd456755236cb261320e3"
+                "reference": "edc43b1a50402bb06b5111eb86b275c87a93e373"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/14bacad23a4f075bfd3fd456755236cb261320e3",
-                "reference": "14bacad23a4f075bfd3fd456755236cb261320e3",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/edc43b1a50402bb06b5111eb86b275c87a93e373",
+                "reference": "edc43b1a50402bb06b5111eb86b275c87a93e373",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-mbstring": "~1.1"
+                "symfony/polyfill-mbstring": "~1.1",
+                "symfony/polyfill-php70": "~1.6"
             },
             "require-dev": {
-                "symfony/expression-language": "~2.8|~3.0"
+                "symfony/expression-language": "~2.8|~3.0|~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1718,56 +1771,58 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-08-10T07:07:06+00:00"
+            "time": "2018-04-30T01:05:13+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "1c1717d28904744dc9a9f6a9d97a8b9bed1680e9"
+                "reference": "280fcedbcb3dabcc467a9c1734054af61928fe4f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1c1717d28904744dc9a9f6a9d97a8b9bed1680e9",
-                "reference": "1c1717d28904744dc9a9f6a9d97a8b9bed1680e9",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/280fcedbcb3dabcc467a9c1734054af61928fe4f",
+                "reference": "280fcedbcb3dabcc467a9c1734054af61928fe4f",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
                 "psr/log": "~1.0",
-                "symfony/debug": "~2.8|~3.0",
-                "symfony/event-dispatcher": "~2.8|~3.0",
-                "symfony/http-foundation": "~3.3"
+                "symfony/debug": "~2.8|~3.0|~4.0",
+                "symfony/event-dispatcher": "~2.8|~3.0|~4.0",
+                "symfony/http-foundation": "^3.4.4|^4.0.4"
             },
             "conflict": {
                 "symfony/config": "<2.8",
-                "symfony/dependency-injection": "<3.3",
+                "symfony/dependency-injection": "<3.4.5|<4.0.5,>=4",
                 "symfony/var-dumper": "<3.3",
                 "twig/twig": "<1.34|<2.4,>=2"
             },
+            "provide": {
+                "psr/log-implementation": "1.0"
+            },
             "require-dev": {
                 "psr/cache": "~1.0",
-                "symfony/browser-kit": "~2.8|~3.0",
+                "symfony/browser-kit": "~2.8|~3.0|~4.0",
                 "symfony/class-loader": "~2.8|~3.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/console": "~2.8|~3.0",
-                "symfony/css-selector": "~2.8|~3.0",
-                "symfony/dependency-injection": "~3.3",
-                "symfony/dom-crawler": "~2.8|~3.0",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/finder": "~2.8|~3.0",
-                "symfony/process": "~2.8|~3.0",
-                "symfony/routing": "~2.8|~3.0",
-                "symfony/stopwatch": "~2.8|~3.0",
-                "symfony/templating": "~2.8|~3.0",
-                "symfony/translation": "~2.8|~3.0",
-                "symfony/var-dumper": "~3.3"
+                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/console": "~2.8|~3.0|~4.0",
+                "symfony/css-selector": "~2.8|~3.0|~4.0",
+                "symfony/dependency-injection": "^3.4.5|^4.0.5",
+                "symfony/dom-crawler": "~2.8|~3.0|~4.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/finder": "~2.8|~3.0|~4.0",
+                "symfony/process": "~2.8|~3.0|~4.0",
+                "symfony/routing": "~3.4|~4.0",
+                "symfony/stopwatch": "~2.8|~3.0|~4.0",
+                "symfony/templating": "~2.8|~3.0|~4.0",
+                "symfony/translation": "~2.8|~3.0|~4.0",
+                "symfony/var-dumper": "~3.3|~4.0"
             },
             "suggest": {
                 "symfony/browser-kit": "",
-                "symfony/class-loader": "",
                 "symfony/config": "",
                 "symfony/console": "",
                 "symfony/dependency-injection": "",
@@ -1777,7 +1832,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1804,20 +1859,20 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2017-08-28T22:35:03+00:00"
+            "time": "2018-04-30T19:27:02+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.5.0",
+            "version": "v1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803"
+                "reference": "3296adf6a6454a050679cde90f95350ad604b171"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
-                "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
+                "reference": "3296adf6a6454a050679cde90f95350ad604b171",
                 "shasum": ""
             },
             "require": {
@@ -1829,7 +1884,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.5-dev"
+                    "dev-master": "1.8-dev"
                 }
             },
             "autoload": {
@@ -1863,20 +1918,79 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-14T15:44:48+00:00"
+            "time": "2018-04-26T10:06:28+00:00"
         },
         {
-            "name": "symfony/process",
-            "version": "v3.3.8",
+            "name": "symfony/polyfill-php70",
+            "version": "v1.8.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0"
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0",
-                "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6",
+                "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": "~1.0|~2.0",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php70\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2018-04-26T10:06:28+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v3.4.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "4b7d64e852886319e93ddfdecff0d744ab87658b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/4b7d64e852886319e93ddfdecff0d744ab87658b",
+                "reference": "4b7d64e852886319e93ddfdecff0d744ab87658b",
                 "shasum": ""
             },
             "require": {
@@ -1885,7 +1999,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1912,39 +2026,39 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2018-04-03T05:22:50+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "970326dcd04522e1cd1fe128abaee54c225e27f9"
+                "reference": "9deb375986f5d1f37283d8386716d26985a0f4b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/970326dcd04522e1cd1fe128abaee54c225e27f9",
-                "reference": "970326dcd04522e1cd1fe128abaee54c225e27f9",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/9deb375986f5d1f37283d8386716d26985a0f4b6",
+                "reference": "9deb375986f5d1f37283d8386716d26985a0f4b6",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8"
             },
             "conflict": {
-                "symfony/config": "<2.8",
+                "symfony/config": "<3.3.1",
                 "symfony/dependency-injection": "<3.3",
-                "symfony/yaml": "<3.3"
+                "symfony/yaml": "<3.4"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "doctrine/common": "~2.2",
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/dependency-injection": "~3.3",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/http-foundation": "~2.8|~3.0",
-                "symfony/yaml": "~3.3"
+                "symfony/config": "^3.3.1|~4.0",
+                "symfony/dependency-injection": "~3.3|~4.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/http-foundation": "~2.8|~3.0|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation loader",
@@ -1957,7 +2071,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -1990,20 +2104,20 @@
                 "uri",
                 "url"
             ],
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2018-04-12T09:01:03+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "add53753d978f635492dfe8cd6953f6a7361ef90"
+                "reference": "d4af50f46cd8171fd5c1cdebdb9a8bbcd8078c6c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/add53753d978f635492dfe8cd6953f6a7361ef90",
-                "reference": "add53753d978f635492dfe8cd6953f6a7361ef90",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/d4af50f46cd8171fd5c1cdebdb9a8bbcd8078c6c",
+                "reference": "d4af50f46cd8171fd5c1cdebdb9a8bbcd8078c6c",
                 "shasum": ""
             },
             "require": {
@@ -2012,23 +2126,26 @@
             },
             "conflict": {
                 "symfony/config": "<2.8",
-                "symfony/yaml": "<3.3"
+                "symfony/dependency-injection": "<3.4",
+                "symfony/yaml": "<3.4"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/intl": "^2.8.18|^3.2.5",
-                "symfony/yaml": "~3.3"
+                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/finder": "~2.8|~3.0|~4.0",
+                "symfony/intl": "^2.8.18|^3.2.5|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
-                "psr/log": "To use logging capability in translator",
+                "psr/log-implementation": "To use logging capability in translator",
                 "symfony/config": "",
                 "symfony/yaml": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -2055,20 +2172,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2018-04-30T01:22:56+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "89fcb5a73e0ede2be2512234c4e40457bb22b35f"
+                "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/89fcb5a73e0ede2be2512234c4e40457bb22b35f",
-                "reference": "89fcb5a73e0ede2be2512234c4e40457bb22b35f",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0e6545672d8c9ce70dd472adc2f8b03155a46f73",
+                "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73",
                 "shasum": ""
             },
             "require": {
@@ -2084,12 +2201,13 @@
             },
             "suggest": {
                 "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
+                "ext-intl": "To show region name in time zone dump",
                 "ext-symfony_debug": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -2123,33 +2241,33 @@
                 "debug",
                 "dump"
             ],
-            "time": "2017-08-27T14:52:21+00:00"
+            "time": "2018-04-26T12:42:15+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
-            "version": "2.2.0",
+            "version": "2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
-                "reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b"
+                "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b",
-                "reference": "ab03919dfd85a74ae0372f8baf9f3c7d5c03b04b",
+                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757",
+                "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5 || ^7",
-                "symfony/css-selector": "^2.7|~3.0"
+                "php": "^5.5 || ^7.0",
+                "symfony/css-selector": "^2.7 || ^3.0 || ^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.8|5.1.*"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "2.2.x-dev"
                 }
             },
             "autoload": {
@@ -2170,7 +2288,7 @@
             ],
             "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
             "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
-            "time": "2016-09-20T12:50:39+00:00"
+            "time": "2017-11-27T11:13:29+00:00"
         },
         {
             "name": "typo3/class-alias-loader",
@@ -2284,16 +2402,16 @@
     "packages-dev": [
         {
             "name": "beberlei/assert",
-            "version": "v2.7.6",
+            "version": "v2.9.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/beberlei/assert.git",
-                "reference": "8726e183ebbb0169cb6cb4832e22ebd355524563"
+                "reference": "c07fe163d6a3b3e4b1275981ec004397954afa89"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/beberlei/assert/zipball/8726e183ebbb0169cb6cb4832e22ebd355524563",
-                "reference": "8726e183ebbb0169cb6cb4832e22ebd355524563",
+                "url": "https://api.github.com/repos/beberlei/assert/zipball/c07fe163d6a3b3e4b1275981ec004397954afa89",
+                "reference": "c07fe163d6a3b3e4b1275981ec004397954afa89",
                 "shasum": ""
             },
             "require": {
@@ -2302,7 +2420,7 @@
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^2.1.1",
-                "phpunit/phpunit": "^4|^5"
+                "phpunit/phpunit": "^4.8.35|^5.7"
             },
             "type": "library",
             "autoload": {
@@ -2335,40 +2453,41 @@
                 "assertion",
                 "validation"
             ],
-            "time": "2017-05-04T02:00:24+00:00"
+            "time": "2018-04-16T11:18:27+00:00"
         },
         {
             "name": "behat/behat",
-            "version": "v3.3.1",
+            "version": "v3.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Behat/Behat.git",
-                "reference": "44a58c1480d6144b2dc2c2bf02b9cef73c83840d"
+                "reference": "d60b161bff1b95ec4bb80bb8cb210ccf890314c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Behat/zipball/44a58c1480d6144b2dc2c2bf02b9cef73c83840d",
-                "reference": "44a58c1480d6144b2dc2c2bf02b9cef73c83840d",
+                "url": "https://api.github.com/repos/Behat/Behat/zipball/d60b161bff1b95ec4bb80bb8cb210ccf890314c2",
+                "reference": "d60b161bff1b95ec4bb80bb8cb210ccf890314c2",
                 "shasum": ""
             },
             "require": {
-                "behat/gherkin": "^4.4.4",
+                "behat/gherkin": "^4.5.1",
                 "behat/transliterator": "^1.2",
-                "container-interop/container-interop": "^1.1",
+                "container-interop/container-interop": "^1.2",
                 "ext-mbstring": "*",
                 "php": ">=5.3.3",
-                "symfony/class-loader": "~2.1||~3.0",
-                "symfony/config": "~2.3||~3.0",
-                "symfony/console": "~2.5||~3.0",
-                "symfony/dependency-injection": "~2.1||~3.0",
-                "symfony/event-dispatcher": "~2.1||~3.0",
-                "symfony/translation": "~2.3||~3.0",
-                "symfony/yaml": "~2.1||~3.0"
+                "psr/container": "^1.0",
+                "symfony/class-loader": "~2.1||~3.0||~4.0",
+                "symfony/config": "~2.3||~3.0||~4.0",
+                "symfony/console": "~2.5||~3.0||~4.0",
+                "symfony/dependency-injection": "~2.1||~3.0||~4.0",
+                "symfony/event-dispatcher": "~2.1||~3.0||~4.0",
+                "symfony/translation": "~2.3||~3.0||~4.0",
+                "symfony/yaml": "~2.1||~3.0||~4.0"
             },
             "require-dev": {
                 "herrera-io/box": "~1.6.1",
-                "phpunit/phpunit": "~4.5",
-                "symfony/process": "~2.5|~3.0"
+                "phpunit/phpunit": "^4.8.36|^6.3",
+                "symfony/process": "~2.5|~3.0|~4.0"
             },
             "suggest": {
                 "behat/mink-extension": "for integration with Mink testing framework",
@@ -2417,7 +2536,7 @@
                 "symfony",
                 "testing"
             ],
-            "time": "2017-05-15T16:49:16+00:00"
+            "time": "2017-11-27T10:37:56+00:00"
         },
         {
             "name": "behat/gherkin",
@@ -2773,30 +2892,33 @@
         },
         {
             "name": "facebook/webdriver",
-            "version": "1.4.1",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/facebook/php-webdriver.git",
-                "reference": "eadb0b7a7c3e6578185197fd40158b08c3164c83"
+                "reference": "86b5ca2f67173c9d34340845dd690149c886a605"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/eadb0b7a7c3e6578185197fd40158b08c3164c83",
-                "reference": "eadb0b7a7c3e6578185197fd40158b08c3164c83",
+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/86b5ca2f67173c9d34340845dd690149c886a605",
+                "reference": "86b5ca2f67173c9d34340845dd690149c886a605",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "ext-zip": "*",
-                "php": "^5.5 || ~7.0",
-                "symfony/process": "^2.8 || ^3.1"
+                "php": "^5.6 || ~7.0",
+                "symfony/process": "^2.8 || ^3.1 || ^4.0"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^2.0",
+                "guzzle/guzzle": "^3.4.1",
+                "php-coveralls/php-coveralls": "^1.0.2",
                 "php-mock/php-mock-phpunit": "^1.1",
-                "phpunit/phpunit": "4.6.* || ~5.0",
-                "satooshi/php-coveralls": "^1.0",
-                "squizlabs/php_codesniffer": "^2.6"
+                "phpunit/phpunit": "^5.7",
+                "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
+                "squizlabs/php_codesniffer": "^2.6",
+                "symfony/var-dumper": "^3.3 || ^4.0"
             },
             "type": "library",
             "extra": {
@@ -2821,7 +2943,7 @@
                 "selenium",
                 "webdriver"
             ],
-            "time": "2017-04-28T14:54:49+00:00"
+            "time": "2017-11-15T11:08:09+00:00"
         },
         {
             "name": "florianwolters/component-core-stringutils",
@@ -2963,6 +3085,56 @@
             ],
             "time": "2013-06-29T12:35:22+00:00"
         },
+        {
+            "name": "fzaninotto/faker",
+            "version": "v1.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fzaninotto/Faker.git",
+                "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
+                "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "ext-intl": "*",
+                "phpunit/phpunit": "^4.0 || ^5.0",
+                "squizlabs/php_codesniffer": "^1.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Faker\\": "src/Faker/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "François Zaninotto"
+                }
+            ],
+            "description": "Faker is a PHP library that generates fake data for you.",
+            "keywords": [
+                "data",
+                "faker",
+                "fixtures"
+            ],
+            "time": "2017-08-15T16:48:10+00:00"
+        },
         {
             "name": "graphp/algorithms",
             "version": "v0.8.1",
@@ -2996,7 +3168,7 @@
             ],
             "authors": [
                 {
-                    "name": "Christian L??ck",
+                    "name": "Christian Lück",
                     "email": "christian@lueck.tv"
                 }
             ],
@@ -3015,7 +3187,7 @@
         },
         {
             "name": "guzzle/guzzle",
-            "version": "3.1.2",
+            "version": "v3.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
@@ -3025,10 +3197,86 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7901ea7d27373d0cc85eac6f6694e4c2ced90a26",
                 "reference": "7901ea7d27373d0cc85eac6f6694e4c2ced90a26",
-                "shasum": "25bc38119541c151c455c3140b4dc388d7ec4187"
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "php": ">=5.3.2",
+                "symfony/event-dispatcher": ">=2.1"
+            },
+            "replace": {
+                "guzzle/batch": "self.version",
+                "guzzle/cache": "self.version",
+                "guzzle/common": "self.version",
+                "guzzle/http": "self.version",
+                "guzzle/inflection": "self.version",
+                "guzzle/iterator": "self.version",
+                "guzzle/log": "self.version",
+                "guzzle/parser": "self.version",
+                "guzzle/plugin": "self.version",
+                "guzzle/plugin-async": "self.version",
+                "guzzle/plugin-backoff": "self.version",
+                "guzzle/plugin-cache": "self.version",
+                "guzzle/plugin-cookie": "self.version",
+                "guzzle/plugin-curlauth": "self.version",
+                "guzzle/plugin-history": "self.version",
+                "guzzle/plugin-log": "self.version",
+                "guzzle/plugin-md5": "self.version",
+                "guzzle/plugin-mock": "self.version",
+                "guzzle/plugin-oauth": "self.version",
+                "guzzle/service": "self.version",
+                "guzzle/stream": "self.version"
+            },
+            "require-dev": {
+                "doctrine/common": "*",
+                "monolog/monolog": "1.*",
+                "phpunit/phpunit": "3.7.*",
+                "symfony/class-loader": "*",
+                "zend/zend-cache1": "1.12",
+                "zend/zend-log1": "1.12",
+                "zendframework/zend-cache": "2.0.*",
+                "zendframework/zend-log": "2.0.*"
             },
             "type": "library",
-            "abandoned": "guzzlehttp/guzzle"
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Guzzle\\Tests": "tests/",
+                    "Guzzle": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Guzzle Community",
+                    "homepage": "https://github.com/guzzle/guzzle/contributors"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "abandoned": "guzzlehttp/guzzle",
+            "time": "2013-01-28T00:07:40+00:00"
         },
         {
             "name": "instaclick/php-webdriver",
@@ -3091,16 +3339,16 @@
         },
         {
             "name": "lmc/steward",
-            "version": "2.2.1",
+            "version": "2.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lmc-eu/steward.git",
-                "reference": "3d2b203a8576b074a829b639563322dcb53a2668"
+                "reference": "f40db91e7378a373ada4505932d8ba2d8a4ea04a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lmc-eu/steward/zipball/3d2b203a8576b074a829b639563322dcb53a2668",
-                "reference": "3d2b203a8576b074a829b639563322dcb53a2668",
+                "url": "https://api.github.com/repos/lmc-eu/steward/zipball/f40db91e7378a373ada4505932d8ba2d8a4ea04a",
+                "reference": "f40db91e7378a373ada4505932d8ba2d8a4ea04a",
                 "shasum": ""
             },
             "require": {
@@ -3112,10 +3360,10 @@
                 "facebook/webdriver": "^1.4.0",
                 "florianwolters/component-util-singleton": "0.3.2",
                 "graphp/algorithms": "^0.8.1",
-                "nette/reflection": "^2.3.2",
+                "nette/reflection": "^2.4.2",
                 "ondram/ci-detector": "^2.1",
                 "php": "^5.6 || ~7.0",
-                "phpunit/phpunit": "^5.7",
+                "phpunit/phpunit": "^5.7.11",
                 "symfony/console": "^3.3.0",
                 "symfony/event-dispatcher": "~3.0",
                 "symfony/filesystem": "~3.0",
@@ -3127,8 +3375,8 @@
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^2.0",
+                "php-coveralls/php-coveralls": "^1.0.2",
                 "php-mock/php-mock-phpunit": "~1.0",
-                "satooshi/php-coveralls": "^1.0",
                 "squizlabs/php_codesniffer": "^2.4.1",
                 "symfony/var-dumper": "^3.2"
             },
@@ -3155,6 +3403,12 @@
             "license": [
                 "MIT"
             ],
+            "authors": [
+                {
+                    "name": "LMC s.r.o.",
+                    "homepage": "https://github.com/lmc-eu"
+                }
+            ],
             "description": "Steward - makes Selenium WebDriver + PHPUnit testing easy and robust",
             "keywords": [
                 "phpunit",
@@ -3162,41 +3416,44 @@
                 "testing",
                 "webdriver"
             ],
-            "time": "2017-06-05T23:56:28+00:00"
+            "time": "2018-03-12T00:56:44+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.6.1",
+            "version": "1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102"
+                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102",
-                "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0"
+                "php": "^5.6 || ^7.0"
             },
             "require-dev": {
-                "doctrine/collections": "1.*",
-                "phpunit/phpunit": "~4.1"
+                "doctrine/collections": "^1.0",
+                "doctrine/common": "^2.6",
+                "phpunit/phpunit": "^4.1"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
                     "DeepCopy\\": "src/DeepCopy/"
-                }
+                },
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "description": "Create deep copies (clones) of your objects",
-            "homepage": "https://github.com/myclabs/DeepCopy",
             "keywords": [
                 "clone",
                 "copy",
@@ -3204,20 +3461,20 @@
                 "object",
                 "object graph"
             ],
-            "time": "2017-04-12T18:52:22+00:00"
+            "time": "2017-10-19T19:58:43+00:00"
         },
         {
             "name": "nette/caching",
-            "version": "v2.5.5",
+            "version": "v2.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/caching.git",
-                "reference": "997d3b9868840da8b51f27565bfe1a8210e94620"
+                "reference": "7fba7c7ab2585fafb7b31152f2595e1551120555"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/caching/zipball/997d3b9868840da8b51f27565bfe1a8210e94620",
-                "reference": "997d3b9868840da8b51f27565bfe1a8210e94620",
+                "url": "https://api.github.com/repos/nette/caching/zipball/7fba7c7ab2585fafb7b31152f2595e1551120555",
+                "reference": "7fba7c7ab2585fafb7b31152f2595e1551120555",
                 "shasum": ""
             },
             "require": {
@@ -3264,7 +3521,7 @@
                     "homepage": "https://nette.org/contributors"
                 }
             ],
-            "description": "??? Nette Caching: library with easy-to-use API and many cache backends.",
+            "description": "⏱ Nette Caching: library with easy-to-use API and many cache backends.",
             "homepage": "https://nette.org",
             "keywords": [
                 "cache",
@@ -3273,7 +3530,7 @@
                 "nette",
                 "sqlite"
             ],
-            "time": "2017-08-18T15:20:18+00:00"
+            "time": "2018-03-21T11:04:32+00:00"
         },
         {
             "name": "nette/finder",
@@ -3397,16 +3654,16 @@
         },
         {
             "name": "nette/utils",
-            "version": "v2.4.8",
+            "version": "v2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "f1584033b5af945b470533b466b81a789d532034"
+                "reference": "183069866dc477fcfbac393ed486aaa6d93d19a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/f1584033b5af945b470533b466b81a789d532034",
-                "reference": "f1584033b5af945b470533b466b81a789d532034",
+                "url": "https://api.github.com/repos/nette/utils/zipball/183069866dc477fcfbac393ed486aaa6d93d19a5",
+                "reference": "183069866dc477fcfbac393ed486aaa6d93d19a5",
                 "shasum": ""
             },
             "require": {
@@ -3430,12 +3687,15 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.5-dev"
                 }
             },
             "autoload": {
                 "classmap": [
                     "src/"
+                ],
+                "files": [
+                    "src/loader.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -3454,7 +3714,7 @@
                     "homepage": "https://nette.org/contributors"
                 }
             ],
-            "description": "???? Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.",
+            "description": "🛠 Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.",
             "homepage": "https://nette.org",
             "keywords": [
                 "array",
@@ -3472,7 +3732,7 @@
                 "utility",
                 "validation"
             ],
-            "time": "2017-08-20T17:32:29+00:00"
+            "time": "2018-05-02T17:16:08+00:00"
         },
         {
             "name": "ondram/ci-detector",
@@ -3507,7 +3767,7 @@
             ],
             "authors": [
                 {
-                    "name": "Ond??ej Machulda",
+                    "name": "Ondřej Machulda",
                     "email": "ondrej.machulda@gmail.com"
                 }
             ],
@@ -3529,16 +3789,16 @@
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "1.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
                 "shasum": ""
             },
             "require": {
@@ -3579,26 +3839,26 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2015-12-27T11:43:31+00:00"
+            "time": "2017-09-11T18:02:19+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "3.2.2",
+            "version": "3.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157"
+                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157",
-                "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2",
+                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5",
-                "phpdocumentor/reflection-common": "^1.0@dev",
-                "phpdocumentor/type-resolver": "^0.3.0",
+                "php": "^5.6 || ^7.0",
+                "phpdocumentor/reflection-common": "^1.0.0",
+                "phpdocumentor/type-resolver": "^0.4.0",
                 "webmozart/assert": "^1.0"
             },
             "require-dev": {
@@ -3624,20 +3884,20 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-08-08T06:39:58+00:00"
+            "time": "2017-11-10T14:09:06+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "0.3.0",
+            "version": "0.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773"
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773",
-                "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
                 "shasum": ""
             },
             "require": {
@@ -3671,32 +3931,32 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2017-06-03T08:32:36+00:00"
+            "time": "2017-07-14T14:27:02+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.7.2",
+            "version": "1.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6"
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
-                "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
                 "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/comparator": "^1.1|^2.0|^3.0",
                 "sebastian/recursion-context": "^1.0|^2.0|^3.0"
             },
             "require-dev": {
                 "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8 || ^5.6.5"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
             },
             "type": "library",
             "extra": {
@@ -3734,7 +3994,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2017-09-04T11:05:03+00:00"
+            "time": "2018-04-18T13:57:24+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -3801,16 +4061,16 @@
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.4.2",
+            "version": "1.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
                 "shasum": ""
             },
             "require": {
@@ -3844,7 +4104,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2016-10-03T07:40:28+00:00"
+            "time": "2017-11-27T13:52:08+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -3938,16 +4198,16 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "1.4.11",
+            "version": "1.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
+                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
-                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16",
+                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16",
                 "shasum": ""
             },
             "require": {
@@ -3983,20 +4243,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2017-02-27T10:12:30+00:00"
+            "time": "2017-12-04T08:55:13+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "5.7.21",
+            "version": "5.7.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db"
+                "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3b91adfb64264ddec5a2dee9851f354aa66327db",
-                "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
+                "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
                 "shasum": ""
             },
             "require": {
@@ -4020,8 +4280,8 @@
                 "sebastian/global-state": "^1.1",
                 "sebastian/object-enumerator": "~2.0",
                 "sebastian/resource-operations": "~1.0",
-                "sebastian/version": "~1.0.3|~2.0",
-                "symfony/yaml": "~2.1|~3.0"
+                "sebastian/version": "^1.0.6|^2.0.1",
+                "symfony/yaml": "~2.1|~3.0|~4.0"
             },
             "conflict": {
                 "phpdocumentor/reflection-docblock": "3.0.2"
@@ -4065,7 +4325,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-06-21T08:11:54+00:00"
+            "time": "2018-02-01T05:50:59+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -4690,16 +4950,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.0.2",
+            "version": "3.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "c7594a88ae75401e8f8d0bd4deb8431b39045c51"
+                "reference": "4842476c434e375f9d3182ff7b89059583aa8b27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/c7594a88ae75401e8f8d0bd4deb8431b39045c51",
-                "reference": "c7594a88ae75401e8f8d0bd4deb8431b39045c51",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4842476c434e375f9d3182ff7b89059583aa8b27",
+                "reference": "4842476c434e375f9d3182ff7b89059583aa8b27",
                 "shasum": ""
             },
             "require": {
@@ -4709,7 +4969,7 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
             },
             "bin": [
                 "bin/phpcs",
@@ -4737,27 +4997,27 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2017-07-18T01:12:32+00:00"
+            "time": "2018-02-20T21:35:23+00:00"
         },
         {
             "name": "symfony/class-loader",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/class-loader.git",
-                "reference": "9c69968ce57924e9e93550895cd2b0477edf0e19"
+                "reference": "e63c12699822bb3b667e7216ba07fbcc3a3e203e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/9c69968ce57924e9e93550895cd2b0477edf0e19",
-                "reference": "9c69968ce57924e9e93550895cd2b0477edf0e19",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/e63c12699822bb3b667e7216ba07fbcc3a3e203e",
+                "reference": "e63c12699822bb3b667e7216ba07fbcc3a3e203e",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8"
             },
             "require-dev": {
-                "symfony/finder": "~2.8|~3.0",
+                "symfony/finder": "~2.8|~3.0|~4.0",
                 "symfony/polyfill-apcu": "~1.1"
             },
             "suggest": {
@@ -4766,7 +5026,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -4793,34 +5053,35 @@
             ],
             "description": "Symfony ClassLoader Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2018-01-03T07:37:34+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488"
+                "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488",
-                "reference": "6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488",
+                "url": "https://api.github.com/repos/symfony/config/zipball/7c2a9d44f4433863e9bca682e7f03609234657f9",
+                "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
-                "symfony/filesystem": "~2.8|~3.0"
+                "symfony/filesystem": "~2.8|~3.0|~4.0"
             },
             "conflict": {
                 "symfony/dependency-injection": "<3.3",
                 "symfony/finder": "<3.3"
             },
             "require-dev": {
-                "symfony/dependency-injection": "~3.3",
-                "symfony/finder": "~3.3",
-                "symfony/yaml": "~3.0"
+                "symfony/dependency-injection": "~3.3|~4.0",
+                "symfony/event-dispatcher": "~3.3|~4.0",
+                "symfony/finder": "~3.3|~4.0",
+                "symfony/yaml": "~3.0|~4.0"
             },
             "suggest": {
                 "symfony/yaml": "To use the yaml reference dumper"
@@ -4828,7 +5089,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -4855,20 +5116,20 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2017-08-03T08:59:45+00:00"
+            "time": "2018-03-19T22:32:39+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "2ac658972626c75cbde7b0067c84b988170a6907"
+                "reference": "54ff9d78b56429f9a1ac12e60bfb6d169c0468e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ac658972626c75cbde7b0067c84b988170a6907",
-                "reference": "2ac658972626c75cbde7b0067c84b988170a6907",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/54ff9d78b56429f9a1ac12e60bfb6d169c0468e3",
+                "reference": "54ff9d78b56429f9a1ac12e60bfb6d169c0468e3",
                 "shasum": ""
             },
             "require": {
@@ -4876,17 +5137,18 @@
                 "psr/container": "^1.0"
             },
             "conflict": {
-                "symfony/config": "<3.3.1",
+                "symfony/config": "<3.3.7",
                 "symfony/finder": "<3.3",
-                "symfony/yaml": "<3.3"
+                "symfony/proxy-manager-bridge": "<3.4",
+                "symfony/yaml": "<3.4"
             },
             "provide": {
                 "psr/container-implementation": "1.0"
             },
             "require-dev": {
-                "symfony/config": "~3.3",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/yaml": "~3.3"
+                "symfony/config": "~3.3|~4.0",
+                "symfony/expression-language": "~2.8|~3.0|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
                 "symfony/config": "",
@@ -4898,7 +5160,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -4925,20 +5187,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2017-08-28T22:20:37+00:00"
+            "time": "2018-04-29T14:04:08+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "b32a0e5f928d0fa3d1dd03c78d020777e50c10cb"
+                "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/b32a0e5f928d0fa3d1dd03c78d020777e50c10cb",
-                "reference": "b32a0e5f928d0fa3d1dd03c78d020777e50c10cb",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/253a4490b528597aa14d2bf5aeded6f5e5e4a541",
+                "reference": "253a4490b528597aa14d2bf5aeded6f5e5e4a541",
                 "shasum": ""
             },
             "require": {
@@ -4947,7 +5209,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -4974,20 +5236,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2018-02-22T10:48:49+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "ee4e22978fe885b54ee5da8c7964f0a5301abfb6"
+                "reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ee4e22978fe885b54ee5da8c7964f0a5301abfb6",
-                "reference": "ee4e22978fe885b54ee5da8c7964f0a5301abfb6",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/f3109a6aedd20e35c3a33190e932c2b063b7b50e",
+                "reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e",
                 "shasum": ""
             },
             "require": {
@@ -4996,7 +5258,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -5028,20 +5290,20 @@
                 "configuration",
                 "options"
             ],
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2018-01-11T07:56:07+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "9a5610a8d6a50985a7be485c0ba745c22607beeb"
+                "reference": "eb17cfa072cab26537ac37e9c4ece6c0361369af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/9a5610a8d6a50985a7be485c0ba745c22607beeb",
-                "reference": "9a5610a8d6a50985a7be485c0ba745c22607beeb",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/eb17cfa072cab26537ac37e9c4ece6c0361369af",
+                "reference": "eb17cfa072cab26537ac37e9c4ece6c0361369af",
                 "shasum": ""
             },
             "require": {
@@ -5050,7 +5312,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -5077,27 +5339,30 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2018-02-17T14:55:25+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.3.8",
+            "version": "v3.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0"
+                "reference": "033cfa61ef06ee0847e056e530201842b6e926c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/1d8c2a99c80862bdc3af94c1781bf70f86bccac0",
-                "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/033cfa61ef06ee0847e056e530201842b6e926c3",
+                "reference": "033cfa61ef06ee0847e056e530201842b6e926c3",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8"
             },
+            "conflict": {
+                "symfony/console": "<3.4"
+            },
             "require-dev": {
-                "symfony/console": "~2.8|~3.0"
+                "symfony/console": "~3.4|~4.0"
             },
             "suggest": {
                 "symfony/console": "For validating YAML files using the lint command"
@@ -5105,7 +5370,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -5132,20 +5397,20 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-29T21:54:42+00:00"
+            "time": "2018-04-08T08:21:29+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f"
+                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f",
-                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
+                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
                 "shasum": ""
             },
             "require": {
@@ -5182,20 +5447,20 @@
                 "check",
                 "validate"
             ],
-            "time": "2016-11-23T20:04:58+00:00"
+            "time": "2018-01-29T19:49:41+00:00"
         },
         {
             "name": "wimg/php-compatibility",
-            "version": "8.0.1",
+            "version": "8.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wimg/PHPCompatibility.git",
-                "reference": "4c4385fb891dff0501009670f988d4fe36785249"
+                "reference": "4ac01e4fe8faaa4f8d3b3cd06ea92e5418ce472e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wimg/PHPCompatibility/zipball/4c4385fb891dff0501009670f988d4fe36785249",
-                "reference": "4c4385fb891dff0501009670f988d4fe36785249",
+                "url": "https://api.github.com/repos/wimg/PHPCompatibility/zipball/4ac01e4fe8faaa4f8d3b3cd06ea92e5418ce472e",
+                "reference": "4ac01e4fe8faaa4f8d3b3cd06ea92e5418ce472e",
                 "shasum": ""
             },
             "require": {
@@ -5209,7 +5474,7 @@
                 "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0"
             },
             "suggest": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1"
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3"
             },
             "type": "phpcodesniffer-standard",
             "autoload": {
@@ -5234,7 +5499,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2017-08-07T19:39:05+00:00"
+            "time": "2017-12-27T21:58:38+00:00"
         }
     ],
     "aliases": [],
@@ -5247,6 +5512,8 @@
     },
     "prefer-stable": true,
     "prefer-lowest": false,
-    "platform": [],
+    "platform": {
+        "php": ">=5.6"
+    },
     "platform-dev": []
 }
diff --git a/config/app.php b/config/app.php
index 69bf9504e..a1b753afc 100644
--- a/config/app.php
+++ b/config/app.php
@@ -6,6 +6,7 @@ use Illuminate\View\ViewServiceProvider;
 
 return [
     'name' => env('APP_NAME', 'ProcessMaker'),
+    'url' => env('APP_URL', 'http://localhost'),
     'env' => env('APP_ENV', 'production'),
     'debug' => env('APP_DEBUG', false),
     'log' => env('APP_LOG', 'single'),
@@ -16,6 +17,8 @@ return [
         FilesystemServiceProvider::class,
         CacheServiceProvider::class,
         ViewServiceProvider::class,
+        \Illuminate\Database\DatabaseServiceProvider::class,
+
     ],
 
     'aliases' => [
diff --git a/config/database.php b/config/database.php
new file mode 100644
index 000000000..fa9a2db5c
--- /dev/null
+++ b/config/database.php
@@ -0,0 +1,75 @@
+<?php
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Default Database Connection Name
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which of the database connections below you wish
+    | to use as your default connection for all database work. Of course
+    | you may use many connections at once using the Database library.
+    |
+    */
+    'default' => env('DB_CONNECTION', 'workflow'),
+    /*
+    |--------------------------------------------------------------------------
+    | Database Connections
+    |--------------------------------------------------------------------------
+    |
+    | Here are each of the database connections setup for your application.
+    | Of course, examples of configuring each database platform that is
+    | supported by Laravel is shown below to make development simple.
+    |
+    |
+    | All database work in Laravel is done through the PHP PDO facilities
+    | so make sure you have the driver for your particular database of
+    | choice installed on your machine before you begin development.
+    |
+    */
+    'connections' => [
+        'workflow' => [
+            'driver' => 'mysql',
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', '3306'),
+            'database' => env('DB_DATABASE', 'workflow'),
+            'username' => env('DB_USERNAME', 'workflow'),
+            'password' => env('DB_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'strict' => true,
+            'engine' => null,
+        ]
+    ],
+    /*
+    |--------------------------------------------------------------------------
+    | Migration Repository Table
+    |--------------------------------------------------------------------------
+    |
+    | This table keeps track of all the migrations that have already run for
+    | your application. Using this information, we can determine which of
+    | the migrations on disk haven't actually been run in the database.
+    |
+    */
+    'migrations' => 'migrations',
+    /*
+    |--------------------------------------------------------------------------
+    | Redis Databases
+    |--------------------------------------------------------------------------
+    |
+    | Redis is an open source, fast, and advanced key-value store that also
+    | provides a richer set of commands than a typical key-value systems
+    | such as APC or Memcached. Laravel makes it easy to dig right in.
+    |
+    */
+    'redis' => [
+        'client' => 'predis',
+        'default' => [
+            'host' => env('REDIS_HOST', '127.0.0.1'),
+            'password' => env('REDIS_PASSWORD', null),
+            'port' => env('REDIS_PORT', 6379),
+            'database' => 0,
+        ],
+    ],
+];
\ No newline at end of file
diff --git a/database/factories/DbSourceFactory.php b/database/factories/DbSourceFactory.php
new file mode 100644
index 000000000..ac4ebe6cc
--- /dev/null
+++ b/database/factories/DbSourceFactory.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Model factory for a process
+ */
+use Faker\Generator as Faker;
+
+$factory->define(\ProcessMaker\Model\DbSource::class, function(Faker $faker) {
+
+    /**
+     * @todo Determine if we need more base columns populated
+     */
+    $dbName = $faker->word;
+    return [
+        'DBS_UID' => G::generateUniqueID(),
+        'PRO_UID' => function() {
+            return factory(\ProcessMaker\Model\Process::class)->create()->PRO_UID;
+        },
+        'DBS_TYPE' => 'mysql',
+        'DBS_SERVER' => $faker->localIpv4,
+        'DBS_DATABASE_NAME' => $faker->word,
+        'DBS_USERNAME' => $faker->userName,
+        /**
+         * @todo WHY figure out there's a magic value to the encryption here
+         */
+        'DBS_PASSWORD' => \G::encrypt( $faker->password, $dbName) . "_2NnV3ujj3w",
+        'DBS_PORT' => $faker->numberBetween(1000, 9000),
+        'DBS_ENCODE' => 'utf8', // @todo Perhaps grab this from our definitions in DbConnections
+        'DBS_CONNECTION_TYPE' => 'NORMAL', // @todo Determine what this value means
+        'DBS_TNS' => null // @todo Determine what this value means
+    ];
+});
\ No newline at end of file
diff --git a/database/factories/ProcessFactory.php b/database/factories/ProcessFactory.php
new file mode 100644
index 000000000..d8a60d371
--- /dev/null
+++ b/database/factories/ProcessFactory.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Model factory for a process
+ */
+use Faker\Generator as Faker;
+
+$factory->define(\ProcessMaker\Model\Process::class, function(Faker $faker) {
+
+    /**
+     * @todo Determine if we need more base columns populated
+     */
+    return [
+        'PRO_UID' => G::generateUniqueID(),
+        'PRO_TITLE' => $faker->sentence(3),
+        'PRO_DESCRIPTION' => $faker->paragraph(3)
+    ];
+});
\ No newline at end of file
diff --git a/gulliver/bin/tasks/pakeGulliver.php b/gulliver/bin/tasks/pakeGulliver.php
index 18e3600b1..b5969bf94 100644
--- a/gulliver/bin/tasks/pakeGulliver.php
+++ b/gulliver/bin/tasks/pakeGulliver.php
@@ -29,7 +29,6 @@
 
 use ProcessMaker\Plugins\PluginRegistry;
 
-
 pake_desc('gulliver version');
 pake_task('version', 'project_exists');
 
@@ -58,7 +57,7 @@ pake_task('propel-build-crud', 'project_exists');
 
 /*----------------------------------********---------------------------------*/
 pake_desc("check standard code\n   args: <directory>");
-pake_task('check-standard-code', 'project_exists' );
+pake_task('check-standard-code', 'project_exists');
 /*----------------------------------********---------------------------------*/
 
 /**
@@ -66,429 +65,450 @@ pake_task('check-standard-code', 'project_exists' );
    * access public
    */
 
-function run_version($task, $args) {
-  printf("Gulliver version %s\n", pakeColor::colorize(trim(file_get_contents(PATH_GULLIVER . 'VERSION')), 'INFO'));
-  exit(0);
+function run_version($task, $args)
+{
+    printf("Gulliver version %s\n", pakeColor::colorize(trim(file_get_contents(PATH_GULLIVER . 'VERSION')), 'INFO'));
+    exit(0);
 }
 
-function isUTF8($str) {
-  if( $str === mb_convert_encoding(mb_convert_encoding($str, "UTF-32", "UTF-8"), "UTF-8", "UTF-32") ) {
-    return true;
-  } else {
-    return false;
-  }
+function isUTF8($str)
+{
+    if ($str === mb_convert_encoding(mb_convert_encoding($str, "UTF-32", "UTF-8"), "UTF-8", "UTF-32")) {
+        return true;
+    } else {
+        return false;
+    }
 }
 
-function strip_quotes($text) {
-  if( ! isUTF8($text) )
-    $text = utf8_encode($text);
-  return str_replace('"', "", $text);
+function strip_quotes($text)
+{
+    if (! isUTF8($text)) {
+        $text = utf8_encode($text);
+    }
+    return str_replace('"', "", $text);
 }
 // function for the prompt data read in windows
-function prompt_win($text) {
-
-  print $text;
-  flush();
-  ob_flush();
-  $read = trim(fgets(STDIN));
-  return $read;
-
+function prompt_win($text)
+{
+    print $text;
+    flush();
+    ob_flush();
+    $read = trim(fgets(STDIN));
+    return $read;
 }
 
-function prompt($text) {
-
-  if( ! (PHP_OS == "WINNT") ) {
-    printf("$text%s ", pakeColor::colorize(':', 'INFO'));
-    # 4092 max on win32 fopen
+function prompt($text)
+{
+    if (! (PHP_OS == "WINNT")) {
+        printf("$text%s ", pakeColor::colorize(':', 'INFO'));
+        # 4092 max on win32 fopen
 
 
-    //$fp=fopen("php://stdin", "r");
-    $fp = fopen("/dev/tty", "r");
-    $in = fgets($fp, 4094);
-    fclose($fp);
+        //$fp=fopen("php://stdin", "r");
+        $fp = fopen("/dev/tty", "r");
+        $in = fgets($fp, 4094);
+        fclose($fp);
 
-    # strip newline
-    (PHP_OS == "WINNT") ? ($read = str_replace("\r\n", "", $in)) : ($read = str_replace("\n", "", $in));
-  } else {
-    $read = prompt_win($text);
-  }
+        # strip newline
+        (PHP_OS == "WINNT") ? ($read = str_replace("\r\n", "", $in)) : ($read = str_replace("\n", "", $in));
+    } else {
+        $read = prompt_win($text);
+    }
 
-  return $read;
+    return $read;
 }
 
-function query_sql_file($file, $connection) {
-  $report = array (
+function query_sql_file($file, $connection)
+{
+    $report = array(
     'SQL_FILE' => $file,
-    'errors' => array (),
+    'errors' => array(),
     'querys' => 0
   );
-  $content = @fread(@fopen($file, "rt"), @filesize($file));
-  if( ! $content ) {
-    $report['errors'] = "Error reading SQL";
+    $content = @fread(@fopen($file, "rt"), @filesize($file));
+    if (! $content) {
+        $report['errors'] = "Error reading SQL";
+        return $report;
+    }
+    $ret = array();
+    for ($i = 0; $i < strlen($content) - 1; $i ++) {
+        if ($content[$i] == ";") {
+            if ($content[$i + 1] == "\n") {
+                $ret[] = substr($content, 0, $i);
+                $content = substr($content, $i + 1);
+                $i = 0;
+            }
+        }
+    }
+    $report['querys'] = count($ret);
+    foreach ($ret as $qr) {
+        $re = mysqli_query($connection, $qr);
+        if (! $re) {
+            $report['errors'][] = "Query error: " . mysqli_error($connection);
+        }
+    }
     return $report;
-  }
-  $ret = array ();
-  for( $i = 0; $i < strlen($content) - 1; $i ++ ) {
-    if( $content[$i] == ";" ) {
-      if( $content[$i + 1] == "\n" ) {
-        $ret[] = substr($content, 0, $i);
-        $content = substr($content, $i + 1);
-        $i = 0;
-      }
-    }
-  }
-  $report['querys'] = count($ret);
-  foreach( $ret as $qr ) {
-    $re = @mysql_query($qr, $connection);
-    if( ! $re ) {
-      $report['errors'][] = "Query error: " . mysql_error();
-    }
-  }
-  return $report;
 }
 
-function createPngLogo($filePng, $text) {
-  $im = imagecreatetruecolor(162, 50);
-  $orange = imagecolorallocate($im, 140, 120, 0);
-  $white = imagecolorallocate($im, 255, 255, 255);
-  $black = imagecolorallocate($im, 0, 0, 0);
-  $grey = imagecolorallocate($im, 100, 100, 100);
-  $yellow = imagecolorallocatealpha($im, 255, 255, 10, 95);
-  $red = imagecolorallocatealpha($im, 255, 10, 10, 95);
-  $blue = imagecolorallocatealpha($im, 10, 10, 255, 95);
-  $transparent = imagecolorallocatealpha($im, 0, 0, 0, 127);
+function createPngLogo($filePng, $text)
+{
+    $im = imagecreatetruecolor(162, 50);
+    $orange = imagecolorallocate($im, 140, 120, 0);
+    $white = imagecolorallocate($im, 255, 255, 255);
+    $black = imagecolorallocate($im, 0, 0, 0);
+    $grey = imagecolorallocate($im, 100, 100, 100);
+    $yellow = imagecolorallocatealpha($im, 255, 255, 10, 95);
+    $red = imagecolorallocatealpha($im, 255, 10, 10, 95);
+    $blue = imagecolorallocatealpha($im, 10, 10, 255, 95);
+    $transparent = imagecolorallocatealpha($im, 0, 0, 0, 127);
 
-  imagefill($im, 0, 0, $white);
-  imagestring($im, 4, 50, 14, $text, $orange);
+    imagefill($im, 0, 0, $white);
+    imagestring($im, 4, 50, 14, $text, $orange);
 
-  // drawing 3 overlapped circle
-  imagefilledellipse($im, 25, 20, 27, 25, $yellow);
-  imagefilledellipse($im, 15, 30, 27, 25, $red);
-  imagefilledellipse($im, 30, 30, 27, 25, $blue);
+    // drawing 3 overlapped circle
+    imagefilledellipse($im, 25, 20, 27, 25, $yellow);
+    imagefilledellipse($im, 15, 30, 27, 25, $red);
+    imagefilledellipse($im, 30, 30, 27, 25, $blue);
 
-  imagefill($im, 0, 0, $transparent);
-  imagesavealpha($im, true);
-  imagepng($im, $filePng);
-
-  $aux = explode(PATH_SEP, $filePng);
-  $auxName = $aux[count($aux) - 2] . PATH_SEP . $aux[count($aux) - 1];
-  $iSize = filesize($filePng);
-  printf("saved %s bytes in file %s [%s]\n", pakeColor::colorize($iSize, 'INFO'), pakeColor::colorize($auxName, 'INFO'), pakeColor::colorize($aux[count($aux) - 1], 'INFO'));
+    imagefill($im, 0, 0, $transparent);
+    imagesavealpha($im, true);
+    imagepng($im, $filePng);
 
+    $aux = explode(PATH_SEP, $filePng);
+    $auxName = $aux[count($aux) - 2] . PATH_SEP . $aux[count($aux) - 1];
+    $iSize = filesize($filePng);
+    printf("saved %s bytes in file %s [%s]\n", pakeColor::colorize($iSize, 'INFO'), pakeColor::colorize($auxName, 'INFO'), pakeColor::colorize($aux[count($aux) - 1], 'INFO'));
 }
 
-function run_generate_unit_test_class($task, $args) {
-  //the class filename in the first argument
-  $class = $args[0];
+function run_generate_unit_test_class($task, $args)
+{
+    //the class filename in the first argument
+    $class = $args[0];
+
+    //try to find the class in classes directory
+    $classFilename = PATH_CORE . 'classes' . PATH_SEP . 'class.' . $args[0] . '.php';
+    if (file_exists($classFilename)) {
+        printf("class found in %s \n", pakeColor::colorize($classFilename, 'INFO'));
+    } else {
+        printf("class %s not found \n", pakeColor::colorize($class, 'ERROR'));
+        exit(0);
+    }
+
+    include('test' . PATH_SEP . 'bootstrap' . PATH_SEP . 'unit.php');
+
+
+    require_once($classFilename);
+
+    $unitFilename = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' . PATH_SEP . 'templates' . PATH_SEP . 'unitTest.tpl';
+
+    $smarty = new Smarty();
+
+    $smarty->template_dir = PATH_GULLIVER . 'bin' . PATH_SEP . 'tasks';
+    $smarty->compile_dir = PATH_SMARTY_C;
+    $smarty->cache_dir = PATH_SMARTY_CACHE;
+    $smarty->config_dir = PATH_THIRDPARTY . 'smarty/configs';
+
+    printf("using unit file in %s \n", pakeColor::colorize($unitFilename, 'INFO'));
+    $smarty->assign('className', ucwords($class));
+    $smarty->assign('classFile', $class);
+
+    //get the method list
+    $reflect = new ReflectionClass($class);
+    $methods = array();
+    $testItems = 0;
+    foreach ($reflect->getMethods() as $reflectmethod) {
+        $params = '';
+        foreach ($reflectmethod->getParameters() as $key => $row) {
+            if ($params != '') {
+                $params .= ', ';
+            }
+            $params .= '$' . $row->name;
+        }
+        $testItems ++;
+        $methods[$reflectmethod->getName()] = $params;
+    }
+
+    $smarty->assign('methods', $methods);
+    $smarty->assign('testItems', (count($methods) * 2) + 3);
+    $smarty->assign('cantMethods', count($methods));
+    //  $smarty->assign('llave', '{' );
+
+
+    // fetch smarty output
+    $content = $smarty->fetch($unitFilename);
+
+    //saving the content in the output file
+    if (defined('MAIN_POFILE') && MAIN_POFILE != '') {
+        $unitFilename = PATH_CORE . 'test' . PATH_SEP . 'unit' . PATH_SEP . MAIN_POFILE . PATH_SEP . 'class' . ucwords($class) . 'Test.php';
+    } else {
+        $unitFilename = PATH_CORE . 'test' . PATH_SEP . 'unit' . PATH_SEP . 'class' . ucwords($class) . 'Test.php';
+    }
+    printf("creating unit file in %s \n", pakeColor::colorize($unitFilename, 'INFO'));
+    $fp = fopen($unitFilename, 'w');
+    fprintf($fp, $content);
+    fclose($fp);
 
-  //try to find the class in classes directory
-  $classFilename = PATH_CORE . 'classes' . PATH_SEP . 'class.' . $args[0] . '.php';
-  if( file_exists($classFilename) )
-    printf("class found in %s \n", pakeColor::colorize($classFilename, 'INFO'));
-  else {
-    printf("class %s not found \n", pakeColor::colorize($class, 'ERROR'));
     exit(0);
-  }
-
-  include ('test' . PATH_SEP . 'bootstrap' . PATH_SEP . 'unit.php');
-
-
-  require_once ($classFilename);
-
-  $unitFilename = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' . PATH_SEP . 'templates' . PATH_SEP . 'unitTest.tpl';
-
-  $smarty = new Smarty();
-
-  $smarty->template_dir = PATH_GULLIVER . 'bin' . PATH_SEP . 'tasks';
-  $smarty->compile_dir = PATH_SMARTY_C;
-  $smarty->cache_dir = PATH_SMARTY_CACHE;
-  $smarty->config_dir = PATH_THIRDPARTY . 'smarty/configs';
-
-  printf("using unit file in %s \n", pakeColor::colorize($unitFilename, 'INFO'));
-  $smarty->assign('className', ucwords($class));
-  $smarty->assign('classFile', $class);
-
-  //get the method list
-  $reflect = new ReflectionClass($class);
-  $methods = array ();
-  $testItems = 0;
-  foreach( $reflect->getMethods() as $reflectmethod ) {
-    $params = '';
-    foreach( $reflectmethod->getParameters() as $key => $row ) {
-      if( $params != '' )
-        $params .= ', ';
-      $params .= '$' . $row->name;
-    }
-    $testItems ++;
-    $methods[$reflectmethod->getName()] = $params;
-  }
-
-  $smarty->assign('methods', $methods);
-  $smarty->assign('testItems', (count($methods) * 2) + 3);
-  $smarty->assign('cantMethods', count($methods));
-  //  $smarty->assign('llave', '{' );
-
-
-  // fetch smarty output
-  $content = $smarty->fetch($unitFilename);
-
-  //saving the content in the output file
-  if( defined('MAIN_POFILE') && MAIN_POFILE != '' )
-    $unitFilename = PATH_CORE . 'test' . PATH_SEP . 'unit' . PATH_SEP . MAIN_POFILE . PATH_SEP . 'class' . ucwords($class) . 'Test.php';
-  else
-    $unitFilename = PATH_CORE . 'test' . PATH_SEP . 'unit' . PATH_SEP . 'class' . ucwords($class) . 'Test.php';
-  printf("creating unit file in %s \n", pakeColor::colorize($unitFilename, 'INFO'));
-  $fp = fopen($unitFilename, 'w');
-  fprintf($fp, $content);
-  fclose($fp);
-
-  exit(0);
 }
 
-function convertPhpName($f) {
-  $upper = true;
-  $res = '';
-  for( $i = 0; $i < strlen($f); $i ++ ) {
-    $car = substr($f, $i, 1);
-    if( $car == '_' )
-      $upper = true;
-    else {
-      if( $upper ) {
-        $res .= strtoupper($car);
-        $upper = false;
-      } else
-        $res .= strtolower($car);
+function convertPhpName($f)
+{
+    $upper = true;
+    $res = '';
+    for ($i = 0; $i < strlen($f); $i ++) {
+        $car = substr($f, $i, 1);
+        if ($car == '_') {
+            $upper = true;
+        } else {
+            if ($upper) {
+                $res .= strtoupper($car);
+                $upper = false;
+            } else {
+                $res .= strtolower($car);
+            }
+        }
     }
-  }
-  return $res;
+    return $res;
 }
 
-function copyPluginFile($tplName, $fName, $class) {
-  $pluginOutDirectory = PATH_OUTTRUNK . "plugins" . PATH_SEP . $class . PATH_SEP;
-  $pluginFilename     = $pluginOutDirectory . $fName;
+function copyPluginFile($tplName, $fName, $class)
+{
+    $pluginOutDirectory = PATH_OUTTRUNK . "plugins" . PATH_SEP . $class . PATH_SEP;
+    $pluginFilename     = $pluginOutDirectory . $fName;
 
-  $fileTpl = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' . PATH_SEP . 'templates' . PATH_SEP . $tplName . '.tpl';
-  $content = file_get_contents($fileTpl);
-  $iSize = file_put_contents($pluginFilename, $content);
-  printf("saved %s bytes in file %s \n", pakeColor::colorize($iSize, 'INFO'), pakeColor::colorize($tplName, 'INFO'));
+    $fileTpl = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' . PATH_SEP . 'templates' . PATH_SEP . $tplName . '.tpl';
+    $content = file_get_contents($fileTpl);
+    $iSize = file_put_contents($pluginFilename, $content);
+    printf("saved %s bytes in file %s \n", pakeColor::colorize($iSize, 'INFO'), pakeColor::colorize($tplName, 'INFO'));
 }
 
 function savePluginFile($fName, $tplName, $class, $tableName, $fields = null, $utf8 = false)
 {
-  $pluginOutDirectory = PATH_OUTTRUNK . "plugins" . PATH_SEP . $class . PATH_SEP;
-  $pluginFilename     = $pluginOutDirectory . $fName;
+    $pluginOutDirectory = PATH_OUTTRUNK . "plugins" . PATH_SEP . $class . PATH_SEP;
+    $pluginFilename     = $pluginOutDirectory . $fName;
 
-  $pluginTpl = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' . PATH_SEP . 'templates' . PATH_SEP . $tplName . '.tpl';
-  $template = new TemplatePower($pluginTpl);
-  $template->prepare();
-  $template->assign('className', $class);
-  $template->assign('tableName', $tableName);
-  $template->assign('menuId', 'ID_' . strtoupper($class));
+    $pluginTpl = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' . PATH_SEP . 'templates' . PATH_SEP . $tplName . '.tpl';
+    $template = new TemplatePower($pluginTpl);
+    $template->prepare();
+    $template->assign('className', $class);
+    $template->assign('tableName', $tableName);
+    $template->assign('menuId', 'ID_' . strtoupper($class));
 
-  if( is_array($fields) ) {
-    foreach( $fields as $block => $data ) {
-      $template->gotoBlock("_ROOT");
-      if( is_array($data) )
-        foreach( $data as $rowId => $row ) {
-          $template->newBlock($block);
-          foreach( $row as $key => $val )
-            $template->assign($key, $val);
+    if (is_array($fields)) {
+        foreach ($fields as $block => $data) {
+            $template->gotoBlock("_ROOT");
+            if (is_array($data)) {
+                foreach ($data as $rowId => $row) {
+                    $template->newBlock($block);
+                    foreach ($row as $key => $val) {
+                        $template->assign($key, $val);
+                    }
+                }
+            } else {
+                $template->assign($block, $data);
+            }
         }
-      else
-        $template->assign($block, $data);
     }
-  }
 
-  $content = $template->getOutputContent();
-  $iSize = file_put_contents($pluginFilename, $content);
+    $content = $template->getOutputContent();
+    $iSize = file_put_contents($pluginFilename, $content);
     if ($utf8) {
         //add BOM utf-8
-        $fp = fopen($pluginFilename,"wb");
-        fwrite($fp,pack("CCC",0xef,0xbb,0xbf) . $content);
+        $fp = fopen($pluginFilename, "wb");
+        fwrite($fp, pack("CCC", 0xef, 0xbb, 0xbf) . $content);
         fclose($fp);
     }
-  printf("saved %s bytes in file %s [%s]\n", pakeColor::colorize($iSize, 'INFO'), pakeColor::colorize($fName, 'INFO'), pakeColor::colorize($tplName, 'INFO'));
+    printf("saved %s bytes in file %s [%s]\n", pakeColor::colorize($iSize, 'INFO'), pakeColor::colorize($fName, 'INFO'), pakeColor::colorize($tplName, 'INFO'));
 }
 
-function run_generate_crud($task, $args) {
-  ini_set('display_errors', 'on');
-  ini_set('error_reporting', E_ERROR);
+function run_generate_crud($task, $args)
+{
+    ini_set('display_errors', 'on');
+    ini_set('error_reporting', E_ERROR);
 
-  // the environment for poedit always is Development
-  define('G_ENVIRONMENT', G_DEV_ENV);
+    // the environment for poedit always is Development
+    define('G_ENVIRONMENT', G_DEV_ENV);
 
-  //the class filename in the first argument
-  if( ! isset($args[0]) ) {
-    printf("Error: %s\n", pakeColor::colorize('you must specify a valid classname ', 'ERROR'));
-    exit(0);
-  }
-  $class = $args[0];
-  //second parameter is the table name, by default is the same classname in uppercase.
-  $tableName = isset($args[1]) ? $args[1] : strtoupper($class);
+    //the class filename in the first argument
+    if (! isset($args[0])) {
+        printf("Error: %s\n", pakeColor::colorize('you must specify a valid classname ', 'ERROR'));
+        exit(0);
+    }
+    $class = $args[0];
+    //second parameter is the table name, by default is the same classname in uppercase.
+    $tableName = isset($args[1]) ? $args[1] : strtoupper($class);
 
-  //try to find the class in classes directory
-  $classFilename = PATH_CORE . 'classes' . PATH_SEP . 'model' . PATH_SEP . $args[0] . '.php';
-  if( file_exists($classFilename) )
-    printf("class found in %s \n", pakeColor::colorize($classFilename, 'INFO'));
-  else {
-    printf("class %s not found \n", pakeColor::colorize($class, 'ERROR'));
-    exit(0);
-  }
+    //try to find the class in classes directory
+    $classFilename = PATH_CORE . 'classes' . PATH_SEP . 'model' . PATH_SEP . $args[0] . '.php';
+    if (file_exists($classFilename)) {
+        printf("class found in %s \n", pakeColor::colorize($classFilename, 'INFO'));
+    } else {
+        printf("class %s not found \n", pakeColor::colorize($class, 'ERROR'));
+        exit(0);
+    }
 
-  require_once ($classFilename);
+    require_once($classFilename);
 
-  Propel::init(PATH_CORE . "config/databases.php");
+    Propel::init(PATH_CORE . "config/databases.php");
 
-  $configuration = Propel::getConfiguration();
-  $connectionDSN = $configuration['datasources']['workflow']['connection'];
-  printf("using DSN Connection %s \n", pakeColor::colorize($connectionDSN, 'INFO'));
+    $configuration = Propel::getConfiguration();
+    $connectionDSN = $configuration['datasources']['workflow']['connection'];
+    printf("using DSN Connection %s \n", pakeColor::colorize($connectionDSN, 'INFO'));
 
-  $dirs = explode(PATH_SEP, PATH_HOME);
-  print_r($dirs);
-  $projectName = $dirs[count($dirs) - 1];
+    $dirs = explode(PATH_SEP, PATH_HOME);
+    print_r($dirs);
+    $projectName = $dirs[count($dirs) - 1];
 
-  //  if ( strlen ( trim( $projectName) ) == 0 )  {
-  //    printf("Project name not found \n", pakeColor::colorize( $class, 'ERROR'));
-  //    exit (0);
-  //  }
+    //  if ( strlen ( trim( $projectName) ) == 0 )  {
+    //    printf("Project name not found \n", pakeColor::colorize( $class, 'ERROR'));
+    //    exit (0);
+    //  }
 
 
-  //  printf("using Project Name %s \n", pakeColor::colorize( $projectName, 'INFO'));
+    //  printf("using Project Name %s \n", pakeColor::colorize( $projectName, 'INFO'));
 
 
-  //  $pluginDirectory = PATH_PLUGINS . $class;
-  //  $pluginOutDirectory = PATH_OUTTRUNK . 'plugins' . PATH_SEP . $class;
-  //
-  //  G::verifyPath ( $pluginOutDirectory, true );
-  //  G::verifyPath ( $pluginOutDirectory. PATH_SEP . $class, $pluginDirectory );
+    //  $pluginDirectory = PATH_PLUGINS . $class;
+    //  $pluginOutDirectory = PATH_OUTTRUNK . 'plugins' . PATH_SEP . $class;
+    //
+    //  G::verifyPath ( $pluginOutDirectory, true );
+    //  G::verifyPath ( $pluginOutDirectory. PATH_SEP . $class, $pluginDirectory );
 
 
-  //G::verifyPath ( $pluginDirectory, true );
+    //G::verifyPath ( $pluginDirectory, true );
 
 
-  //  //main php file
-  //  savePluginFile ( $class . '.php', 'pluginMainFile', $class, $tableName );
+    //  //main php file
+    //  savePluginFile ( $class . '.php', 'pluginMainFile', $class, $tableName );
 
 
-  //menu
-  savePluginFile($class . PATH_SEP . 'menu' . $class . '.php', 'pluginMenu', $class, $tableName);
+    //menu
+    savePluginFile($class . PATH_SEP . 'menu' . $class . '.php', 'pluginMenu', $class, $tableName);
 
-  //default list
-  savePluginFile($class . PATH_SEP . $class . 'List.php', 'pluginList', $class, $tableName);
+    //default list
+    savePluginFile($class . PATH_SEP . $class . 'List.php', 'pluginList', $class, $tableName);
 
-  //parse the schema file in order to get Table definition
-  $schemaFile = PATH_CORE . 'config' . PATH_SEP . 'schema.xml';
-  $xmlContent = file_get_contents($schemaFile);
-  $s = simplexml_load_file($schemaFile);
+    //parse the schema file in order to get Table definition
+    $schemaFile = PATH_CORE . 'config' . PATH_SEP . 'schema.xml';
+    $xmlContent = file_get_contents($schemaFile);
+    $s = simplexml_load_file($schemaFile);
 
-  //default xmlform
-  //load the $fields array with fields data for an xmlform.
-  $fields = array ();
-  foreach( $s->table as $key => $table ) {
-    if( $table['name'] == $tableName )
-      foreach( $table->column as $kc => $column ) {
-        //print $column['name'] . ' ' .$column['type'] . ' ' .$column['size'] . ' ' .$column['required'] . ' ' .$column['primaryKey'];
-        //print "\n";
-        $maxlength = $column['size'];
-        $size = ($maxlength > 60) ? 60 : $maxlength;
-        $type = $column['type'];
-        $field = array (
+    //default xmlform
+    //load the $fields array with fields data for an xmlform.
+    $fields = array();
+    foreach ($s->table as $key => $table) {
+        if ($table['name'] == $tableName) {
+            foreach ($table->column as $kc => $column) {
+                //print $column['name'] . ' ' .$column['type'] . ' ' .$column['size'] . ' ' .$column['required'] . ' ' .$column['primaryKey'];
+                //print "\n";
+                $maxlength = $column['size'];
+                $size = ($maxlength > 60) ? 60 : $maxlength;
+                $type = $column['type'];
+                $field = array(
           'name' => $column['name'],
           'type' => $type,
           'size' => $size,
           'maxlength' => $maxlength
         );
-        $fields['fields'][] = $field;
-      }
-  }
-  savePluginFile($class . PATH_SEP . $class . '.xml', 'pluginXmlform', $class, $tableName, $fields);
+                $fields['fields'][] = $field;
+            }
+        }
+    }
+    savePluginFile($class . PATH_SEP . $class . '.xml', 'pluginXmlform', $class, $tableName, $fields);
 
-  die();
-  //xmlform for list
-  //load the $fields array with fields data for PagedTable xml.
-  $fields = array ();
-  $primaryKey = '';
-  foreach( $s->table as $key => $table ) {
-    if( $table['name'] == $tableName )
-      foreach( $table->column as $kc => $column ) {
-        //print $column['name'] . ' ' .$column['type'] . ' ' .$column['size'] . ' ' .$column['required'] . ' ' .$column['primaryKey'];
-        //print "\n";
-        $size = ($column['size'] > 30) ? 30 : $column['size'];
-        $type = $column['type'];
-        if( $column['primaryKey'] )
-          if( $primaryKey == '' )
-            $primaryKey .= '@@' . $column['name'];
-          else
-            $primaryKey .= '|@@' . $column['name'];
+    die();
+    //xmlform for list
+    //load the $fields array with fields data for PagedTable xml.
+    $fields = array();
+    $primaryKey = '';
+    foreach ($s->table as $key => $table) {
+        if ($table['name'] == $tableName) {
+            foreach ($table->column as $kc => $column) {
+                //print $column['name'] . ' ' .$column['type'] . ' ' .$column['size'] . ' ' .$column['required'] . ' ' .$column['primaryKey'];
+                //print "\n";
+                $size = ($column['size'] > 30) ? 30 : $column['size'];
+                $type = $column['type'];
+                if ($column['primaryKey']) {
+                    if ($primaryKey == '') {
+                        $primaryKey .= '@@' . $column['name'];
+                    } else {
+                        $primaryKey .= '|@@' . $column['name'];
+                    }
+                }
 
-        $field = array (
+                $field = array(
           'name' => $column['name'],
           'type' => $type,
           'size' => $size
         );
-        $fields['fields'][] = $field;
-      }
-  }
-  $fields['primaryKey'] = $primaryKey;
-  savePluginFile($class . PATH_SEP . $class . 'List.xml', 'pluginXmlformList', $class, $tableName, $fields);
+                $fields['fields'][] = $field;
+            }
+        }
+    }
+    $fields['primaryKey'] = $primaryKey;
+    savePluginFile($class . PATH_SEP . $class . 'List.xml', 'pluginXmlformList', $class, $tableName, $fields);
 
-  //default edit
-  $fields = array ();
-  $index = 0;
-  $keylist = '';
-  foreach( $s->table as $key => $table ) {
-    if( $table['name'] == $tableName )
-      foreach( $table->column as $kc => $column ) {
-        $name = $column['name'];
-        $phpName = convertPhpName($name);
-        $field = array (
+    //default edit
+    $fields = array();
+    $index = 0;
+    $keylist = '';
+    foreach ($s->table as $key => $table) {
+        if ($table['name'] == $tableName) {
+            foreach ($table->column as $kc => $column) {
+                $name = $column['name'];
+                $phpName = convertPhpName($name);
+                $field = array(
           'name' => $name,
           'phpName' => $phpName,
           'index' => $index ++
         );
-        if( $column['primaryKey'] ) {
-          if( $keylist == '' )
-            $keylist .= '$' . $phpName;
-          else
-            $keylist .= ', $' . $phpName;
-          $fields['keys'][] = $field;
-          //$index++;
+                if ($column['primaryKey']) {
+                    if ($keylist == '') {
+                        $keylist .= '$' . $phpName;
+                    } else {
+                        $keylist .= ', $' . $phpName;
+                    }
+                    $fields['keys'][] = $field;
+                    //$index++;
+                }
+                $fields['fields'][] = $field;
+                $fields['fields2'][] = $field;
+            }
         }
-        $fields['fields'][] = $field;
-        $fields['fields2'][] = $field;
-      }
-  }
-  $fields['keylist'] = $keylist;
-  savePluginFile($class . PATH_SEP . $class . 'Edit.php', 'pluginEdit', $class, $tableName, $fields);
-  savePluginFile($class . PATH_SEP . $class . 'Save.php', 'pluginSave', $class, $tableName, $fields);
+    }
+    $fields['keylist'] = $keylist;
+    savePluginFile($class . PATH_SEP . $class . 'Edit.php', 'pluginEdit', $class, $tableName, $fields);
+    savePluginFile($class . PATH_SEP . $class . 'Save.php', 'pluginSave', $class, $tableName, $fields);
 
-  if( ! PHP_OS == "WINNT" ) {
-    printf("creting symlinks %s \n", pakeColor::colorize($pluginDirectory, 'INFO'));
-    symlink($pluginOutDirectory . PATH_SEP . $class . '.php', PATH_PLUGINS . $class . '.php');
-    symlink($pluginOutDirectory . PATH_SEP . $class, $pluginDirectory);
-  }
-  exit(0);
+    if (! PHP_OS == "WINNT") {
+        printf("creting symlinks %s \n", pakeColor::colorize($pluginDirectory, 'INFO'));
+        symlink($pluginOutDirectory . PATH_SEP . $class . '.php', PATH_PLUGINS . $class . '.php');
+        symlink($pluginOutDirectory . PATH_SEP . $class, $pluginDirectory);
+    }
+    exit(0);
 }
 
-function addTarFolder($tar, $pathBase, $pluginHome) {
-  $aux = explode(PATH_SEP, $pathBase);
-  //print $aux[count($aux) -2 ] . "\n";
-  if( $aux[count($aux) - 2] == '.svn' )
-    return;
-
-  if( $handle = opendir($pathBase) ) {
-    while( false !== ($file = readdir($handle)) ) {
-      if( is_file($pathBase . $file) ) {
-        //print "file $file \n";
-        $tar->addModify($pathBase . $file, '', $pluginHome);
-      }
-      if( is_dir($pathBase . $file) && $file != '..' && $file != '.' ) {
-        //print "dir $pathBase$file \n";
-        addTarFolder($tar, $pathBase . $file . PATH_SEP, $pluginHome);
-      }
+function addTarFolder($tar, $pathBase, $pluginHome)
+{
+    $aux = explode(PATH_SEP, $pathBase);
+    //print $aux[count($aux) -2 ] . "\n";
+    if ($aux[count($aux) - 2] == '.svn') {
+        return;
+    }
+
+    if ($handle = opendir($pathBase)) {
+        while (false !== ($file = readdir($handle))) {
+            if (is_file($pathBase . $file)) {
+                //print "file $file \n";
+                $tar->addModify($pathBase . $file, '', $pluginHome);
+            }
+            if (is_dir($pathBase . $file) && $file != '..' && $file != '.') {
+                //print "dir $pathBase$file \n";
+                addTarFolder($tar, $pathBase . $file . PATH_SEP, $pluginHome);
+            }
+        }
+        closedir($handle);
     }
-    closedir($handle);
-  }
 }
 
 function run_pack_plugin($task, $args)
@@ -544,158 +564,160 @@ function run_pack_plugin($task, $args)
     printf("Filesize  %s Kb \n", pakeColor::colorize($filesize, 'INFO'));
 }
 
-function run_new_plugin($task, $args) {
-  ini_set('display_errors', 'on');
-  ini_set('error_reporting', E_ERROR);
+function run_new_plugin($task, $args)
+{
+    ini_set('display_errors', 'on');
+    ini_set('error_reporting', E_ERROR);
 
-  // the environment for poedit always is Development
-  define('G_ENVIRONMENT', G_DEV_ENV);
+    // the environment for poedit always is Development
+    define('G_ENVIRONMENT', G_DEV_ENV);
 
-  //the plugin name in the first argument
-  if( ! isset($args[0]) ) {
-    printf("Error: %s\n", pakeColor::colorize('you must specify a valid name for the plugin', 'ERROR'));
-    exit(0);
-  }
-  $pluginName = $args[0];
+    //the plugin name in the first argument
+    if (! isset($args[0])) {
+        printf("Error: %s\n", pakeColor::colorize('you must specify a valid name for the plugin', 'ERROR'));
+        exit(0);
+    }
+    $pluginName = $args[0];
 
-  Propel::init(PATH_CORE . "config/databases.php");
-  $configuration = Propel::getConfiguration();
-  $connectionDSN = $configuration['datasources']['workflow']['connection'];
-  printf("using DSN Connection %s \n", pakeColor::colorize($connectionDSN, 'INFO'));
+    Propel::init(PATH_CORE . "config/databases.php");
+    $configuration = Propel::getConfiguration();
+    $connectionDSN = $configuration['datasources']['workflow']['connection'];
+    printf("using DSN Connection %s \n", pakeColor::colorize($connectionDSN, 'INFO'));
 
-  $pluginDirectory = PATH_PLUGINS . $pluginName;
-  $pluginOutDirectory = PATH_OUTTRUNK . 'plugins' . PATH_SEP . $pluginName;
-  $pluginHome = PATH_OUTTRUNK . 'plugins' . PATH_SEP . $pluginName . PATH_SEP . $pluginName;
+    $pluginDirectory = PATH_PLUGINS . $pluginName;
+    $pluginOutDirectory = PATH_OUTTRUNK . 'plugins' . PATH_SEP . $pluginName;
+    $pluginHome = PATH_OUTTRUNK . 'plugins' . PATH_SEP . $pluginName . PATH_SEP . $pluginName;
 
-  //verify if plugin exists, and then ask for overwrite
-  $pluginClassFilename = PATH_PLUGINS . $pluginName . PATH_SEP . 'class.' . $pluginName . '.php';
-  if( is_file($pluginClassFilename) ) {
-    printf("The plugin %s exists in this file %s \n", pakeColor::colorize($pluginName, 'ERROR'), pakeColor::colorize($pluginClassFilename, 'INFO'));
-    $overwrite = strtolower(prompt('Do you want to create a new plugin? [Y/n]'));
-    if( $overwrite == 'n' )
-      die();
-  }
+    //verify if plugin exists, and then ask for overwrite
+    $pluginClassFilename = PATH_PLUGINS . $pluginName . PATH_SEP . 'class.' . $pluginName . '.php';
+    if (is_file($pluginClassFilename)) {
+        printf("The plugin %s exists in this file %s \n", pakeColor::colorize($pluginName, 'ERROR'), pakeColor::colorize($pluginClassFilename, 'INFO'));
+        $overwrite = strtolower(prompt('Do you want to create a new plugin? [Y/n]'));
+        if ($overwrite == 'n') {
+            die();
+        }
+    }
 
-  printf("creating plugin directory %s \n", pakeColor::colorize($pluginOutDirectory, 'INFO'));
+    printf("creating plugin directory %s \n", pakeColor::colorize($pluginOutDirectory, 'INFO'));
 
-  G::verifyPath($pluginOutDirectory, true);
-  G::verifyPath($pluginHome . PATH_SEP . 'classes', true);
-  G::verifyPath($pluginHome . PATH_SEP . 'public_html', true);
-  G::verifyPath($pluginHome . PATH_SEP . 'config', true);
-  G::verifyPath($pluginHome . PATH_SEP . 'data', true);
+    G::verifyPath($pluginOutDirectory, true);
+    G::verifyPath($pluginHome . PATH_SEP . 'classes', true);
+    G::verifyPath($pluginHome . PATH_SEP . 'public_html', true);
+    G::verifyPath($pluginHome . PATH_SEP . 'config', true);
+    G::verifyPath($pluginHome . PATH_SEP . 'data', true);
 
-  //config
-  savePluginFile($pluginName . PATH_SEP . "setup.xml", "pluginSetup.xml", $pluginName, $pluginName);
-  savePluginFile($pluginName . PATH_SEP . "messageShow.xml", "pluginMessageShow.xml", $pluginName, $pluginName);
-  savePluginFile($pluginName . PATH_SEP . 'config' . PATH_SEP . 'schema.xml', 'pluginSchema.xml', $pluginName, $pluginName);
-  savePluginFile($pluginName . PATH_SEP . 'config' . PATH_SEP . 'propel.ini', 'pluginPropel.ini', $pluginName, $pluginName);
-  savePluginFile($pluginName . PATH_SEP . 'config' . PATH_SEP . 'propel.mysql.ini', 'pluginPropel.mysql.ini', $pluginName, $pluginName);
+    //config
+    savePluginFile($pluginName . PATH_SEP . "setup.xml", "pluginSetup.xml", $pluginName, $pluginName);
+    savePluginFile($pluginName . PATH_SEP . "messageShow.xml", "pluginMessageShow.xml", $pluginName, $pluginName);
+    savePluginFile($pluginName . PATH_SEP . 'config' . PATH_SEP . 'schema.xml', 'pluginSchema.xml', $pluginName, $pluginName);
+    savePluginFile($pluginName . PATH_SEP . 'config' . PATH_SEP . 'propel.ini', 'pluginPropel.ini', $pluginName, $pluginName);
+    savePluginFile($pluginName . PATH_SEP . 'config' . PATH_SEP . 'propel.mysql.ini', 'pluginPropel.mysql.ini', $pluginName, $pluginName);
 
-  //create a logo to use instead the Workspace logo
-  $changeLogo = strtolower(prompt('Change system logo [y/N]'));
+    //create a logo to use instead the Workspace logo
+    $changeLogo = strtolower(prompt('Change system logo [y/N]'));
 
-  $fields = array ();
-  $fields['phpClassName'] = $pluginName;
-  if( $changeLogo == 'y' ) {
-    $filePng = $pluginHome . PATH_SEP . 'public_html' . PATH_SEP . $pluginName . '.png';
-    createPngLogo($filePng, $pluginName);
-    $fields['changeLogo'][] = array (
+    $fields = array();
+    $fields['phpClassName'] = $pluginName;
+    if ($changeLogo == 'y') {
+        $filePng = $pluginHome . PATH_SEP . 'public_html' . PATH_SEP . $pluginName . '.png';
+        createPngLogo($filePng, $pluginName);
+        $fields['changeLogo'][] = array(
       'className' => $pluginName
     );
-  }
+    }
 
-  //Menu
-  $menu = strtolower(prompt('Create an example Page [Y/n]'));
-  $swMenu = 0;
+    //Menu
+    $menu = strtolower(prompt('Create an example Page [Y/n]'));
+    $swMenu = 0;
 
-  if( $menu == 'y' ) {
-    $fields['menu'][] = array (
+    if ($menu == 'y') {
+        $fields['menu'][] = array(
       'className' => $pluginName
     );
 
-    savePluginFile($pluginName . PATH_SEP . 'menu' . $pluginName . '.php', 'pluginMenu', $pluginName, $pluginName, $fields, true);
+        savePluginFile($pluginName . PATH_SEP . 'menu' . $pluginName . '.php', 'pluginMenu', $pluginName, $pluginName, $fields, true);
 
-    savePluginFile($pluginName . PATH_SEP . $pluginName . "Application.php",     "pluginApplication.php", $pluginName, $pluginName, null, true);
-    savePluginFile($pluginName . PATH_SEP . $pluginName . "Application.html",    "pluginApplication.html", $pluginName, $pluginName, null, true);
-    savePluginFile($pluginName . PATH_SEP . $pluginName . "Application.js",      "pluginApplication.js", $pluginName, $pluginName, null, true);
-    savePluginFile($pluginName . PATH_SEP . $pluginName . "ApplicationAjax.php", "pluginApplicationAjax.php", $pluginName, $pluginName);
+        savePluginFile($pluginName . PATH_SEP . $pluginName . "Application.php", "pluginApplication.php", $pluginName, $pluginName, null, true);
+        savePluginFile($pluginName . PATH_SEP . $pluginName . "Application.html", "pluginApplication.html", $pluginName, $pluginName, null, true);
+        savePluginFile($pluginName . PATH_SEP . $pluginName . "Application.js", "pluginApplication.js", $pluginName, $pluginName, null, true);
+        savePluginFile($pluginName . PATH_SEP . $pluginName . "ApplicationAjax.php", "pluginApplicationAjax.php", $pluginName, $pluginName);
 
-    $swMenu = 1;
-  }
+        $swMenu = 1;
+    }
 
-  //Menu cases
-  $menuCases = strtolower(prompt("Create new option in the menu of cases [Y/n]"));
+    //Menu cases
+    $menuCases = strtolower(prompt("Create new option in the menu of cases [Y/n]"));
 
-  if($menuCases == "y") {
-    $fields["menuCases"][] = array (
+    if ($menuCases == "y") {
+        $fields["menuCases"][] = array(
       "className" => $pluginName
     );
 
-    savePluginFile($pluginName . PATH_SEP . "menuCases" . $pluginName . ".php", "pluginMenuCases", $pluginName, $pluginName, $fields, true);
+        savePluginFile($pluginName . PATH_SEP . "menuCases" . $pluginName . ".php", "pluginMenuCases", $pluginName, $pluginName, $fields, true);
 
-    if ($swMenu == 0) {
-      savePluginFile($pluginName . PATH_SEP . $pluginName . "Application.php",     "pluginApplication.php", $pluginName, $pluginName, null, true);
-      savePluginFile($pluginName . PATH_SEP . $pluginName . "Application.html",    "pluginApplication.html", $pluginName, $pluginName, null, true);
-      savePluginFile($pluginName . PATH_SEP . $pluginName . "Application.js",      "pluginApplication.js", $pluginName, $pluginName, null, true);
-      savePluginFile($pluginName . PATH_SEP . $pluginName . "ApplicationAjax.php", "pluginApplicationAjax.php", $pluginName, $pluginName, null, true);
+        if ($swMenu == 0) {
+            savePluginFile($pluginName . PATH_SEP . $pluginName . "Application.php", "pluginApplication.php", $pluginName, $pluginName, null, true);
+            savePluginFile($pluginName . PATH_SEP . $pluginName . "Application.html", "pluginApplication.html", $pluginName, $pluginName, null, true);
+            savePluginFile($pluginName . PATH_SEP . $pluginName . "Application.js", "pluginApplication.js", $pluginName, $pluginName, null, true);
+            savePluginFile($pluginName . PATH_SEP . $pluginName . "ApplicationAjax.php", "pluginApplicationAjax.php", $pluginName, $pluginName, null, true);
+        }
+
+        savePluginFile($pluginName . PATH_SEP . $pluginName . "Application2.php", "pluginApplication2.php", $pluginName, $pluginName, null, true);
+        savePluginFile($pluginName . PATH_SEP . $pluginName . "Application2.html", "pluginApplication2.html", $pluginName, $pluginName, null, true);
+        savePluginFile($pluginName . PATH_SEP . $pluginName . "Application2.js", "pluginApplication2.js", $pluginName, $pluginName, null, true);
+
+        savePluginFile($pluginName . PATH_SEP . $pluginName . "Application3.php", "pluginApplication3.php", $pluginName, $pluginName, null, true);
+        savePluginFile($pluginName . PATH_SEP . $pluginName . "Application3.html", "pluginApplication3.html", $pluginName, $pluginName, null, true);
+        savePluginFile($pluginName . PATH_SEP . $pluginName . "Application3.js", "pluginApplication3.js", $pluginName, $pluginName, null, true);
     }
 
-    savePluginFile($pluginName . PATH_SEP . $pluginName . "Application2.php",     "pluginApplication2.php", $pluginName, $pluginName, null, true);
-    savePluginFile($pluginName . PATH_SEP . $pluginName . "Application2.html",    "pluginApplication2.html", $pluginName, $pluginName, null, true);
-    savePluginFile($pluginName . PATH_SEP . $pluginName . "Application2.js",      "pluginApplication2.js", $pluginName, $pluginName, null, true);
+    //RBAC features
+    $classNameUpperCase = strtoupper($pluginName);
+    //Create a new Permission a new role
+    $newPermission = strtolower(prompt("Create the Role 'PROCESSMAKER_$classNameUpperCase' and \n       the Permission 'PM_$classNameUpperCase' [y/N]"));
+    $swRole = 0;
 
-    savePluginFile($pluginName . PATH_SEP . $pluginName . "Application3.php",     "pluginApplication3.php", $pluginName, $pluginName, null, true);
-    savePluginFile($pluginName . PATH_SEP . $pluginName . "Application3.html",    "pluginApplication3.html", $pluginName, $pluginName, null, true);
-    savePluginFile($pluginName . PATH_SEP . $pluginName . "Application3.js",      "pluginApplication3.js", $pluginName, $pluginName, null, true);
-  }
-
-  //RBAC features
-  $classNameUpperCase = strtoupper($pluginName);
-  //Create a new Permission a new role
-  $newPermission = strtolower(prompt("Create the Role 'PROCESSMAKER_$classNameUpperCase' and \n       the Permission 'PM_$classNameUpperCase' [y/N]"));
-  $swRole = 0;
-
-  if( $newPermission == 'y' ) {
-    $fields['createPermission'][] = array (
+    if ($newPermission == 'y') {
+        $fields['createPermission'][] = array(
       'className' => $classNameUpperCase
     );
 
-    $swRole = 1;
-  }
+        $swRole = 1;
+    }
 
-  //Redirect
-  if ($swRole == 1) {
-    $redirect = strtolower(prompt("Create a Redirect Login for the Role 'PROCESSMAKER_$classNameUpperCase' [y/N]"));
-    if( $redirect == 'y' ) {
-      $fields['redirectLogin'][] = array (
+    //Redirect
+    if ($swRole == 1) {
+        $redirect = strtolower(prompt("Create a Redirect Login for the Role 'PROCESSMAKER_$classNameUpperCase' [y/N]"));
+        if ($redirect == 'y') {
+            $fields['redirectLogin'][] = array(
         'className' => $classNameUpperCase
       );
+        }
     }
-  }
 
-  //External step
-  $externalStep = strtolower(prompt('Create external step for Processmaker [y/N]'));
-  if( $externalStep == 'y' ) {
-    $fields['externalStep'][] = array (
+    //External step
+    $externalStep = strtolower(prompt('Create external step for Processmaker [y/N]'));
+    if ($externalStep == 'y') {
+        $fields['externalStep'][] = array(
       'className' => $pluginName,
       'GUID' => G::generateUniqueID()
     );
 
-    savePluginFile($pluginName . PATH_SEP . "step" . $pluginName . "Application.php",     "pluginStepApplication.php",     $pluginName, $pluginName, null, true);
-    savePluginFile($pluginName . PATH_SEP . "step" . $pluginName . "Application.html",    "pluginStepApplication.html",    $pluginName, $pluginName, null, true);
-    savePluginFile($pluginName . PATH_SEP . "step" . $pluginName . "Application.js",      "pluginStepApplication.js",      $pluginName, $pluginName, null, true);
-    savePluginFile($pluginName . PATH_SEP . "step" . $pluginName . "ApplicationAjax.php", "pluginStepApplicationAjax.php", $pluginName, $pluginName, null, true);
-  }
+        savePluginFile($pluginName . PATH_SEP . "step" . $pluginName . "Application.php", "pluginStepApplication.php", $pluginName, $pluginName, null, true);
+        savePluginFile($pluginName . PATH_SEP . "step" . $pluginName . "Application.html", "pluginStepApplication.html", $pluginName, $pluginName, null, true);
+        savePluginFile($pluginName . PATH_SEP . "step" . $pluginName . "Application.js", "pluginStepApplication.js", $pluginName, $pluginName, null, true);
+        savePluginFile($pluginName . PATH_SEP . "step" . $pluginName . "ApplicationAjax.php", "pluginStepApplicationAjax.php", $pluginName, $pluginName, null, true);
+    }
 
-  //Dashboards
-  $dashboard = strtolower(prompt("Create an element for the Processmaker Dashboards [y/N]"));
-  if ($dashboard == "y") {
-    $fields["dashboard"][] = array(
+    //Dashboards
+    $dashboard = strtolower(prompt("Create an element for the Processmaker Dashboards [y/N]"));
+    if ($dashboard == "y") {
+        $fields["dashboard"][] = array(
       "className" => $pluginName
     );
 
-    $fields["dashboardAttribute"] = "private \$dashletsUids;";
-    $fields["dashboardAttributeValue"] = "
+        $fields["dashboardAttribute"] = "private \$dashletsUids;";
+        $fields["dashboardAttributeValue"] = "
     \$this->dashletsUids = array(
       array(\"DAS_UID\" => \"". G::GenerateUniqueId() ."\",
             \"DAS_CLASS\" => \"dashlet" . $pluginName . "\",
@@ -706,197 +728,199 @@ function run_new_plugin($task, $args) {
             \"DAS_UPDATE_DATE\" => date(\"Y-m-d\"))
     );
     ";
-    $fields["dashboardSetup"]   = "\$this->registerDashlets();";
-    $fields["dashboardEnable"]  = "\$this->dashletInsert();";
-    $fields["dashboardDisable"] = "\$this->dashletDelete();";
+        $fields["dashboardSetup"]   = "\$this->registerDashlets();";
+        $fields["dashboardEnable"]  = "\$this->dashletInsert();";
+        $fields["dashboardDisable"] = "\$this->dashletDelete();";
 
-    G::verifyPath($pluginHome . PATH_SEP . "views", true);
+        G::verifyPath($pluginHome . PATH_SEP . "views", true);
 
-    savePluginFile($pluginName . PATH_SEP . "classes" . PATH_SEP . "class.dashlet". $pluginName . ".php", "pluginDashletClass.php", $pluginName, $pluginName);
-    copyPluginFile("pluginDashlet.html", $pluginName . PATH_SEP . "views" . PATH_SEP . "dashlet". $pluginName . ".html", $pluginName, null, true);
-  }
+        savePluginFile($pluginName . PATH_SEP . "classes" . PATH_SEP . "class.dashlet". $pluginName . ".php", "pluginDashletClass.php", $pluginName, $pluginName);
+        copyPluginFile("pluginDashlet.html", $pluginName . PATH_SEP . "views" . PATH_SEP . "dashlet". $pluginName . ".html", $pluginName, null, true);
+    }
 
-  //$report = strtolower(prompt('Create a Report for Processmaker [y/N]'));
-  //if( $report == 'y' ) {
-  //  $fields['report'][] = array (
-  //    'className' => $pluginName
-  //  );
-  //  savePluginFile($pluginName . PATH_SEP . 'report.xml', 'pluginReport.xml', $pluginName, $pluginName, $fields);
-  //}
+    //$report = strtolower(prompt('Create a Report for Processmaker [y/N]'));
+    //if( $report == 'y' ) {
+    //  $fields['report'][] = array (
+    //    'className' => $pluginName
+    //  );
+    //  savePluginFile($pluginName . PATH_SEP . 'report.xml', 'pluginReport.xml', $pluginName, $pluginName, $fields);
+    //}
 
-  $report = strtolower(prompt('Create a PmFunction Class for extending Processmaker [y/N]'));
-  if( $report == 'y' ) {
-    $fields['PmFunction'][] = array (
+    $report = strtolower(prompt('Create a PmFunction Class for extending Processmaker [y/N]'));
+    if ($report == 'y') {
+        $fields['PmFunction'][] = array(
       'className' => $pluginName
     );
-    savePluginFile($pluginName . PATH_SEP . 'classes' . PATH_SEP . 'class.pmFunctions.php', 'class.pmFunctions.php', $pluginName, $pluginName, $fields);
-  }
+        savePluginFile($pluginName . PATH_SEP . 'classes' . PATH_SEP . 'class.pmFunctions.php', 'class.pmFunctions.php', $pluginName, $pluginName, $fields);
+    }
 
-  //main php file
-  savePluginFile($pluginName . '.php', 'pluginMainFile', $pluginName, $pluginName, $fields);
-  savePluginFile($pluginName . PATH_SEP . 'class.' . $pluginName . '.php', 'pluginClass', $pluginName, $pluginName, $fields);
+    //main php file
+    savePluginFile($pluginName . '.php', 'pluginMainFile', $pluginName, $pluginName, $fields);
+    savePluginFile($pluginName . PATH_SEP . 'class.' . $pluginName . '.php', 'pluginClass', $pluginName, $pluginName, $fields);
 
-  if( ! PHP_OS == "WINNT" ) {
-    printf("creating symlinks %s \n", pakeColor::colorize($pluginDirectory, 'INFO'));
-    symlink($pluginOutDirectory . PATH_SEP . $pluginName . '.php', PATH_PLUGINS . $pluginName . '.php');
-    symlink($pluginOutDirectory . PATH_SEP . $pluginName, $pluginDirectory);
-  }
+    if (! PHP_OS == "WINNT") {
+        printf("creating symlinks %s \n", pakeColor::colorize($pluginDirectory, 'INFO'));
+        symlink($pluginOutDirectory . PATH_SEP . $pluginName . '.php', PATH_PLUGINS . $pluginName . '.php');
+        symlink($pluginOutDirectory . PATH_SEP . $pluginName, $pluginDirectory);
+    }
 
-  exit(0);
+    exit(0);
 }
 
-function run_create_poedit_file($task, $args) {
-  // the environment for poedit always is Development
-  define('G_ENVIRONMENT', G_DEV_ENV);
+function run_create_poedit_file($task, $args)
+{
+    // the environment for poedit always is Development
+    define('G_ENVIRONMENT', G_DEV_ENV);
 
-  //the output language .po file
-  $lgOutId = isset($args[0]) ? $args[0] : 'en';
-  $countryOutId = isset($args[1]) ? strtoupper($args[1]) : 'US';
-  $verboseFlag = isset($args[2]) ? $args[2] == true : false;
+    //the output language .po file
+    $lgOutId = isset($args[0]) ? $args[0] : 'en';
+    $countryOutId = isset($args[1]) ? strtoupper($args[1]) : 'US';
+    $verboseFlag = isset($args[2]) ? $args[2] == true : false;
 
 
 
 
 
 
-  Propel::init(PATH_CORE . "config/databases.php");
-  $configuration = Propel::getConfiguration();
-  $connectionDSN = $configuration['datasources']['propel']['connection'];
-  printf("using DSN Connection %s \n", pakeColor::colorize($connectionDSN, 'INFO'));
+    Propel::init(PATH_CORE . "config/databases.php");
+    $configuration = Propel::getConfiguration();
+    $connectionDSN = $configuration['datasources']['propel']['connection'];
+    printf("using DSN Connection %s \n", pakeColor::colorize($connectionDSN, 'INFO'));
 
-  printf("checking Language table \n");
-  $c = new Criteria();
-  $c->add(LanguagePeer::LAN_ENABLED, "1");
-  $c->addor(LanguagePeer::LAN_ENABLED, "0");
+    printf("checking Language table \n");
+    $c = new Criteria();
+    $c->add(LanguagePeer::LAN_ENABLED, "1");
+    $c->addor(LanguagePeer::LAN_ENABLED, "0");
 
-  $languages = LanguagePeer::doSelect($c);
-  $langs = array ();
-  $lgIndex = 0;
-  $findLang = false;
-  $langDir = 'english';
-  $langId = 'en';
-  foreach( $languages as $rowid => $row ) {
-    $lgIndex ++;
-    $langs[$row->getLanId()] = $row->getLanName();
-    if( $lgOutId != '' && $lgOutId == $row->getLanId() ) {
-      $findLang = true;
-      $langDir = strtolower($row->getLanName());
-      $langId = $row->getLanId();
+    $languages = LanguagePeer::doSelect($c);
+    $langs = array();
+    $lgIndex = 0;
+    $findLang = false;
+    $langDir = 'english';
+    $langId = 'en';
+    foreach ($languages as $rowid => $row) {
+        $lgIndex ++;
+        $langs[$row->getLanId()] = $row->getLanName();
+        if ($lgOutId != '' && $lgOutId == $row->getLanId()) {
+            $findLang = true;
+            $langDir = strtolower($row->getLanName());
+            $langId = $row->getLanId();
+        }
     }
-  }
-  printf("read %s entries from language table\n", pakeColor::colorize($lgIndex, 'INFO'));
+    printf("read %s entries from language table\n", pakeColor::colorize($lgIndex, 'INFO'));
 
-  printf("checking iso_country table \n");
-  $c = new Criteria();
-  $c->add(IsoCountryPeer::IC_UID, NULL, Criteria::ISNOTNULL);
+    printf("checking iso_country table \n");
+    $c = new Criteria();
+    $c->add(IsoCountryPeer::IC_UID, null, Criteria::ISNOTNULL);
 
-  $countries = IsoCountryPeer::doSelect($c);
-  $countryIndex = 0;
-  $findCountry = false;
-  $countryDir = 'UNITED STATES';
-  $countryId = 'US';
-  foreach( $countries as $rowid => $row ) {
-    $countryIndex ++;
-    if( $countryOutId != '' && $countryOutId == $row->getICUid() ) {
-      $findCountry = true;
-      $countryDir = strtoupper($row->getICName());
-      $countryId = $row->getICUid();
+    $countries = IsoCountryPeer::doSelect($c);
+    $countryIndex = 0;
+    $findCountry = false;
+    $countryDir = 'UNITED STATES';
+    $countryId = 'US';
+    foreach ($countries as $rowid => $row) {
+        $countryIndex ++;
+        if ($countryOutId != '' && $countryOutId == $row->getICUid()) {
+            $findCountry = true;
+            $countryDir = strtoupper($row->getICName());
+            $countryId = $row->getICUid();
+        }
     }
-  }
-  printf("read %s entries from iso_country table\n", pakeColor::colorize($countryIndex, 'INFO'));
+    printf("read %s entries from iso_country table\n", pakeColor::colorize($countryIndex, 'INFO'));
 
-  if( $findLang == false && $lgOutId != '' ) {
-    printf("%s \n", pakeColor::colorize("'$lgOutId' is not a valid language ", 'ERROR'));
-    die();
-  } else {
-    printf("language: %s\n", pakeColor::colorize($langDir, 'INFO'));
-  }
-
-  if( $findCountry == false && $countryOutId != '' ) {
-    printf("%s \n", pakeColor::colorize("'$countryOutId' is not a valid country ", 'ERROR'));
-    die();
-  } else {
-    printf("country: [%s] %s\n", pakeColor::colorize($countryId, 'INFO'), pakeColor::colorize($countryDir, 'INFO'));
-  }
-
-  if( $findCountry && $countryId != '' )
-    $poeditOutFile = PATH_CORE . 'content' . PATH_SEP . 'translations' . PATH_SEP . $langDir . PATH_SEP . MAIN_POFILE . '.' . $langId . '_' . $countryId . '.po';
-  else
-    $poeditOutFile = PATH_CORE . 'content' . PATH_SEP . 'translations' . PATH_SEP . $langDir . PATH_SEP . MAIN_POFILE . '.' . $langId . '.po';
-
-  printf("poedit file: %s\n", pakeColor::colorize($poeditOutFile, 'INFO'));
-
-  $poeditOutPathInfo = pathinfo($poeditOutFile);
-  G::verifyPath($poeditOutPathInfo['dirname'], true);
-  $lf = "\n";
-  $fp = fopen($poeditOutFile, 'w');
-  fprintf($fp, "msgid \"\" \n");
-  fprintf($fp, "msgstr \"\" \n");
-  fprintf($fp, "\"Project-Id-Version: %s\\n\"\n", PO_SYSTEM_VERSION);
-  fprintf($fp, "\"POT-Creation-Date: \\n\"\n");
-  fprintf($fp, "\"PO-Revision-Date: %s \\n\"\n", date('Y-m-d H:i+0100'));
-  fprintf($fp, "\"Last-Translator: Fernando Ontiveros<fernando@colosa.com>\\n\"\n");
-  fprintf($fp, "\"Language-Team: Colosa Developers Team <developers@colosa.com>\\n\"\n");
-  fprintf($fp, "\"MIME-Version: 1.0 \\n\"\n");
-  fprintf($fp, "\"Content-Type: text/plain; charset=utf-8 \\n\"\n");
-  fprintf($fp, "\"Content-Transfer_Encoding: 8bit\\n\"\n");
-  fprintf($fp, "\"X-Poedit-Language: %s\\n\"\n", ucwords($langDir));
-  fprintf($fp, "\"X-Poedit-Country: %s\\n\"\n", $countryDir);
-  fprintf($fp, "\"X-Poedit-SourceCharset: utf-8\\n\"\n");
-
-  printf("checking translation table\n");
-
-  $c = new Criteria();
-  $c->add(TranslationPeer::TRN_LANG, "en");
-
-  $translation = TranslationPeer::doSelect($c);
-  $trIndex = 0;
-  $trError = 0;
-  $langIdOut = $langId; //the output language, later we'll include the country too.
-
-
-  $arrayLabels = array ();
-  foreach( $translation as $rowid => $row ) {
-    $keyid = 'TRANSLATION/' . $row->getTrnCategory() . '/' . $row->getTrnId();
-    if( trim($row->getTrnValue()) == '' ) {
-      printf("warning the key %s is empty.\n", pakeColor::colorize($keyid, 'ERROR'));
-      $trError ++;
+    if ($findLang == false && $lgOutId != '') {
+        printf("%s \n", pakeColor::colorize("'$lgOutId' is not a valid language ", 'ERROR'));
+        die();
     } else {
-      $trans = TranslationPeer::retrieveByPK($row->getTrnCategory(), $row->getTrnId(), $langIdOut);
-      if( is_null($trans) ) {
-        $msgStr = $row->getTrnValue();
-      } else {
-        $msgStr = $trans->getTrnValue();
-      }
-
-      $msgid = $row->getTrnValue();
-      if( in_array($msgid, $arrayLabels) ) {
-        $newMsgid = '[' . $row->getTrnCategory() . '/' . $row->getTrnId() . '] ' . $msgid;
-        printf("duplicated key %s is renamed to %s.\n", pakeColor::colorize($msgid, 'ERROR'), pakeColor::colorize($newMsgid, 'INFO'));
-        $trError ++;
-        $msgid = $newMsgid;
-      }
-
-      $arrayLabels[] = $msgid;
-      sort($arrayLabels);
-
-      $trIndex ++;
-      fprintf($fp, "\n");
-      fprintf($fp, "#: %s \n", $keyid);
-      //fprintf ( $fp, "#, php-format \n" );
-      fprintf($fp, "# %s \n", strip_quotes($keyid));
-      fprintf($fp, "msgid \"%s\" \n", strip_quotes($msgid));
-      fprintf($fp, "msgstr \"%s\" \n", strip_quotes($msgStr));
+        printf("language: %s\n", pakeColor::colorize($langDir, 'INFO'));
     }
-  }
 
-  printf("checking xmlform\n");
-  printf("using directory %s \n", pakeColor::colorize(PATH_XMLFORM, 'INFO'));
+    if ($findCountry == false && $countryOutId != '') {
+        printf("%s \n", pakeColor::colorize("'$countryOutId' is not a valid country ", 'ERROR'));
+        die();
+    } else {
+        printf("country: [%s] %s\n", pakeColor::colorize($countryId, 'INFO'), pakeColor::colorize($countryDir, 'INFO'));
+    }
 
-  $filter = new InputFilter();
+    if ($findCountry && $countryId != '') {
+        $poeditOutFile = PATH_CORE . 'content' . PATH_SEP . 'translations' . PATH_SEP . $langDir . PATH_SEP . MAIN_POFILE . '.' . $langId . '_' . $countryId . '.po';
+    } else {
+        $poeditOutFile = PATH_CORE . 'content' . PATH_SEP . 'translations' . PATH_SEP . $langDir . PATH_SEP . MAIN_POFILE . '.' . $langId . '.po';
+    }
 
-  $langIdOut = $langId; //the output language, later we'll include the country too.
-  $exceptionFields = array (
+    printf("poedit file: %s\n", pakeColor::colorize($poeditOutFile, 'INFO'));
+
+    $poeditOutPathInfo = pathinfo($poeditOutFile);
+    G::verifyPath($poeditOutPathInfo['dirname'], true);
+    $lf = "\n";
+    $fp = fopen($poeditOutFile, 'w');
+    fprintf($fp, "msgid \"\" \n");
+    fprintf($fp, "msgstr \"\" \n");
+    fprintf($fp, "\"Project-Id-Version: %s\\n\"\n", PO_SYSTEM_VERSION);
+    fprintf($fp, "\"POT-Creation-Date: \\n\"\n");
+    fprintf($fp, "\"PO-Revision-Date: %s \\n\"\n", date('Y-m-d H:i+0100'));
+    fprintf($fp, "\"Last-Translator: Fernando Ontiveros<fernando@colosa.com>\\n\"\n");
+    fprintf($fp, "\"Language-Team: Colosa Developers Team <developers@colosa.com>\\n\"\n");
+    fprintf($fp, "\"MIME-Version: 1.0 \\n\"\n");
+    fprintf($fp, "\"Content-Type: text/plain; charset=utf-8 \\n\"\n");
+    fprintf($fp, "\"Content-Transfer_Encoding: 8bit\\n\"\n");
+    fprintf($fp, "\"X-Poedit-Language: %s\\n\"\n", ucwords($langDir));
+    fprintf($fp, "\"X-Poedit-Country: %s\\n\"\n", $countryDir);
+    fprintf($fp, "\"X-Poedit-SourceCharset: utf-8\\n\"\n");
+
+    printf("checking translation table\n");
+
+    $c = new Criteria();
+    $c->add(TranslationPeer::TRN_LANG, "en");
+
+    $translation = TranslationPeer::doSelect($c);
+    $trIndex = 0;
+    $trError = 0;
+    $langIdOut = $langId; //the output language, later we'll include the country too.
+
+
+    $arrayLabels = array();
+    foreach ($translation as $rowid => $row) {
+        $keyid = 'TRANSLATION/' . $row->getTrnCategory() . '/' . $row->getTrnId();
+        if (trim($row->getTrnValue()) == '') {
+            printf("warning the key %s is empty.\n", pakeColor::colorize($keyid, 'ERROR'));
+            $trError ++;
+        } else {
+            $trans = TranslationPeer::retrieveByPK($row->getTrnCategory(), $row->getTrnId(), $langIdOut);
+            if (is_null($trans)) {
+                $msgStr = $row->getTrnValue();
+            } else {
+                $msgStr = $trans->getTrnValue();
+            }
+
+            $msgid = $row->getTrnValue();
+            if (in_array($msgid, $arrayLabels)) {
+                $newMsgid = '[' . $row->getTrnCategory() . '/' . $row->getTrnId() . '] ' . $msgid;
+                printf("duplicated key %s is renamed to %s.\n", pakeColor::colorize($msgid, 'ERROR'), pakeColor::colorize($newMsgid, 'INFO'));
+                $trError ++;
+                $msgid = $newMsgid;
+            }
+
+            $arrayLabels[] = $msgid;
+            sort($arrayLabels);
+
+            $trIndex ++;
+            fprintf($fp, "\n");
+            fprintf($fp, "#: %s \n", $keyid);
+            //fprintf ( $fp, "#, php-format \n" );
+            fprintf($fp, "# %s \n", strip_quotes($keyid));
+            fprintf($fp, "msgid \"%s\" \n", strip_quotes($msgid));
+            fprintf($fp, "msgstr \"%s\" \n", strip_quotes($msgStr));
+        }
+    }
+
+    printf("checking xmlform\n");
+    printf("using directory %s \n", pakeColor::colorize(PATH_XMLFORM, 'INFO'));
+
+    $filter = new InputFilter();
+
+    $langIdOut = $langId; //the output language, later we'll include the country too.
+    $exceptionFields = array(
     'javascript',
     'hidden',
     'phpvariable',
@@ -908,356 +932,374 @@ function run_create_poedit_file($task, $args) {
     'grid'
   );
 
-  $xmlfiles = pakeFinder::type('file')->name('*.xml')->in(PATH_XMLFORM);
-  $xmlIndex = 0;
-  $xmlError = 0;
-  $fieldsIndexTotal = 0;
-  $exceptIndexTotal = 0;
-  foreach( $xmlfiles as $xmlfileComplete ) {
-    $xmlIndex ++;
-    $xmlfile = str_replace(PATH_XMLFORM, '', $xmlfileComplete);
+    $xmlfiles = pakeFinder::type('file')->name('*.xml')->in(PATH_XMLFORM);
+    $xmlIndex = 0;
+    $xmlError = 0;
+    $fieldsIndexTotal = 0;
+    $exceptIndexTotal = 0;
+    foreach ($xmlfiles as $xmlfileComplete) {
+        $xmlIndex ++;
+        $xmlfile = str_replace(PATH_XMLFORM, '', $xmlfileComplete);
 
-    //english version of dynaform
-    $form = new Form($xmlfile, '', 'en');
-    $englishLabel = array ();
-    foreach( $form->fields as $nodeName => $node ) {
-      if( trim($node->label) != '' )
-        $englishLabel[$node->name] = $node->label;
-    }
-    unset($form->fields);
-    unset($form->tree);
-    unset($form);
-
-    //in this second pass, we are getting the target language labels
-    $form = new Form($xmlfile, '', $langIdOut);
-    $fieldsIndex = 0;
-    $exceptIndex = 0;
-    foreach( $form->fields as $nodeName => $node ) {
-      if( is_object($node) && isset($englishLabel[$node->name]) ) {
-        $msgid = trim($englishLabel[$node->name]);
-        $node->label = trim(str_replace(chr(10), '', $node->label));
-      } else
-        $msgid = '';
-      if( trim($msgid) != '' && ! in_array($node->type, $exceptionFields) ) {
-        //$msgid = $englishLabel [ $node->name ];
-        $keyid = $xmlfile . '?' . $node->name;
-        if( in_array($msgid, $arrayLabels) ) {
-          $newMsgid = '[' . $keyid . '] ' . $msgid;
-          if( $verboseFlag )
-            printf("duplicated key %s is renamed to %s.\n", pakeColor::colorize($msgid, 'ERROR'), pakeColor::colorize($newMsgid, 'INFO'));
-          $xmlError ++;
-          $msgid = $newMsgid;
-        }
-
-        $arrayLabels[] = $msgid;
-        sort($arrayLabels);
-
-        $comment1 = $xmlfile;
-        $comment2 = $node->type . ' - ' . $node->name;
-        fprintf($fp, "\n");
-        fprintf($fp, "#: %s \n", $keyid);
-        //        fprintf ( $fp, "#, php-format \n" );
-        fprintf($fp, "# %s \n", strip_quotes($comment1));
-        fprintf($fp, "# %s \n", strip_quotes($comment2));
-        fprintf($fp, "msgid \"%s\" \n", strip_quotes($msgid));
-        fprintf($fp, "msgstr \"%s\" \n", strip_quotes($node->label));
-        //fprintf ( $fp, "msgstr \"%s\" \n",  strip_quotes( utf8_encode( trim($node->label) ) ));
-        $fieldsIndex ++;
-        $fieldsIndexTotal ++;
-      }
-
-      else {
-        $xmlfile = $filter->xssFilterHard($xmlfile);
-        $exceptionFields = $filter->xssFilterHard($exceptionFields);
-        if( is_object($node) && ! in_array($node->type, $exceptionFields) ) {
-          if( isset($node->value) && strpos($node->value, 'G::LoadTranslation') !== false ) {
-            $exceptIndex ++;
-            //print ($node->value);
-          } else {
-            $node->name = $filter->xssFilterHard($node->name);
-            $node->type = $filter->xssFilterHard($node->type);
-            printf("Error: xmlform %s has no english definition for %s [%s]\n", pakeColor::colorize($xmlfile, 'ERROR'), pakeColor::colorize($node->name, 'INFO'), pakeColor::colorize($node->type, 'INFO'));
-            $xmlError ++;
-          }
-        } else {
-          $exceptIndex ++;
-          if( $verboseFlag ){
-            $node->name = $filter->xssFilterHard($node->name);
-            $node->type = $filter->xssFilterHard($node->type);
-            printf("%s %s in %s\n", $node->type, pakeColor::colorize($node->name, 'INFO'), pakeColor::colorize($xmlfile, 'INFO'));
-          }
-        }
-      }
-    }
-    unset($form->fields);
-    unset($form->tree);
-    unset($form);
-    printf("xmlform: %s has %s fields and %s exceptions \n", pakeColor::colorize($xmlfile, 'INFO'), pakeColor::colorize($fieldsIndex, 'INFO'), pakeColor::colorize($exceptIndex, 'INFO'));
-    $exceptIndexTotal += $exceptIndex;
-  }
-
-  fclose($fp);
-  printf("added %s entries from translation table\n", pakeColor::colorize($trIndex, 'INFO'));
-  printf("added %s entries from %s xmlforms  \n", pakeColor::colorize($fieldsIndexTotal, 'INFO'), pakeColor::colorize($xmlIndex, 'INFO'));
-
-  if( $trError > 0 ) {
-    printf("there are %s errors in tranlation table\n", pakeColor::colorize($trError, 'ERROR'));
-  }
-  if( $xmlError > 0 ) {
-    printf("there are %s errors and %s exceptions in xmlforms\n", pakeColor::colorize($xmlError, 'ERROR'), pakeColor::colorize($exceptIndexTotal, 'ERROR'));
-  }
-
-  exit(0);
-
-//to do: leer los html templates
-}
-
-function create_file_from_tpl($tplName, $newFilename, $fields = NULL) {
-  global $pathHome;
-  global $projectName;
-
-  $httpdTpl = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' . PATH_SEP . 'templates' . PATH_SEP . $tplName . '.tpl';
-  if( substr($newFilename, 0, 1) == PATH_SEP )
-    $httpFilename = $newFilename;
-  else
-    $httpFilename = $pathHome . PATH_SEP . $newFilename;
-  $template = new TemplatePower($httpdTpl);
-  $template->prepare();
-  $template->assignGlobal('pathHome', $pathHome);
-  $template->assignGlobal('projectName', $projectName);
-  $template->assignGlobal('rbacProjectName', strtoupper($projectName));
-  $template->assignGlobal('siglaProjectName', substr(strtoupper($projectName), 0, 3));
-  $template->assignGlobal('propel.output.dir', '{propel.output.dir}');
-
-  if( is_array($fields) ) {
-    foreach( $fields as $block => $data ) {
-      $template->gotoBlock("_ROOT");
-      if( is_array($data) )
-        foreach( $data as $rowId => $row ) {
-          $template->newBlock($block);
-          foreach( $row as $key => $val ) {
-            if( is_array($val) ) {
-              //              $template->newBlock( $key );
-              foreach( $val as $key2 => $val2 ) {
-                if( is_array($val2) ) {
-                  $template->newBlock($key);
-                  foreach( $val2 as $key3 => $val3 )
-                    $template->assign($key3, $val3);
-                }
-              }
-            } else
-              $template->assign($key, $val);
-          }
-        }
-      else
-        $template->assign($block, $data);
-    }
-  }
-
-  $content = $template->getOutputContent();
-  $iSize = file_put_contents($httpFilename, $content);
-  printf("saved %s bytes in file %s \n", pakeColor::colorize($iSize, 'INFO'), pakeColor::colorize($tplName, 'INFO'));
-}
-
-function copy_file_from_tpl($tplName, $newFilename) {
-  global $pathHome;
-  global $projectName;
-  $httpdTpl = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' . PATH_SEP . 'templates' . PATH_SEP . $tplName . '.tpl';
-  $httpFilename = $pathHome . PATH_SEP . $newFilename;
-  $content = file_get_contents($httpdTpl);
-  $iSize = file_put_contents($httpFilename, $content);
-  printf("saved %s bytes in file %s \n", pakeColor::colorize($iSize, 'INFO'), pakeColor::colorize($tplName, 'INFO'));
-}
-
-function copy_file($newFilename) {
-  global $pathHome;
-  $httpdTpl = PATH_HOME . $newFilename;
-  $httpFilename = $pathHome . PATH_SEP . $newFilename;
-  $content = file_get_contents($httpdTpl);
-  $iSize = file_put_contents($httpFilename, $content);
-  printf("saved %s bytes in file %s \n", pakeColor::colorize($iSize, 'INFO'), pakeColor::colorize($newFilename, 'INFO'));
-}
-
-function fieldToLabel($field) {
-  $aux = substr($field, 4);
-  $res = $aux[0];
-  for( $i = 1; $i < strlen($aux); $i ++ ) {
-    if( $aux[$i] == '_' ) {
-      $res .= " " . $aux[++ $i];
-    } else
-      $res .= strtolower($aux[$i]);
-  }
-  return $res;
-}
-
-function fieldToLabelOption($field) {
-  $aux = $field;
-  $res = $aux[0];
-  for( $i = 1; $i < strlen($aux); $i ++ ) {
-    if( $aux[$i] == '_' ) {
-      $res .= " " . $aux[++ $i];
-    } else
-      $res .= strtolower($aux[$i]);
-  }
-  return $res;
-}
-function run_propel_build_crud($task, $args) {
-  ini_set('display_errors', 'on');
-  ini_set('error_reporting', E_ERROR);
-
-  // the environment for poedit always is Development
-  define('G_ENVIRONMENT', G_DEV_ENV);
-
-  printf("Arguments: %s\n", pakeColor::colorize('./gulliver propel-build-crud <class-name> <table-name> <plugin-name> ', 'INFO'));
-
-  //the class filename in the first argument
-  if( ! isset($args[0]) ) {
-    printf("Error: %s\n", pakeColor::colorize('you must specify a valid classname ', 'ERROR'));
-    exit(0);
-  }
-  $class = $args[0];
-  $phpClass = $class;
-  $phpClass[0] = strtolower($phpClass[0]);
-
-  $tableName = $class[0];
-  for( $i = 1; $i < strlen($class); $i ++ ) {
-    if( $class[$i] >= 'a' )
-      $tableName .= strtoupper($class[$i]);
-    else
-      $tableName .= "_" . $class[$i];
-  }
-
-  //second parameter is the table name, by default is the same classname in uppercase.
-  if( isset($args[1]) )
-    $tableName = $args[1];
-
-  $pluginName = '';
-  if( isset($args[2]) )
-    $pluginName = $args[2];
-
-  //try to find the class in classes directory
-  $classFilename = PATH_CORE . 'classes' . PATH_SEP . 'model' . PATH_SEP . $args[0] . '.php';
-
-  //try to find in the plugis directory, assuming there are a class in the plugin
-  if( $pluginName != '' ) {
-    $classFilename = PATH_PLUGINS . $pluginName . PATH_SEP . 'classes' . PATH_SEP . 'model' . PATH_SEP . $args[0] . '.php';
-    set_include_path(PATH_PLUGINS . $pluginName . PATH_SEPARATOR . get_include_path());
-    printf("using plugin : %s\n", pakeColor::colorize($pluginName, 'ERROR'));
-  }
-
-  if( file_exists($classFilename) )
-    printf("class found in %s \n", pakeColor::colorize($classFilename, 'INFO'));
-  else {
-    printf("class %s not found \n", pakeColor::colorize($class, 'ERROR'));
-    exit(0);
-  }
-  printf("TableName : %s \n", pakeColor::colorize($tableName, 'INFO'));
-
-  require_once ($classFilename);
-
-  global $G_ENVIRONMENTS;
-  $aux = explode(PATH_SEP, PATH_HOME);
-  $projectName = $aux[count($aux) - 2];
-  define('PATH_SHARED', PATH_SEP . 'shared' . PATH_SEP . $projectName . '_data' . PATH_SEP);
-
-  $dbFile = PATH_SHARED . 'sites' . PATH_SEP . $projectName . PATH_SEP . 'db.php';
-  if( ! file_exists($dbFile) ) {
-    $dbFile = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' . PATH_SEP . 'templates' . PATH_SEP . 'db.php.tpl';
-  }
-  printf("searching db file in : %s \n", pakeColor::colorize($dbFile, 'INFO'));
-
-  $G_ENVIRONMENTS['DEVELOPMENT']['dbfile'] = $dbFile;
-  Propel::init(PATH_CORE . "config/databases.php");
-
-  $configuration = Propel::getConfiguration();
-  $connectionDSN = $configuration['datasources']['workflow']['connection'];
-  printf("using DSN Connection %s \n", pakeColor::colorize($connectionDSN, 'INFO'));
-
-  if( $pluginName != '' ) {
-    $xmlformPath = PATH_PLUGINS . $pluginName . PATH_SEP;
-    $methodsPath = PATH_PLUGINS . $pluginName . PATH_SEP . $phpClass . PATH_SEP;
-    $corePath = PATH_PLUGINS . $pluginName . PATH_SEP;
-  } else {
-    $xmlformPath = PATH_CORE . 'xmlform' . PATH_SEP . $phpClass . PATH_SEP;
-    $methodsPath = PATH_CORE . 'methods' . PATH_SEP . $phpClass . PATH_SEP;
-    $corePath = PATH_CORE;
-  }
-  G::mk_dir($xmlformPath);
-  G::mk_dir($methodsPath);
-
-  $fields['className'] = $class;
-  $fields['phpClassName'] = $phpClass;
-  $fields['tableName'] = $tableName;
-  $fields['projectName'] = $projectName;
-
-  //1. MENU
-  if( $pluginName == '' ) {
-    create_file_from_tpl('pluginMenu', PATH_CORE . 'menus' . PATH_SEP . $phpClass . ".php", $fields);
-  }
-  //else {
-  //  create_file_from_tpl ( 'pluginMenu',  $corePath. $phpClass. ".php", $fields );
-  //}
-
-
-  //2. si existe menu welcome, aqade la opcion
-  if( $pluginName == '' ) {
-    if( ! file_exists(PATH_CORE . 'menus' . PATH_SEP . "welcome.php") ) {
-      $fp = fopen(PATH_CORE . 'menus' . PATH_SEP . "welcome.php", "w");
-      fwrite($fp, "<?php\n  ");
-      fclose($fp);
-    }
-    $content = file_get_contents(PATH_CORE . 'menus' . PATH_SEP . "welcome.php");
-
-    if( strpos($content, $phpClass . ".php") == false ) {
-      $fp = fopen(PATH_CORE . 'menus' . PATH_SEP . "welcome.php", "a");
-      fwrite($fp, "  require_once ( '" . $phpClass . ".php' );\n");
-      fclose($fp);
-    }
-  }
-
-  //parse the schema file in order to get Table definition
-  $schemaFile = PATH_CORE . 'config' . PATH_SEP . 'schema.xml';
-  if( $pluginName != '' )
-    $schemaFile = PATH_PLUGINS . $pluginName . PATH_SEP . 'config' . PATH_SEP . 'schema.xml';
-
-  printf("using schemaFile %s \n", pakeColor::colorize($schemaFile, 'INFO'));
-
-  $xmlContent = file_get_contents($schemaFile);
-  $s = simplexml_load_file($schemaFile);
-
-  //default xmlform
-  //load the $fields array with fields data for an xmlform.
-  $fields = array ();
-  foreach( $s->table as $key => $table ) {
-    if( $table['name'] == $tableName )
-      foreach( $table->column as $kc => $column ) {
-        $valuesOpt = NULL;
-        if( isset($table->validator) ) {
-          foreach( $table->validator as $kc => $validator ) {
-            if( $validator['column'] == $column['name'] ) {
-              foreach( $validator->rule as $kr => $rule ) {
-                if( $rule['name'] == 'validValues' )
-                  $valuesOpt = explode('|', $rule['value']);
-              }
+        //english version of dynaform
+        $form = new Form($xmlfile, '', 'en');
+        $englishLabel = array();
+        foreach ($form->fields as $nodeName => $node) {
+            if (trim($node->label) != '') {
+                $englishLabel[$node->name] = $node->label;
             }
-          }
         }
-        //        print "\033[1;34m "; print_r ( $values);
-        //print $column['name'] . ' ' .$column['type'] . ' ' .$column['size'] . ' ' .$column['required'] . ' ' .$column['primaryKey'];
-        //print_r ( $column); print "\n";
-        $maxlength = isset($column['size']) ? $column['size'] : 25;
-        $size = ($maxlength > 60) ? 60 : $maxlength;
-        $values = NULL;
-        if( isset($valuesOpt) ) {
-          $type = 'dropdown';
-          foreach( $valuesOpt as $key => $val ) {
-            $values[] = array (
+        unset($form->fields);
+        unset($form->tree);
+        unset($form);
+
+        //in this second pass, we are getting the target language labels
+        $form = new Form($xmlfile, '', $langIdOut);
+        $fieldsIndex = 0;
+        $exceptIndex = 0;
+        foreach ($form->fields as $nodeName => $node) {
+            if (is_object($node) && isset($englishLabel[$node->name])) {
+                $msgid = trim($englishLabel[$node->name]);
+                $node->label = trim(str_replace(chr(10), '', $node->label));
+            } else {
+                $msgid = '';
+            }
+            if (trim($msgid) != '' && ! in_array($node->type, $exceptionFields)) {
+                //$msgid = $englishLabel [ $node->name ];
+                $keyid = $xmlfile . '?' . $node->name;
+                if (in_array($msgid, $arrayLabels)) {
+                    $newMsgid = '[' . $keyid . '] ' . $msgid;
+                    if ($verboseFlag) {
+                        printf("duplicated key %s is renamed to %s.\n", pakeColor::colorize($msgid, 'ERROR'), pakeColor::colorize($newMsgid, 'INFO'));
+                    }
+                    $xmlError ++;
+                    $msgid = $newMsgid;
+                }
+
+                $arrayLabels[] = $msgid;
+                sort($arrayLabels);
+
+                $comment1 = $xmlfile;
+                $comment2 = $node->type . ' - ' . $node->name;
+                fprintf($fp, "\n");
+                fprintf($fp, "#: %s \n", $keyid);
+                //        fprintf ( $fp, "#, php-format \n" );
+                fprintf($fp, "# %s \n", strip_quotes($comment1));
+                fprintf($fp, "# %s \n", strip_quotes($comment2));
+                fprintf($fp, "msgid \"%s\" \n", strip_quotes($msgid));
+                fprintf($fp, "msgstr \"%s\" \n", strip_quotes($node->label));
+                //fprintf ( $fp, "msgstr \"%s\" \n",  strip_quotes( utf8_encode( trim($node->label) ) ));
+                $fieldsIndex ++;
+                $fieldsIndexTotal ++;
+            } else {
+                $xmlfile = $filter->xssFilterHard($xmlfile);
+                $exceptionFields = $filter->xssFilterHard($exceptionFields);
+                if (is_object($node) && ! in_array($node->type, $exceptionFields)) {
+                    if (isset($node->value) && strpos($node->value, 'G::LoadTranslation') !== false) {
+                        $exceptIndex ++;
+                        //print ($node->value);
+                    } else {
+                        $node->name = $filter->xssFilterHard($node->name);
+                        $node->type = $filter->xssFilterHard($node->type);
+                        printf("Error: xmlform %s has no english definition for %s [%s]\n", pakeColor::colorize($xmlfile, 'ERROR'), pakeColor::colorize($node->name, 'INFO'), pakeColor::colorize($node->type, 'INFO'));
+                        $xmlError ++;
+                    }
+                } else {
+                    $exceptIndex ++;
+                    if ($verboseFlag) {
+                        $node->name = $filter->xssFilterHard($node->name);
+                        $node->type = $filter->xssFilterHard($node->type);
+                        printf("%s %s in %s\n", $node->type, pakeColor::colorize($node->name, 'INFO'), pakeColor::colorize($xmlfile, 'INFO'));
+                    }
+                }
+            }
+        }
+        unset($form->fields);
+        unset($form->tree);
+        unset($form);
+        printf("xmlform: %s has %s fields and %s exceptions \n", pakeColor::colorize($xmlfile, 'INFO'), pakeColor::colorize($fieldsIndex, 'INFO'), pakeColor::colorize($exceptIndex, 'INFO'));
+        $exceptIndexTotal += $exceptIndex;
+    }
+
+    fclose($fp);
+    printf("added %s entries from translation table\n", pakeColor::colorize($trIndex, 'INFO'));
+    printf("added %s entries from %s xmlforms  \n", pakeColor::colorize($fieldsIndexTotal, 'INFO'), pakeColor::colorize($xmlIndex, 'INFO'));
+
+    if ($trError > 0) {
+        printf("there are %s errors in tranlation table\n", pakeColor::colorize($trError, 'ERROR'));
+    }
+    if ($xmlError > 0) {
+        printf("there are %s errors and %s exceptions in xmlforms\n", pakeColor::colorize($xmlError, 'ERROR'), pakeColor::colorize($exceptIndexTotal, 'ERROR'));
+    }
+
+    exit(0);
+
+    //to do: leer los html templates
+}
+
+function create_file_from_tpl($tplName, $newFilename, $fields = null)
+{
+    global $pathHome;
+    global $projectName;
+
+    $httpdTpl = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' . PATH_SEP . 'templates' . PATH_SEP . $tplName . '.tpl';
+    if (substr($newFilename, 0, 1) == PATH_SEP) {
+        $httpFilename = $newFilename;
+    } else {
+        $httpFilename = $pathHome . PATH_SEP . $newFilename;
+    }
+    $template = new TemplatePower($httpdTpl);
+    $template->prepare();
+    $template->assignGlobal('pathHome', $pathHome);
+    $template->assignGlobal('projectName', $projectName);
+    $template->assignGlobal('rbacProjectName', strtoupper($projectName));
+    $template->assignGlobal('siglaProjectName', substr(strtoupper($projectName), 0, 3));
+    $template->assignGlobal('propel.output.dir', '{propel.output.dir}');
+
+    if (is_array($fields)) {
+        foreach ($fields as $block => $data) {
+            $template->gotoBlock("_ROOT");
+            if (is_array($data)) {
+                foreach ($data as $rowId => $row) {
+                    $template->newBlock($block);
+                    foreach ($row as $key => $val) {
+                        if (is_array($val)) {
+                            //              $template->newBlock( $key );
+                            foreach ($val as $key2 => $val2) {
+                                if (is_array($val2)) {
+                                    $template->newBlock($key);
+                                    foreach ($val2 as $key3 => $val3) {
+                                        $template->assign($key3, $val3);
+                                    }
+                                }
+                            }
+                        } else {
+                            $template->assign($key, $val);
+                        }
+                    }
+                }
+            } else {
+                $template->assign($block, $data);
+            }
+        }
+    }
+
+    $content = $template->getOutputContent();
+    $iSize = file_put_contents($httpFilename, $content);
+    printf("saved %s bytes in file %s \n", pakeColor::colorize($iSize, 'INFO'), pakeColor::colorize($tplName, 'INFO'));
+}
+
+function copy_file_from_tpl($tplName, $newFilename)
+{
+    global $pathHome;
+    global $projectName;
+    $httpdTpl = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' . PATH_SEP . 'templates' . PATH_SEP . $tplName . '.tpl';
+    $httpFilename = $pathHome . PATH_SEP . $newFilename;
+    $content = file_get_contents($httpdTpl);
+    $iSize = file_put_contents($httpFilename, $content);
+    printf("saved %s bytes in file %s \n", pakeColor::colorize($iSize, 'INFO'), pakeColor::colorize($tplName, 'INFO'));
+}
+
+function copy_file($newFilename)
+{
+    global $pathHome;
+    $httpdTpl = PATH_HOME . $newFilename;
+    $httpFilename = $pathHome . PATH_SEP . $newFilename;
+    $content = file_get_contents($httpdTpl);
+    $iSize = file_put_contents($httpFilename, $content);
+    printf("saved %s bytes in file %s \n", pakeColor::colorize($iSize, 'INFO'), pakeColor::colorize($newFilename, 'INFO'));
+}
+
+function fieldToLabel($field)
+{
+    $aux = substr($field, 4);
+    $res = $aux[0];
+    for ($i = 1; $i < strlen($aux); $i ++) {
+        if ($aux[$i] == '_') {
+            $res .= " " . $aux[++ $i];
+        } else {
+            $res .= strtolower($aux[$i]);
+        }
+    }
+    return $res;
+}
+
+function fieldToLabelOption($field)
+{
+    $aux = $field;
+    $res = $aux[0];
+    for ($i = 1; $i < strlen($aux); $i ++) {
+        if ($aux[$i] == '_') {
+            $res .= " " . $aux[++ $i];
+        } else {
+            $res .= strtolower($aux[$i]);
+        }
+    }
+    return $res;
+}
+function run_propel_build_crud($task, $args)
+{
+    ini_set('display_errors', 'on');
+    ini_set('error_reporting', E_ERROR);
+
+    // the environment for poedit always is Development
+    define('G_ENVIRONMENT', G_DEV_ENV);
+
+    printf("Arguments: %s\n", pakeColor::colorize('./gulliver propel-build-crud <class-name> <table-name> <plugin-name> ', 'INFO'));
+
+    //the class filename in the first argument
+    if (! isset($args[0])) {
+        printf("Error: %s\n", pakeColor::colorize('you must specify a valid classname ', 'ERROR'));
+        exit(0);
+    }
+    $class = $args[0];
+    $phpClass = $class;
+    $phpClass[0] = strtolower($phpClass[0]);
+
+    $tableName = $class[0];
+    for ($i = 1; $i < strlen($class); $i ++) {
+        if ($class[$i] >= 'a') {
+            $tableName .= strtoupper($class[$i]);
+        } else {
+            $tableName .= "_" . $class[$i];
+        }
+    }
+
+    //second parameter is the table name, by default is the same classname in uppercase.
+    if (isset($args[1])) {
+        $tableName = $args[1];
+    }
+
+    $pluginName = '';
+    if (isset($args[2])) {
+        $pluginName = $args[2];
+    }
+
+    //try to find the class in classes directory
+    $classFilename = PATH_CORE . 'classes' . PATH_SEP . 'model' . PATH_SEP . $args[0] . '.php';
+
+    //try to find in the plugis directory, assuming there are a class in the plugin
+    if ($pluginName != '') {
+        $classFilename = PATH_PLUGINS . $pluginName . PATH_SEP . 'classes' . PATH_SEP . 'model' . PATH_SEP . $args[0] . '.php';
+        set_include_path(PATH_PLUGINS . $pluginName . PATH_SEPARATOR . get_include_path());
+        printf("using plugin : %s\n", pakeColor::colorize($pluginName, 'ERROR'));
+    }
+
+    if (file_exists($classFilename)) {
+        printf("class found in %s \n", pakeColor::colorize($classFilename, 'INFO'));
+    } else {
+        printf("class %s not found \n", pakeColor::colorize($class, 'ERROR'));
+        exit(0);
+    }
+    printf("TableName : %s \n", pakeColor::colorize($tableName, 'INFO'));
+
+    require_once($classFilename);
+
+    global $G_ENVIRONMENTS;
+    $aux = explode(PATH_SEP, PATH_HOME);
+    $projectName = $aux[count($aux) - 2];
+    define('PATH_SHARED', PATH_SEP . 'shared' . PATH_SEP . $projectName . '_data' . PATH_SEP);
+
+    $dbFile = PATH_SHARED . 'sites' . PATH_SEP . $projectName . PATH_SEP . 'db.php';
+    if (! file_exists($dbFile)) {
+        $dbFile = PATH_GULLIVER_HOME . 'bin' . PATH_SEP . 'tasks' . PATH_SEP . 'templates' . PATH_SEP . 'db.php.tpl';
+    }
+    printf("searching db file in : %s \n", pakeColor::colorize($dbFile, 'INFO'));
+
+    $G_ENVIRONMENTS['DEVELOPMENT']['dbfile'] = $dbFile;
+    Propel::init(PATH_CORE . "config/databases.php");
+
+    $configuration = Propel::getConfiguration();
+    $connectionDSN = $configuration['datasources']['workflow']['connection'];
+    printf("using DSN Connection %s \n", pakeColor::colorize($connectionDSN, 'INFO'));
+
+    if ($pluginName != '') {
+        $xmlformPath = PATH_PLUGINS . $pluginName . PATH_SEP;
+        $methodsPath = PATH_PLUGINS . $pluginName . PATH_SEP . $phpClass . PATH_SEP;
+        $corePath = PATH_PLUGINS . $pluginName . PATH_SEP;
+    } else {
+        $xmlformPath = PATH_CORE . 'xmlform' . PATH_SEP . $phpClass . PATH_SEP;
+        $methodsPath = PATH_CORE . 'methods' . PATH_SEP . $phpClass . PATH_SEP;
+        $corePath = PATH_CORE;
+    }
+    G::mk_dir($xmlformPath);
+    G::mk_dir($methodsPath);
+
+    $fields['className'] = $class;
+    $fields['phpClassName'] = $phpClass;
+    $fields['tableName'] = $tableName;
+    $fields['projectName'] = $projectName;
+
+    //1. MENU
+    if ($pluginName == '') {
+        create_file_from_tpl('pluginMenu', PATH_CORE . 'menus' . PATH_SEP . $phpClass . ".php", $fields);
+    }
+    //else {
+    //  create_file_from_tpl ( 'pluginMenu',  $corePath. $phpClass. ".php", $fields );
+    //}
+
+
+    //2. si existe menu welcome, aqade la opcion
+    if ($pluginName == '') {
+        if (! file_exists(PATH_CORE . 'menus' . PATH_SEP . "welcome.php")) {
+            $fp = fopen(PATH_CORE . 'menus' . PATH_SEP . "welcome.php", "w");
+            fwrite($fp, "<?php\n  ");
+            fclose($fp);
+        }
+        $content = file_get_contents(PATH_CORE . 'menus' . PATH_SEP . "welcome.php");
+
+        if (strpos($content, $phpClass . ".php") == false) {
+            $fp = fopen(PATH_CORE . 'menus' . PATH_SEP . "welcome.php", "a");
+            fwrite($fp, "  require_once ( '" . $phpClass . ".php' );\n");
+            fclose($fp);
+        }
+    }
+
+    //parse the schema file in order to get Table definition
+    $schemaFile = PATH_CORE . 'config' . PATH_SEP . 'schema.xml';
+    if ($pluginName != '') {
+        $schemaFile = PATH_PLUGINS . $pluginName . PATH_SEP . 'config' . PATH_SEP . 'schema.xml';
+    }
+
+    printf("using schemaFile %s \n", pakeColor::colorize($schemaFile, 'INFO'));
+
+    $xmlContent = file_get_contents($schemaFile);
+    $s = simplexml_load_file($schemaFile);
+
+    //default xmlform
+    //load the $fields array with fields data for an xmlform.
+    $fields = array();
+    foreach ($s->table as $key => $table) {
+        if ($table['name'] == $tableName) {
+            foreach ($table->column as $kc => $column) {
+                $valuesOpt = null;
+                if (isset($table->validator)) {
+                    foreach ($table->validator as $kc => $validator) {
+                        if ($validator['column'] == $column['name']) {
+                            foreach ($validator->rule as $kr => $rule) {
+                                if ($rule['name'] == 'validValues') {
+                                    $valuesOpt = explode('|', $rule['value']);
+                                }
+                            }
+                        }
+                    }
+                }
+                //        print "\033[1;34m "; print_r ( $values);
+                //print $column['name'] . ' ' .$column['type'] . ' ' .$column['size'] . ' ' .$column['required'] . ' ' .$column['primaryKey'];
+                //print_r ( $column); print "\n";
+                $maxlength = isset($column['size']) ? $column['size'] : 25;
+                $size = ($maxlength > 60) ? 60 : $maxlength;
+                $values = null;
+                if (isset($valuesOpt)) {
+                    $type = 'dropdown';
+                    foreach ($valuesOpt as $key => $val) {
+                        $values[] = array(
               'value' => $val,
               'label' => fieldToLabelOption($val)
             );
-          }
-        } else {
-          switch( $column['type'] ) {
+                    }
+                } else {
+                    switch ($column['type']) {
             case 'TIMESTAMP':
               $type = 'date';
               break;
@@ -1267,13 +1309,13 @@ function run_propel_build_crud($task, $args) {
             default:
               $type = 'text';
           }
-        }
-        if( isset($column['label']) ) {
-          $label = $column['label'];
-        } else {
-          $label = fieldToLabel($column['name']);
-        }
-        $field = array (
+                }
+                if (isset($column['label'])) {
+                    $label = $column['label'];
+                } else {
+                    $label = fieldToLabel($column['name']);
+                }
+                $field = array(
           'name' => $column['name'],
           'className' => $class,
           'type' => $type,
@@ -1282,546 +1324,573 @@ function run_propel_build_crud($task, $args) {
           'label' => $label,
           'values' => $values
         );
-        $fields['fields'][] = $field;
-        if( ! $column['primaryKey'] ) {
-          $fields['onlyFields'][] = $field;
-        } else {
-          $fields['keys'][] = $field;
+                $fields['fields'][] = $field;
+                if (! $column['primaryKey']) {
+                    $fields['onlyFields'][] = $field;
+                } else {
+                    $fields['keys'][] = $field;
+                }
+            }
         }
-      }
-  }
-  $fields['className'] = $class;
-  $fields['phpClassName'] = $phpClass;
-  $fields['projectName'] = $projectName;
-  $fields['firstKey'] = $fields['keys'][0]['name'];
+    }
+    $fields['className'] = $class;
+    $fields['phpClassName'] = $phpClass;
+    $fields['projectName'] = $projectName;
+    $fields['firstKey'] = $fields['keys'][0]['name'];
 
-  $fields['phpFolderName'] = $phpClass;
-  if( $pluginName != '' ) {
-    $fields['plugin'][] = array (
+    $fields['phpFolderName'] = $phpClass;
+    if ($pluginName != '') {
+        $fields['plugin'][] = array(
       'pluginName' => $pluginName
     );
-    $fields['phpFolderName'] = $pluginName;
-  }
-  create_file_from_tpl('pluginXmlform', $xmlformPath . $phpClass . ".xml", $fields);
-  create_file_from_tpl('pluginXmlformEdit', $xmlformPath . $phpClass . "Edit.xml", $fields);
-  create_file_from_tpl('pluginXmlformDelete', $xmlformPath . $phpClass . "Delete.xml", $fields);
-  create_file_from_tpl('pluginList', $methodsPath . $phpClass . "List.php", $fields);
+        $fields['phpFolderName'] = $pluginName;
+    }
+    create_file_from_tpl('pluginXmlform', $xmlformPath . $phpClass . ".xml", $fields);
+    create_file_from_tpl('pluginXmlformEdit', $xmlformPath . $phpClass . "Edit.xml", $fields);
+    create_file_from_tpl('pluginXmlformDelete', $xmlformPath . $phpClass . "Delete.xml", $fields);
+    create_file_from_tpl('pluginList', $methodsPath . $phpClass . "List.php", $fields);
 
-  //xmlform for list
-  //load the $fields array with fields data for PagedTable xml.
-  $fields = array ();
-  $onlyFields = array ();
-  $primaryKey = '';
-  foreach( $s->table as $key => $table ) {
-    if( $table['name'] == $tableName )
-      foreach( $table->column as $kc => $column ) {
-        //print $column['name'] . ' ' .$column['type'] . ' ' .$column['size'] . ' ' .$column['required'] . ' ' .$column['primaryKey'];
-        //print "\n";
-        $size = ($column['size'] > 40) ? 40 * 3 : $column['size'] * 3;
-        $type = $column['type'];
-        $label = fieldToLabel($column['name']);
-        if( $column['primaryKey'] ) {
-          if( $primaryKey == '' )
-            $primaryKey .= '@!' . $column['name'];
-          else
-            $primaryKey .= '|@!' . $column['name'];
+    //xmlform for list
+    //load the $fields array with fields data for PagedTable xml.
+    $fields = array();
+    $onlyFields = array();
+    $primaryKey = '';
+    foreach ($s->table as $key => $table) {
+        if ($table['name'] == $tableName) {
+            foreach ($table->column as $kc => $column) {
+                //print $column['name'] . ' ' .$column['type'] . ' ' .$column['size'] . ' ' .$column['required'] . ' ' .$column['primaryKey'];
+                //print "\n";
+                $size = ($column['size'] > 40) ? 40 * 3 : $column['size'] * 3;
+                $type = $column['type'];
+                $label = fieldToLabel($column['name']);
+                if ($column['primaryKey']) {
+                    if ($primaryKey == '') {
+                        $primaryKey .= '@!' . $column['name'];
+                    } else {
+                        $primaryKey .= '|@!' . $column['name'];
+                    }
 
-          if( isset($column['label']) ) {
-            $label = $column['label'];
-          } else {
-            $label = fieldToLabel($column['name']);
-          }
-        }
+                    if (isset($column['label'])) {
+                        $label = $column['label'];
+                    } else {
+                        $label = fieldToLabel($column['name']);
+                    }
+                }
 
-        $field = array (
+                $field = array(
           'name' => $column['name'],
           'type' => $type,
           'size' => $size,
           'label' => $label
         );
-        $fields['fields'][] = $field;
-        if( ! $column['primaryKey'] ) {
-          if( $column['type'] != 'LONGVARCHAR' )
-            $fields['onlyFields'][] = $field;
-        } else {
-          $fields['keys'][] = $field;
+                $fields['fields'][] = $field;
+                if (! $column['primaryKey']) {
+                    if ($column['type'] != 'LONGVARCHAR') {
+                        $fields['onlyFields'][] = $field;
+                    }
+                } else {
+                    $fields['keys'][] = $field;
+                }
+            }
         }
-      }
-  }
-  $fields['primaryKey'] = $primaryKey;
-  $fields['className'] = $class;
-  $fields['phpClassName'] = $phpClass;
-  $fields['phpFolderName'] = $phpClass;
-  if( $pluginName != '' ) {
-    $fields['phpFolderName'] = $pluginName;
-  }
-  $fields['projectName'] = $projectName;
-  $fields['tableName'] = $tableName;
-  create_file_from_tpl('pluginXmlformList', $xmlformPath . $phpClass . "List.xml", $fields);
-  create_file_from_tpl('pluginXmlformOptions', $xmlformPath . $phpClass . "Options.xml", $fields);
+    }
+    $fields['primaryKey'] = $primaryKey;
+    $fields['className'] = $class;
+    $fields['phpClassName'] = $phpClass;
+    $fields['phpFolderName'] = $phpClass;
+    if ($pluginName != '') {
+        $fields['phpFolderName'] = $pluginName;
+    }
+    $fields['projectName'] = $projectName;
+    $fields['tableName'] = $tableName;
+    create_file_from_tpl('pluginXmlformList', $xmlformPath . $phpClass . "List.xml", $fields);
+    create_file_from_tpl('pluginXmlformOptions', $xmlformPath . $phpClass . "Options.xml", $fields);
 
-  //default edit
-  $fields = array ();
-  $index = 0;
-  $keylist = '';
-  foreach( $s->table as $key => $table ) {
-    if( $table['name'] == $tableName )
-      foreach( $table->column as $kc => $column ) {
-        $name = $column['name'];
-        $phpName = convertPhpName($name);
-        $field = array (
+    //default edit
+    $fields = array();
+    $index = 0;
+    $keylist = '';
+    foreach ($s->table as $key => $table) {
+        if ($table['name'] == $tableName) {
+            foreach ($table->column as $kc => $column) {
+                $name = $column['name'];
+                $phpName = convertPhpName($name);
+                $field = array(
           'name' => $name,
           'phpName' => $phpName,
           'index' => $index ++
         );
-        if( $column['primaryKey'] ) {
-          if( $keylist == '' )
-            $keylist .= '$' . $phpName;
-          else
-            $keylist .= ', $' . $phpName;
-          $fields['keys'][] = $field;
+                if ($column['primaryKey']) {
+                    if ($keylist == '') {
+                        $keylist .= '$' . $phpName;
+                    } else {
+                        $keylist .= ', $' . $phpName;
+                    }
+                    $fields['keys'][] = $field;
+                }
+                $fields['fields'][] = $field;
+                if (! $column['primaryKey']) {
+                    $fields['onlyFields'][] = $field;
+                }
+                $fields['fields2'][] = $field;
+            }
         }
-        $fields['fields'][] = $field;
-        if( ! $column['primaryKey'] ) {
-          $fields['onlyFields'][] = $field;
-        }
-        $fields['fields2'][] = $field;
-      }
-  }
-  $fields['keylist'] = $keylist;
-  $fields['phpClassName'] = $phpClass;
-  $fields['phpFolderName'] = $phpClass;
-  $fields['className'] = $class;
-  $fields['tableName'] = $tableName;
-  $fields['projectName'] = $projectName;
-  if( $pluginName != '' ) {
-    $fields['plugin'][] = array (
+    }
+    $fields['keylist'] = $keylist;
+    $fields['phpClassName'] = $phpClass;
+    $fields['phpFolderName'] = $phpClass;
+    $fields['className'] = $class;
+    $fields['tableName'] = $tableName;
+    $fields['projectName'] = $projectName;
+    if ($pluginName != '') {
+        $fields['plugin'][] = array(
       'pluginName' => $pluginName
     );
-    $fields['phpFolderName'] = $pluginName;
-  }
-  //savePluginFile ( $class . PATH_SEP . $class . 'Edit.php', 'pluginEdit', $class, $tableName, $fields );
-  //savePluginFile ( $class . PATH_SEP . $class . 'Save.php', 'pluginSave', $class, $tableName, $fields );
-  create_file_from_tpl('pluginEdit', $methodsPath . $phpClass . "Edit.php", $fields);
-  create_file_from_tpl('pluginSave', $methodsPath . $phpClass . "Save.php", $fields);
-  create_file_from_tpl('pluginNew', $methodsPath . $phpClass . "New.php", $fields);
-  create_file_from_tpl('pluginDelete', $methodsPath . $phpClass . "Delete.php", $fields);
-  create_file_from_tpl('pluginDeleteExec', $methodsPath . $phpClass . "DeleteExec.php", $fields);
+        $fields['phpFolderName'] = $pluginName;
+    }
+    //savePluginFile ( $class . PATH_SEP . $class . 'Edit.php', 'pluginEdit', $class, $tableName, $fields );
+    //savePluginFile ( $class . PATH_SEP . $class . 'Save.php', 'pluginSave', $class, $tableName, $fields );
+    create_file_from_tpl('pluginEdit', $methodsPath . $phpClass . "Edit.php", $fields);
+    create_file_from_tpl('pluginSave', $methodsPath . $phpClass . "Save.php", $fields);
+    create_file_from_tpl('pluginNew', $methodsPath . $phpClass . "New.php", $fields);
+    create_file_from_tpl('pluginDelete', $methodsPath . $phpClass . "Delete.php", $fields);
+    create_file_from_tpl('pluginDeleteExec', $methodsPath . $phpClass . "DeleteExec.php", $fields);
 
-  exit(0);
+    exit(0);
 }
 
 //////////////////////////// backup and restore functions  ///////////////////////////////////
-function backupAddTarFolder($tar, $pathBase, $pluginHome) {
-  $empty = true;
-  print "  " . str_replace($pluginHome, '', $pathBase) . "\n";
-  if( $handle = opendir($pathBase) ) {
-    while( false !== ($file = readdir($handle)) ) {
-      if( is_file($pathBase . $file) ) {
-        $empty = false;
-        $tar->addModify(array($pathBase . $file), '', $pluginHome);
-      }
-      if( is_dir($pathBase . $file) && $file != '..' && $file != '.' ) {
-        //print "dir $pathBase$file \n";
-        backupAddTarFolder($tar, $pathBase . $file . PATH_SEP, $pluginHome);
-        $empty = false;
-      }
+function backupAddTarFolder($tar, $pathBase, $pluginHome)
+{
+    $empty = true;
+    print "  " . str_replace($pluginHome, '', $pathBase) . "\n";
+    if ($handle = opendir($pathBase)) {
+        while (false !== ($file = readdir($handle))) {
+            if (is_file($pathBase . $file)) {
+                $empty = false;
+                $tar->addModify(array($pathBase . $file), '', $pluginHome);
+            }
+            if (is_dir($pathBase . $file) && $file != '..' && $file != '.') {
+                //print "dir $pathBase$file \n";
+                backupAddTarFolder($tar, $pathBase . $file . PATH_SEP, $pluginHome);
+                $empty = false;
+            }
+        }
+        closedir($handle);
+    }
+    if ($empty /*&& $pathBase . $file != $pluginHome */) {
+        $tar->addModify(array($pathBase . $file), '', $pluginHome);
     }
-    closedir($handle);
-  }
-  if( $empty /*&& $pathBase . $file != $pluginHome */) {
-    $tar->addModify(array($pathBase . $file), '', $pluginHome);
-  }
-
 }
 
-function getSysInfo() {
-  if( file_exists(PATH_METHODS . 'login/version-pmos.php') ) {
-    include (PATH_METHODS . 'login/version-pmos.php');
-  } else {
-    define('PM_VERSION', 'Development Version');
-  }
-
-  $ipe = explode(" ", $_SERVER['SSH_CONNECTION']);
-
-  if( getenv('HTTP_CLIENT_IP') ) {
-    $ip = getenv('HTTP_CLIENT_IP');
-  } elseif( getenv('HTTP_X_FORWARDED_FOR') ) {
-    $ip = getenv('HTTP_X_FORWARDED_FOR');
-  } else {
-    $ip = getenv('REMOTE_ADDR');
-  }
-
-  /* For distros with the lsb_release, this returns a one-line description of
-   * the distro name, such as "CentOS release 5.3 (Final)" or "Ubuntu 10.10"
-   */
-  $distro = exec("lsb_release -d -s 2> /dev/null");
-
-  /* For distros without lsb_release, we look for *release (such as
-   * redhat-release, gentoo-release, SuSE-release, etc) or *version (such as
-   * debian_version, slackware-version, etc)
-   */
-  if (empty($distro)) {
-    foreach (glob("/etc/*release") as $filename) {
-      $distro = trim(file_get_contents($filename));
-      if (!empty($distro))
-        break;
+function getSysInfo()
+{
+    if (file_exists(PATH_METHODS . 'login/version-pmos.php')) {
+        include(PATH_METHODS . 'login/version-pmos.php');
+    } else {
+        define('PM_VERSION', 'Development Version');
     }
+
+    $ipe = explode(" ", $_SERVER['SSH_CONNECTION']);
+
+    if (getenv('HTTP_CLIENT_IP')) {
+        $ip = getenv('HTTP_CLIENT_IP');
+    } elseif (getenv('HTTP_X_FORWARDED_FOR')) {
+        $ip = getenv('HTTP_X_FORWARDED_FOR');
+    } else {
+        $ip = getenv('REMOTE_ADDR');
+    }
+
+    /* For distros with the lsb_release, this returns a one-line description of
+     * the distro name, such as "CentOS release 5.3 (Final)" or "Ubuntu 10.10"
+     */
+    $distro = exec("lsb_release -d -s 2> /dev/null");
+
+    /* For distros without lsb_release, we look for *release (such as
+     * redhat-release, gentoo-release, SuSE-release, etc) or *version (such as
+     * debian_version, slackware-version, etc)
+     */
     if (empty($distro)) {
-      foreach (glob("/etc/*version") as $filename) {
-        $distro = trim(file_get_contents($filename));
-        if (!empty($distro))
-          break;
-      }
+        foreach (glob("/etc/*release") as $filename) {
+            $distro = trim(file_get_contents($filename));
+            if (!empty($distro)) {
+                break;
+            }
+        }
+        if (empty($distro)) {
+            foreach (glob("/etc/*version") as $filename) {
+                $distro = trim(file_get_contents($filename));
+                if (!empty($distro)) {
+                    break;
+                }
+            }
+        }
     }
-  }
 
-  /* CentOS returns a string with quotes, remove them! */
-  $distro = trim($distro, "\"");
+    /* CentOS returns a string with quotes, remove them! */
+    $distro = trim($distro, "\"");
 
-  $distro .= " (" . PHP_OS . ")";
+    $distro .= " (" . PHP_OS . ")";
 
-  $Fields = array();
+    $Fields = array();
 
-  $Fields['SYSTEM'] = $distro;
-  $Fields['PHP'] = phpversion();
-  $Fields['PM_VERSION'] = PM_VERSION;
-  $Fields['SERVER_ADDR'] = lookup($ipe[2]);
-  $Fields['IP'] = lookup($ipe[0]);
+    $Fields['SYSTEM'] = $distro;
+    $Fields['PHP'] = phpversion();
+    $Fields['PM_VERSION'] = PM_VERSION;
+    $Fields['SERVER_ADDR'] = lookup($ipe[2]);
+    $Fields['IP'] = lookup($ipe[0]);
 
-  return $Fields;
+    return $Fields;
 }
 
 /*
 ** function get_infoOnPM
 ** information about workspace
 */
-function get_infoOnPM($workspace) {
-  $infoPM = array ();
+function get_infoOnPM($workspace)
+{
+    $infoPM = array();
 
-  $Fields = getSysInfo();
+    $Fields = getSysInfo();
 
-  $Fields['WORKSPACE_NAME'] = $workspace;
+    $Fields['WORKSPACE_NAME'] = $workspace;
 
-  if( defined("DB_HOST") ) {
+    if (defined("DB_HOST")) {
+        $dbNetView = new Net(DB_HOST);
+        $dbNetView->loginDbServer(DB_USER, DB_PASS);
 
-    $dbNetView = new Net(DB_HOST);
-    $dbNetView->loginDbServer(DB_USER, DB_PASS);
-
-    $dbConns = new DbConnections('');
-    $availdb = '';
-    foreach( $dbConns->getDbServicesAvailables() as $key => $val ) {
-      if( $availdb != '' )
-        $availdb .= ', ';
-      $availdb .= $val['name'];
-    }
-    try {
-      $sMySQLVersion = $dbNetView->getDbServerVersion('mysql');
-    } catch( Exception $oException ) {
-      $sMySQLVersion = 'Unknown';
-    }
-
-    $Fields['DATABASE'] = $dbNetView->dbName(DB_ADAPTER) . ' (Version ' . $sMySQLVersion . ')';
-    $Fields['DATABASE_SERVER'] = DB_HOST;
-    $Fields['DATABASE_NAME'] = DB_NAME;
-    $Fields['AVAILABLE_DB'] = $availdb;
-  } else {
-    $Fields['DATABASE'] = "Not defined";
-    $Fields['DATABASE_SERVER'] = $info_db['adap'];
-    $Fields['DATABASE_NAME'] = "Not defined";
-    $Fields['AVAILABLE_DB'] = "Not defined";
-  }
-
-  $info_db = get_DirDB($workspace);
-
-  $Fields['MYSQL_DATA_DIR'] = $info_db['datadir'];
-  $Fields['PLUGINS_LIST'] = get_plugins();
-  $Fields['DB_ADAPTER'] = $info_db['DB_ADAPTER'];
-  $Fields['DB_HOST'] = $info_db['DB_HOST'];
-  $Fields['DB_NAME'] = $info_db['DB_NAME'];
-  $Fields['DB_USER'] = $info_db['DB_USER'];
-  $Fields['DB_PASS'] = $info_db['DB_PASS'];
-  $Fields['DB_RBAC_HOST'] = $info_db['DB_RBAC_HOST'];
-  $Fields['DB_RBAC_NAME'] = $info_db['DB_RBAC_NAME'];
-  $Fields['DB_RBAC_USER'] = $info_db['DB_RBAC_USER'];
-  $Fields['DB_RBAC_PASS'] = $info_db['DB_RBAC_PASS'];
-  $Fields['DB_REPORT_HOST'] = $info_db['DB_REPORT_HOST'];
-  $Fields['DB_REPORT_NAME'] = $info_db['DB_REPORT_NAME'];
-  $Fields['DB_REPORT_USER'] = $info_db['DB_REPORT_USER'];
-  $Fields['DB_REPORT_PASS'] = $info_db['DB_REPORT_PASS'];
-
-  $infoPM = $Fields;
-
-  return $infoPM;
-
-}
-
-function printMetadata($fields) {
-  printf("%20s %s \n", 'Workspace Name', pakeColor::colorize($fields['WORKSPACE_NAME'], 'INFO'));
-  printf("%20s %s \n", 'System', pakeColor::colorize($fields['SYSTEM'], 'INFO'));
-
-  printf("%20s %s \n", 'ProcessMaker Version', pakeColor::colorize($fields['PM_VERSION'], 'INFO'));
-  printf("%20s %s \n", 'PHP Version', pakeColor::colorize($fields['PHP'], 'INFO'));
-  printf("%20s %s \n", 'Server Address', pakeColor::colorize($fields['SERVER_ADDR'], 'INFO'));
-  printf("%20s %s \n", 'Client IP Address', pakeColor::colorize($fields['IP'], 'INFO'));
-
-  printf("%20s %s \n", 'MySql Version', pakeColor::colorize($fields['DATABASE'], 'INFO'));
-  printf("%20s %s \n", 'MySql Data Directory', pakeColor::colorize($fields['MYSQL_DATA_DIR'], 'INFO'));
-  printf("%20s %s \n", 'Available Databases', pakeColor::colorize($fields['AVAILABLE_DB'], 'INFO'));
-
-  printf("%20s %s \n", 'Plugins', pakeColor::colorize('', 'INFO'));
-
-  foreach( $fields['PLUGINS_LIST'] as $k => $v ) {
-    printf("%20s %s \n", ' -', pakeColor::colorize($v, 'INFO'));
-  }
-
-  $wfDsn = $fields['DB_ADAPTER'] . '://' . $fields['DB_USER'] . ':' . $fields['DB_PASS'] . '@' . $fields['DB_HOST'] . '/' . $fields['DB_NAME'];
-  $rbDsn = $fields['DB_ADAPTER'] . '://' . $fields['DB_RBAC_USER'] . ':' . $fields['DB_RBAC_PASS'] . '@' . $fields['DB_RBAC_HOST'] . '/' . $fields['DB_RBAC_NAME'];
-  $rpDsn = $fields['DB_ADAPTER'] . '://' . $fields['DB_REPORT_USER'] . ':' . $fields['DB_REPORT_PASS'] . '@' . $fields['DB_REPORT_HOST'] . '/' . $fields['DB_REPORT_NAME'];
-  printf("%20s %s \n", 'Workflow Database', pakeColor::colorize($wfDsn, 'INFO'));
-  printf("%20s %s \n", 'RBAC Database', pakeColor::colorize($rbDsn, 'INFO'));
-  printf("%20s %s \n", 'Report Database', pakeColor::colorize($rpDsn, 'INFO'));
-
-}
-function get_plugins() {
-  $dir = PATH_PLUGINS;
-  $filesArray = array ();
-
-  if( file_exists($dir) ) {
-    if( $handle = opendir($dir) ) {
-      while( false !== ($file = readdir($handle)) ) {
-        if( ($file != ".") && ($file != "..") && ($file != ".svn") ) {
-          if( ! strpos($file, ".php") ) {
-            $filesArray[] = $file;
-          }
+        $dbConns = new DbConnections('');
+        $availdb = '';
+        foreach ($dbConns->getDbServicesAvailables() as $key => $val) {
+            if ($availdb != '') {
+                $availdb .= ', ';
+            }
+            $availdb .= $val['name'];
+        }
+        try {
+            $sMySQLVersion = $dbNetView->getDbServerVersion('mysql');
+        } catch (Exception $oException) {
+            $sMySQLVersion = 'Unknown';
         }
-      }
-      closedir($handle);
-    }
-  }
-  sort($filesArray, SORT_STRING);
-  return $filesArray;
-}
 
-function lookup($target) {
-  global $ntarget;
-  $msg = $target . ' => ';
-  //if( eregi('[a-zA-Z]', $target) )
-  if( preg_match('[a-zA-Z]', $target) ) //Made compatible to PHP 5.3
-    $ntarget = gethostbyname($target);
-  else
-    $ntarget = gethostbyaddr($target);
-  $msg .= $ntarget;
-  return ($msg);
-}
-
-function run_workspace_backup($task, $args) {
-  throw new Exception("Gulliver backup is no longer supported, use processmaker command-line instead.");
-  try {
-    ini_set('display_errors', 'on');
-    ini_set('error_reporting', E_ERROR);
-
-    // the environment for poedit always is Development
-    define('G_ENVIRONMENT', G_DEV_ENV);
-
-    /* Look for -c and --compress in arguments */
-    $compress = array_search('-c', $args);
-    if ($compress === false)
-      $compress = array_search('--compress', $args);
-    if ($compress !== false) {
-      unset($args[$compress]);
-      /* We need to reorder the args if we removed the compress switch */
-      $args = array_values($args);
-      $compress = true;
-    }
-
-    /* Look for -c and --compress in arguments */
-    $overwrite = array_search('-o', $args);
-    if ($overwrite === false)
-      $overwrite = array_search('--overwrite', $args);
-    if ($overwrite !== false) {
-      unset($args[$overwrite]);
-      /* We need to reorder the args if we removed the compress switch */
-      $args = array_values($args);
-      $overwrite = true;
-    }
-
-    if (array_search('compress', $args)) {
-      echo pakeColor::colorize("Compress is no longer an option, check if this is what you want\n", 'ERROR');
-    }
-
-    if (count($args) > 2 || count($args) == 0)
-      throw (new Exception('wrong arguments specified'));
-
-    $workspace = $args[0];
-
-    /* Use system gzip if not in Windows */
-    if ($compress && strtolower(reset(explode(' ',php_uname('s')))) != "windows") {
-      /* Find the system gzip */
-      exec("whereis -b gzip", $whereisGzip);
-      $gzipPaths = explode(' ', $whereisGzip[0]);
-      if (isset($gzipPaths[1]))
-        $gzipPath = $gzipPaths[1];
-      if (isset($gzipPath))
-        echo "Using system gzip in $gzipPath\n";
-    }
-
-    if (isset($args[1])) {
-      $fileTar = $args[1];
-      /* Check if the second argument is an absolute filename. If it is, use
-       * it as the backup filename. Otherwise, use it as a filename relative
-       * to the backups directory. This makes migration from previous versions
-       * easier, which always expects a relative filename, while still accepting
-       * absolute filenames.
-       */
-      if (dirname($fileTar) == '.') {
-        printf("Using %s as root. Use an absolute filename to change it.\n", pakeColor::colorize(PATH_TRUNK . 'backups', 'INFO'));
-        G::mk_dir(PATH_DATA . 'backups');
-        $fileTar = PATH_DATA . 'backups' . PATH_SEP . $fileTar . '.tar';
-        if ($compress)
-          $fileTar .= '.gz';
-      }
-      printf("Backing up workspace %s to %s\n", pakeColor::colorize($workspace, 'INFO'), pakeColor::colorize($fileTar, 'INFO'));
-      if (!$overwrite && file_exists($fileTar)) {
-        $overwrite = strtolower(prompt('Backup file already exists, do you want to overwrite? [Y/n]'));
-        if( array_search(trim($overwrite), array("y", "")) === false )
-          die();
-        $overwrite = true;
-      }
+        $Fields['DATABASE'] = $dbNetView->dbName(DB_ADAPTER) . ' (Version ' . $sMySQLVersion . ')';
+        $Fields['DATABASE_SERVER'] = DB_HOST;
+        $Fields['DATABASE_NAME'] = DB_NAME;
+        $Fields['AVAILABLE_DB'] = $availdb;
     } else {
-      G::mk_dir(PATH_DATA . 'backups');
-      $fileBase = PATH_DATA . 'backups' . PATH_SEP . $workspace . '.tar';
-      $fileTar = $fileBase;
-      if ($compress)
-        $fileTar .= '.gz';
-      printf("Backing up workspace %s to %s\n", pakeColor::colorize($workspace, 'INFO'), pakeColor::colorize($fileTar, 'INFO'));
-      /* To avoid confusion, we remove both .tar and .tar.gz */
-      if (!$overwrite && (file_exists($fileBase) || file_exists($fileBase.'.gz'))) {
-        $overwrite = strtolower(prompt('Backup file already exists, do you want to overwrite? [Y/n]'));
-        if( array_search(trim($overwrite), array("y", "")) === false )
-          die();
-        $overwrite = true;
-      }
-      if (file_exists($fileBase))
-        unlink($fileBase);
-      if (file_exists($fileBase.".gz"))
-        unlink($fileBase.'.gz');
+        $Fields['DATABASE'] = "Not defined";
+        $Fields['DATABASE_SERVER'] = $info_db['adap'];
+        $Fields['DATABASE_NAME'] = "Not defined";
+        $Fields['AVAILABLE_DB'] = "Not defined";
     }
 
-    /* Remove the backup file before backing up. Previous versions didn't do
-     * this, so backup files would increase indefinetely as new data was
-     * appended to the tar file instead of replaced.
-     */
-    if (file_exists($fileTar))
-      unlink($fileTar);
+    $info_db = get_DirDB($workspace);
 
-    /* If using the system gzip, create the tar using a temporary filename */
-    if (isset($gzipPath)) {
-      $gzipFinal = $fileTar;
-      $fileTar = tempnam(__FILE__, '');
+    $Fields['MYSQL_DATA_DIR'] = $info_db['datadir'];
+    $Fields['PLUGINS_LIST'] = get_plugins();
+    $Fields['DB_ADAPTER'] = $info_db['DB_ADAPTER'];
+    $Fields['DB_HOST'] = $info_db['DB_HOST'];
+    $Fields['DB_NAME'] = $info_db['DB_NAME'];
+    $Fields['DB_USER'] = $info_db['DB_USER'];
+    $Fields['DB_PASS'] = $info_db['DB_PASS'];
+    $Fields['DB_RBAC_HOST'] = $info_db['DB_RBAC_HOST'];
+    $Fields['DB_RBAC_NAME'] = $info_db['DB_RBAC_NAME'];
+    $Fields['DB_RBAC_USER'] = $info_db['DB_RBAC_USER'];
+    $Fields['DB_RBAC_PASS'] = $info_db['DB_RBAC_PASS'];
+    $Fields['DB_REPORT_HOST'] = $info_db['DB_REPORT_HOST'];
+    $Fields['DB_REPORT_NAME'] = $info_db['DB_REPORT_NAME'];
+    $Fields['DB_REPORT_USER'] = $info_db['DB_REPORT_USER'];
+    $Fields['DB_REPORT_PASS'] = $info_db['DB_REPORT_PASS'];
+
+    $infoPM = $Fields;
+
+    return $infoPM;
+}
+
+function printMetadata($fields)
+{
+    printf("%20s %s \n", 'Workspace Name', pakeColor::colorize($fields['WORKSPACE_NAME'], 'INFO'));
+    printf("%20s %s \n", 'System', pakeColor::colorize($fields['SYSTEM'], 'INFO'));
+
+    printf("%20s %s \n", 'ProcessMaker Version', pakeColor::colorize($fields['PM_VERSION'], 'INFO'));
+    printf("%20s %s \n", 'PHP Version', pakeColor::colorize($fields['PHP'], 'INFO'));
+    printf("%20s %s \n", 'Server Address', pakeColor::colorize($fields['SERVER_ADDR'], 'INFO'));
+    printf("%20s %s \n", 'Client IP Address', pakeColor::colorize($fields['IP'], 'INFO'));
+
+    printf("%20s %s \n", 'MySql Version', pakeColor::colorize($fields['DATABASE'], 'INFO'));
+    printf("%20s %s \n", 'MySql Data Directory', pakeColor::colorize($fields['MYSQL_DATA_DIR'], 'INFO'));
+    printf("%20s %s \n", 'Available Databases', pakeColor::colorize($fields['AVAILABLE_DB'], 'INFO'));
+
+    printf("%20s %s \n", 'Plugins', pakeColor::colorize('', 'INFO'));
+
+    foreach ($fields['PLUGINS_LIST'] as $k => $v) {
+        printf("%20s %s \n", ' -', pakeColor::colorize($v, 'INFO'));
     }
 
-    $aSerializeData = get_infoOnPM($workspace);
+    $wfDsn = $fields['DB_ADAPTER'] . '://' . $fields['DB_USER'] . ':' . $fields['DB_PASS'] . '@' . $fields['DB_HOST'] . '/' . $fields['DB_NAME'];
+    $rbDsn = $fields['DB_ADAPTER'] . '://' . $fields['DB_RBAC_USER'] . ':' . $fields['DB_RBAC_PASS'] . '@' . $fields['DB_RBAC_HOST'] . '/' . $fields['DB_RBAC_NAME'];
+    $rpDsn = $fields['DB_ADAPTER'] . '://' . $fields['DB_REPORT_USER'] . ':' . $fields['DB_REPORT_PASS'] . '@' . $fields['DB_REPORT_HOST'] . '/' . $fields['DB_REPORT_NAME'];
+    printf("%20s %s \n", 'Workflow Database', pakeColor::colorize($wfDsn, 'INFO'));
+    printf("%20s %s \n", 'RBAC Database', pakeColor::colorize($rbDsn, 'INFO'));
+    printf("%20s %s \n", 'Report Database', pakeColor::colorize($rpDsn, 'INFO'));
+}
+function get_plugins()
+{
+    $dir = PATH_PLUGINS;
+    $filesArray = array();
 
-    $dbFile = PATH_DB . $workspace . PATH_SEP . 'db.php';
-    if( ! file_exists($dbFile) ) {
-      throw (new Exception("Invalid workspace, the db file does not exist, $dbFile"));
+    if (file_exists($dir)) {
+        if ($handle = opendir($dir)) {
+            while (false !== ($file = readdir($handle))) {
+                if (($file != ".") && ($file != "..") && ($file != ".svn")) {
+                    if (! strpos($file, ".php")) {
+                        $filesArray[] = $file;
+                    }
+                }
+            }
+            closedir($handle);
+        }
     }
+    sort($filesArray, SORT_STRING);
+    return $filesArray;
+}
 
-    $dbOpt = @explode(SYSTEM_HASH, G::decrypt(HASH_INSTALLATION, SYSTEM_HASH));
-    $oDbMaintainer = new DataBaseMaintenance($dbOpt[0], $dbOpt[1], $dbOpt[2]);
-    try{
-      $oDbMaintainer->connect("mysql");
-    } catch(Exception $e){
-      echo "Problems contacting the database with the administrator user\n";
-      echo "The response was: {$e->getMessage()}\n";
-    }
-
-    require_once ($dbFile);
-
-    Propel::init(PATH_CORE . "config/databases.php");
-    $configuration = Propel::getConfiguration();
-    $connectionDSN = $configuration['datasources']['workflow']['connection'];
-    printf("using DSN Connection %s \n", pakeColor::colorize($connectionDSN, 'INFO'));
-
-    $con = Propel::getConnection('workflow');
-    $sql = "show variables like 'datadir'";
-    $stmt = $con->createStatement();
-    $rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
-    $rs->next();
-    $row = $rs->getRow();
-    if( ! is_array($row) )
-      throw (new Exception("unable to execute query in database"));
-    $dataDir = $row['Value'];
-    if( $dataDir[count($dataDir) - 1] == '/' )
-      $dataDir = substr($dataDir, count($dataDir) - 1);
-
-    printf("MySQL data dir %s \n", pakeColor::colorize($dataDir, 'INFO'));
-
-    $sql = "SELECT VERSION();";
-    $stmt = $con->createStatement();
-    $rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_NUM);
-    $rs->next();
-    $row = $rs->getRow();
-    $mysqlVersion = $row[0];
-    $aSerializeData['DATABASE'] = $mysqlVersion;
-
-    //new db restore rotines, by Erik <erik@colosa.com> on May 17th, 2010
-    //set the temporal directory for all tables into wf, rb, and rp databases
-    $tmpDir = G::sys_get_temp_dir() . PATH_SEP . 'pmDbBackup' . PATH_SEP;
-    //create the db maintenance temporal dir
-    G::mk_dir($tmpDir);
-
-    $fileMetadata = $tmpDir . 'metadata.txt';
-    $sMetadata = file_put_contents($fileMetadata, serialize($aSerializeData));
-    if ($sMetadata === false) {
-      throw new Exception("Metadata file could not be written");
-    }
-
-
-
-    $tar = new Archive_Tar($fileTar);
-    if (!isset($gzipPath))
-      $tar->_compress = $compress;
-
-    $pathSharedBase = PATH_DATA . 'sites' . PATH_SEP . $workspace . PATH_SEP;
-    printf("copying folder: %s \n", pakeColor::colorize($pathSharedBase, 'INFO'));
-    backupAddTarFolder($tar, $pathSharedBase, PATH_DATA . 'sites');
-
-    backupAddTarFolder($tar, $fileMetadata, dirname($fileMetadata));
-    unlink($fileMetadata);
-    $aFiles = $tar->listContent();
-
-    $total = 0;
-    foreach( $aFiles as $key => $val ) {
-      //    printf( " %6d %s \n", $val['size'], pakeColor::colorize( $val['filename'], 'INFO') );
-      $total += $val['size'];
-    }
-
-    /* If using system gzip, compress the temporary tar to the original
-     * filename.
-     */
-    if (isset($gzipPath)) {
-      exec("gzip -c \"$fileTar\" > $gzipFinal", $output, $ret);
-      if ($ret != 0) {
-        /* The error message is in stderr, which should be displayed already */
-        echo pakeColor::colorize("Error compressing backup", "ERROR") . "\n";
-        die(1);
-      }
-      unlink($fileTar);
-      $fileTar = $gzipFinal;
-    }
-
-    printMetadata($aSerializeData);
-    printf("%20s %s \n", 'Backup File', pakeColor::colorize($fileTar, 'INFO'));
-    printf("%20s %s \n", 'Files in Backup', pakeColor::colorize(count($aFiles), 'INFO'));
-    printf("%20s %s \n", 'Total Filesize', pakeColor::colorize(sprintf("%5.2f MB", $total / 1024 / 1024), 'INFO'));
-    printf("%20s %s \n", 'Backup Filesize', pakeColor::colorize(sprintf("%5.2f MB", filesize($fileTar) / 1024 / 1024), 'INFO'));
-
-  } catch( Exception $e ) {
-    printf("Error: %s\n", pakeColor::colorize($e->getMessage(), 'ERROR'));
-    exit(0);
+function lookup($target)
+{
+    global $ntarget;
+    $msg = $target . ' => ';
+    //if( eregi('[a-zA-Z]', $target) )
+  if (preg_match('[a-zA-Z]', $target)) { //Made compatible to PHP 5.3
+    $ntarget = gethostbyname($target);
+  } else {
+      $ntarget = gethostbyaddr($target);
   }
+    $msg .= $ntarget;
+    return ($msg);
+}
+
+function run_workspace_backup($task, $args)
+{
+    throw new Exception("Gulliver backup is no longer supported, use processmaker command-line instead.");
+    try {
+        ini_set('display_errors', 'on');
+        ini_set('error_reporting', E_ERROR);
+
+        // the environment for poedit always is Development
+        define('G_ENVIRONMENT', G_DEV_ENV);
+
+        /* Look for -c and --compress in arguments */
+        $compress = array_search('-c', $args);
+        if ($compress === false) {
+            $compress = array_search('--compress', $args);
+        }
+        if ($compress !== false) {
+            unset($args[$compress]);
+            /* We need to reorder the args if we removed the compress switch */
+            $args = array_values($args);
+            $compress = true;
+        }
+
+        /* Look for -c and --compress in arguments */
+        $overwrite = array_search('-o', $args);
+        if ($overwrite === false) {
+            $overwrite = array_search('--overwrite', $args);
+        }
+        if ($overwrite !== false) {
+            unset($args[$overwrite]);
+            /* We need to reorder the args if we removed the compress switch */
+            $args = array_values($args);
+            $overwrite = true;
+        }
+
+        if (array_search('compress', $args)) {
+            echo pakeColor::colorize("Compress is no longer an option, check if this is what you want\n", 'ERROR');
+        }
+
+        if (count($args) > 2 || count($args) == 0) {
+            throw (new Exception('wrong arguments specified'));
+        }
+
+        $workspace = $args[0];
+
+        /* Use system gzip if not in Windows */
+        if ($compress && strtolower(reset(explode(' ', php_uname('s')))) != "windows") {
+            /* Find the system gzip */
+            exec("whereis -b gzip", $whereisGzip);
+            $gzipPaths = explode(' ', $whereisGzip[0]);
+            if (isset($gzipPaths[1])) {
+                $gzipPath = $gzipPaths[1];
+            }
+            if (isset($gzipPath)) {
+                echo "Using system gzip in $gzipPath\n";
+            }
+        }
+
+        if (isset($args[1])) {
+            $fileTar = $args[1];
+            /* Check if the second argument is an absolute filename. If it is, use
+             * it as the backup filename. Otherwise, use it as a filename relative
+             * to the backups directory. This makes migration from previous versions
+             * easier, which always expects a relative filename, while still accepting
+             * absolute filenames.
+             */
+            if (dirname($fileTar) == '.') {
+                printf("Using %s as root. Use an absolute filename to change it.\n", pakeColor::colorize(PATH_TRUNK . 'backups', 'INFO'));
+                G::mk_dir(PATH_DATA . 'backups');
+                $fileTar = PATH_DATA . 'backups' . PATH_SEP . $fileTar . '.tar';
+                if ($compress) {
+                    $fileTar .= '.gz';
+                }
+            }
+            printf("Backing up workspace %s to %s\n", pakeColor::colorize($workspace, 'INFO'), pakeColor::colorize($fileTar, 'INFO'));
+            if (!$overwrite && file_exists($fileTar)) {
+                $overwrite = strtolower(prompt('Backup file already exists, do you want to overwrite? [Y/n]'));
+                if (array_search(trim($overwrite), array("y", "")) === false) {
+                    die();
+                }
+                $overwrite = true;
+            }
+        } else {
+            G::mk_dir(PATH_DATA . 'backups');
+            $fileBase = PATH_DATA . 'backups' . PATH_SEP . $workspace . '.tar';
+            $fileTar = $fileBase;
+            if ($compress) {
+                $fileTar .= '.gz';
+            }
+            printf("Backing up workspace %s to %s\n", pakeColor::colorize($workspace, 'INFO'), pakeColor::colorize($fileTar, 'INFO'));
+            /* To avoid confusion, we remove both .tar and .tar.gz */
+            if (!$overwrite && (file_exists($fileBase) || file_exists($fileBase.'.gz'))) {
+                $overwrite = strtolower(prompt('Backup file already exists, do you want to overwrite? [Y/n]'));
+                if (array_search(trim($overwrite), array("y", "")) === false) {
+                    die();
+                }
+                $overwrite = true;
+            }
+            if (file_exists($fileBase)) {
+                unlink($fileBase);
+            }
+            if (file_exists($fileBase.".gz")) {
+                unlink($fileBase.'.gz');
+            }
+        }
+
+        /* Remove the backup file before backing up. Previous versions didn't do
+         * this, so backup files would increase indefinetely as new data was
+         * appended to the tar file instead of replaced.
+         */
+        if (file_exists($fileTar)) {
+            unlink($fileTar);
+        }
+
+        /* If using the system gzip, create the tar using a temporary filename */
+        if (isset($gzipPath)) {
+            $gzipFinal = $fileTar;
+            $fileTar = tempnam(__FILE__, '');
+        }
+
+        $aSerializeData = get_infoOnPM($workspace);
+
+        $dbFile = PATH_DB . $workspace . PATH_SEP . 'db.php';
+        if (! file_exists($dbFile)) {
+            throw (new Exception("Invalid workspace, the db file does not exist, $dbFile"));
+        }
+
+        $dbOpt = @explode(SYSTEM_HASH, G::decrypt(HASH_INSTALLATION, SYSTEM_HASH));
+        $oDbMaintainer = new DataBaseMaintenance($dbOpt[0], $dbOpt[1], $dbOpt[2]);
+        try {
+            $oDbMaintainer->connect("mysql");
+        } catch (Exception $e) {
+            echo "Problems contacting the database with the administrator user\n";
+            echo "The response was: {$e->getMessage()}\n";
+        }
+
+        require_once($dbFile);
+
+        Propel::init(PATH_CORE . "config/databases.php");
+        $configuration = Propel::getConfiguration();
+        $connectionDSN = $configuration['datasources']['workflow']['connection'];
+        printf("using DSN Connection %s \n", pakeColor::colorize($connectionDSN, 'INFO'));
+
+        $con = Propel::getConnection('workflow');
+        $sql = "show variables like 'datadir'";
+        $stmt = $con->createStatement();
+        $rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
+        $rs->next();
+        $row = $rs->getRow();
+        if (! is_array($row)) {
+            throw (new Exception("unable to execute query in database"));
+        }
+        $dataDir = $row['Value'];
+        if ($dataDir[count($dataDir) - 1] == '/') {
+            $dataDir = substr($dataDir, count($dataDir) - 1);
+        }
+
+        printf("MySQL data dir %s \n", pakeColor::colorize($dataDir, 'INFO'));
+
+        $sql = "SELECT VERSION();";
+        $stmt = $con->createStatement();
+        $rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_NUM);
+        $rs->next();
+        $row = $rs->getRow();
+        $mysqlVersion = $row[0];
+        $aSerializeData['DATABASE'] = $mysqlVersion;
+
+        //new db restore rotines, by Erik <erik@colosa.com> on May 17th, 2010
+        //set the temporal directory for all tables into wf, rb, and rp databases
+        $tmpDir = G::sys_get_temp_dir() . PATH_SEP . 'pmDbBackup' . PATH_SEP;
+        //create the db maintenance temporal dir
+        G::mk_dir($tmpDir);
+
+        $fileMetadata = $tmpDir . 'metadata.txt';
+        $sMetadata = file_put_contents($fileMetadata, serialize($aSerializeData));
+        if ($sMetadata === false) {
+            throw new Exception("Metadata file could not be written");
+        }
+
+
+
+        $tar = new Archive_Tar($fileTar);
+        if (!isset($gzipPath)) {
+            $tar->_compress = $compress;
+        }
+
+        $pathSharedBase = PATH_DATA . 'sites' . PATH_SEP . $workspace . PATH_SEP;
+        printf("copying folder: %s \n", pakeColor::colorize($pathSharedBase, 'INFO'));
+        backupAddTarFolder($tar, $pathSharedBase, PATH_DATA . 'sites');
+
+        backupAddTarFolder($tar, $fileMetadata, dirname($fileMetadata));
+        unlink($fileMetadata);
+        $aFiles = $tar->listContent();
+
+        $total = 0;
+        foreach ($aFiles as $key => $val) {
+            //    printf( " %6d %s \n", $val['size'], pakeColor::colorize( $val['filename'], 'INFO') );
+            $total += $val['size'];
+        }
+
+        /* If using system gzip, compress the temporary tar to the original
+         * filename.
+         */
+        if (isset($gzipPath)) {
+            exec("gzip -c \"$fileTar\" > $gzipFinal", $output, $ret);
+            if ($ret != 0) {
+                /* The error message is in stderr, which should be displayed already */
+                echo pakeColor::colorize("Error compressing backup", "ERROR") . "\n";
+                die(1);
+            }
+            unlink($fileTar);
+            $fileTar = $gzipFinal;
+        }
+
+        printMetadata($aSerializeData);
+        printf("%20s %s \n", 'Backup File', pakeColor::colorize($fileTar, 'INFO'));
+        printf("%20s %s \n", 'Files in Backup', pakeColor::colorize(count($aFiles), 'INFO'));
+        printf("%20s %s \n", 'Total Filesize', pakeColor::colorize(sprintf("%5.2f MB", $total / 1024 / 1024), 'INFO'));
+        printf("%20s %s \n", 'Backup Filesize', pakeColor::colorize(sprintf("%5.2f MB", filesize($fileTar) / 1024 / 1024), 'INFO'));
+    } catch (Exception $e) {
+        printf("Error: %s\n", pakeColor::colorize($e->getMessage(), 'ERROR'));
+        exit(0);
+    }
 }
 
 /**
@@ -1830,361 +1899,375 @@ function run_workspace_backup($task, $args) {
  *
  * @author Erik A. O. <erik@colosa.com, erik@gmail.com>
  */
-function getDataBaseConfiguration($dsn) {
-  $dsn = trim($dsn);
-  $tmp = explode(':', $dsn);
-  $tmp2 = str_replace('//', '', $tmp[1]);
-  $result["user"] = $tmp2;
-  $tmp2 = explode('@', $tmp[2]);
-  $result["passwd"] = $tmp2[0];
-  $result["host"] = $tmp2[1];
-  $tmp2 = explode('?', $tmp[3]);
-  $tmp2 = explode('/', $tmp2[0]);
-  $result["port"] = $tmp2[0];
-  $result["dbname"] = $tmp2[1];
+function getDataBaseConfiguration($dsn)
+{
+    $dsn = trim($dsn);
+    $tmp = explode(':', $dsn);
+    $tmp2 = str_replace('//', '', $tmp[1]);
+    $result["user"] = $tmp2;
+    $tmp2 = explode('@', $tmp[2]);
+    $result["passwd"] = $tmp2[0];
+    $result["host"] = $tmp2[1];
+    $tmp2 = explode('?', $tmp[3]);
+    $tmp2 = explode('/', $tmp2[0]);
+    $result["port"] = $tmp2[0];
+    $result["dbname"] = $tmp2[1];
 
-  return $result;
+    return $result;
 }
 
-function updateDBCallback($matches) {
-  global $updateDBCallbackData;
-  /* This function changes the values of defines while keeping their formatting
-   * intact.
-   * $matches will contain several groups:
-   * ((define('(<key>)2', ')1 (<value>)3 (');)4 )0
-   */
-  $dbPrefix = array(
+function updateDBCallback($matches)
+{
+    global $updateDBCallbackData;
+    /* This function changes the values of defines while keeping their formatting
+     * intact.
+     * $matches will contain several groups:
+     * ((define('(<key>)2', ')1 (<value>)3 (');)4 )0
+     */
+    $dbPrefix = array(
       'DB_NAME' => 'wf_',
       'DB_USER' => 'wf_',
       'DB_RBAC_NAME' => 'rb_',
       'DB_RBAC_USER' => 'rb_',
       'DB_REPORT_NAME' => 'rp_',
       'DB_REPORT_USER' => 'rp_');
-  $key = $matches['key'];
-  $value = $matches['value'];
-  if (array_search($key,array('DB_HOST', 'DB_RBAC_HOST', 'DB_REPORT_HOST')) !== false) {
-    /* Change the database hostname for these keys */
-    $value = $updateDBCallbackData['new_host'];
-  } else if (array_key_exists($key, $dbPrefix)) {
-    if ($updateDBCallbackData['change_workspace'])
-      /* Change the database name to the new workspace, following the standard
-       * of prefix (either wf_, rp_, rb_) and the workspace name.
-       */
-      $value = $dbPrefix[$key].$updateDBCallbackData['target_workspace'];
-  }
-  $updateDBCallbackData['config'][$key] = $value;
-  return $matches[1].$value.$matches[4];
+    $key = $matches['key'];
+    $value = $matches['value'];
+    if (array_search($key, array('DB_HOST', 'DB_RBAC_HOST', 'DB_REPORT_HOST')) !== false) {
+        /* Change the database hostname for these keys */
+        $value = $updateDBCallbackData['new_host'];
+    } elseif (array_key_exists($key, $dbPrefix)) {
+        if ($updateDBCallbackData['change_workspace']) {
+            /* Change the database name to the new workspace, following the standard
+             * of prefix (either wf_, rp_, rb_) and the workspace name.
+             */
+            $value = $dbPrefix[$key].$updateDBCallbackData['target_workspace'];
+        }
+    }
+    $updateDBCallbackData['config'][$key] = $value;
+    return $matches[1].$value.$matches[4];
 }
 
-function updateDBfile($directory, $targetWorkspace, $dbNewHost, $changeWorkspace) {
-  if (count(explode(":", $dbNewHost)) < 2)
-    $dbNewHost .= ':3306';
-  /* Workaround to send variables to updateDBCallback callback */
-  $GLOBALS['updateDBCallbackData'] = array(
+function updateDBfile($directory, $targetWorkspace, $dbNewHost, $changeWorkspace)
+{
+    if (count(explode(":", $dbNewHost)) < 2) {
+        $dbNewHost .= ':3306';
+    }
+    /* Workaround to send variables to updateDBCallback callback */
+    $GLOBALS['updateDBCallbackData'] = array(
       "new_host" => $dbNewHost,
       "change_workspace" => $changeWorkspace,
       "target_workspace" => $targetWorkspace,
       "config" => array()
   );
-  global $updateDBCallbackData;
+    global $updateDBCallbackData;
 
-  $dbfile = $directory . PATH_SEP . 'db.php';
-  if( file_exists($dbfile) ) {
-    $sDbFile = file_get_contents($dbfile);
-    /* Match all defines in the config file. Check updateDBCallback to know what
-     * keys are changed and what groups are matched.
-     * This regular expression will match any "define ('<key>', '<value>');"
-     * with any combination of whitespace between words.
-     */
-    $sNewDbFile = preg_replace_callback("/( *define *\( *'(?P<key>.*?)' *, *\n* *')(?P<value>.*?)(' *\) *;.*)/",
+    $dbfile = $directory . PATH_SEP . 'db.php';
+    if (file_exists($dbfile)) {
+        $sDbFile = file_get_contents($dbfile);
+        /* Match all defines in the config file. Check updateDBCallback to know what
+         * keys are changed and what groups are matched.
+         * This regular expression will match any "define ('<key>', '<value>');"
+         * with any combination of whitespace between words.
+         */
+        $sNewDbFile = preg_replace_callback(
+        "/( *define *\( *'(?P<key>.*?)' *, *\n* *')(?P<value>.*?)(' *\) *;.*)/",
       updateDBCallback,
-      $sDbFile);
-    file_put_contents($dbfile, $sNewDbFile);
-    return $updateDBCallbackData['config'];
-  }
-}
-
-function restoreDB($dbHost, $dbMaintainer, $dbOldName, $dbName, $dbUser, $dbPass, $tempDirectory, $overwrite) {
-  printf("Restoring database %s to %s\n", $dbOldName, pakeColor::colorize($dbName, 'INFO'));
-
-  /* Check if the hostname is local (localhost or 127.0.0.1) */
-  $islocal = (strcmp(substr($dbHost, 0, strlen('localhost')),'localhost')===0) ||
-             (strcmp(substr($dbHost, 0, strlen('127.0.0.1')),'127.0.0.1')===0);
-
-  $dbMaintainer->connect('mysql');
-
-  $result = $dbMaintainer->query("SELECT * FROM `user` WHERE user='$dbUser' AND password=PASSWORD('{$dbPass}')");
-  if( ! isset($result[0]) ){ //the user doesn't exist
-    $dbHostPerm = $islocal ? "localhost":"%";
-    $dbMaintainer->query("INSERT INTO user VALUES('$dbHostPerm','$dbUser',PASSWORD('{$dbPass}'),'Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);");
-  }
-  $dbMaintainer->query("GRANT ALL PRIVILEGES ON `$dbUser`.* TO $dbName@'localhost' IDENTIFIED BY '{$dbPass}' WITH GRANT OPTION");
-
-  if( $overwrite ) {
-    $dbMaintainer->createDb($dbName, true);
-  } else {
-    $dbMaintainer->createDb($dbName);
-  }
-
-  $dbMaintainer->connect($dbName);
-  $dbMaintainer->setTempDir($tempDirectory . PATH_SEP . $dbOldName . PATH_SEP);
-  $dbMaintainer->restoreFromSql($dbMaintainer->getTempDir() . $dbOldName . '.sql');
-  $dbMaintainer->restoreAllData('sql');
-}
-
-function workspaceRestore($backupFilename, $targetWorkspace, $overwrite) {
-
-  $tempDirectory = tempnam(__FILE__, '');
-  if (file_exists($tempDirectory)) {
-    unlink($tempDirectory);
-  }
-
-  if (file_exists($tempDirectory))
-    G::rm_dir($tempDirectory);
-  G::mk_dir($tempDirectory);
-
-
-  $tar = new Archive_Tar($backupFilename);
-  $res = $tar->extract($tempDirectory);
-
-  $metadataFilename = $tempDirectory . PATH_SEP . 'metadata.txt';
-  if (!file_exists($metadataFilename)) {
-    /* Look for legacy backups, where metadata was stored as a file with the
-     * workspace name, such as workflow.txt
-     * This means the backup filename must be the same as the metadata file.
-     */
-    $info = pathinfo($backupFilename);
-    /* Check if it's a compressed backup, in which case we need to remove
-     * both the gz and the tar extensions.
-     */
-    if ($info['extension'] == "gz")
-      $info = pathinfo(basename($backupFilename, '.' . $info['extension']));
-    $wsNameFromTar = basename($backupFilename, '.' . $info['extension']);
-    $metadataFilename = $tempDirectory . PATH_SEP . $wsNameFromTar . '.txt';
-    if (!file_exists($metadataFilename)) {
-      throw (new Exception("Metadata file was not found in backup"));
+      $sDbFile
+    );
+        file_put_contents($dbfile, $sNewDbFile);
+        return $updateDBCallbackData['config'];
     }
-  }
-
-  $metadata = unserialize(file_get_contents($metadataFilename));
-
-  $backupWorkspace = $metadata['WORKSPACE_NAME'];
-  $changeWorkspace = (isset($targetWorkspace));
-  if (!$changeWorkspace) {
-    $targetWorkspace = $backupWorkspace;
-  } else {
-    echo "Restoring from workspace: " . pakeColor::colorize($backupWorkspace, 'INFO') . "\n";
-  }
-  echo "Restoring to workspace:   ".pakeColor::colorize($targetWorkspace, 'INFO')."\n";
-
-  //moving the site files
-  $backupWorkspaceDir = $tempDirectory . PATH_SEP . $backupWorkspace;
-  $targetWorkspaceDir = PATH_DATA . 'sites' . PATH_SEP . $targetWorkspace;
-
-  if (!$overwrite && file_exists($targetWorkspaceDir)) {
-    $overwrite = strtolower(prompt('Workspace already exists, do you want to overwrite? [Y/n]'));
-    if( array_search(trim($overwrite), array("y", "")) === false )
-      die();
-    $overwrite = true;
-  }
-
-  printf("Moving files to %s \n", pakeColor::colorize($targetWorkspaceDir, 'INFO'));
-
-  /* We already know we will be overwriting the new workspace if we reach this
-   * point, so remove the workspace directory if it exists.
-   */
-  if (file_exists($targetWorkspaceDir))
-    G::rm_dir($targetWorkspaceDir);
-
-  if( ! rename($backupWorkspaceDir, $targetWorkspaceDir) ) {
-    throw (new Exception("There was an error moving from $backupWorkspaceDir to $targetWorkspaceDir"));
-  }
-
-  $dbOpt = @explode(SYSTEM_HASH, G::decrypt(HASH_INSTALLATION, SYSTEM_HASH));
-  $dbHostname = $dbOpt[0];
-
-  /* TODO: Check if database exists after updateDBfile */
-  $config = updateDBfile($targetWorkspaceDir, $targetWorkspace, $dbHostname, $changeWorkspace);
-
-  $oDbMaintainer = new DataBaseMaintenance($dbOpt[0], $dbOpt[1], $dbOpt[2]);
-
-  $dbName = $config['DB_NAME'];
-  $dbUser = $config['DB_USER'];
-  $dbPass = $config['DB_PASS'];
-  restoreDB($dbHostname, $oDbMaintainer, $metadata['DB_NAME'], $dbName, $dbUser, $dbPass, $tempDirectory, $overwrite);
-
-  $dbName = $config['DB_RBAC_NAME'];
-  $dbUser = $config['DB_RBAC_USER'];
-  $dbPass = $config['DB_RBAC_PASS'];
-  restoreDB($dbHostname, $oDbMaintainer, $metadata['DB_RBAC_NAME'], $dbName, $dbUser, $dbPass, $tempDirectory, $overwrite);
-
-  $dbName = $config['DB_REPORT_NAME'];
-  $dbUser = $config['DB_REPORT_USER'];
-  $dbPass = $config['DB_REPORT_PASS'];
-  restoreDB($dbHostname, $oDbMaintainer, $metadata['DB_REPORT_NAME'], $dbName, $dbUser, $dbPass, $tempDirectory, $overwrite);
-
-  echo "\n";
-
-  $wsInfo = getSysInfo();
-  $wsInfo['WORKSPACE_NAME'] = $targetWorkspace;
-  $wsInfo = array_merge($wsInfo, $config);
-
-  printInfoSites($metadata, $wsInfo);
-
-  return true;
 }
 
-function get_DirDB($workspace) {
+function restoreDB($dbHost, $dbMaintainer, $dbOldName, $dbName, $dbUser, $dbPass, $tempDirectory, $overwrite)
+{
+    printf("Restoring database %s to %s\n", $dbOldName, pakeColor::colorize($dbName, 'INFO'));
 
-  $dbFile = PATH_DB . $workspace . PATH_SEP . 'db.php';
-  if( ! file_exists($dbFile) ) {
-    throw (new Exception("the db file does not exist, $dbFile"));
-  }
+    /* Check if the hostname is local (localhost or 127.0.0.1) */
+    $islocal = (strcmp(substr($dbHost, 0, strlen('localhost')), 'localhost')===0) ||
+             (strcmp(substr($dbHost, 0, strlen('127.0.0.1')), '127.0.0.1')===0);
 
-  require_once ($dbFile);
+    $dbMaintainer->connect('mysql');
 
+    $result = $dbMaintainer->query("SELECT * FROM `user` WHERE user='$dbUser' AND password=PASSWORD('{$dbPass}')");
+    if (! isset($result[0])) { //the user doesn't exist
+        $dbHostPerm = $islocal ? "localhost":"%";
+        $dbMaintainer->query("INSERT INTO user VALUES('$dbHostPerm','$dbUser',PASSWORD('{$dbPass}'),'Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);");
+    }
+    $dbMaintainer->query("GRANT ALL PRIVILEGES ON `$dbUser`.* TO $dbName@'localhost' IDENTIFIED BY '{$dbPass}' WITH GRANT OPTION");
 
-  Propel::init(PATH_CORE . "config/databases.php");
-  $configuration = Propel::getConfiguration();
-  $connectionDSN = $configuration['datasources']['workflow']['connection'];
+    if ($overwrite) {
+        $dbMaintainer->createDb($dbName, true);
+    } else {
+        $dbMaintainer->createDb($dbName);
+    }
 
-  //  printf("using DSN Connection %s \n", pakeColor::colorize( $connectionDSN, 'INFO'));
-
-
-  $con = Propel::getConnection('workflow');
-  $sql = "show variables like 'datadir'";
-  $stmt = $con->createStatement();
-  $rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
-  $rs->next();
-  $row = $rs->getRow();
-
-  if( ! is_array($row) )
-    throw (new Exception("unable to execute query in database"));
-  $dataDir = $row['Value'];
-  if( $dataDir[count($dataDir) - 1] == '/' )
-    $dataDir = substr($dataDir, count($dataDir) - 1);
-
-  $info_db = array ();
-  $info_db['conx'] = $configuration['datasources']['workflow']['connection'];
-  $info_db['adap'] = $configuration['datasources']['workflow']['adapter'];
-  $info_db['datadir'] = $dataDir;
-
-  $info_db['DB_ADAPTER'] = DB_ADAPTER;
-  $info_db['DB_HOST'] = DB_HOST;
-  $info_db['DB_NAME'] = DB_NAME;
-  $info_db['DB_USER'] = DB_USER;
-  $info_db['DB_PASS'] = DB_PASS;
-  $info_db['DB_RBAC_HOST'] = DB_RBAC_HOST;
-  $info_db['DB_RBAC_NAME'] = DB_RBAC_NAME;
-  $info_db['DB_RBAC_USER'] = DB_RBAC_USER;
-  $info_db['DB_RBAC_PASS'] = DB_RBAC_PASS;
-  $info_db['DB_REPORT_HOST'] = DB_REPORT_HOST;
-  $info_db['DB_REPORT_NAME'] = DB_REPORT_NAME;
-  $info_db['DB_REPORT_USER'] = DB_REPORT_USER;
-  $info_db['DB_REPORT_PASS'] = DB_REPORT_PASS;
-
-  return $info_db;
+    $dbMaintainer->connect($dbName);
+    $dbMaintainer->setTempDir($tempDirectory . PATH_SEP . $dbOldName . PATH_SEP);
+    $dbMaintainer->restoreFromSql($dbMaintainer->getTempDir() . $dbOldName . '.sql');
+    $dbMaintainer->restoreAllData('sql');
 }
 
-function printInfoSites($aSitebck, $aSiterestared) {
-  printf("%25s %s \n", 'Workspace Name Backup', pakeColor::colorize($aSitebck['WORKSPACE_NAME'], 'INFO'));
-  printf("%25s %s \n", 'Workspace Name Restored', pakeColor::colorize($aSiterestared['WORKSPACE_NAME'], 'INFO'));
+function workspaceRestore($backupFilename, $targetWorkspace, $overwrite)
+{
+    $tempDirectory = tempnam(__FILE__, '');
+    if (file_exists($tempDirectory)) {
+        unlink($tempDirectory);
+    }
 
-  printf("%25s %s \n", 'System Backup', pakeColor::colorize($aSitebck['SYSTEM'], 'INFO'));
-  printf("%25s %s \n", 'System Restored', pakeColor::colorize($aSiterestared['SYSTEM'], 'INFO'));
-
-  printf("%25s %s \n", 'PM Version Backup', pakeColor::colorize($aSitebck['PM_VERSION'], 'INFO'));
-  printf("%25s %s \n", 'PM Version Restored', pakeColor::colorize($aSiterestared['PM_VERSION'], 'INFO'));
-
-  printf("%25s %s \n", 'PHP Version Backup', pakeColor::colorize($aSitebck['PHP'], 'INFO'));
-  printf("%25s %s \n", 'PHP Version Restored', pakeColor::colorize($aSiterestared['PHP'], 'INFO'));
-
-  //printf( "%25s %s \n", 'Server Address', pakeColor::colorize( $aSitebck['SERVER_ADDR'], 'INFO') );
-  //printf( "%25s %s \n", 'Client IP Address', pakeColor::colorize( $aSitebck['IP'], 'INFO') );
+    if (file_exists($tempDirectory)) {
+        G::rm_dir($tempDirectory);
+    }
+    G::mk_dir($tempDirectory);
 
 
-  //printf( "%25s %s \n", 'MySql Version', pakeColor::colorize( $aSitebck['DATABASE'], 'INFO') );
-  //printf( "%25s %s \n", 'MySql Version', pakeColor::colorize( $aSiterestared['DATABASE'], 'INFO') );
+    $tar = new Archive_Tar($backupFilename);
+    $res = $tar->extract($tempDirectory);
+
+    $metadataFilename = $tempDirectory . PATH_SEP . 'metadata.txt';
+    if (!file_exists($metadataFilename)) {
+        /* Look for legacy backups, where metadata was stored as a file with the
+         * workspace name, such as workflow.txt
+         * This means the backup filename must be the same as the metadata file.
+         */
+        $info = pathinfo($backupFilename);
+        /* Check if it's a compressed backup, in which case we need to remove
+         * both the gz and the tar extensions.
+         */
+        if ($info['extension'] == "gz") {
+            $info = pathinfo(basename($backupFilename, '.' . $info['extension']));
+        }
+        $wsNameFromTar = basename($backupFilename, '.' . $info['extension']);
+        $metadataFilename = $tempDirectory . PATH_SEP . $wsNameFromTar . '.txt';
+        if (!file_exists($metadataFilename)) {
+            throw (new Exception("Metadata file was not found in backup"));
+        }
+    }
+
+    $metadata = unserialize(file_get_contents($metadataFilename));
+
+    $backupWorkspace = $metadata['WORKSPACE_NAME'];
+    $changeWorkspace = (isset($targetWorkspace));
+    if (!$changeWorkspace) {
+        $targetWorkspace = $backupWorkspace;
+    } else {
+        echo "Restoring from workspace: " . pakeColor::colorize($backupWorkspace, 'INFO') . "\n";
+    }
+    echo "Restoring to workspace:   ".pakeColor::colorize($targetWorkspace, 'INFO')."\n";
+
+    //moving the site files
+    $backupWorkspaceDir = $tempDirectory . PATH_SEP . $backupWorkspace;
+    $targetWorkspaceDir = PATH_DATA . 'sites' . PATH_SEP . $targetWorkspace;
+
+    if (!$overwrite && file_exists($targetWorkspaceDir)) {
+        $overwrite = strtolower(prompt('Workspace already exists, do you want to overwrite? [Y/n]'));
+        if (array_search(trim($overwrite), array("y", "")) === false) {
+            die();
+        }
+        $overwrite = true;
+    }
+
+    printf("Moving files to %s \n", pakeColor::colorize($targetWorkspaceDir, 'INFO'));
+
+    /* We already know we will be overwriting the new workspace if we reach this
+     * point, so remove the workspace directory if it exists.
+     */
+    if (file_exists($targetWorkspaceDir)) {
+        G::rm_dir($targetWorkspaceDir);
+    }
+
+    if (! rename($backupWorkspaceDir, $targetWorkspaceDir)) {
+        throw (new Exception("There was an error moving from $backupWorkspaceDir to $targetWorkspaceDir"));
+    }
+
+    $dbOpt = @explode(SYSTEM_HASH, G::decrypt(HASH_INSTALLATION, SYSTEM_HASH));
+    $dbHostname = $dbOpt[0];
+
+    /* TODO: Check if database exists after updateDBfile */
+    $config = updateDBfile($targetWorkspaceDir, $targetWorkspace, $dbHostname, $changeWorkspace);
+
+    $oDbMaintainer = new DataBaseMaintenance($dbOpt[0], $dbOpt[1], $dbOpt[2]);
+
+    $dbName = $config['DB_NAME'];
+    $dbUser = $config['DB_USER'];
+    $dbPass = $config['DB_PASS'];
+    restoreDB($dbHostname, $oDbMaintainer, $metadata['DB_NAME'], $dbName, $dbUser, $dbPass, $tempDirectory, $overwrite);
+
+    $dbName = $config['DB_RBAC_NAME'];
+    $dbUser = $config['DB_RBAC_USER'];
+    $dbPass = $config['DB_RBAC_PASS'];
+    restoreDB($dbHostname, $oDbMaintainer, $metadata['DB_RBAC_NAME'], $dbName, $dbUser, $dbPass, $tempDirectory, $overwrite);
+
+    $dbName = $config['DB_REPORT_NAME'];
+    $dbUser = $config['DB_REPORT_USER'];
+    $dbPass = $config['DB_REPORT_PASS'];
+    restoreDB($dbHostname, $oDbMaintainer, $metadata['DB_REPORT_NAME'], $dbName, $dbUser, $dbPass, $tempDirectory, $overwrite);
+
+    echo "\n";
+
+    $wsInfo = getSysInfo();
+    $wsInfo['WORKSPACE_NAME'] = $targetWorkspace;
+    $wsInfo = array_merge($wsInfo, $config);
+
+    printInfoSites($metadata, $wsInfo);
+
+    return true;
+}
+
+function get_DirDB($workspace)
+{
+    $dbFile = PATH_DB . $workspace . PATH_SEP . 'db.php';
+    if (! file_exists($dbFile)) {
+        throw (new Exception("the db file does not exist, $dbFile"));
+    }
+
+    require_once($dbFile);
 
 
-  //printf( "%25s %s \n", 'MySql Data Directory', pakeColor::colorize( $aSitebck['MYSQL_DATA_DIR'], 'INFO') );
-  //printf( "%25s %s \n", 'MySql Data Directory', pakeColor::colorize( $aSiterestared['MYSQL_DATA_DIR'], 'INFO') );
+    Propel::init(PATH_CORE . "config/databases.php");
+    $configuration = Propel::getConfiguration();
+    $connectionDSN = $configuration['datasources']['workflow']['connection'];
+
+    //  printf("using DSN Connection %s \n", pakeColor::colorize( $connectionDSN, 'INFO'));
 
 
-  //printf( "%25s %s \n", 'Available Databases', pakeColor::colorize( $aSitebck['AVAILABLE_DB'], 'INFO') );
+    $con = Propel::getConnection('workflow');
+    $sql = "show variables like 'datadir'";
+    $stmt = $con->createStatement();
+    $rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
+    $rs->next();
+    $row = $rs->getRow();
+
+    if (! is_array($row)) {
+        throw (new Exception("unable to execute query in database"));
+    }
+    $dataDir = $row['Value'];
+    if ($dataDir[count($dataDir) - 1] == '/') {
+        $dataDir = substr($dataDir, count($dataDir) - 1);
+    }
+
+    $info_db = array();
+    $info_db['conx'] = $configuration['datasources']['workflow']['connection'];
+    $info_db['adap'] = $configuration['datasources']['workflow']['adapter'];
+    $info_db['datadir'] = $dataDir;
+
+    $info_db['DB_ADAPTER'] = DB_ADAPTER;
+    $info_db['DB_HOST'] = DB_HOST;
+    $info_db['DB_NAME'] = DB_NAME;
+    $info_db['DB_USER'] = DB_USER;
+    $info_db['DB_PASS'] = DB_PASS;
+    $info_db['DB_RBAC_HOST'] = DB_RBAC_HOST;
+    $info_db['DB_RBAC_NAME'] = DB_RBAC_NAME;
+    $info_db['DB_RBAC_USER'] = DB_RBAC_USER;
+    $info_db['DB_RBAC_PASS'] = DB_RBAC_PASS;
+    $info_db['DB_REPORT_HOST'] = DB_REPORT_HOST;
+    $info_db['DB_REPORT_NAME'] = DB_REPORT_NAME;
+    $info_db['DB_REPORT_USER'] = DB_REPORT_USER;
+    $info_db['DB_REPORT_PASS'] = DB_REPORT_PASS;
+
+    return $info_db;
+}
+
+function printInfoSites($aSitebck, $aSiterestared)
+{
+    printf("%25s %s \n", 'Workspace Name Backup', pakeColor::colorize($aSitebck['WORKSPACE_NAME'], 'INFO'));
+    printf("%25s %s \n", 'Workspace Name Restored', pakeColor::colorize($aSiterestared['WORKSPACE_NAME'], 'INFO'));
+
+    printf("%25s %s \n", 'System Backup', pakeColor::colorize($aSitebck['SYSTEM'], 'INFO'));
+    printf("%25s %s \n", 'System Restored', pakeColor::colorize($aSiterestared['SYSTEM'], 'INFO'));
+
+    printf("%25s %s \n", 'PM Version Backup', pakeColor::colorize($aSitebck['PM_VERSION'], 'INFO'));
+    printf("%25s %s \n", 'PM Version Restored', pakeColor::colorize($aSiterestared['PM_VERSION'], 'INFO'));
+
+    printf("%25s %s \n", 'PHP Version Backup', pakeColor::colorize($aSitebck['PHP'], 'INFO'));
+    printf("%25s %s \n", 'PHP Version Restored', pakeColor::colorize($aSiterestared['PHP'], 'INFO'));
+
+    //printf( "%25s %s \n", 'Server Address', pakeColor::colorize( $aSitebck['SERVER_ADDR'], 'INFO') );
+    //printf( "%25s %s \n", 'Client IP Address', pakeColor::colorize( $aSitebck['IP'], 'INFO') );
 
 
-  /*printf( "%20s %s \n", 'Plugins', pakeColor::colorize( '', 'INFO') );
-  foreach ($aSitebck['PLUGINS_LIST'] as $k => $v){
-  	 printf( "%20s %s \n", ' -', pakeColor::colorize( $v, 'INFO') );
-  	}*/
+    //printf( "%25s %s \n", 'MySql Version', pakeColor::colorize( $aSitebck['DATABASE'], 'INFO') );
+    //printf( "%25s %s \n", 'MySql Version', pakeColor::colorize( $aSiterestared['DATABASE'], 'INFO') );
 
-  $wfDsn = $aSiterestared['DB_ADAPTER'] . '://' . $aSiterestared['DB_USER'] . ':' . $aSiterestared['DB_PASS'] . '@' . $aSiterestared['DB_HOST'] . '/' . $aSiterestared['DB_NAME'];
-  $rbDsn = $aSiterestared['DB_ADAPTER'] . '://' . $aSiterestared['DB_RBAC_USER'] . ':' . $aSiterestared['DB_RBAC_PASS'] . '@' . $aSiterestared['DB_RBAC_HOST'] . '/' . $aSiterestared['DB_RBAC_NAME'];
-  $rpDsn = $aSiterestared['DB_ADAPTER'] . '://' . $aSiterestared['DB_REPORT_USER'] . ':' . $aSiterestared['DB_REPORT_PASS'] . '@' . $aSiterestared['DB_REPORT_HOST'] . '/' . $aSiterestared['DB_REPORT_NAME'];
-  printf("%25s %s \n", 'Workflow Database', pakeColor::colorize($wfDsn, 'INFO'));
-  printf("%25s %s \n", 'RBAC Database', pakeColor::colorize($rbDsn, 'INFO'));
-  printf("%25s %s \n", 'Report Database', pakeColor::colorize($rpDsn, 'INFO'));
 
+    //printf( "%25s %s \n", 'MySql Data Directory', pakeColor::colorize( $aSitebck['MYSQL_DATA_DIR'], 'INFO') );
+    //printf( "%25s %s \n", 'MySql Data Directory', pakeColor::colorize( $aSiterestared['MYSQL_DATA_DIR'], 'INFO') );
+
+
+    //printf( "%25s %s \n", 'Available Databases', pakeColor::colorize( $aSitebck['AVAILABLE_DB'], 'INFO') );
+
+
+    /*printf( "%20s %s \n", 'Plugins', pakeColor::colorize( '', 'INFO') );
+    foreach ($aSitebck['PLUGINS_LIST'] as $k => $v){
+       printf( "%20s %s \n", ' -', pakeColor::colorize( $v, 'INFO') );
+      }*/
+
+    $wfDsn = $aSiterestared['DB_ADAPTER'] . '://' . $aSiterestared['DB_USER'] . ':' . $aSiterestared['DB_PASS'] . '@' . $aSiterestared['DB_HOST'] . '/' . $aSiterestared['DB_NAME'];
+    $rbDsn = $aSiterestared['DB_ADAPTER'] . '://' . $aSiterestared['DB_RBAC_USER'] . ':' . $aSiterestared['DB_RBAC_PASS'] . '@' . $aSiterestared['DB_RBAC_HOST'] . '/' . $aSiterestared['DB_RBAC_NAME'];
+    $rpDsn = $aSiterestared['DB_ADAPTER'] . '://' . $aSiterestared['DB_REPORT_USER'] . ':' . $aSiterestared['DB_REPORT_PASS'] . '@' . $aSiterestared['DB_REPORT_HOST'] . '/' . $aSiterestared['DB_REPORT_NAME'];
+    printf("%25s %s \n", 'Workflow Database', pakeColor::colorize($wfDsn, 'INFO'));
+    printf("%25s %s \n", 'RBAC Database', pakeColor::colorize($rbDsn, 'INFO'));
+    printf("%25s %s \n", 'Report Database', pakeColor::colorize($rpDsn, 'INFO'));
 }
 
 global $aFiles;
 
-function checkFileStandardCode ( $file ) {
-  global $aFiles;
+function checkFileStandardCode($file)
+{
+    global $aFiles;
 
-	if (  strpos ($file, 'workflow/engine/classes/model/om/') !== false ) {
-	  return;
-	}
-	if (  strpos ($file, 'workflow/engine/classes/model/map/') !== false ) {
-	  return;
-	}
-	if (  substr ($file, -4 ) == '.gif' ) {
-	  return;
-	}
+    if (strpos($file, 'workflow/engine/classes/model/om/') !== false) {
+        return;
+    }
+    if (strpos($file, 'workflow/engine/classes/model/map/') !== false) {
+        return;
+    }
+    if (substr($file, -4) == '.gif') {
+        return;
+    }
 
-	$rootFolder = str_replace ( PATH_TRUNK, '', $file );
+    $rootFolder = str_replace(PATH_TRUNK, '', $file);
 
-  $data = file_get_contents ( $file );
+    $data = file_get_contents($file);
 
-  $bTabs = false;
-  if ( strpos( $data, "\t" ) !== false ) {
-  	$bTabs = true;
-  }
+    $bTabs = false;
+    if (strpos($data, "\t") !== false) {
+        $bTabs = true;
+    }
 
-  $bUtf8 = false;
-  if ( strpos( $data, "\xff" ) !== false || strpos( $data, "\x00" ) !== false ) {
-//isUTF8
-  	$bUtf8 = true;
-  }
-  if ( filesize ( $file ) != strlen($data) ) {
-  	$bUtf8 = true;
-  }
+    $bUtf8 = false;
+    if (strpos($data, "\xff") !== false || strpos($data, "\x00") !== false) {
+        //isUTF8
+        $bUtf8 = true;
+    }
+    if (filesize($file) != strlen($data)) {
+        $bUtf8 = true;
+    }
 
-  $bDos = false;
-  if ( strpos( $data, "\x0D" ) !== false   ) {
-  	$bDos = true;
-  }
+    $bDos = false;
+    if (strpos($data, "\x0D") !== false) {
+        $bDos = true;
+    }
 
-  if ( $bUtf8 || $bTabs || $bDos ) {
-  	$aFiles[] = array ( 'file' => $rootFolder, 'tab' => $bTabs, 'utf' => $bUtf8, 'dos' => $bDos );
-
-  }
+    if ($bUtf8 || $bTabs || $bDos) {
+        $aFiles[] = array( 'file' => $rootFolder, 'tab' => $bTabs, 'utf' => $bUtf8, 'dos' => $bDos );
+    }
 }
 /*----------------------------------********---------------------------------*/
 /*function checkFolderStandardCode ( $folder, $bSubFolders ) {
   global $aFiles;
-	$rootFolder = str_replace ( PATH_TRUNK, '', $folder );
+    $rootFolder = str_replace ( PATH_TRUNK, '', $folder );
   //printf("%s \n", pakeColor::colorize($rootFolder, 'INFO'));
   if ($handle = opendir( $folder )) {
     while ( false !== ($file = readdir($handle))) {
 
       if ( substr( $file, 0, 1 ) !== '.' ) {
-      	if ( is_file ( $folder . '/' . $file ) ) {
+          if ( is_file ( $folder . '/' . $file ) ) {
           checkFileStandardCode ( $folder . '/' . $file);
         }
         if ( is_dir( $folder . '/' . $file ) && $bSubFolders  ) {
-        	checkFolderStandardCode ( $folder . '/' . $file, $bSubFolders );
+            checkFolderStandardCode ( $folder . '/' . $file, $bSubFolders );
         }
       }
     }
@@ -2193,31 +2276,35 @@ function checkFileStandardCode ( $file ) {
 /*----------------------------------********---------------------------------*/
 
 /*----------------------------------********---------------------------------*/
-function run_check_standard_code ( $task, $options) {
-  global $aFiles;
-  $aFiles = array();
-  if ( ! isset( $options[0]) ) {
-    $folder = PATH_TRUNK . 'classes';
-  }
-  else
-    $folder = PATH_TRUNK . $options[0];
+function run_check_standard_code($task, $options)
+{
+    global $aFiles;
+    $aFiles = array();
+    if (! isset($options[0])) {
+        $folder = PATH_TRUNK . 'classes';
+    } else {
+        $folder = PATH_TRUNK . $options[0];
+    }
 
 
-  if ( ! isset( $options[1]) ) {
-    $bSubFolders = false;
-  }
-  else
-    $bSubFolders = strtolower($options[1]) == 'true';
+    if (! isset($options[1])) {
+        $bSubFolders = false;
+    } else {
+        $bSubFolders = strtolower($options[1]) == 'true';
+    }
 
-  printf("checking folder %s\n", pakeColor::colorize($folder, 'INFO') );
-	checkFolderStandardCode ( $folder , $bSubFolders);
-  sort($aFiles);
-  foreach ( $aFiles as $key => $val ) {
-
-    printf("%s %s %s %s \n", pakeColor::colorize($val['tab'] ? 'tab' : '   ', 'INFO'),
+    printf("checking folder %s\n", pakeColor::colorize($folder, 'INFO'));
+    checkFolderStandardCode($folder, $bSubFolders);
+    sort($aFiles);
+    foreach ($aFiles as $key => $val) {
+        printf(
+        "%s %s %s %s \n",
+        pakeColor::colorize($val['tab'] ? 'tab' : '   ', 'INFO'),
            pakeColor::colorize($val['utf'] ? 'utf' : '   ', 'INFO'),
-           pakeColor::colorize($val['dos'] ? 'dos' : '   ', 'INFO'), $val['file'] );
-  }
+           pakeColor::colorize($val['dos'] ? 'dos' : '   ', 'INFO'),
+        $val['file']
+    );
+    }
 }
 /*----------------------------------********---------------------------------*/
 function run_update_plugin_attributes($task, $args)
@@ -2317,7 +2404,6 @@ function run_check_plugin_disabled_code($task, $args)
 
                 //Check disabled code
                 if (count($arrayData) > 0) {
-
                     $cs = new CodeScanner(true);
 
                     $strFoundDisabledCode = "";
@@ -2356,4 +2442,3 @@ function run_check_plugin_disabled_code($task, $args)
         error_log($e->getMessage() . "\n");
     }
 }
-
diff --git a/gulliver/bin/tasks/templates/dbInfo.php.tpl b/gulliver/bin/tasks/templates/dbInfo.php.tpl
index 0dff1bc0a..3868ff189 100644
--- a/gulliver/bin/tasks/templates/dbInfo.php.tpl
+++ b/gulliver/bin/tasks/templates/dbInfo.php.tpl
@@ -1,108 +1,106 @@
 <?php
 /**
  * dbInfo.php
- *  
+ *
  * {projectName}
- * 
+ *
  */
 function lookup($target)
 {
-  global $ntarget;
-  $msg = $target . ' => ';
-  //if( eregi('[a-zA-Z]', $target) )
-  if( preg_match('[a-zA-Z]', $target)) //Made compatible to PHP 5.3
+    global $ntarget;
+    $msg = $target . ' => ';
+    //if( eregi('[a-zA-Z]', $target) )
+  if (preg_match('[a-zA-Z]', $target)) { //Made compatible to PHP 5.3
     $ntarget = gethostbyname($target);
-  else
-    $ntarget = gethostbyaddr($target);
-  $msg .= $ntarget;
-  return($msg);
+  } else {
+      $ntarget = gethostbyaddr($target);
+  }
+    $msg .= $ntarget;
+    return($msg);
 }
 
-	function getDbServicesAvailables()
-	{ 
-		$servicesAvailables = Array();
-		
-		$dbServices = Array(
-			'mysql' => Array(
-                'id'        => 'mysql', 
-                'command'   => 'mysql_connect',
+    function getDbServicesAvailables()
+    {
+        $servicesAvailables = array();
+        
+        $dbServices = array(
+            'mysql' => array(
+                'id'        => 'mysql',
+                'command'   => 'mysqli_connect',
                 'name'      => 'MySql'
             ),
-			'pgsql' => Array(
+            'pgsql' => array(
                  'id'       => 'pgsql',
                  'command'  => 'pg_connect',
                  'name'     => 'PostgreSQL'
             ),
-			'mssql' => Array(
+            'mssql' => array(
                   'id'      => 'mssql',
                   'command' => 'mssql_connect',
                   'name'    => 'Microsoft SQL Server'),
-			'oracle'=> Array(
+            'oracle'=> array(
                 'id'        => 'oracle',
                 'command'   => 'oci_connect',
                 'name'      => 'Oracle'
             ),
-			'informix'=> Array(
+            'informix'=> array(
                 'id'        => 'informix',
                 'command'   => 'ifx_connect',
                 'name'      => 'Informix'
             ),
-			'sqlite' => Array(
+            'sqlite' => array(
                 'id'        => 'sqlite',
                 'command'   => 'sqlite_open',
                 'name'      => 'SQLite'
             )
-		);
-			
-		foreach($dbServices as $service) {
-			if(@function_exists($service['command'])){
-				$servicesAvailables[] = $service;
-			}
-		}
-		return $servicesAvailables;
-	}
+        );
+            
+        foreach ($dbServices as $service) {
+            if (@function_exists($service['command'])) {
+                $servicesAvailables[] = $service;
+            }
+        }
+        return $servicesAvailables;
+    }
 
-  function getDbServerVersion($driver)  {
-    try{
-      switch($driver)
-      {
+  function getDbServerVersion($driver)
+  {
+      try {
+          switch ($driver) {
         case 'mysql':
-            if($link = @mysql_connect( DB_HOST, DB_USER, DB_PASS)){
-                $v = @mysql_get_server_info();
+            if ($link = mysqli_connect(DB_HOST, DB_USER, DB_PASS)) {
+                $v = mysqli_get_server_info($link);
             } else {
-                throw new Exception(@mysql_error($link));
+                throw new Exception(mysqli_error($link));
             }
             break;
       }
-      return (isset($v))?$v:'none';
-    } catch (Exception $e){
-        return ($e->getMessage());
-    }
+          return (isset($v))?$v:'none';
+      } catch (Exception $e) {
+          return ($e->getMessage());
+      }
   }
 
-  if (file_exists(PATH_METHODS . 'login/version-{projectName}.php'))
-  {
-    include('version-{projectName}.php');
-  }
-  else {
-    define('PRG_VERSION', 'Development Version');
+  if (file_exists(PATH_METHODS . 'login/version-{projectName}.php')) {
+      include('version-{projectName}.php');
+  } else {
+      define('PRG_VERSION', 'Development Version');
   }
 
   if (getenv('HTTP_CLIENT_IP')) {
-    $ip = getenv('HTTP_CLIENT_IP');
-  }
-  elseif(getenv('HTTP_X_FORWARDED_FOR')) {
-    $ip = getenv('HTTP_X_FORWARDED_FOR');
+      $ip = getenv('HTTP_CLIENT_IP');
+  } elseif (getenv('HTTP_X_FORWARDED_FOR')) {
+      $ip = getenv('HTTP_X_FORWARDED_FOR');
   } else {
-    $ip = getenv('REMOTE_ADDR');
+      $ip = getenv('REMOTE_ADDR');
   }
 
     $redhat = '';
-    if ( file_exists ( '/etc/redhat-release' ) ) {
-      $fnewsize = filesize( '/etc/redhat-release'  );
-      $fp = fopen( '/etc/redhat-release' , 'r' );
-      $redhat = fread( $fp, $fnewsize );
-      fclose( $fp );
+    if (file_exists('/etc/redhat-release')) {
+        $fnewsize = filesize('/etc/redhat-release');
+        $fp = fopen('/etc/redhat-release', 'r');
+        $redhat = fread($fp, $fnewsize);
+        fclose($fp);
     }
     
     $redhat .= " (" . PHP_OS . ")";
@@ -111,9 +109,11 @@ function lookup($target)
   //$dbNetView->loginDbServer(DB_USER, DB_PASS);
   
   $availdb = '';
-  foreach ( getDbServicesAvailables()  as $key => $val ) {
-    if ( $availdb != '' ) $availdb .= ', ';
-    $availdb .= $val['name'];
+  foreach (getDbServicesAvailables()  as $key => $val) {
+      if ($availdb != '') {
+          $availdb .= ', ';
+      }
+      $availdb .= $val['name'];
   }
 
   $Fields['SYSTEM']          = $redhat;
@@ -122,7 +122,7 @@ function lookup($target)
   $Fields['DATABASE_NAME']   = DB_NAME;
   $Fields['PHP']             = phpversion();
   $Fields['FLUID']           = PRG_VERSION;
-  $Fields['IP']              = lookup ($ip);
+  $Fields['IP']              = lookup($ip);
   $Fields['ENVIRONMENT']     = SYS_SYS;
   $Fields['SERVER_SOFTWARE'] = getenv('SERVER_SOFTWARE');
   $Fields['SERVER_NAME']     = getenv('SERVER_NAME');
diff --git a/gulliver/bin/tasks/templates/green.php.tpl b/gulliver/bin/tasks/templates/green.php.tpl
index fc0698c48..c73ca3336 100644
--- a/gulliver/bin/tasks/templates/green.php.tpl
+++ b/gulliver/bin/tasks/templates/green.php.tpl
@@ -25,7 +25,7 @@
     $smarty->display('blank.html');
   }
   else {
-    $oHeadPublisher =& headPublisher::getSingleton();
+    $oHeadPublisher = headPublisher::getSingleton();
     if (isset($oHeadPublisher)) $header = $oHeadPublisher->printHeader();
 	  $smarty->assign('username', (isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ' ' . G::LoadTranslation('ID_IN') . ' ' . SYS_SYS . ')' : '') );
   	$smarty->assign('header', $header );
diff --git a/gulliver/bin/tasks/templates/pluginApplication.php.tpl b/gulliver/bin/tasks/templates/pluginApplication.php.tpl
index 308e10b0a..cf73b99c9 100644
--- a/gulliver/bin/tasks/templates/pluginApplication.php.tpl
+++ b/gulliver/bin/tasks/templates/pluginApplication.php.tpl
@@ -7,7 +7,7 @@
 
 try {
   /* Render page */
-  $oHeadPublisher = &headPublisher::getSingleton();
+  $oHeadPublisher = headPublisher::getSingleton();
   
   $G_MAIN_MENU        = "processmaker";
   $G_ID_MENU_SELECTED = "{menuId}_MNU_01";
diff --git a/gulliver/bin/tasks/templates/pluginApplication2.php.tpl b/gulliver/bin/tasks/templates/pluginApplication2.php.tpl
index 320f44c6e..58cd380e9 100644
--- a/gulliver/bin/tasks/templates/pluginApplication2.php.tpl
+++ b/gulliver/bin/tasks/templates/pluginApplication2.php.tpl
@@ -1,6 +1,6 @@
 <?php
 try {
-  $oHeadPublisher = &headPublisher::getSingleton();
+  $oHeadPublisher = headPublisher::getSingleton();
   
   $oHeadPublisher->addContent("{className}/{className}Application2"); //Adding a html file .html.
   $oHeadPublisher->addExtJsScript("{className}/{className}Application2", false); //Adding a javascript file .js
diff --git a/gulliver/bin/tasks/templates/pluginApplication3.php.tpl b/gulliver/bin/tasks/templates/pluginApplication3.php.tpl
index 575befe8a..6729c27df 100644
--- a/gulliver/bin/tasks/templates/pluginApplication3.php.tpl
+++ b/gulliver/bin/tasks/templates/pluginApplication3.php.tpl
@@ -1,6 +1,6 @@
 <?php
 try {
-  $oHeadPublisher = &headPublisher::getSingleton();
+  $oHeadPublisher = headPublisher::getSingleton();
   
   $oHeadPublisher->addContent("{className}/{className}Application3"); //Adding a html file .html.
   $oHeadPublisher->addExtJsScript("{className}/{className}Application3", false); //Adding a javascript file .js
diff --git a/gulliver/bin/tasks/templates/pluginMainFile.tpl b/gulliver/bin/tasks/templates/pluginMainFile.tpl
index b1b438ca3..74459db57 100644
--- a/gulliver/bin/tasks/templates/pluginMainFile.tpl
+++ b/gulliver/bin/tasks/templates/pluginMainFile.tpl
@@ -111,5 +111,5 @@ class {className}Plugin extends PMPlugin
   <!-- END BLOCK : dashboard -->
 }
 
-$oPluginRegistry = &PMPluginRegistry::getSingleton();
+$oPluginRegistry = PMPluginRegistry::getSingleton();
 $oPluginRegistry->registerPlugin("{className}", __FILE__);
diff --git a/gulliver/bin/tasks/templates/pluginStepApplication.php.tpl b/gulliver/bin/tasks/templates/pluginStepApplication.php.tpl
index a763be264..7f08e28d1 100644
--- a/gulliver/bin/tasks/templates/pluginStepApplication.php.tpl
+++ b/gulliver/bin/tasks/templates/pluginStepApplication.php.tpl
@@ -1,7 +1,7 @@
 <?php
 try {
   global $Fields;
-  $oHeadPublisher = &headPublisher::getSingleton();
+  $oHeadPublisher = headPublisher::getSingleton();
   
   //SYS_SYS     //Workspace name
   //PROCESS     //Process UID
diff --git a/gulliver/bin/tasks/templates/sysGeneric.php.tpl b/gulliver/bin/tasks/templates/sysGeneric.php.tpl
index abe03b7fd..79914245e 100644
--- a/gulliver/bin/tasks/templates/sysGeneric.php.tpl
+++ b/gulliver/bin/tasks/templates/sysGeneric.php.tpl
@@ -124,7 +124,7 @@ $docuroot = explode ( PATH_SEP , $_SERVER['DOCUMENT_ROOT'] );
 
 //***************** Call Gulliver Classes **************************
 
-  $oHeadPublisher =& headPublisher::getSingleton();
+  $oHeadPublisher = headPublisher::getSingleton();
 
   //***************** database and workspace definition  ************************
   //if SYS_TEMP exists, the URL has a workspace, now we need to verify if exists their db.php file
@@ -203,7 +203,7 @@ $docuroot = explode ( PATH_SEP , $_SERVER['DOCUMENT_ROOT'] );
 //  //the singleton has a list of enabled plugins
 
 //  $sSerializedFile = PATH_DATA_SITE . 'plugin.singleton';
-//  $oPluginRegistry =& PMPluginRegistry::getSingleton();
+//  $oPluginRegistry = PMPluginRegistry::getSingleton();
 //  if ( file_exists ($sSerializedFile) )
 //    $oPluginRegistry->unSerializeInstance( file_get_contents  ( $sSerializedFile ) );
 //
@@ -297,7 +297,7 @@ $docuroot = explode ( PATH_SEP , $_SERVER['DOCUMENT_ROOT'] );
 
 //  ***************** enable rbac **************************
 
-    $RBAC =& RBAC::getSingleton();
+    $RBAC = RBAC::getSingleton();
     $RBAC->sSystem = '{rbacProjectName}';
 
 //  ***************** Headers **************************
diff --git a/gulliver/methods/defaultAjax.php b/gulliver/methods/defaultAjax.php
index 645cf34b6..1a89e359c 100644
--- a/gulliver/methods/defaultAjax.php
+++ b/gulliver/methods/defaultAjax.php
@@ -26,113 +26,115 @@
 
 use ProcessMaker\Plugins\PluginRegistry;
 
-if (isset( $_SESSION['CURRENT_PAGE_INITILIZATION'] ))
-    eval( $_SESSION['CURRENT_PAGE_INITILIZATION'] );
+if (isset($_SESSION['CURRENT_PAGE_INITILIZATION'])) {
+    eval($_SESSION['CURRENT_PAGE_INITILIZATION']);
+}
 
 
-   // $json=new Services_JSON();
-if (! defined( 'XMLFORM_AJAX_PATH' ))
-    define( 'XMLFORM_AJAX_PATH', PATH_XMLFORM );
+// $json=new Services_JSON();
+if (!defined('XMLFORM_AJAX_PATH')) {
+    define('XMLFORM_AJAX_PATH', PATH_XMLFORM);
+}
 
-$_DBArray = array ();
-if (isset( $_SESSION['_DBArray'] )) {
+$_DBArray = array();
+if (isset($_SESSION['_DBArray'])) {
     $_DBArray = $_SESSION['_DBArray'];
 }
 
-$xmlFile = G::getUIDName( urlDecode( $_POST['form'] ) );
+$xmlFile = G::getUIDName(urlDecode($_POST['form']));
 $sPath = XMLFORM_AJAX_PATH;
 
 //if the xmlform file doesn't exist, then try with the plugins folders
-if (! is_file( XMLFORM_AJAX_PATH . $xmlFile )) {
-    $aux = explode( PATH_SEP, $xmlFile );
+if (!is_file(XMLFORM_AJAX_PATH . $xmlFile)) {
+    $aux = explode(PATH_SEP, $xmlFile);
     //check if G_PLUGIN_CLASS is defined, because publisher can be called without an environment
-    if (count( $aux ) == 2 && defined( 'G_PLUGIN_CLASS' )) {
+    if (count($aux) == 2 && defined('G_PLUGIN_CLASS')) {
         $oPluginRegistry = PluginRegistry::loadSingleton();
-        if ($oPluginRegistry->isRegisteredFolder( $aux[0] )) {
+        if ($oPluginRegistry->isRegisteredFolder($aux[0])) {
             $sPath = PATH_PLUGINS;
         }
     }
 }
 
-$G_FORM = new Form( $xmlFile, $sPath );
-$G_FORM->id = urlDecode( $_POST['form'] );
-$G_FORM->values = isset( $_SESSION[$G_FORM->id] ) ? $_SESSION[$G_FORM->id] : array ();
+$G_FORM = new Form($xmlFile, $sPath);
+$G_FORM->id = urlDecode($_POST['form']);
+$G_FORM->values = isset($_SESSION[$G_FORM->id]) ? $_SESSION[$G_FORM->id] : array();
 
-$newValues = (Bootstrap::json_decode( urlDecode( stripslashes( $_POST['fields'] ) ) ));
+$newValues = (Bootstrap::json_decode(urlDecode(stripslashes($_POST['fields']))));
 
-if (isset( $_POST['grid'] )) {
-    $_POST['row'] = (int) $_POST['row'];
-    $aAux = array ();
+if (isset($_POST['grid'])) {
+    $_POST['row'] = (int)$_POST['row'];
+    $aAux = array();
 
     foreach ($newValues as $sKey => $newValue) {
-        $newValue = (array) $newValue;
-        $aKeys = array_keys( $newValue );
-        if (count($aKeys)>0) {
-            $aValues = array ();
-            for ($i = 1; $i <= ($_POST['row'] - 1); $i ++) {
-                $aValues[$i] = array ($aKeys[0] => '' );
+        $newValue = (array)$newValue;
+        $aKeys = array_keys($newValue);
+        if (count($aKeys) > 0) {
+            $aValues = array();
+            for ($i = 1; $i <= ($_POST['row'] - 1); $i++) {
+                $aValues[$i] = array($aKeys[0] => '');
             }
-            $aValues[$_POST['row']] = array ($aKeys[0] => $newValue[$aKeys[0]] );
-            $newValues[$sKey]->$_POST['grid'] = $aValues;
-            unset( $newValues[$sKey]->$aKeys[0] );
+            $aValues[$_POST['row']] = array($aKeys[0] => $newValue[$aKeys[0]]);
+            $newValues[$sKey]->{$_POST['grid']} = $aValues;
+            unset($newValues[$sKey]->{$aKeys[0]});
         }
     }
 }
 
 //Next Lines re-build newValues array to send multiple dependent fields merged by row into a grid.
-if (sizeof( $newValues ) > 1 && isset( $_POST['grid'] )) {
-    $fieldBase = array ();
+if (count($newValues) > 1 && isset($_POST['grid'])) {
+    $fieldBase = array();
     foreach ($newValues as $key => $values) {
-        for ($r2 = 1; $r2 <= $_POST['row']; $r2 ++) {
+        for ($r2 = 1; $r2 <= $_POST['row']; $r2++) {
             foreach ($values as $class => $value) {
                 if ($class == $_POST['grid']) {
-                    $value = (array) $value;
+                    $value = (array)$value;
                     $arrayK = $value[$r2];
                     foreach ($arrayK as $key2 => $val) {
-                        $fieldBase[$r2][$key2] = is_array( $val ) ? $val[$key2] : $val;
+                        $fieldBase[$r2][$key2] = is_array($val) ? $val[$key2] : $val;
                     }
                 }
             }
         }
     }
-    $newValues[0]->$_POST['grid'] = $fieldBase;
+    $newValues[0]->{$_POST['grid']} = $fieldBase;
 }
 
 //Resolve dependencies
 //Returns an array ($dependentFields) with the names of the fields
 //that depends of fields passed through AJAX ($_GET/$_POST)
 //Returns all dependencies of all fields, this in grids
-$dependentFields = array ();
-$aux = array ();
-for ($r = 0; $r < sizeof( $newValues ); $r ++) {
-    $newValues[$r] = (array) $newValues[$r];
-    $G_FORM->setValues( $newValues[$r] );
+$dependentFields = array();
+$aux = array();
+for ($r = 0; $r < count($newValues); $r++) {
+    $newValues[$r] = (array)$newValues[$r];
+    $G_FORM->setValues($newValues[$r]);
     //Search dependent fields
     foreach ($newValues[$r] as $k => $v) {
-        if (! is_array( $v )) {
-            $myDependentFields = subDependencies( $k, $G_FORM, $aux );
+        if (!is_array($v)) {
+            $myDependentFields = subDependencies($k, $G_FORM, $aux);
             $_SESSION[$G_FORM->id][$k] = $v;
         } else {
             foreach ($v[$_POST['row']] as $k1 => $v1) {
-                $myDependentFields = subDependencies( $k1, $G_FORM, $aux, $_POST['grid'] );
+                $myDependentFields = subDependencies($k1, $G_FORM, $aux, $_POST['grid']);
                 $_SESSION[$G_FORM->id][$_POST['grid']][$_POST['row']][$k1] = $v1;
                 $G_FORM->values[$_POST['grid']][$_POST['row']][$k1] = $v1;
             }
         }
-        $dependentFields = array_merge( $dependentFields, $myDependentFields );
+        $dependentFields = array_merge($dependentFields, $myDependentFields);
     }
 }
 
-$dependentFields = array_unique( $dependentFields );
+$dependentFields = array_unique($dependentFields);
 
 //Update when is depenfield set empty
 $newForm = $G_FORM->values;
-foreach($newForm as $fKey => $values){
-  foreach($dependentFields as $att){
-    if($att == $fKey){
-      $newForm[$fKey] = '';
+foreach ($newForm as $fKey => $values) {
+    foreach ($dependentFields as $att) {
+        if ($att == $fKey) {
+            $newForm[$fKey] = '';
+        }
     }
-  }
 }
 $G_FORM->values = $newForm;
 
@@ -148,7 +150,7 @@ if (isset($_POST["grid"])) {
         $arrayAux = (array)($fieldData);
 
         foreach ($arrayAux as $index => $value) {
-            $ereg = $ereg . (($ereg != null)? "|" : null) . $index; //Concatenate field
+            $ereg = $ereg . (($ereg != null) ? "|" : null) . $index; //Concatenate field
         }
     }
 
@@ -200,10 +202,10 @@ if (isset($_POST["grid"]) && isset($_POST["gridField"])) {
 }
 
 //Parse and update the new content
-$newContent = $G_FORM->getFields(PATH_CORE . "templates" . PATH_SEP . "xmlform.html", (isset($_POST["row"])? $_POST["row"] : -1));
+$newContent = $G_FORM->getFields(PATH_CORE . "templates" . PATH_SEP . "xmlform.html", (isset($_POST["row"]) ? $_POST["row"] : -1));
 
 //Returns the dependentFields's content
-$sendContent = array ();
+$sendContent = array();
 $r = 0;
 
 //Set data
@@ -213,19 +215,19 @@ foreach ($dependentFields as $d) {
     $sendContent[$r]->name = $d;
     $sendContent[$r]->content = new stdclass();
 
-    if (! isset( $_POST['grid'] )) {
-        if (isset( $G_FORM->fields[$d] )) {
+    if (!isset($_POST['grid'])) {
+        if (isset($G_FORM->fields[$d])) {
             foreach ($G_FORM->fields[$d] as $attribute => $value) {
                 switch ($attribute) {
                     case 'type':
                         $sendContent[$r]->content->{$attribute} = $value;
                         break;
                     case 'options':
-                        $sendContent[$r]->content->{$attribute} = toJSArray( $value, $sendContent[$r]->content->type );
+                        $sendContent[$r]->content->{$attribute} = toJSArray($value, $sendContent[$r]->content->type);
                         break;
                 }
             }
-            $sendContent[$r]->value = isset( $G_FORM->values[$d] ) ? $G_FORM->values[$d] : '';
+            $sendContent[$r]->value = isset($G_FORM->values[$d]) ? $G_FORM->values[$d] : '';
         }
     } else {
         foreach ($G_FORM->fields[$_POST['grid']]->fields[$d] as $attribute => $value) {
@@ -237,12 +239,12 @@ foreach ($dependentFields as $d) {
                     if ($sendContent[$r]->content->type != "text" && $sendContent[$r]->content->type != "textarea") {
                         $sendContent[$r]->content->{$attribute} = toJSArray($value);
                     } else {
-                        $sendContent[$r]->content->{$attribute} = toJSArray((isset($value[$_POST["row"]])? array($value[$_POST["row"]]) : array()));
+                        $sendContent[$r]->content->{$attribute} = toJSArray((isset($value[$_POST["row"]]) ? array($value[$_POST["row"]]) : array()));
                     }
                     break;
             }
         }
-        $sendContent[$r]->value = isset( $G_FORM->values[$_POST['grid']][$_POST['row']][$d] ) ? $G_FORM->values[$_POST['grid']][$_POST['row']][$d] : '';
+        $sendContent[$r]->value = isset($G_FORM->values[$_POST['grid']][$_POST['row']][$d]) ? $G_FORM->values[$_POST['grid']][$_POST['row']][$d] : '';
     }
 
     $r = $r + 1;
@@ -250,9 +252,9 @@ foreach ($dependentFields as $d) {
 
 echo Bootstrap::json_encode($sendContent);
 
-function toJSArray ($array, $type = '')
+function toJSArray($array, $type = '')
 {
-    $result = array ();
+    $result = array();
     foreach ($array as $k => $v) {
         $o = new stdclass();
         $o->key = $k;
@@ -264,55 +266,62 @@ function toJSArray ($array, $type = '')
     return $result;
 }
 
-function subDependencies ($k, &$G_FORM, &$aux, $grid = '')
+function subDependencies($k, &$G_FORM, &$aux, $grid = '')
 {
-    if (array_search( $k, $aux ) !== FALSE)
-        return array ();
+    if (array_search($k, $aux) !== false) {
+        return array();
+    }
     if ($grid == '') {
-        if (! array_key_exists( $k, $G_FORM->fields ))
-            return array ();
-        if (! isset( $G_FORM->fields[$k]->dependentFields ))
-            return array ();
-        $aux[] = $k;
-        if (strpos( $G_FORM->fields[$k]->dependentFields, ',' ) !== false) {
-            $myDependentFields = explode( ',', $G_FORM->fields[$k]->dependentFields );
-        } else {
-            $myDependentFields = explode( '|', $G_FORM->fields[$k]->dependentFields );
+        if (!array_key_exists($k, $G_FORM->fields)) {
+            return array();
         }
-        for ($r = 0; $r < sizeof( $myDependentFields ); $r ++) {
-            if ($myDependentFields[$r] == "")
-                unset( $myDependentFields[$r] );
+        if (!isset($G_FORM->fields[$k]->dependentFields)) {
+            return array();
+        }
+        $aux[] = $k;
+        if (strpos($G_FORM->fields[$k]->dependentFields, ',') !== false) {
+            $myDependentFields = explode(',', $G_FORM->fields[$k]->dependentFields);
+        } else {
+            $myDependentFields = explode('|', $G_FORM->fields[$k]->dependentFields);
+        }
+        for ($r = 0; $r < count($myDependentFields); $r++) {
+            if ($myDependentFields[$r] == "") {
+                unset($myDependentFields[$r]);
+            }
         }
         $mD = $myDependentFields;
-        foreach( $mD as $ki) {
-            $myDependentFields = array_merge( $myDependentFields , subDependencies( $ki , $G_FORM , $aux ) );
+        foreach ($mD as $ki) {
+            $myDependentFields = array_merge($myDependentFields, subDependencies($ki, $G_FORM, $aux));
         }
     } else {
-        if (! isset($G_FORM->fields[$grid])) {
-            return array ();
+        if (!isset($G_FORM->fields[$grid])) {
+            return array();
+        }
+        if (!array_key_exists($k, $G_FORM->fields[$grid]->fields)) {
+            return array();
+        }
+        if (!isset($G_FORM->fields[$grid]->fields[$k]->dependentFields)) {
+            return array();
         }
-        if (! array_key_exists( $k, $G_FORM->fields[$grid]->fields ))
-            return array ();
-        if (! isset( $G_FORM->fields[$grid]->fields[$k]->dependentFields ))
-            return array ();
 
         $aux[] = $k;
 
-        if (strpos( $G_FORM->fields[$grid]->fields[$k]->dependentFields, ',' ) !== false) {
-            $myDependentFields = explode( ',', $G_FORM->fields[$grid]->fields[$k]->dependentFields );
+        if (strpos($G_FORM->fields[$grid]->fields[$k]->dependentFields, ',') !== false) {
+            $myDependentFields = explode(',', $G_FORM->fields[$grid]->fields[$k]->dependentFields);
         } else {
-            $myDependentFields = explode( '|', $G_FORM->fields[$grid]->fields[$k]->dependentFields );
+            $myDependentFields = explode('|', $G_FORM->fields[$grid]->fields[$k]->dependentFields);
         }
 
-        for ($r = 0; $r < sizeof( $myDependentFields ); $r ++) {
-            if ($myDependentFields[$r] == "")
-                unset( $myDependentFields[$r] );
+        for ($r = 0; $r < count($myDependentFields); $r++) {
+            if ($myDependentFields[$r] == "") {
+                unset($myDependentFields[$r]);
+            }
         }
 
         $mD = $myDependentFields;
 
-        foreach( $mD as $ki) {
-            $myDependentFields = array_merge( $myDependentFields , subDependencies( $ki , $G_FORM , $aux, $grid) );
+        foreach ($mD as $ki) {
+            $myDependentFields = array_merge($myDependentFields, subDependencies($ki, $G_FORM, $aux, $grid));
         }
 
         //Set field and the dependent field of the grid
@@ -323,4 +332,3 @@ function subDependencies ($k, &$G_FORM, &$aux, $grid = '')
 
     return $myDependentFields;
 }
-
diff --git a/gulliver/methods/genericAjax.php b/gulliver/methods/genericAjax.php
index f75561d26..83883f03b 100644
--- a/gulliver/methods/genericAjax.php
+++ b/gulliver/methods/genericAjax.php
@@ -24,7 +24,7 @@ if (isset($request)) {
                     $_SESSION[$_POST["formID"]][$_POST["gridname"]] = (array)$_SESSION[$_POST["formID"]][$_POST["gridname"]];
                 }
                 ksort($_SESSION[$_POST["formID"]][$_POST["gridname"]]);
-                $oFields = array();
+                $oFields = [];
                 $initialKey = 1;
 
                 foreach ($_SESSION[$_POST["formID"]][$_POST["gridname"]] as $key => $value) {
@@ -66,12 +66,12 @@ if (isset($request)) {
 
 
                 $bdUid = 'workflow';
-                if (isset($_GET['type']) && $_GET['type']==='form' && isset($myForm->fields[$_GET['variable']]->sql)) {
+                if (isset($_GET['type']) && $_GET['type'] === 'form' && isset($myForm->fields[$_GET['variable']]->sql)) {
                     $sqlQuery = $myForm->fields[$_GET['variable']]->sql;
                     if (isset($myForm->fields[$_GET['variable']]->sqlConnection) && !empty($myForm->fields[$_GET['variable']]->sqlConnection)) {
                         $bdUid = $myForm->fields[$_GET['variable']]->sqlConnection;
                     }
-                } elseif (isset($_GET['type']) && $_GET['type']==='grid' &&  isset($myForm->fields[$_GET['grid']])) {
+                } elseif (isset($_GET['type']) && $_GET['type'] === 'grid' && isset($myForm->fields[$_GET['grid']])) {
                     foreach ($myForm->fields[$_GET['grid']] as $index => $value) {
                         if (is_array($value) && isset($value[$_GET['variable']])) {
                             $newObj = $value[$_GET['variable']];
@@ -89,7 +89,7 @@ if (isset($request)) {
                 $aDependentFieldsKeys = explode("|", base64_decode(str_rot13($_GET['dependentFieldsKeys'])));
                 $aDependentFieldsValue = explode("|", $_GET['dependentFieldsValue']);
                 if ($aDependentFieldsKeys) {
-                    $aDependentFields = array();
+                    $aDependentFields = [];
                     foreach ($aDependentFieldsKeys as $nKey => $sFieldVar) {
                         $sKeyDepFields = substr($sFieldVar, 2);
                         $aDependentFields[$sKeyDepFields] = $aDependentFieldsValue[$nKey];
@@ -105,7 +105,7 @@ if (isset($request)) {
                 // Verify parsed array
                 $sqlQuery = queryModified($parser->parsed, $_GET['input'], $searchType);
 
-                $aRows = Array();
+                $aRows = [];
                 try {
                     $con = Propel::getConnection($bdUid);
                     $con->begin();
@@ -122,7 +122,7 @@ if (isset($request)) {
                 $input = strtolower($_GET['input']);
                 $len = strlen($input);
                 $limit = isset($_GET['limit']) ? (int)$_GET['limit'] : 0;
-                $aResults = array();
+                $aResults = [];
                 $count = 0;
                 $aRows = sortByChar($aRows, $input);
 
@@ -213,7 +213,7 @@ if (isset($request)) {
                 }
 
                 // See above. Gross, but it works.
-                $field = mysql_real_escape_string($_GET['fld']);
+                $field = mysqli_real_escape_string($con->getResource(), $_GET['fld']);
                 $field = str_replace("`", "", $field);
 
                 $query = "INSERT INTO $tableName ($primaryKeyField, $field) VALUES (?, ?)"; // '$gKey', '{$_GET['value']}')";
@@ -235,8 +235,8 @@ if (isset($request)) {
 
 function sortByChar($aRows, $charSel)
 {
-    $aIniChar = array();
-    $aRest = array();
+    $aIniChar = [];
+    $aRest = [];
     for ($i = 0; $i < count($aRows); $i++) {
         $aRow = $aRows[$i];
         $nCols = sizeof($aRow);
diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php
index 40d1f90a4..fef3f13bd 100644
--- a/gulliver/system/class.bootstrap.php
+++ b/gulliver/system/class.bootstrap.php
@@ -134,7 +134,7 @@ class Bootstrap
 
         $filter = new InputFilter();
 
-        $smarty = new Smarty ();
+        $smarty = new Smarty();
         $smarty->compile_dir = Bootstrap::sys_get_temp_dir();
         $smarty->cache_dir = Bootstrap::sys_get_temp_dir();
         $configDir = PATH_THIRDPARTY . 'smarty/configs';
@@ -320,7 +320,7 @@ class Bootstrap
                     if ($download) {
                         Bootstrap::sendHeaders($fileNameIni, "text/plain", $download, $downloadFileName);
                     } else {
-                        require_once ($filename);
+                        require_once($filename);
                         return;
                     }
                     break;
@@ -334,7 +334,7 @@ class Bootstrap
             }
         } else {
             if (strpos($file, 'gulliver') !== false) {
-                list ($path, $filename) = explode('gulliver', $file);
+                list($path, $filename) = explode('gulliver', $file);
             }
 
             $_SESSION['phpFileNotFound'] = $file;
@@ -358,7 +358,7 @@ class Bootstrap
      *
      * @return string
      */
-    static public function parseURI($uri, array $arrayFriendlyUri = null)
+    public static function parseURI($uri, array $arrayFriendlyUri = null)
     {
         // *** process the $_POST with magic_quotes enabled
         // The magic_quotes_gpc feature has been DEPRECATED as of PHP 5.3.0.
@@ -475,21 +475,21 @@ class Bootstrap
      */
     public static function LoadTranslationObject($lang = SYS_LANG)
     {
-        $defaultTranslations = Array();
-        $foreignTranslations = Array();
+        $defaultTranslations = array();
+        $foreignTranslations = array();
 
         // if the default translations table doesn't exist we can't proceed
         if (!is_file(PATH_LANGUAGECONT . 'translation.en')) {
             return null;
         }
         // load the translations table
-        require_once (PATH_LANGUAGECONT . 'translation.en');
+        require_once(PATH_LANGUAGECONT . 'translation.en');
         $defaultTranslations = $translation;
 
         // if some foreign language was requested and its translation file
         // exists
         if ($lang != 'en' && file_exists(PATH_LANGUAGECONT . 'translation.' . $lang)) {
-            require_once (PATH_LANGUAGECONT . 'translation.' . $lang); // load the foreign translations table
+            require_once(PATH_LANGUAGECONT . 'translation.' . $lang); // load the foreign translations table
             $foreignTranslations = $translation;
         }
 
@@ -514,9 +514,9 @@ class Bootstrap
      * @param  array list plugins active
      * @return void
      */
-    public static function LoadTranslationPlugins ($lang = SYS_LANG, $listPluginsActive)
+    public static function LoadTranslationPlugins($lang = SYS_LANG, $listPluginsActive)
     {
-        if ( ! ( is_array ( $listPluginsActive ) ) ) {
+        if (! (is_array($listPluginsActive))) {
             return null;
         }
 
@@ -528,17 +528,17 @@ class Bootstrap
                 Translation::generateFileTranslationPlugin($namePlugin, 'en');
             }
 
-            if ( ($lang != 'en') && (!file_exists(PATH_LANGUAGECONT . $namePlugin . '.' . $lang)) ) {
+            if (($lang != 'en') && (!file_exists(PATH_LANGUAGECONT . $namePlugin . '.' . $lang))) {
                 Translation::generateFileTranslationPlugin($namePlugin, $lang);
             }
 
             if (file_exists(PATH_LANGUAGECONT . $namePlugin . '.' . $lang)) {
                 eval('global $translation'.$namePlugin.';');
-                require_once (PATH_LANGUAGECONT . $namePlugin . '.' . $lang);
+                require_once(PATH_LANGUAGECONT . $namePlugin . '.' . $lang);
             } else {
                 if (file_exists(PATH_LANGUAGECONT . $namePlugin . '.en')) {
                     eval('global $translation'.$namePlugin.';');
-                    require_once (PATH_LANGUAGECONT . $namePlugin . '.en');
+                    require_once(PATH_LANGUAGECONT . $namePlugin . '.en');
                 }
             }
         }
@@ -575,7 +575,7 @@ class Bootstrap
         } catch (Exception $e) {
             global $G_PUBLISH;
             if (is_null($G_PUBLISH)) {
-                $G_PUBLISH = new Publisher ();
+                $G_PUBLISH = new Publisher();
             }
             if (count($G_PUBLISH->Parts) == 1) {
                 array_shift($G_PUBLISH->Parts);
@@ -594,7 +594,7 @@ class Bootstrap
             } else {
                 $token = strtotime("now");
                 PMException::registerErrorLog($e, $token);
-                G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
+                G::outRes(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)));
                 die;
             }
         }
@@ -676,7 +676,7 @@ class Bootstrap
     {
         // Get the current Include path, where the plugins directories should be
         if (!defined('PATH_SEPARATOR')) {
-            define('PATH_SEPARATOR', (substr(PHP_OS, 0, 3) == 'WIN') ? ';' : ':' );
+            define('PATH_SEPARATOR', (substr(PHP_OS, 0, 3) == 'WIN') ? ';' : ':');
         }
         $path = explode(PATH_SEPARATOR, get_include_path());
 
@@ -687,7 +687,7 @@ class Bootstrap
                     if ($handle = opendir($baseDir)) {
                         while (false !== ($file = readdir($handle))) {
                             if (strpos($file, '.php', 1) && !strpos($file, 'Peer.php', 1)) {
-                                require_once ($baseDir . PATH_SEP . $file);
+                                require_once($baseDir . PATH_SEP . $file);
                             }
                         }
                     }
@@ -756,19 +756,19 @@ class Bootstrap
         $fileConst = ($typeName == 'translation') ? 'translation.' . $locale : 'translation.' . $typeName . '.' . $locale;
 
         if ($typeName == 'translation') {
-            $defaultTranslations = Array();
-            $foreignTranslations = Array();
+            $defaultTranslations = array();
+            $foreignTranslations = array();
             $calendarJs = '';
 
             //load the translations table
             if (is_file(PATH_LANGUAGECONT . 'translation.en')) {
-                require_once (PATH_LANGUAGECONT . 'translation.en');
+                require_once(PATH_LANGUAGECONT . 'translation.en');
                 $defaultTranslations = $translation;
             }
 
             //if some foreign language was requested and its translation file exists
             if ($locale != 'en' && file_exists(PATH_LANGUAGECONT . 'translation.' . $locale)) {
-                require_once (PATH_LANGUAGECONT . 'translation.' . $locale); //load the foreign translations table
+                require_once(PATH_LANGUAGECONT . 'translation.' . $locale); //load the foreign translations table
                 $foreignTranslations = $translation;
             }
 
@@ -790,7 +790,7 @@ class Bootstrap
             unset($typearray[count($typearray)]);
             $newName = implode('.', $typearray);
             if (file_exists(PATH_LANGUAGECONT . $newName)) {
-                require_once (PATH_LANGUAGECONT . $newName);
+                require_once(PATH_LANGUAGECONT . $newName);
                 $return = '';
                 eval('$return = "var TRANSLATIONS_" . strtoupper($typeName) . " = " . Bootstrap::json_encode($translation' . $typeName . ') . ";";');
                 return $return;
@@ -921,8 +921,7 @@ class Bootstrap
 
             if (((in_array($browserName, $enabledBrowsers)) || (in_array('ALL', $enabledBrowsers))) && (!(in_array($browserName, $disabledBrowsers)))) {
                 if ($cssFileInfo['__ATTRIBUTES__']['file'] == 'rtl.css') {
-
-                    $oServerConf = & ServerConf::getSingleton();
+                    $oServerConf = ServerConf::getSingleton();
                     if (!(defined('SYS_LANG'))) {
                         if (isset($_SERVER['HTTP_REFERER'])) {
                             $syss = explode('://', $_SERVER['HTTP_REFERER']);
@@ -997,7 +996,6 @@ class Bootstrap
         }
 
         if (!$download) {
-
             header('Pragma: cache');
 
             if (file_exists($filename)) {
@@ -1203,7 +1201,6 @@ class Bootstrap
         if (function_exists('json_encode')) {
             return json_encode($Json);
         } else {
-
             $oJSON = new Services_JSON();
             return $oJSON->encode($Json);
         }
@@ -1219,7 +1216,6 @@ class Bootstrap
         if (function_exists('json_decode')) {
             return json_decode($Json);
         } else {
-
             $oJSON = new Services_JSON();
             return $oJSON->decode($Json);
         }
@@ -1575,7 +1571,7 @@ class Bootstrap
             //start the search after the first string occurrence
             if (strpos($pv_browser_user_agent, $pv_search_string, $start_pos) !== false) {
                 $start_pos = strpos($pv_browser_user_agent, $pv_search_string, $start_pos) + strlen($pv_search_string);
-                if (!$pv_b_break_last || ( $pv_extra_search && strstr($pv_browser_user_agent, $pv_extra_search) )) {
+                if (!$pv_b_break_last || ($pv_extra_search && strstr($pv_browser_user_agent, $pv_extra_search))) {
                     break;
                 }
             } else {
@@ -1683,7 +1679,7 @@ class Bootstrap
                             $os_working_type = 'nt';
                         } elseif (strstr($pv_browser_string, '95')) {
                             $os_working_number = '95';
-                        } elseif (( strstr($pv_browser_string, '9x 4.9') ) || ( strstr($pv_browser_string, ' me') )) {
+                        } elseif ((strstr($pv_browser_string, '9x 4.9')) || (strstr($pv_browser_string, ' me'))) {
                             $os_working_number = 'me';
                         } elseif (strstr($pv_browser_string, '98')) {
                             $os_working_number = '98';
@@ -1699,9 +1695,9 @@ class Bootstrap
                             } else {
                                 $os_working_number = 10;
                             }
-                        } elseif (( $pv_browser_name == 'saf' ) || ( $pv_browser_name == 'cam' ) ||
-                                ( ( $pv_browser_name == 'moz' ) && ( $pv_version_number >= 1.3 ) ) ||
-                                ( ( $pv_browser_name == 'ie' ) && ( $pv_version_number >= 5.2 ) )) {
+                        } elseif (($pv_browser_name == 'saf') || ($pv_browser_name == 'cam') ||
+                                (($pv_browser_name == 'moz') && ($pv_version_number >= 1.3)) ||
+                                (($pv_browser_name == 'ie') && ($pv_version_number >= 5.2))) {
                             $os_working_number = 10;
                         }
                         break;
@@ -1712,23 +1708,23 @@ class Bootstrap
                         break;
                 }
                 break;
-            } elseif (is_array($os_working_data) && ( $i == ( $i_count - 2 ) )) {
+            } elseif (is_array($os_working_data) && ($i == ($i_count - 2))) {
                 $j_count = count($os_working_data);
                 for ($j = 0; $j < $j_count; $j++) {
                     if (strstr($pv_browser_string, $os_working_data[$j])) {
                         $os_working_type = 'unix'; //if the os is in the unix array, it's unix, obviously...
-                        $os_working_number = ( $os_working_data[$j] != 'unix' ) ? $os_working_data[$j] : ''; // assign sub unix version from the unix array
+                        $os_working_number = ($os_working_data[$j] != 'unix') ? $os_working_data[$j] : ''; // assign sub unix version from the unix array
                         break;
                     }
                 }
-            } elseif (is_array($os_working_data) && ( $i == ( $i_count - 1 ))) {
+            } elseif (is_array($os_working_data) && ($i == ($i_count - 1))) {
                 $j_count = count($os_working_data);
                 for ($j = 0; $j < $j_count; $j++) {
                     if (strstr($pv_browser_string, $os_working_data[$j])) {
                         $os_working_type = 'lin';
                         // assign linux distro from the linux array, there's a default
                         //search for 'lin', if it's that, set version to ''
-                        $os_working_number = ( $os_working_data[$j] != 'linux' ) ? $os_working_data[$j] : '';
+                        $os_working_number = ($os_working_data[$j] != 'linux') ? $os_working_data[$j] : '';
                         break;
                     }
                 }
@@ -1827,7 +1823,7 @@ class Bootstrap
             }
         }
         // just for cases where we know it's a mobile device already
-        if (!$mobile_os && ( $mobile_browser || $mobile_device || $mobile_server ) && strstr($pv_browser_user_agent, 'linux')) {
+        if (!$mobile_os && ($mobile_browser || $mobile_device || $mobile_server) && strstr($pv_browser_user_agent, 'linux')) {
             $mobile_os = 'linux';
             $mobile_os_number = Bootstrap::get_item_version($pv_browser_user_agent, 'linux');
         }
@@ -2176,7 +2172,7 @@ class Bootstrap
         switch ($DBEngine) {
             case 'mysql':
                 $con = Propel::getConnection('workflow');
-                return mysql_real_escape_string(stripslashes($sqlString), $con->getResource());
+                return mysqli_real_escape_string($con->getResource(), stripslashes($sqlString));
                 break;
             case 'myxml':
                 $sqlString = str_replace('"', '""', $sqlString);
@@ -2207,13 +2203,13 @@ class Bootstrap
         // Check if its a user template
         if (file_exists($file)) {
             //require_once( $file );
-            include ($file);
+            include($file);
         } else {
             // Try to get the global system template
             $file = PATH_TEMPLATE . PATH_SEP . $temp;
             //require_once( $file );
             if (file_exists($file)) {
-                include ($file);
+                include($file);
             }
         }
     }
@@ -2295,8 +2291,8 @@ class Bootstrap
             $lang = defined(SYS_LANG) ? SYS_LANG : 'en';
         }
         $aux = explode(' ', $date); //para dividir la fecha del dia
-        $date = explode('-', isset($aux[0]) ? $aux[0] : '00-00-00' ); //para obtener los dias, el mes, y el año.
-        $time = explode(':', isset($aux[1]) ? $aux[1] : '00:00:00' ); //para obtener las horas, minutos, segundos.
+        $date = explode('-', isset($aux[0]) ? $aux[0] : '00-00-00'); //para obtener los dias, el mes, y el año.
+        $time = explode(':', isset($aux[1]) ? $aux[1] : '00:00:00'); //para obtener las horas, minutos, segundos.
 
 
         $year = (int) ((isset($date[0])) ? $date[0] : '0'); //year
@@ -2309,7 +2305,7 @@ class Bootstrap
         $s = isset($time[2]) ? $time[2] : '00'; //second
 
 
-        $MONTHS = Array();
+        $MONTHS = array();
         for ($i = 1; $i <= 12; $i++) {
             $MONTHS[$i] = Bootstrap::LoadTranslation("ID_MONTH_$i", $lang);
         }
@@ -2418,7 +2414,7 @@ class Bootstrap
      */
     public function evalJScript($c)
     {
-        print ("<script language=\"javascript\">{$c}</script>");
+        print("<script language=\"javascript\">{$c}</script>");
     }
 
     /**
@@ -2595,13 +2591,13 @@ class Bootstrap
             //To enable compatibility with soap login
             if ((Bootstrap::hashPassword($pass, $hashTypeCurrent) == $userPass) || ($pass === $hashTypeCurrent . ':' . $userPass)) {
                 $acceptance = true;
-            } else if ((Bootstrap::hashPassword($pass, $hashTypePrevious) == $userPass) || ($pass === $hashTypePrevious . ':' . $userPass)) {
+            } elseif ((Bootstrap::hashPassword($pass, $hashTypePrevious) == $userPass) || ($pass === $hashTypePrevious . ':' . $userPass)) {
                 $acceptance = true;
             }
         } else {
             if (Bootstrap::hashPassword($pass, $hashTypeCurrent) == $userPass) {
                 $acceptance = true;
-            } else if (Bootstrap::hashPassword($pass, $hashTypePrevious) == $userPass) {
+            } elseif (Bootstrap::hashPassword($pass, $hashTypePrevious) == $userPass) {
                 $acceptance = true;
             }
         }
@@ -2613,7 +2609,7 @@ class Bootstrap
      * @param $string
      * @return mixed
      */
-    public function encryptOld ($string)
+    public function encryptOld($string)
     {
         $consthashFx = self::hashFx;
         return $consthashFx($string);
@@ -2630,7 +2626,7 @@ class Bootstrap
             $translationsTable = $Translations->getTranslationEnvironments();
             $inLang = false;
             foreach ($translationsTable as $locale) {
-                if ($locale['LOCALE'] == $acceptLanguage){
+                if ($locale['LOCALE'] == $acceptLanguage) {
                     $inLang = true;
                     break;
                 }
@@ -2638,7 +2634,6 @@ class Bootstrap
             $lang = $inLang?$acceptLanguage:'en';
             define("SYS_LANG", $lang);
         }
-
     }
 
     /**
@@ -2672,7 +2667,7 @@ class Bootstrap
     {
         $fileLog = $pathData .'sites'. PATH_SEP . $ws . PATH_SEP . 'log' . PATH_SEP . $file;
 
-        $registerLogger = &MonologProvider::getSingleton($channel, $fileLog);
+        $registerLogger = MonologProvider::getSingleton($channel, $fileLog);
         $registerLogger->addLog($level, $message, $context);
     }
 
@@ -2747,6 +2742,4 @@ class Bootstrap
         }
         set_include_path(get_include_path() . PATH_SEPARATOR . PATH_DATA_SITE);
     }
-
 }
-
diff --git a/gulliver/system/class.controller.php b/gulliver/system/class.controller.php
index 3e6eccf4d..65d91a003 100644
--- a/gulliver/system/class.controller.php
+++ b/gulliver/system/class.controller.php
@@ -1,326 +1,325 @@
-<?php
-
-/**
- * Controller Class
- * Implementing MVC Pattern
- *
- * @author Erik Amaru Ortiz <erik@colosa.com, aortiz.erik@gmail.com>
- * @package gulliver.system
- * @access private
- */
-class Controller
-{
-    /**
-     *
-     * @var boolean debug switch for general purpose
-     */
-    public $debug = null;
-
-    /**
-     *
-     * @var array - private array to store proxy data
-     */
-    private $__data__ = array ();
-
-    /**
-     *
-     * @var object - private object to store the http request data
-     */
-    private $__request__;
-
-    /**
-     *
-     * @var object - headPublisher object to handle the output
-     */
-    private $headPublisher = null;
-
-    /**
-     *
-     * @var string - response type var. possibles values: json|plain
-     */
-    private $responseType = '';
-
-    /**
-     *
-     * @var string - layout to pass skinEngine
-     */
-    private $layout = '';
-
-    /**
-     *
-     * @var string contains the pluin name, in case the controller is on a plugin
-     */
-    private $pluginName = '';
-
-    /**
-     *
-     * @var string contains the plugin path
-     */
-    private $pluginHomeDir = '';
-
-    /**
-     * Magic setter method
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function __set ($name, $value)
-    {
-        $this->__data__[$name] = $value;
-    }
-
-    /**
-     * Magic getter method
-     *
-     * @param string $name
-     * @return string or NULL if the internal var doesn't exist
-     */
-    public function __get ($name)
-    {
-        if (array_key_exists( $name, $this->__data__ )) {
-            return $this->__data__[$name];
-        }
-
-        $trace = debug_backtrace();
-        trigger_error( 'Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_NOTICE );
-        return null;
-    }
-
-    /**
-     * Magic isset method
-     *
-     * @param string $name
-     */
-    public function __isset ($name)
-    {
-        return isset( $this->__data__[$name] );
-    }
-
-    /**
-     * Magic unset method
-     *
-     * @param string $name
-     */
-    public function __unset ($name)
-    {
-        unset( $this->__data__[$name] );
-    }
-
-    /**
-     * Set Response type method
-     *
-     * @param string $type contains : json|plain
-     */
-    public function setResponseType ($type)
-    {
-        $this->responseType = $type;
-    }
-
-    /**
-     * call to execute a internal proxy method and handle its exceptions
-     *
-     * @param string $name
-     */
-    public function call ($name)
-    {
-        try {
-            $result = $this->$name( $this->__request__ );
-            if ($this->responseType == 'json') {
-                print G::json_encode( $result );
-            }
-        } catch (Exception $e) {
-            $result = new StdClass();
-            if ($this->responseType != 'json') {
-                Bootstrap::renderTemplate('controller.exception.tpl', array(
-                    'title' => 'Controller Exception',
-                    'message' => nl2br($e->getMessage()),
-                    'controller' => (function_exists( 'get_called_class' ) ? get_called_class() : 'Controller'),
-                    'exceptionClass' => get_class($e),
-                    'file' => $e->getFile(),
-                    'line' => $e->getLine(),
-                    'trace' => $e->getTrace()
-                ));
-            } else {
-                $result->success = false;
-                $result->msg = $e->getMessage();
-                switch (get_class( $e )) {
-                    case 'Exception':
-                        $error = "SYSTEM ERROR";
-                        break;
-                    case 'PMException':
-                        $error = "PROCESSMAKER ERROR";
-                        break;
-                    case 'PropelException':
-                        $error = "DATABASE ERROR";
-                        break;
-                    case 'UserException':
-                        $error = "USER ERROR";
-                        break;
-                }
-                $result->error = $error;
-
-                $result->exception->class = get_class( $e );
-                $result->exception->code = $e->getCode();
-                print G::json_encode( $result );
-            }
-        }
-    }
-
-    /**
-     * Set the http request data
-     *
-     * @param array $data
-     */
-    public function setHttpRequestData ($data)
-    {
-        if (! is_object( $this->__request__ )) {
-            $this->__request__ = new stdclass();
-        }
-        if (is_array( $data )) {
-            while ($var = each( $data )) {
-                $this->__request__->$var['key'] = $var['value'];
-            }
-        } else {
-            $this->__request__ = $data;
-        }
-    }
-
-    /**
-     * Get debug var.
-     * method
-     *
-     * @param boolan $val boolean value for debug var.
-     */
-    public function setDebug ($val)
-    {
-        $this->debug = $val;
-    }
-
-    /**
-     * Get debug var.
-     * method
-     */
-    public function getDebug ()
-    {
-        if ($this->debug === null) {
-            $this->debug = defined( 'DEBUG' ) && DEBUG ? true : false;
-        }
-
-        return $this->debug;
-    }
-
-    /**
-     * * HeadPublisher Functions Binding **
-     */
-
-    /**
-     * Include a particular extjs library or extension to the main output
-     *
-     * @param string $srcFile path of a extjs library or extension
-     * @param boolean $debug debug flag to indicate if the js output will be minifield or not
-     * $debug: true -> the js content will be not minified (readable)
-     * false -> the js content will be minified
-     */
-    public function includeExtJSLib ($srcFile, $debug = false)
-    {
-        $this->getHeadPublisher()->usingExtJs( $srcFile, ($debug ? $debug : $this->getDebug()) );
-    }
-
-    /**
-     * Include a javascript file that is using extjs framework to the main output
-     *
-     * @param string $srcFile path of javascrit file to include
-     * @param boolean $debug debug flag to indicate if the js output will be minifield or not
-     * $debug: true -> the js content will be not minified (readable)
-     * false -> the js content will be minified
-     */
-    public function includeExtJS ($srcFile, $debug = false)
-    {
-        $this->getHeadPublisher()->addExtJsScript( $srcFile, ($debug ? $debug : $this->getDebug()) );
-    }
-
-    /**
-     * Include a Html file to the main output
-     *
-     * @param string $file path of html file to include to the main output
-     */
-    public function setView ($file)
-    {
-        $this->getHeadPublisher()->addContent( $file );
-    }
-
-    /**
-     * Set variables to be accesible by javascripts
-     *
-     * @param string $name contains var. name
-     * @param string $value conatins var. value
-     */
-    public function setJSVar ($name, $value)
-    {
-        $this->getHeadPublisher()->assign( $name, $value );
-    }
-
-    /**
-     * Set variables to be accesible by the extjs layout template
-     *
-     * @param string $name contains var. name
-     * @param string $value conatins var. value
-     */
-    public function setVar ($name, $value)
-    {
-        $this->getHeadPublisher()->assignVar( $name, $value );
-    }
-
-    /**
-     * method to get the local getHeadPublisher object
-     */
-    public function getHeadPublisher ()
-    {
-        if (! is_object( $this->headPublisher )) {
-            $this->headPublisher = headPublisher::getSingleton();
-        }
-
-        return $this->headPublisher;
-    }
-
-    public function setLayout ($layout)
-    {
-        $this->layout = $layout;
-    }
-
-    public function render ($type = 'mvc')
-    {
-        G::RenderPage( 'publish', $type, null, $this->layout );
-    }
-
-    public function header ($header)
-    {
-        G::header( $header );
-    }
-
-    public function redirect ($url)
-    {
-        G::header( "Location: $url" );
-    }
-
-    public function setPluginName($name)
-    {
-        $this->pluginName = $name;
-    }
-
-    public function getPluginName()
-    {
-        return $this->pluginName;
-    }
-
-    public function setPluginHomeDir($dir)
-    {
-        $this->pluginHomeDir = $dir;
-    }
-
-    public function getPluginHomeDir()
-    {
-        return $this->pluginHomeDir;
-    }
-}
-
+<?php
+
+/**
+ * Controller Class
+ * Implementing MVC Pattern
+ *
+ * @author Erik Amaru Ortiz <erik@colosa.com, aortiz.erik@gmail.com>
+ * @package gulliver.system
+ * @access private
+ */
+class Controller
+{
+    /**
+     *
+     * @var boolean debug switch for general purpose
+     */
+    public $debug = null;
+
+    /**
+     *
+     * @var array - private array to store proxy data
+     */
+    private $__data__ = array();
+
+    /**
+     *
+     * @var object - private object to store the http request data
+     */
+    private $__request__;
+
+    /**
+     *
+     * @var object - headPublisher object to handle the output
+     */
+    private $headPublisher = null;
+
+    /**
+     *
+     * @var string - response type var. possibles values: json|plain
+     */
+    private $responseType = '';
+
+    /**
+     *
+     * @var string - layout to pass skinEngine
+     */
+    private $layout = '';
+
+    /**
+     *
+     * @var string contains the pluin name, in case the controller is on a plugin
+     */
+    private $pluginName = '';
+
+    /**
+     *
+     * @var string contains the plugin path
+     */
+    private $pluginHomeDir = '';
+
+    /**
+     * Magic setter method
+     *
+     * @param string $name
+     * @param string $value
+     */
+    public function __set($name, $value)
+    {
+        $this->__data__[$name] = $value;
+    }
+
+    /**
+     * Magic getter method
+     *
+     * @param string $name
+     * @return string or NULL if the internal var doesn't exist
+     */
+    public function __get($name)
+    {
+        if (array_key_exists($name, $this->__data__)) {
+            return $this->__data__[$name];
+        }
+
+        $trace = debug_backtrace();
+        trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_NOTICE);
+        return null;
+    }
+
+    /**
+     * Magic isset method
+     *
+     * @param string $name
+     */
+    public function __isset($name)
+    {
+        return isset($this->__data__[$name]);
+    }
+
+    /**
+     * Magic unset method
+     *
+     * @param string $name
+     */
+    public function __unset($name)
+    {
+        unset($this->__data__[$name]);
+    }
+
+    /**
+     * Set Response type method
+     *
+     * @param string $type contains : json|plain
+     */
+    public function setResponseType($type)
+    {
+        $this->responseType = $type;
+    }
+
+    /**
+     * call to execute a internal proxy method and handle its exceptions
+     *
+     * @param string $name
+     */
+    public function call($name)
+    {
+        try {
+            $result = $this->$name($this->__request__);
+            if ($this->responseType == 'json') {
+                print G::json_encode($result);
+            }
+        } catch (Exception $e) {
+            $result = new StdClass();
+            if ($this->responseType != 'json') {
+                Bootstrap::renderTemplate('controller.exception.tpl', array(
+                    'title' => 'Controller Exception',
+                    'message' => nl2br($e->getMessage()),
+                    'controller' => (function_exists('get_called_class') ? get_called_class() : 'Controller'),
+                    'exceptionClass' => get_class($e),
+                    'file' => $e->getFile(),
+                    'line' => $e->getLine(),
+                    'trace' => $e->getTrace()
+                ));
+            } else {
+                $result->success = false;
+                $result->msg = $e->getMessage();
+                switch (get_class($e)) {
+                    case 'Exception':
+                        $error = "SYSTEM ERROR";
+                        break;
+                    case 'PMException':
+                        $error = "PROCESSMAKER ERROR";
+                        break;
+                    case 'PropelException':
+                        $error = "DATABASE ERROR";
+                        break;
+                    case 'UserException':
+                        $error = "USER ERROR";
+                        break;
+                }
+                $result->error = $error;
+
+                $result->exception->class = get_class($e);
+                $result->exception->code = $e->getCode();
+                print G::json_encode($result);
+            }
+        }
+    }
+
+    /**
+     * Set the http request data
+     *
+     * @param array $data
+     */
+    public function setHttpRequestData($data)
+    {
+        if (! is_object($this->__request__)) {
+            $this->__request__ = new stdclass();
+        }
+        if (is_array($data)) {
+            while ($var = each($data)) {
+                $this->__request__->{$var['key']} = $var['value'];
+            }
+        } else {
+            $this->__request__ = $data;
+        }
+    }
+
+    /**
+     * Get debug var.
+     * method
+     *
+     * @param boolan $val boolean value for debug var.
+     */
+    public function setDebug($val)
+    {
+        $this->debug = $val;
+    }
+
+    /**
+     * Get debug var.
+     * method
+     */
+    public function getDebug()
+    {
+        if ($this->debug === null) {
+            $this->debug = defined('DEBUG') && DEBUG ? true : false;
+        }
+
+        return $this->debug;
+    }
+
+    /**
+     * * HeadPublisher Functions Binding **
+     */
+
+    /**
+     * Include a particular extjs library or extension to the main output
+     *
+     * @param string $srcFile path of a extjs library or extension
+     * @param boolean $debug debug flag to indicate if the js output will be minifield or not
+     * $debug: true -> the js content will be not minified (readable)
+     * false -> the js content will be minified
+     */
+    public function includeExtJSLib($srcFile, $debug = false)
+    {
+        $this->getHeadPublisher()->usingExtJs($srcFile, ($debug ? $debug : $this->getDebug()));
+    }
+
+    /**
+     * Include a javascript file that is using extjs framework to the main output
+     *
+     * @param string $srcFile path of javascrit file to include
+     * @param boolean $debug debug flag to indicate if the js output will be minifield or not
+     * $debug: true -> the js content will be not minified (readable)
+     * false -> the js content will be minified
+     */
+    public function includeExtJS($srcFile, $debug = false)
+    {
+        $this->getHeadPublisher()->addExtJsScript($srcFile, ($debug ? $debug : $this->getDebug()));
+    }
+
+    /**
+     * Include a Html file to the main output
+     *
+     * @param string $file path of html file to include to the main output
+     */
+    public function setView($file)
+    {
+        $this->getHeadPublisher()->addContent($file);
+    }
+
+    /**
+     * Set variables to be accesible by javascripts
+     *
+     * @param string $name contains var. name
+     * @param string $value conatins var. value
+     */
+    public function setJSVar($name, $value)
+    {
+        $this->getHeadPublisher()->assign($name, $value);
+    }
+
+    /**
+     * Set variables to be accesible by the extjs layout template
+     *
+     * @param string $name contains var. name
+     * @param string $value conatins var. value
+     */
+    public function setVar($name, $value)
+    {
+        $this->getHeadPublisher()->assignVar($name, $value);
+    }
+
+    /**
+     * method to get the local getHeadPublisher object
+     */
+    public function getHeadPublisher()
+    {
+        if (! is_object($this->headPublisher)) {
+            $this->headPublisher = headPublisher::getSingleton();
+        }
+
+        return $this->headPublisher;
+    }
+
+    public function setLayout($layout)
+    {
+        $this->layout = $layout;
+    }
+
+    public function render($type = 'mvc')
+    {
+        G::RenderPage('publish', $type, null, $this->layout);
+    }
+
+    public function header($header)
+    {
+        G::header($header);
+    }
+
+    public function redirect($url)
+    {
+        G::header("Location: $url");
+    }
+
+    public function setPluginName($name)
+    {
+        $this->pluginName = $name;
+    }
+
+    public function getPluginName()
+    {
+        return $this->pluginName;
+    }
+
+    public function setPluginHomeDir($dir)
+    {
+        $this->pluginHomeDir = $dir;
+    }
+
+    public function getPluginHomeDir()
+    {
+        return $this->pluginHomeDir;
+    }
+}
diff --git a/gulliver/system/class.database_mysql.php b/gulliver/system/class.database_mysql.php
index d8666f588..419d6ccb6 100644
--- a/gulliver/system/class.database_mysql.php
+++ b/gulliver/system/class.database_mysql.php
@@ -30,31 +30,27 @@
  * @package gulliver.system
  *
  */
-
-
-
 class database extends database_base
 {
-
-    public $iFetchType = MYSQL_ASSOC;
+    public $iFetchType = MYSQLI_ASSOC;
 
     /**
-     * class database constructor
+     * class database constructor.
      *
-     * @param $sType adapter type
-     * @param $sServer server
-     * @param $sUser db user
-     * @param $sPass db user password
-     * @param $sDataBase Database name
+     * @param string $sType adapter type
+     * @param string $sServer server
+     * @param string $sUser db user
+     * @param string $sPass db user password
+     * @param string $sDataBase Database name
      */
-    public function __construct ($sType = DB_ADAPTER, $sServer = DB_HOST, $sUser = DB_USER, $sPass = DB_PASS, $sDataBase = DB_NAME)
+    public function __construct($sType = DB_ADAPTER, $sServer = DB_HOST, $sUser = DB_USER, $sPass = DB_PASS, $sDataBase = DB_NAME)
     {
         $this->sType = $sType;
         $this->sServer = $sServer;
         $this->sUser = $sUser;
         $this->sPass = $sPass;
         $this->sDataBase = $sDataBase;
-        $this->oConnection = @mysql_connect( $sServer, $sUser, $sPass ) || null;
+        $this->oConnection = mysqli_connect($sServer, $sUser, $sPass, $sDataBase) or die('Could not connect to database...');
         $this->sQuoteCharacter = '`';
         $this->nullString = 'null';
     }
@@ -66,30 +62,29 @@ class database extends database_base
      * @param $aColumns array of columns
      * @return $sSql the sql sentence
      */
-    public function generateCreateTableSQL ($sTable, $aColumns)
+    public function generateCreateTableSQL($sTable, $aColumns)
     {
         $sKeys = '';
         $sSQL = 'CREATE TABLE IF NOT EXISTS ' . $this->sQuoteCharacter . $sTable . $this->sQuoteCharacter . '(';
 
         foreach ($aColumns as $sColumnName => $aParameters) {
             if ($sColumnName != 'INDEXES') {
-
-                if ($sColumnName != '' && isset( $aParameters['Type'] ) && $aParameters['Type'] != '') {
+                if ($sColumnName != '' && isset($aParameters['Type']) && $aParameters['Type'] != '') {
                     $sSQL .= $this->sQuoteCharacter . $sColumnName . $this->sQuoteCharacter . ' ' . $aParameters['Type'];
 
-                    if (isset( $aParameters['Null'] ) && $aParameters['Null'] == 'YES') {
+                    if (isset($aParameters['Null']) && $aParameters['Null'] == 'YES') {
                         $sSQL .= ' NULL';
                     } else {
-                        $sSQL .= ' NOT NULL'; 
+                        $sSQL .= ' NOT NULL';
                     }
-                    if (isset( $aParameters['AutoIncrement'] ) && $aParameters['AutoIncrement']) {
+                    if (isset($aParameters['AutoIncrement']) && $aParameters['AutoIncrement']) {
                         $sSQL .= ' AUTO_INCREMENT PRIMARY KEY';
                     }
-                    if (isset( $aParameters['Key'] ) && $aParameters['Key'] == 'PRI') {
+                    if (isset($aParameters['Key']) && $aParameters['Key'] == 'PRI') {
                         $sKeys .= $this->sQuoteCharacter . $sColumnName . $this->sQuoteCharacter . ',';
                     }
 
-                    if (isset( $aParameters['Default'] )) {
+                    if (isset($aParameters['Default'])) {
                         $sSQL .= " DEFAULT '" . trim($aParameters['Default']) . "'";
                     }
 
@@ -97,9 +92,9 @@ class database extends database_base
                 }
             }
         }
-        $sSQL = substr( $sSQL, 0, - 1 );
+        $sSQL = substr($sSQL, 0, -1);
         if ($sKeys != '') {
-            $sSQL .= ',PRIMARY KEY(' . substr( $sKeys, 0, - 1 ) . ')';
+            $sSQL .= ',PRIMARY KEY(' . substr($sKeys, 0, -1) . ')';
         }
         $sSQL .= ')ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci' . $this->sEndLine;
 
@@ -112,7 +107,7 @@ class database extends database_base
      * @param $sTable table name
      * @return sql sentence string
      */
-    public function generateDropTableSQL ($sTable)
+    public function generateDropTableSQL($sTable)
     {
         return 'DROP TABLE ' . $this->sQuoteCharacter . $sTable . $this->sQuoteCharacter . $this->sEndLine;
     }
@@ -123,7 +118,7 @@ class database extends database_base
      * @param $sTableOld old table name
      * @return $sSql sql sentence
      */
-    public function generateRenameTableSQL ($sTableOld)
+    public function generateRenameTableSQL($sTableOld)
     {
         $sSQL = 'ALTER TABLE ' . $sTableOld . ' RENAME TO RBAC_' . $sTableOld;
         return $sSQL;
@@ -136,7 +131,7 @@ class database extends database_base
      * @param $sColumn column name
      * @return $sSql sql sentence
      */
-    public function generateDropColumnSQL ($sTable, $sColumn)
+    public function generateDropColumnSQL($sTable, $sColumn)
     {
         $sSQL = 'ALTER TABLE ' . $this->sQuoteCharacter . $sTable . $this->sQuoteCharacter . ' DROP COLUMN ' . $this->sQuoteCharacter . $sColumn . $this->sQuoteCharacter . $this->sEndLine;
         return $sSQL;
@@ -187,7 +182,6 @@ class database extends database_base
     }
 
 
-
     /**
      * generate an add column sentence
      *
@@ -196,9 +190,9 @@ class database extends database_base
      * @param $aParameters parameters of field like typo or if it can be null
      * @return $sSql sql sentence
      */
-    public function generateAddColumnSQL ($sTable, $sColumn, $aParameters)
+    public function generateAddColumnSQL($sTable, $sColumn, $aParameters)
     {
-        if (isset( $aParameters['Type'] ) && isset( $aParameters['Null'] )) {
+        if (isset($aParameters['Type']) && isset($aParameters['Null'])) {
             $sSQL = 'ALTER TABLE ' . $this->sQuoteCharacter . $sTable . $this->sQuoteCharacter . ' ADD COLUMN ' . $this->sQuoteCharacter . $sColumn . $this->sQuoteCharacter . ' ' . $aParameters['Type'];
             if ($aParameters['Null'] == 'YES') {
                 $sSQL .= ' NULL';
@@ -206,18 +200,18 @@ class database extends database_base
                 $sSQL .= ' NOT NULL';
             }
         }
-        if (isset( $aParameters['AutoIncrement'] ) && $aParameters['AutoIncrement']) {
+        if (isset($aParameters['AutoIncrement']) && $aParameters['AutoIncrement']) {
             $sSQL .= ' AUTO_INCREMENT';
         }
-        if (isset( $aParameters['PrimaryKey'] ) && $aParameters['PrimaryKey']) {
+        if (isset($aParameters['PrimaryKey']) && $aParameters['PrimaryKey']) {
             $sSQL .= ' PRIMARY KEY';
         }
-        if (isset( $aParameters['Unique'] ) && $aParameters['Unique']) {
+        if (isset($aParameters['Unique']) && $aParameters['Unique']) {
             $sSQL .= ' UNIQUE';
         }
 
         //we need to check the property AI
-        if (isset( $aParameters['AI'] )) {
+        if (isset($aParameters['AI'])) {
             if ($aParameters['AI'] == 1) {
                 $sSQL .= ' AUTO_INCREMENT';
             } else {
@@ -226,7 +220,7 @@ class database extends database_base
                 }
             }
         } else {
-            if (isset( $aParameters['Default'] )) {
+            if (isset($aParameters['Default'])) {
                 $sSQL .= " DEFAULT '" . $aParameters['Default'] . "'";
             }
         }
@@ -243,13 +237,13 @@ class database extends database_base
      * @param $sColumnNewName column new name
      * @return $sSql sql sentence
      */
-    public function generateChangeColumnSQL ($sTable, $sColumn, $aParameters, $sColumnNewName = '')
+    public function generateChangeColumnSQL($sTable, $sColumn, $aParameters, $sColumnNewName = '')
     {
         $sSQL = 'ALTER TABLE ' . $this->sQuoteCharacter . $sTable . $this->sQuoteCharacter . ' CHANGE COLUMN ' . $this->sQuoteCharacter . ($sColumnNewName != '' ? $sColumnNewName : $sColumn) . $this->sQuoteCharacter . ' ' . $this->sQuoteCharacter . $sColumn . $this->sQuoteCharacter;
-        if (isset( $aParameters['Type'] )) {
+        if (isset($aParameters['Type'])) {
             $sSQL .= ' ' . $aParameters['Type'];
         }
-        if (isset( $aParameters['Null'] )) {
+        if (isset($aParameters['Null'])) {
             if ($aParameters['Null'] == 'YES') {
                 $sSQL .= ' NULL';
             } else {
@@ -269,15 +263,15 @@ class database extends database_base
         //  }
         //}
         //else {
-        if (isset( $aParameters['Default'] )) {
-            if (trim( $aParameters['Default'] ) == '' && $aParameters['Type'] == 'datetime') {
+        if (isset($aParameters['Default'])) {
+            if (trim($aParameters['Default']) == '' && $aParameters['Type'] == 'datetime') {
                 //do nothing
             } else {
                 $sSQL .= " DEFAULT '" . $aParameters['Default'] . "'";
             }
             //}
         }
-        if (! isset( $aParameters['Default'] ) && isset( $aParameters['Null'] ) && $aParameters['Null'] == 'YES') {
+        if (!isset($aParameters['Default']) && isset($aParameters['Null']) && $aParameters['Null'] == 'YES') {
             $sSQL .= " DEFAULT NULL ";
         }
         //}
@@ -291,11 +285,11 @@ class database extends database_base
      * @param $sTable table name
      * @return $sSql sql sentence
      */
-    public function generateGetPrimaryKeysSQL ($sTable)
+    public function generateGetPrimaryKeysSQL($sTable)
     {
         try {
             if ($sTable == '') {
-                throw new Exception( 'The table name cannot be empty!' );
+                throw new Exception('The table name cannot be empty!');
             }
             return 'SHOW INDEX FROM  ' . $this->sQuoteCharacter . $sTable . $this->sQuoteCharacter . ' WHERE Seq_in_index = 1' . $this->sEndLine;
         } catch (Exception $oException) {
@@ -309,11 +303,11 @@ class database extends database_base
      * @param $sTable table name
      * @return sql sentence
      */
-    public function generateDropPrimaryKeysSQL ($sTable)
+    public function generateDropPrimaryKeysSQL($sTable)
     {
         try {
             if ($sTable == '') {
-                throw new Exception( 'The table name cannot be empty!' );
+                throw new Exception('The table name cannot be empty!');
             }
             return 'ALTER TABLE ' . $this->sQuoteCharacter . $sTable . $this->sQuoteCharacter . ' DROP PRIMARY KEY' . $this->sEndLine;
         } catch (Exception $oException) {
@@ -328,17 +322,17 @@ class database extends database_base
      * @param $aPrimaryKeys array of primary keys
      * @return sql sentence
      */
-    public function generateAddPrimaryKeysSQL ($sTable, $aPrimaryKeys)
+    public function generateAddPrimaryKeysSQL($sTable, $aPrimaryKeys)
     {
         try {
             if ($sTable == '') {
-                throw new Exception( 'The table name cannot be empty!' );
+                throw new Exception('The table name cannot be empty!');
             }
             $sSQL = 'ALTER TABLE ' . $this->sQuoteCharacter . $sTable . $this->sQuoteCharacter . ' ADD PRIMARY KEY (';
             foreach ($aPrimaryKeys as $sKey) {
                 $sSQL .= $this->sQuoteCharacter . $sKey . $this->sQuoteCharacter . ',';
             }
-            $sSQL = substr( $sSQL, 0, - 1 ) . ')' . $this->sEndLine;
+            $sSQL = substr($sSQL, 0, -1) . ')' . $this->sEndLine;
             return $sSQL;
         } catch (Exception $oException) {
             throw $oException;
@@ -352,14 +346,14 @@ class database extends database_base
      * @param $sIndexName index name
      * @return sql sentence
      */
-    public function generateDropKeySQL ($sTable, $sIndexName)
+    public function generateDropKeySQL($sTable, $sIndexName)
     {
         try {
             if ($sTable == '') {
-                throw new Exception( 'The table name cannot be empty!' );
+                throw new Exception('The table name cannot be empty!');
             }
             if ($sIndexName == '') {
-                throw new Exception( 'The column name cannot be empty!' );
+                throw new Exception('The column name cannot be empty!');
             }
             return 'ALTER TABLE ' . $this->sQuoteCharacter . $sTable . $this->sQuoteCharacter . ' DROP INDEX ' . $this->sQuoteCharacter . $sIndexName . $this->sQuoteCharacter . $this->sEndLine;
         } catch (Exception $oException) {
@@ -376,7 +370,7 @@ class database extends database_base
      * @return sql sentence
      */
 
-    public function generateAddKeysSQL ($sTable, $indexName, $aKeys)
+    public function generateAddKeysSQL($sTable, $indexName, $aKeys)
     {
         try {
             $indexType = 'INDEX';
@@ -388,7 +382,7 @@ class database extends database_base
             foreach ($aKeys as $sKey) {
                 $sSQL .= $this->sQuoteCharacter . $sKey . $this->sQuoteCharacter . ', ';
             }
-            $sSQL = substr( $sSQL, 0, - 2 );
+            $sSQL = substr($sSQL, 0, -2);
             $sSQL .= ')' . $this->sEndLine;
             return $sSQL;
         } catch (Exception $oException) {
@@ -401,7 +395,7 @@ class database extends database_base
      *
      * @return sql sentence
      */
-    public function generateShowTablesSQL ()
+    public function generateShowTablesSQL()
     {
         return 'SHOW TABLES' . $this->sEndLine;
     }
@@ -411,7 +405,7 @@ class database extends database_base
      *
      * @return sql sentence
      */
-    public function generateShowTablesLikeSQL ($sTable)
+    public function generateShowTablesLikeSQL($sTable)
     {
         return "SHOW TABLES LIKE '" . $sTable . "'" . $this->sEndLine;
     }
@@ -422,11 +416,11 @@ class database extends database_base
      * @param $sTable table name
      * @return sql sentence
      */
-    public function generateDescTableSQL ($sTable)
+    public function generateDescTableSQL($sTable)
     {
         try {
             if ($sTable == '') {
-                throw new Exception( 'The table name cannot be empty!' );
+                throw new Exception('The table name cannot be empty!');
             }
             return 'DESC ' . $this->sQuoteCharacter . $sTable . $this->sQuoteCharacter . $this->sEndLine;
         } catch (Exception $oException) {
@@ -440,7 +434,7 @@ class database extends database_base
      * @param $sTable table name
      * @return sql sentence
      */
-    public function generateTableIndexSQL ($sTable)
+    public function generateTableIndexSQL($sTable)
     {
         return 'SHOW INDEX FROM ' . $this->sQuoteCharacter . $sTable . $this->sQuoteCharacter . " " . $this->sEndLine;
         //return 'SHOW INDEX FROM ' . $this->sQuoteCharacter . $sTable . $this->sQuoteCharacter . " WHERE Key_name <> 'PRIMARY'" . $this->sEndLine;
@@ -451,12 +445,14 @@ class database extends database_base
      *
      * @return void
      */
-    public function isConnected ()
+    public function isConnected()
     {
-        if (! $this->oConnection) {
-            return false;
+        $connect = false;
+        if ($this->oConnection !== false) {
+            $this->executeQuery('USE ' . $this->sDataBase);
+            $connect = true;
         }
-        return $this->executeQuery( 'USE ' . $this->sDataBase );
+        return $connect;
     }
 
     /**
@@ -465,34 +461,34 @@ class database extends database_base
      * @param $sQuery sql query string
      * @return void
      */
-    public function logQuery ($sQuery)
+    public function logQuery($sQuery)
     {
         try {
             $found = false;
-            if (substr( $sQuery, 0, 6 ) == 'SELECT') {
+            if (substr($sQuery, 0, 6) == 'SELECT') {
                 $found = true;
             }
-            if (substr( $sQuery, 0, 4 ) == 'SHOW') {
+            if (substr($sQuery, 0, 4) == 'SHOW') {
                 $found = true;
             }
-            if (substr( $sQuery, 0, 4 ) == 'DESC') {
+            if (substr($sQuery, 0, 4) == 'DESC') {
                 $found = true;
             }
-            if (substr( $sQuery, 0, 4 ) == 'USE ') {
+            if (substr($sQuery, 0, 4) == 'USE ') {
                 $found = true;
             }
-            if (! $found) {
+            if (!$found) {
                 $logDir = PATH_DATA . 'log';
-                if (! file_exists( $logDir )) {
-                    if (! mkdir( $logDir )) {
+                if (!file_exists($logDir)) {
+                    if (!mkdir($logDir)) {
                         return;
                     }
                 }
                 $logFile = "$logDir/query.log";
-                $fp = fopen( $logFile, 'a+' );
+                $fp = fopen($logFile, 'a+');
                 if ($fp !== false) {
-                    fwrite( $fp, date( "Y-m-d H:i:s" ) . " " . $this->sDataBase . " " . $sQuery . "\n" );
-                    fclose( $fp );
+                    fwrite($fp, date("Y-m-d H:i:s") . " " . $this->sDataBase . " " . $sQuery . "\n");
+                    fclose($fp);
                 }
             }
         } catch (Exception $oException) {
@@ -505,20 +501,21 @@ class database extends database_base
      * @param $sQuery table name
      * @return void
      */
-    public function executeQuery ($sQuery)
+    public function executeQuery($sQuery)
     {
-        $this->logQuery( $sQuery );
+        $this->logQuery($sQuery);
 
         try {
             if ($this->oConnection) {
-                @mysql_select_db( $this->sDataBase );
-
-                return @mysql_query( $sQuery );
+                mysqli_select_db($this->oConnection, $this->sDataBase);
+                $result = mysqli_query($this->oConnection, $sQuery);
+                mysqli_use_result($this->oConnection);
+                return $result;
             } else {
-                throw new Exception( 'invalid connection to database ' . $this->sDataBase );
+                throw new Exception('invalid connection to database ' . $this->sDataBase);
             }
         } catch (Exception $oException) {
-            $this->logQuery( $oException->getMessage() );
+            $this->logQuery($oException->getMessage());
             throw $oException;
         }
     }
@@ -529,20 +526,24 @@ class database extends database_base
      * @param $oDataset
      * @return the number of rows
      */
-    public function countResults ($oDataset)
+    public function countResults($oDataset)
     {
-        return @mysql_num_rows( $oDataset );
+        return mysqli_num_rows($oDataset);
     }
 
     /**
      * count an array of the registry from a dataset
      *
-     * @param $oDataset
+     * @param $dataSet
      * @return the registry
      */
-    public function getRegistry ($oDataset)
+    public function getRegistry($dataSet)
     {
-        return @mysql_fetch_array( $oDataset, $this->iFetchType );
+        $response = null;
+        if ($dataSet !== false) {
+            $response = mysqli_fetch_array($dataSet, $this->iFetchType);
+        }
+        return $response;
     }
 
     /**
@@ -550,80 +551,80 @@ class database extends database_base
      *
      * @return void
      */
-    public function close ()
+    public function close()
     {
-        @mysql_close( $this->oConnection );
+        mysqli_close($this->oConnection);
     }
 
-    public function generateInsertSQL ($table, $data)
+    public function generateInsertSQL($table, $data)
     {
-        $fields = array ();
-        $values = array ();
+        $fields = array();
+        $values = array();
         foreach ($data as $field) {
             $fields[] = $field['field'];
-            if (! is_null( $field['value'] )) {
+            if (!is_null($field['value'])) {
                 switch ($field['type']) {
                     case 'text':
                     case 'date':
-                        $values[] = "'" . mysql_real_escape_string( $field['value'] ) . "'";
+                        $values[] = "'" . mysqli_real_escape_string($this->oConnection, $field['value']) . "'";
                         break;
                     case 'int':
                     default:
-                        $values[] = mysql_real_escape_string( $field['value'] );
+                        $values[] = mysqli_real_escape_string($this->oConnection, $field['value']);
                         break;
                 }
             } else {
                 $values[] = $this->nullString;
             }
         }
-        $fields = array_map( array ($this,'putQuotes'
-        ), $fields );
-        $sql = sprintf( "INSERT INTO %s (%s) VALUES (%s)", $this->putQuotes( $table ), implode( ', ', $fields ), implode( ', ', $values ) );
+        $fields = array_map(array($this, 'putQuotes'
+        ), $fields);
+        $sql = sprintf("INSERT INTO %s (%s) VALUES (%s)", $this->putQuotes($table), implode(', ', $fields), implode(', ', $values));
         return $sql;
     }
 
-    public function generateUpdateSQL ($table, $keys, $data)
+    public function generateUpdateSQL($table, $keys, $data)
     {
-        $fields = array ();
-        $where = array ();
+        $fields = array();
+        $where = array();
         foreach ($data as $field) {
-            if (! is_null( $field['value'] )) {
+            if (!is_null($field['value'])) {
                 switch ($field['type']) {
                     case 'text':
                     case 'date':
-                        $fields[] = $this->putQuotes( $field['field'] ) . " = '" . mysql_real_escape_string( $field['value'] ) . "'";
+                        $fields[] = $this->putQuotes($field['field']) . " = '" . mysqli_real_escape_string($this->oConnection, $field['value']) . "'";
                         break;
                     case 'int':
                     default:
-                        $fields[] = $this->putQuotes( $field['field'] ) . " = " . mysql_real_escape_string( $field['value'] );
+                        $fields[] = $this->putQuotes($field['field']) . " = " . mysqli_real_escape_string($this->oConnection, $field['value']);
                         break;
                 }
             } else {
                 $values[] = $this->nullString;
             }
-            if (in_array( $field['field'], $keys )) {
-                $where[] = $fields[count( $fields ) - 1];
+            if (in_array($field['field'], $keys)) {
+                $where[] = $fields[count($fields) - 1];
             }
         }
-        $sql = sprintf( "UPDATE %s SET %s WHERE %s", $this->putQuotes( $table ), implode( ', ', $fields ), implode( ', ', $where ) );
+        $sql = sprintf("UPDATE %s SET %s WHERE %s", $this->putQuotes($table), implode(', ', $fields), implode(', ', $where));
         return $sql;
     }
 
-    public function generateDeleteSQL ($table, $keys, $data)
+    public function generateDeleteSQL($table, $keys, $data)
     {
-        $fields = array ();
-        $where = array ();
+        $fields = array();
+        $where = array();
         foreach ($data as $field) {
-            if (in_array( $field['field'], $keys )) {
-                if (! is_null( $field['value'] )) {
+            if (in_array($field['field'], $keys)) {
+                if (!is_null($field['value'])) {
                     switch ($field['type']) {
                         case 'text':
                         case 'date':
-                            $where[] = $this->putQuotes( $field['field'] ) . " = '" . mysql_real_escape_string( $field['value'] ) . "'";
+                            $where[] = $this->putQuotes($field['field']) . " = '" . mysqli_real_escape_string($this->oConnection, $field['value']) . "'";
                             break;
                         case 'int':
                         default:
-                            $where[] = $this->putQuotes( $field['field'] ) . " = " . mysql_real_escape_string( $field['value'] );
+                            $where[] = $this->putQuotes($field['field']) . " = " . mysqli_real_escape_string($this->oConnection, $field['value']);
                             break;
                     }
                 } else {
@@ -631,25 +632,25 @@ class database extends database_base
                 }
             }
         }
-        $sql = sprintf( "DELETE FROM %s WHERE %s", $this->putQuotes( $table ), implode( ', ', $where ) );
+        $sql = sprintf("DELETE FROM %s WHERE %s", $this->putQuotes($table), implode(', ', $where));
         return $sql;
     }
 
-    public function generateSelectSQL ($table, $keys, $data)
+    public function generateSelectSQL($table, $keys, $data)
     {
-        $fields = array ();
-        $where = array ();
+        $fields = array();
+        $where = array();
         foreach ($data as $field) {
-            if (in_array( $field['field'], $keys )) {
-                if (! is_null( $field['value'] )) {
+            if (in_array($field['field'], $keys)) {
+                if (!is_null($field['value'])) {
                     switch ($field['type']) {
                         case 'text':
                         case 'date':
-                            $where[] = $this->putQuotes( $field['field'] ) . " = '" . mysql_real_escape_string( $field['value'] ) . "'";
+                            $where[] = $this->putQuotes($field['field']) . " = '" . mysqli_real_escape_string($this->oConnection, $field['value']) . "'";
                             break;
                         case 'int':
                         default:
-                            $where[] = $this->putQuotes( $field['field'] ) . " = " . mysql_real_escape_string( $field['value'] );
+                            $where[] = $this->putQuotes($field['field']) . " = " . mysqli_real_escape_string($this->oConnection, $field['value']);
                             break;
                     }
                 } else {
@@ -657,11 +658,11 @@ class database extends database_base
                 }
             }
         }
-        $sql = sprintf( "SELECT * FROM %s WHERE %s", $this->putQuotes( $table ), implode( ', ', $where ) );
+        $sql = sprintf("SELECT * FROM %s WHERE %s", $this->putQuotes($table), implode(', ', $where));
         return $sql;
     }
 
-    private function putQuotes ($element)
+    private function putQuotes($element)
     {
         return $this->sQuoteCharacter . $element . $this->sQuoteCharacter;
     }
@@ -676,14 +677,14 @@ class database extends database_base
      *
      * @return string $sConcat
      */
-    public function concatString ()
+    public function concatString()
     {
         $nums = func_num_args();
         $vars = func_get_args();
 
         $sConcat = " CONCAT(";
-        for ($i = 0; $i < $nums; $i ++) {
-            if (isset( $vars[$i] )) {
+        for ($i = 0; $i < $nums; $i++) {
+            if (isset($vars[$i])) {
                 $sConcat .= $vars[$i];
                 if (($i + 1) < $nums) {
                     $sConcat .= ", ";
@@ -693,7 +694,6 @@ class database extends database_base
         $sConcat .= ")";
 
         return $sConcat;
-
     }
 
     /*
@@ -709,11 +709,10 @@ class database extends database_base
      *
      * @return string $sCompare
      */
-    public function getCaseWhen ($compareValue, $trueResult, $falseResult)
+    public function getCaseWhen($compareValue, $trueResult, $falseResult)
     {
         $sCompare = "IF(" . $compareValue . ", " . $trueResult . ", " . $falseResult . ") ";
         return $sCompare;
-
     }
 
     /**
@@ -724,7 +723,7 @@ class database extends database_base
      *
      * @return string $sql
      */
-    public function createTableObjectPermission ()
+    public function createTableObjectPermission()
     {
         $sql = "CREATE TABLE IF NOT EXISTS `OBJECT_PERMISSION` (
                    `OP_UID` varchar(32) NOT NULL,
@@ -754,9 +753,8 @@ class database extends database_base
      *
      * @return string $sql
      */
-    public function getSelectReport4 ()
+    public function getSelectReport4()
     {
-
         $sqlConcat = " CONCAT(U.USR_LASTNAME,' ',USR_FIRSTNAME) AS USER ";
         $sqlGroupBy = " USER ";
 
@@ -772,7 +770,6 @@ class database extends database_base
                 GROUP BY " . $sqlGroupBy;
 
         return $sql;
-
     }
 
     /**
@@ -783,7 +780,7 @@ class database extends database_base
      *
      * @return string $sql
      */
-    public function getSelectReport4Filter ($var)
+    public function getSelectReport4Filter($var)
     {
         $sqlConcat = " CONCAT(U.USR_LASTNAME,' ',USR_FIRSTNAME) AS USER ";
         $sqlGroupBy = " USER ";
@@ -800,7 +797,6 @@ class database extends database_base
              GROUP BY " . $sqlGroupBy;
 
         return $sql;
-
     }
 
     /**
@@ -811,7 +807,7 @@ class database extends database_base
      *
      * @return string $sql
      */
-    public function getSelectReport5 ()
+    public function getSelectReport5()
     {
         $sqlConcat = " CONCAT(U.USR_LASTNAME,' ',USR_FIRSTNAME) AS USER ";
         $sqlGroupBy = " USER ";
@@ -828,7 +824,6 @@ class database extends database_base
               GROUP BY " . $sqlGroupBy;
 
         return $sql;
-
     }
 
     /**
@@ -839,9 +834,8 @@ class database extends database_base
      *
      * @return string $sql
      */
-    public function getSelectReport5Filter ($var)
+    public function getSelectReport5Filter($var)
     {
-
         $sqlConcat = " CONCAT(U.USR_LASTNAME,' ',USR_FIRSTNAME) AS USER ";
         $sqlGroupBy = " USER ";
 
@@ -863,41 +857,39 @@ class database extends database_base
      * query functions for class class.net.php
      *
      */
-    public function getServerVersion ($driver, $dbIP, $dbPort, $dbUser, $dbPasswd, $dbSourcename)
+    public function getServerVersion($driver, $dbIP, $dbPort, $dbUser, $dbPasswd, $dbSourcename)
     {
-
-        if ($link = @mysql_connect( $dbIP, $dbUser, $dbPasswd )) {
-            $v = @mysql_get_server_info();
+        if ($link = mysqli_connect($dbIP, $dbUser, $dbPasswd, $dbSourcename)) {
+            $v = mysqli_get_server_info($link);
         } else {
-            throw new Exception( @mysql_error( $link ) );
+            throw new Exception(mysqli_error($link));
         }
-        return (isset( $v )) ? $v : 'none';
-
+        return (isset($v)) ? $v : 'none';
     }
 
     /*
      * query functions for class class.net.php, class.reportTables.php
      *
      */
-    public function getDropTable ($sTableName)
+    public function getDropTable($sTableName)
     {
         $sql = 'DROP TABLE IF EXISTS `' . $sTableName . '`';
         return $sql;
     }
 
-    public function getTableDescription ($sTableName)
+    public function getTableDescription($sTableName)
     {
         $sql = "DESC " . $sTableName;
         return $sql;
     }
 
-    public function getFieldNull ()
+    public function getFieldNull()
     {
         $fieldName = "Null";
         return $fieldName;
     }
 
-    public function getValidate ($validate)
+    public function getValidate($validate)
     {
         $oValidate = $validate;
         return $oValidate;
@@ -907,14 +899,14 @@ class database extends database_base
      * Determines whether a table exists
      * It is part of class.reportTables.php
      */
-    public function reportTableExist ()
+    public function reportTableExist()
     {
         $filter = new InputFilter();
         $DB_NAME = $filter->validateInput(DB_NAME);
         $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);
+        $oConnection = mysqli_connect(DB_HOST, DB_USER, DB_PASS);
+        mysqli_select_db($oConnection, $DB_NAME);
+        $oDataset = mysqli_query($oConnection, 'SELECT COUNT(*) FROM REPORT_TABLE') || ($bExists = false);
 
         return $bExists;
     }
@@ -922,7 +914,7 @@ class database extends database_base
     /**
      * It is part of class.pagedTable.php
      */
-    public function getLimitRenderTable ($nCurrentPage, $nRowsPerPage)
+    public function getLimitRenderTable($nCurrentPage, $nRowsPerPage)
     {
         $sql = ' LIMIT ' . (($nCurrentPage - 1) * $nRowsPerPage) . ', ' . $nRowsPerPage;
         return $sql;
@@ -930,32 +922,23 @@ class database extends database_base
 
     /**
      * Determining the existence of a table
+     *
+     * @param string $tableName
+     * @param string $database
+     *
+     * @return bool
      */
-    public function tableExists ($tableName, $database)
+    public function tableExists($tableName, $database)
     {
-        @mysql_select_db( $database );
-        $tables = array ();
-        $tablesResult = mysql_query( "SHOW TABLES FROM $database;" );
-        while ($row = @mysql_fetch_row( $tablesResult )) {
+        mysqli_select_db($this->oConnection, $database);
+        $tables = array();
+        $tablesResult = mysqli_query($this->oConnection, "SHOW TABLES FROM $database;");
+        while ($row = mysqli_fetch_row($tablesResult)) {
             $tables[] = $row[0];
         }
-        if (in_array( $tableName, $tables )) {
+        if (in_array($tableName, $tables)) {
             return true;
         }
         return false;
     }
-
-    /*
-     *   Determining the existence of a table (Depricated)
-     */
-    //  function tableExists ($table, $db) {
-        //    $tables = mysql_list_tables ($db);
-        //    while (list ($temp) = @mysql_fetch_array ($tables)) {
-        //        if ($temp == $table) {
-        //            return TRUE;
-        //        }
-        //    }
-        //    return FALSE;
-        //  }
 }
-
diff --git a/gulliver/system/class.dbMaintenance.php b/gulliver/system/class.dbMaintenance.php
index ffa73dba5..7184ac386 100644
--- a/gulliver/system/class.dbMaintenance.php
+++ b/gulliver/system/class.dbMaintenance.php
@@ -36,7 +36,6 @@
  *
  * @package gulliver.system
  */
-
 class DataBaseMaintenance
 {
     private $host;
@@ -54,19 +53,19 @@ class DataBaseMaintenance
     /**
      * __construct
      *
-     * @param string $host is null
-     * @param string $user is null
+     * @param string $host   is null
+     * @param string $user   is null
      * @param string $passwd is null
      *
      * @return none
      */
-    public function __construct ($host = null, $user = null, $passwd = null)
+    public function __construct($host = null, $user = null, $passwd = null)
     {
         $this->tmpDir = './';
         $this->link = null;
         $this->dbName = null;
         $this->isWindows = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
-        if (isset( $host ) && isset( $user ) && isset( $passwd )) {
+        if (isset($host) && isset($user) && isset($passwd)) {
             $this->host = $host;
             $this->user = $user;
             $this->passwd = $passwd;
@@ -80,7 +79,7 @@ class DataBaseMaintenance
      *
      * @return none
      */
-    public function setUser ($user)
+    public function setUser($user)
     {
         $this->user = $user;
     }
@@ -92,7 +91,7 @@ class DataBaseMaintenance
      *
      * @return none
      */
-    public function setPasswd ($passwd)
+    public function setPasswd($passwd)
     {
         $this->passwd = $passwd;
     }
@@ -104,7 +103,7 @@ class DataBaseMaintenance
      *
      * @return none
      */
-    public function setHost ($host)
+    public function setHost($host)
     {
         $this->host = $host;
     }
@@ -116,11 +115,11 @@ class DataBaseMaintenance
      *
      * @return none
      */
-    public function setTempDir ($tmpDir)
+    public function setTempDir($tmpDir)
     {
         $this->tmpDir = $tmpDir;
-        if (! file_exists( $tmpDir )) {
-            mkdir( $this->tmpDir );
+        if (!file_exists($tmpDir)) {
+            mkdir($this->tmpDir);
         }
     }
 
@@ -129,7 +128,7 @@ class DataBaseMaintenance
      *
      * @return $this->tmpDir
      */
-    public function getTempDir ()
+    public function getTempDir()
     {
         return $this->tmpDir;
     }
@@ -139,7 +138,7 @@ class DataBaseMaintenance
      *
      * @return $this->link
      */
-    public function status ()
+    public function status()
     {
         return $$this->link;
     }
@@ -151,25 +150,25 @@ class DataBaseMaintenance
      *
      * @return none
      */
-    public function connect ($dbname = null)
+    public function connect($dbname = null)
     {
         if ($this->link != null) {
-            mysql_close( $this->link );
+            mysqli_close($this->link);
             $this->link = null;
         }
-        if (isset( $dbname )) {
+        if (isset($dbname)) {
             $this->dbName = $dbname;
         }
 
-        $this->link = mysql_connect( $this->host, $this->user, $this->passwd );
-        @mysql_query( "SET NAMES 'utf8';" );
-        @mysql_query( "SET FOREIGN_KEY_CHECKS=0;" );
-        if (! $this->link) {
-            throw new Exception( "Couldn't connect to host {$this->host} with user {$this->user}" );
+        $this->link = mysqli_connect($this->host, $this->user, $this->passwd, $this->dbName);
+        if (!$this->link) {
+            throw new Exception("Couldn't connect to host {$this->host} with user {$this->user}");
         }
+        mysqli_query($this->link, "SET NAMES 'utf8';");
+        mysqli_query($this->link, "SET FOREIGN_KEY_CHECKS=0;");
 
         if ($this->dbName != null) {
-            $this->selectDataBase( $this->dbName );
+            $this->selectDataBase($this->dbName);
         }
     }
 
@@ -180,7 +179,7 @@ class DataBaseMaintenance
      *
      * @return none
      */
-    public function setDbName ($dbname)
+    public function setDbName($dbname)
     {
         $this->dbName = $dbname;
     }
@@ -189,14 +188,15 @@ class DataBaseMaintenance
      * selectDataBase
      *
      * @param string $dbname
+     * @param        $dbname
      *
-     * @return none
+     * @throws Exception
      */
-    public function selectDataBase ($dbname)
+    public function selectDataBase($dbname)
     {
-        $this->setDbName( $dbname );
-        if (! @mysql_select_db( $this->dbName, $this->link )) {
-            throw new Exception( "Couldn't select database $dbname" );
+        $this->setDbName($dbname);
+        if (!mysqli_select_db($this->link, $this->dbName)) {
+            throw new Exception("Couldn't select database $dbname");
         }
     }
 
@@ -207,13 +207,13 @@ class DataBaseMaintenance
      *
      * @return $aRows
      */
-    public function query ($sql)
+    public function query($sql)
     {
-        $this->result = @mysql_query( $sql );
+        $this->result = mysqli_query($this->link, $sql);
         if ($this->result) {
-            $aRows = Array ();
-            while ($aRow = @mysql_fetch_assoc( $this->result )) {
-                array_push( $aRows, $aRow );
+            $aRows = [];
+            while ($aRow = mysqli_fetch_assoc($this->result)) {
+                $aRows[] = $aRow;
             }
             return $aRows;
         } else {
@@ -224,26 +224,26 @@ class DataBaseMaintenance
     /**
      * error
      *
-     * @return @mysql_error()
+     * @return mysqli_error()
      */
-    public function error ()
+    public function error()
     {
-        return @mysql_error( $this->link );
+        return mysqli_error($this->link);
     }
 
     /**
      * getTablesList
      *
-     * @return $aRows
+     * @return array
      */
-    public function getTablesList ()
+    public function getTablesList()
     {
-        $this->result = @mysql_query( "SHOW TABLES;" );
-        $aRows = Array ();
-        while ($aRow = mysql_fetch_row( $this->result )) {
-            array_push( $aRows, $aRow[0] );
+        $this->result = mysqli_query($this->link, 'SHOW TABLES;');
+        $rows = [];
+        while ($row = mysqli_fetch_row($this->result)) {
+            $rows[] = $row[0];
         }
-        return $aRows;
+        return $rows;
     }
 
     /**
@@ -253,24 +253,24 @@ class DataBaseMaintenance
      *
      * @return boolean true or false
      */
-    function dumpData ($table)
+    public function dumpData($table)
     {
         $this->outfile = $this->tmpDir . $table . '.dump';
 
         //if the file exists delete it
-        if (is_file( $this->outfile )) {
-            @unlink( $this->outfile );
+        if (is_file($this->outfile)) {
+            @unlink($this->outfile);
         }
 
         $sql = "SELECT * INTO OUTFILE '{$this->outfile}' FIELDS TERMINATED BY '\t|\t' OPTIONALLY ENCLOSED BY '\"' LINES TERMINATED BY '\t\t\r\r\n' FROM $table";
         // The mysql_escape_string function has been DEPRECATED as of PHP 5.3.0.
         // Commented that is not assigned to a variable.
         // mysql_escape_string("';");
-        if (! @mysql_query( $sql )) {
-            $ws = (!empty(config("system.workspace")))? config("system.workspace") : "Undefined Workspace";
-            Bootstrap::registerMonolog('MysqlCron', 400, mysql_error(), array('sql'=>$sql), $ws, 'processmaker.log');
-            $varRes = mysql_error() . "\n";
-            G::outRes( $varRes );
+        if (!@mysqli_query($this->link, $sql)) {
+            $ws = (!empty(config('system.workspace'))) ? config('system.workspace') : 'Undefined Workspace';
+            Bootstrap::registerMonolog('MysqlCron', 400, mysqli_error($this->link), ['sql' => $sql], $ws, 'processmaker.log');
+            $varRes = mysqli_error($this->link) . "\n";
+            G::outRes($varRes);
             return false;
         }
         return true;
@@ -283,15 +283,15 @@ class DataBaseMaintenance
      *
      * @return boolean true or false
      */
-    function restoreData ($backupFile)
+    public function restoreData($backupFile)
     {
-        $tableName = str_replace( '.dump', '', basename( $backupFile ) );
+        $tableName = str_replace('.dump', '', basename($backupFile));
         $sql = "LOAD DATA INFILE '$backupFile' INTO TABLE $tableName FIELDS TERMINATED BY '\t|\t' OPTIONALLY ENCLOSED BY '\"' LINES TERMINATED BY '\t\t\r\r\n'";
-        if (! @mysql_query( $sql )) {
-            $ws = (!empty(config("system.workspace")))? config("system.workspace") : "Undefined Workspace";
-            Bootstrap::registerMonolog('MysqlCron', 400, mysql_error(), array('sql'=>$sql), $ws, 'processmaker.log');
-            $varRes = mysql_error() . "\n";
-            G::outRes( $varRes );
+        if (!@mysqli_query($this->link, $sql)) {
+            $ws = (!empty(config("system.workspace"))) ? config("system.workspace") : "Wokspace Undefined";
+            Bootstrap::registerMonolog('MysqlCron', 400, mysqli_error($this->link), ['sql' => $sql], $ws, 'processmaker.log');
+            $varRes = mysqli_error($this->link) . "\n";
+            G::outRes($varRes);
             return false;
         }
         return true;
@@ -304,26 +304,25 @@ class DataBaseMaintenance
      *
      * @return none
      */
-    function restoreAllData ($type = null)
+    public function restoreAllData($type = null)
     {
-
         $aTables = $this->getTablesList();
 
         foreach ($aTables as $table) {
-            if (isset( $type ) && $type == 'sql') {
+            if (isset($type) && $type == 'sql') {
                 $this->infile = $this->tmpDir . $table . ".sql";
-                if (is_file( $this->infile )) {
-                    $queries = $this->restoreFromSql( $this->infile, true );
-                    if (! isset( $queries )) {
+                if (is_file($this->infile)) {
+                    $queries = $this->restoreFromSql($this->infile, true);
+                    if (!isset($queries)) {
                         $queries = "unknown";
                     }
-                    printf( "%-59s%20s", "Restored table $table", "$queries queries\n" );
+                    printf("%-59s%20s", "Restored table $table", "$queries queries\n");
                 }
             } else {
                 $this->infile = $this->tmpDir . $table . ".dump";
-                if (is_file( $this->infile )) {
-                    $this->restoreData( $this->infile );
-                    printf( "%20s %s %s\n", 'Restoring data from ', $this->infile, " in table $table" );
+                if (is_file($this->infile)) {
+                    $this->restoreData($this->infile);
+                    printf("%20s %s %s\n", 'Restoring data from ', $this->infile, " in table $table");
                 }
             }
         }
@@ -337,17 +336,17 @@ class DataBaseMaintenance
      *
      * @return none
      */
-    function createDb ($dbname, $drop = false)
+    public function createDb($dbname, $drop = false)
     {
         if ($drop) {
             $sql = "DROP DATABASE IF EXISTS $dbname;";
-            if (! @mysql_query( $sql )) {
-                throw new Exception( mysql_error() );
+            if (!mysqli_query($this->link, $sql)) {
+                throw new Exception(mysqli_error($this->link));
             }
         }
         $sql = "CREATE DATABASE IF NOT EXISTS $dbname DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;";
-        if (! @mysql_query( $sql )) {
-            throw new Exception( mysql_error() );
+        if (!mysqli_query($this->link, $sql)) {
+            throw new Exception(mysqli_error($this->link));
         }
     }
 
@@ -358,24 +357,23 @@ class DataBaseMaintenance
      *
      * @return none
      */
-    function restoreFromSql2 ($sqlfile)
+    public function restoreFromSql2($sqlfile)
     {
-
-        ini_set( 'memory_limit', '512M' );
-        if (! is_file( $sqlfile )) {
-            throw new Exception( "the $sqlfile doesn't exist!" );
+        ini_set('memory_limit', '512M');
+        if (!is_file($sqlfile)) {
+            throw new Exception("the $sqlfile doesn't exist!");
         }
-        $query = file_get_contents( $sqlfile );
-        $mysqli = new mysqli( $this->host, $this->user, $this->passwd, $this->dbName );
+        $query = file_get_contents($sqlfile);
+        $mysqli = new mysqli($this->host, $this->user, $this->passwd, $this->dbName);
 
         /* check connection */
         if (mysqli_connect_errno()) {
-            printf( "Connect failed: %s\n", mysqli_connect_error() );
+            printf("Connect failed: %s\n", mysqli_connect_error());
             exit();
         }
 
         /* execute multi query */
-        if ($mysqli->multi_query( $query )) {
+        if ($mysqli->multi_query($query)) {
             do {
                 /* store first result set */
                 if ($result = $mysqli->store_result()) {
@@ -383,7 +381,6 @@ class DataBaseMaintenance
                     }
                     $result->free();
                 }
-
             } while ($mysqli->next_result());
         }
 
@@ -398,12 +395,12 @@ class DataBaseMaintenance
      *
      * @return none
      */
-    function backupDataBase ($outfile)
+    public function backupDataBase($outfile)
     {
         $password = escapeshellarg($this->passwd);
-        
-        //On Windows, escapeshellarg() instead replaces percent signs, exclamation 
-        //marks (delayed variable substitution) and double quotes with spaces and 
+
+        //On Windows, escapeshellarg() instead replaces percent signs, exclamation
+        //marks (delayed variable substitution) and double quotes with spaces and
         //adds double quotes around the string.
         //See: http://php.net/manual/en/function.escapeshellarg.php
         if ($this->isWindows) {
@@ -437,16 +434,16 @@ class DataBaseMaintenance
 
     /**
      * string escapeshellargCustom ( string $arg , character $quotes)
-     * 
-     * escapeshellarg() adds single quotes around a string and quotes/escapes any 
-     * existing single quotes allowing you to pass a string directly to a shell 
-     * function and having it be treated as a single safe argument. This function 
-     * should be used to escape individual arguments to shell functions coming 
-     * from user input. The shell functions include exec(), system() and the 
+     *
+     * escapeshellarg() adds single quotes around a string and quotes/escapes any
+     * existing single quotes allowing you to pass a string directly to a shell
+     * function and having it be treated as a single safe argument. This function
+     * should be used to escape individual arguments to shell functions coming
+     * from user input. The shell functions include exec(), system() and the
      * backtick operator.
-     * 
-     * On Windows, escapeshellarg() instead replaces percent signs, exclamation 
-     * marks (delayed variable substitution) and double quotes with spaces and 
+     *
+     * On Windows, escapeshellarg() instead replaces percent signs, exclamation
+     * marks (delayed variable substitution) and double quotes with spaces and
      * adds double quotes around the string.
      */
     private function escapeshellargCustom($string, $quotes = "")
@@ -489,57 +486,56 @@ class DataBaseMaintenance
      *
      * @return boolean false or true
      */
-    function restoreFromSql ($sqlfile, $type = 'file')
+    public function restoreFromSql($sqlfile, $type = 'file')
     {
-        ini_set( 'memory_limit', '64M' );
-        if ($type == 'file' && ! is_file( $sqlfile )) {
-            throw new Exception( "the $sqlfile doesn't exist!" );
+        ini_set('memory_limit', '64M');
+        if ($type == 'file' && !is_file($sqlfile)) {
+            throw new Exception("the $sqlfile doesn't exist!");
         }
 
-        $metaFile = str_replace( '.sql', '.meta', $sqlfile );
+        $metaFile = str_replace('.sql', '.meta', $sqlfile);
 
         $queries = 0;
 
-        if (is_file( $metaFile )) {
+        if (is_file($metaFile)) {
             echo "Using $metaFile as metadata.\n";
-            $fp = fopen( $sqlfile, 'rb' );
-            $fpmd = fopen( $metaFile, 'r' );
-            while ($offset = fgets( $fpmd, 1024 )) {
-                $buffer = intval( $offset ); //reading the size of $oData
-                $query = fread( $fp, $buffer ); //reading string $oData
+            $fp = fopen($sqlfile, 'rb');
+            $fpmd = fopen($metaFile, 'r');
+            while ($offset = fgets($fpmd, 1024)) {
+                $buffer = intval($offset); //reading the size of $oData
+                $query = fread($fp, $buffer); //reading string $oData
                 $queries += 1;
 
-                if (! @mysql_query( $query )) {
-                    $varRes = mysql_error() . "\n";
-                    G::outRes( $varRes );
+                if (!mysqli_query($this->link, $query)) {
+                    $varRes = mysqli_error($this->link) . "\n";
+                    G::outRes($varRes);
                     $varRes = "==>" . $query . "<==\n";
-                    G::outRes( $varRes );
+                    G::outRes($varRes);
                 }
             }
-
         } else {
             $queries = null;
             try {
-                $mysqli = new mysqli( $this->host, $this->user, $this->passwd, $this->dbName );
+                $mysqli = new mysqli($this->host, $this->user, $this->passwd, $this->dbName);
                 /* check connection */
                 if (mysqli_connect_errno()) {
-                    printf( "Connect failed: %s\n", mysqli_connect_error() );
+                    printf("Connect failed: %s\n", mysqli_connect_error());
                     exit();
                 }
-                if ($type == 'file') {
-                    $query = file_get_contents( $sqlfile );
-                } else if ($type == 'string') {
+                if ($type === 'file') {
+                    $query = file_get_contents($sqlfile);
+                } elseif ($type === 'string') {
                     $query = $sqlfile;
                 } else {
                     return false;
                 }
 
-                if (trim( $query ) == "") {
+                if (trim($query) == "") {
                     return false;
                 }
 
-                    /* execute multi query */
-                if ($mysqli->multi_query( $query )) {
+                /* execute multi query */
+                if ($mysqli->multi_query($query)) {
                     do {
                         /* store first result set */
                         if ($result = $mysqli->store_result()) {
@@ -554,16 +550,16 @@ class DataBaseMaintenance
                         }
                     } while ($mysqli->next_result());
                 } else {
-                    throw new Exception( mysqli_error( $mysqli ) );
+                    throw new Exception(mysqli_error($mysqli));
                 }
 
-                    /* close connection */
+                /* close connection */
                 $mysqli->close();
             } catch (Exception $e) {
                 echo $query;
                 $token = strtotime("now");
                 PMException::registerErrorLog($e, $token);
-                G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
+                G::outRes(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)));
             }
         }
         return $queries;
@@ -576,20 +572,20 @@ class DataBaseMaintenance
      *
      * @return string $tableSchema
      */
-    function getSchemaFromTable ($tablename)
+    public function getSchemaFromTable($tablename)
     {
         //$tableSchema = "/* Structure for table `$tablename` */\n";
         //$tableSchema .= "DROP TABLE IF EXISTS `$tablename`;\n\n";
         $tableSchema = "";
         $sql = "show create table `$tablename`; ";
-        $result = @mysql_query( $sql );
+        $result = mysqli_query($this->link, $sql);
         if ($result) {
-            if ($row = mysql_fetch_assoc( $result )) {
+            if ($row = mysqli_fetch_assoc($result)) {
                 $tableSchema .= $row['Create Table'] . ";\n\n";
             }
-            mysql_free_result( $result );
+            mysqli_free_result($result);
         } else {
-            G::outRes( mysql_error() );
+            G::outRes(mysqli_error($this->link));
         }
         return $tableSchema;
     }
@@ -601,12 +597,12 @@ class DataBaseMaintenance
      *
      * @return string $str
      */
-    function removeCommentsIntoString ($str)
+    public function removeCommentsIntoString($str)
     {
-        $str = preg_replace( '/\/\*[\w\W]*\*\//', '', $str );
-        $str = preg_replace( "/--[\w\W]*\\n/", '', $str );
-        $str = preg_replace( "/\/\/[\w\W]*\\n/", '', $str );
-        $str = preg_replace( "/\#[\w\W]*\\n/", '', $str );
+        $str = preg_replace('/\/\*[\w\W]*\*\//', '', $str);
+        $str = preg_replace("/--[\w\W]*\\n/", '', $str);
+        $str = preg_replace("/\/\/[\w\W]*\\n/", '', $str);
+        $str = preg_replace("/\#[\w\W]*\\n/", '', $str);
         return $str;
     }
-}
\ No newline at end of file
+}
diff --git a/gulliver/system/class.dbconnection.php b/gulliver/system/class.dbconnection.php
index 0f4b2968c..b6400743d 100644
--- a/gulliver/system/class.dbconnection.php
+++ b/gulliver/system/class.dbconnection.php
@@ -31,13 +31,13 @@
  *
  */
 
-require_once ("DB.php");
+require_once("DB.php");
 
-define( 'DB_ERROR_NO_SHOW_AND_CONTINUE', 0 );
-define( 'DB_ERROR_SHOW_AND_STOP', 1 );
-define( 'DB_ERROR_SHOW_AND_CONTINUE', 2 );
-define( 'DB_ERROR_SHOWALL_AND_STOP', 3 );
-define( 'DB_ERROR_SHOWALL_AND_CONTINUE', 4 );
+define('DB_ERROR_NO_SHOW_AND_CONTINUE', 0);
+define('DB_ERROR_SHOW_AND_STOP', 1);
+define('DB_ERROR_SHOW_AND_CONTINUE', 2);
+define('DB_ERROR_SHOWALL_AND_STOP', 3);
+define('DB_ERROR_SHOWALL_AND_CONTINUE', 4);
 
 /**
  * DBConnection class definition
@@ -49,10 +49,10 @@ define( 'DB_ERROR_SHOWALL_AND_CONTINUE', 4 );
  */
 class DBConnection
 {
-    var $db;
-    var $db_error;
-    var $errorLevel;
-    var $type;
+    public $db;
+    public $db_error;
+    public $errorLevel;
+    public $type;
 
     /**
      * ***************************************************************
@@ -93,7 +93,7 @@ class DBConnection
      * @return string
      *
      */
-    function DBConnection ($strServer = DB_HOST, $strUser = DB_USER, $strPwd = DB_PASS, $strDB = DB_NAME, $type = DB_ADAPTER, $strPort = 0, $errorLevel = 2)
+    public function DBConnection($strServer = DB_HOST, $strUser = DB_USER, $strPwd = DB_PASS, $strDB = DB_NAME, $type = DB_ADAPTER, $strPort = 0, $errorLevel = 2)
     {
         $this->errorLevel = $errorLevel;
         if ($type == null) {
@@ -101,36 +101,41 @@ class DBConnection
         }
         $this->type = $type;
         //print "<hr>$type $strServer, $strUser, $strPwd, $strDB <hr>";
-        if ($type == "mysql") {
-            $dsn = "mysql://$strUser:$strPwd@$strServer/$strDB";
-        }
-        if ($type == "pgsql") {
-            //$dsn = "pgsql://postgres@$strServer/$strDB";
-            $prt = ($strPort == 0 || $strPort == 5432 ? '' : ":$strPort");
-            $dsn = "pgsql://$strUser:$strPwd@$strServer$prt/$strDB";
-        }
-        if ($type == "odbc") {
-            $dsn = "odbc://$strUser:$strPwd@$strServer/$strDB";
-        }
-        if ($type == "mssql") {
-            $strServer = substr( $strServer, 0, strpos( $strServer, ':' ) );
-            $prt = ($strPort == 0 || $strPort == 1433 ? '' : ":$strPort");
-            $dsn = "mssql://$strUser:$strPwd@$strServer$prt/$strDB";
-            ///--) $dsn = "mssql://$strUser:$strPwd@$strServer/$strDB";
-        }
-        if ($type == "oracle") {
-            $dsn = "oci8://$strUser:$strPwd@$strServer/$strDB";
+        switch ($type) {
+            case 'mysql':
+                $dsn = "mysql://$strUser:$strPwd@$strServer/$strDB";
+                break;
+            case 'pgsql':
+                //$dsn = "pgsql://postgres@$strServer/$strDB";
+                $prt = ($strPort == 0 || $strPort == 5432 ? '' : ":$strPort");
+                $dsn = "pgsql://$strUser:$strPwd@$strServer$prt/$strDB";
+                break;
+            case 'odbc':
+                $dsn = "odbc://$strUser:$strPwd@$strServer/$strDB";
+                break;
+            case 'mssql':
+                $strServer = substr($strServer, 0, strpos($strServer, ':'));
+                $prt = ($strPort == 0 || $strPort == 1433 ? '' : ":$strPort");
+                $dsn = "mssql://$strUser:$strPwd@$strServer$prt/$strDB";
+                ///--) $dsn = "mssql://$strUser:$strPwd@$strServer/$strDB";
+                break;
+            case 'oracle':
+                $dsn = "oci8://$strUser:$strPwd@$strServer/$strDB";
+                break;
+            default:
+                $dsn = "mysql://$strUser:$strPwd@$strServer/$strDB";
+                break;
         }
         $this->db_error = null;
         if ($type === 'myxml') {
-            $this->db = XMLDB::connect( $strServer );
+            $this->db = XMLDB::connect($strServer);
         } else {
-            $this->db = DB::connect( $dsn );
+            $this->db = DB::connect($dsn);
         }
-        if (DB::isError( $this->db )) {
+        if (DB::isError($this->db)) {
             $this->db_error = $this->db;
             $this->db = null;
-            $this->logError( $this->db_error );
+            $this->logError($this->db_error);
         }
     }
 
@@ -141,7 +146,7 @@ class DBConnection
      * @access public
      * @return void
      */
-    function Reset ()
+    public function Reset()
     {
         if ($this->db) {
             $this->db->disconnect();
@@ -156,7 +161,7 @@ class DBConnection
      * @access public
      * @return void
      */
-    function Free ()
+    public function Free()
     {
         $this->Reset();
     }
@@ -168,7 +173,7 @@ class DBConnection
      * @access public
      * @return void
      */
-    function Close ()
+    public function Close()
     {
         $this->Reset();
     }
@@ -182,7 +187,7 @@ class DBConnection
      * @param string $errorLevel
      * @return void
      */
-    function logError ($obj, $errorLevel = null)
+    public function logError($obj, $errorLevel = null)
     {
         global $_SESSION;
         global $_SERVER;
@@ -190,11 +195,12 @@ class DBConnection
         $filter = new InputFilter();
         $_SERVER = $filter->xssFilterHard($_SERVER);
         $_SESSION = $filter->xssFilterHard($_SESSION);
-        if (is_null( $errorLevel ))
-        if (isset( $this->errorLevel )) {
-            $errorLevel = $this->errorLevel;
-        } else {
-            $errorLevel = DB_ERROR_SHOWALL_AND_STOP; //for fatal errors the default is 3, show detailed and die.
+        if (is_null($errorLevel)) {
+            if (isset($this->errorLevel)) {
+                $errorLevel = $this->errorLevel;
+            } else {
+                $errorLevel = DB_ERROR_SHOWALL_AND_STOP; //for fatal errors the default is 3, show detailed and die.
+            }
         }
 
         if ($errorLevel == DB_ERROR_SHOW_AND_STOP || $errorLevel == DB_ERROR_SHOW_AND_CONTINUE || $errorLevel == DB_ERROR_SHOWALL_AND_STOP || $errorLevel == DB_ERROR_SHOWALL_AND_CONTINUE) {
@@ -205,9 +211,9 @@ class DBConnection
             }
             print "</table>";
         }
-        if (defined( 'DB_ERROR_BACKTRACE' ) && DB_ERROR_BACKTRACE) {
+        if (defined('DB_ERROR_BACKTRACE') && DB_ERROR_BACKTRACE) {
             print "<table border = 1 width=400 class= 'sendMsgRojo'><tr><td><textarea rows='12' cols='180' style='width:100%;font-family:courier;white-space:pre-line;overflow:auto;border:none;'>";
-            print ((htmlentities( DBConnection::traceError() ))) ;
+            print((htmlentities(DBConnection::traceError()))) ;
             print "</textarea></td></tr></table>";
         }
         //G::setErrorHandler ( );
@@ -225,7 +231,7 @@ class DBConnection
      * @param string $limit
      * @return string
      */
-    function traceError ($tts = 2, $limit = -1)
+    public function traceError($tts = 2, $limit = -1)
     {
         $trace = debug_backtrace();
         $out = '';
@@ -233,7 +239,7 @@ class DBConnection
             if ($tts > 0) {
                 $tts --;
             } else {
-                $out .= '[' . basename( $step['file'] ) . ': ' . $step['line'] . '] : ' . $step['function'] . '(' . DBConnection::printArgs( $step['args'] ) . ")\n";
+                $out .= '[' . basename($step['file']) . ': ' . $step['line'] . '] : ' . $step['function'] . '(' . DBConnection::printArgs($step['args']) . ")\n";
                 $limit --;
                 if ($limit === 0) {
                     return $out;
@@ -250,31 +256,31 @@ class DBConnection
      * @param string $args
      * @return string
      */
-    function printArgs ($args)
+    public function printArgs($args)
     {
         $out = '';
-        if (is_array( $args )) {
+        if (is_array($args)) {
             foreach ($args as $arg) {
                 if ($out !== '') {
                     $out .= ' ,';
                 }
-                if (is_string( $arg )) {
+                if (is_string($arg)) {
                     $out .= "'" . ($arg) . "'";
-                } elseif (is_array( $arg )) {
-                    $out .= print_r( $arg, 1 );
-                } elseif (is_object( $arg )) {
-                    $out .= get_class( $arg ); // print_r ( $arg ,1 );
-                } elseif (! isset( $arg )) {
+                } elseif (is_array($arg)) {
+                    $out .= print_r($arg, 1);
+                } elseif (is_object($arg)) {
+                    $out .= get_class($arg); // print_r ( $arg ,1 );
+                } elseif (! isset($arg)) {
                     $out .= 'NULL';
                 } else {
-                    $out .= sprintf( "%s", $arg );
+                    $out .= sprintf("%s", $arg);
                 }
             }
         } else {
-            if (! isset( $args )) {
+            if (! isset($args)) {
                 $out = 'NULL';
             } else {
-                $out = print_r( $args, 1 );
+                $out = print_r($args, 1);
             }
         }
         return $out;
@@ -287,16 +293,15 @@ class DBConnection
      * @access public
      * @return void
      */
-    function GetLastID ()
+    public function GetLastID()
     {
-        if (PEAR_DATABASE == "mysql") {
-            return mysql_insert_id();
+        if (PEAR_DATABASE === 'mysql') {
+            $lastId = mysqli_insert_id($this->db);
         } else {
-            $dberror = PEAR::raiseError( null, DB_ERROR_FEATURE_NOT_AVAILABLE, null, 'null', "getLastID with " . PEAR_DATABASE . ' database.', 'G_Error', true );
-            DBconnection::logError( $dberror, DB_ERROR_SHOWALL_AND_STOP ); //this error will stop the execution, until we add this feature!!
-            return $dberror;
+            $dberror = PEAR::raiseError(null, DB_ERROR_FEATURE_NOT_AVAILABLE, null, 'null', "getLastID with " . PEAR_DATABASE . ' database.', 'G_Error', true);
+            DBconnection::logError($dberror, DB_ERROR_SHOWALL_AND_STOP); //this error will stop the execution, until we add this feature!!
+            $lastId = $dberror;
         }
-        return mysql_insert_id();
+        return $lastId;
     }
 }
-
diff --git a/gulliver/system/class.dbtable.php b/gulliver/system/class.dbtable.php
index 12ab7d9f9..b43929378 100644
--- a/gulliver/system/class.dbtable.php
+++ b/gulliver/system/class.dbtable.php
@@ -185,7 +185,7 @@ class DBTable
      * @param array array of arguments key values
      * @return void
      */
-    public function load()
+    public function load($sUID = null)
     {
         //    bug::traceRoute();
         $ncount = 0;
@@ -347,7 +347,7 @@ class DBTable
      * @access public
      * @return boolean
      */
-    public function save()
+    public function save($Fields = null, $labels = [], $options = [])
     {
         if ($this->is_new == true) {
             return $this->Insert();
@@ -363,7 +363,7 @@ class DBTable
      * @access public
      * @return boolean
      */
-    public function delete()
+    public function delete($uid = null)
     {
         $stQry = "delete from `" . $this->table_name . "` ";
 
diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 5fb8e7ade..6bc5af32a 100644
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -67,7 +67,7 @@ class G
      */
     public function LoadSystemExist($strClass)
     {
-        if (file_exists( PATH_GULLIVER . 'class.' . $strClass . '.php' )) {
+        if (file_exists(PATH_GULLIVER . 'class.' . $strClass . '.php')) {
             return true;
         } else {
             return false;
@@ -122,10 +122,10 @@ class G
     public function LoadAllModelClasses()
     {
         $baseDir = PATH_CORE . 'classes' . PATH_SEP . 'model';
-        if ($handle = opendir( $baseDir )) {
-            while (false !== ($file = readdir( $handle ))) {
-                if (strpos( $file, '.php', 1 ) && ! strpos( $file, 'Peer.php', 1 )) {
-                    require_once ($baseDir . PATH_SEP . $file);
+        if ($handle = opendir($baseDir)) {
+            while (false !== ($file = readdir($handle))) {
+                if (strpos($file, '.php', 1) && ! strpos($file, 'Peer.php', 1)) {
+                    require_once($baseDir . PATH_SEP . $file);
                 }
             }
         }
@@ -153,18 +153,18 @@ class G
      * @param Boolean $recursive
      * @return Array
      */
-    public function array_fill_value ($arr = Array(), $value = '', $recursive = false)
+    public function array_fill_value($arr = array(), $value = '', $recursive = false)
     {
-        if (is_array( $arr )) {
+        if (is_array($arr)) {
             foreach ($arr as $key => $val) {
-                if (is_array( $arr[$key] )) {
-                    $arr[$key] = ($recursive === true) ? G::array_fill_value( $arr[$key], $value, true ) : $val;
+                if (is_array($arr[$key])) {
+                    $arr[$key] = ($recursive === true) ? G::array_fill_value($arr[$key], $value, true) : $val;
                 } else {
                     $arr[$key] = $value;
                 }
             }
         } else {
-            $arr = Array ();
+            $arr = array();
         }
         return $arr;
     }
@@ -176,15 +176,15 @@ class G
      * u: uppercase set A-Z
      * n: numbers set 0-9
      * s: symbols set _-+=!@#$%*&,.;:?^()[]{}<>
-     * 
+     *
      * $symbol is source symbol generate
-     * 
+     *
      * @param int $length
      * @param string $availableSets
      * @param string $symbol
      * @return string
      */
-    public function generate_password($length = 15, $availableSets = "luns", $symbol = "_-$!")
+    public static function generate_password($length = 15, $availableSets = "luns", $symbol = "_-$!")
     {
         $chars = "";
         if (strpos($availableSets, "l") !== false) {
@@ -201,17 +201,17 @@ class G
         }
         $n = strlen($chars);
         do {
-        $password = "";
+            $password = "";
             $i = 0;
             while ($i < $length) {
                 $chars = str_shuffle($chars);
                 $char = substr($chars, mt_rand(0, $n - 1), 1);
-            if (!strstr($password, $char)) {
+                if (!strstr($password, $char)) {
                     $password = $password . $char;
-                $i++;
-            }
+                    $i++;
+                }
                 $password = str_shuffle($password);
-        }
+            }
             $info = G::check_password($password, $length, $length, $availableSets);
         } while (!$info->isValid);
         return $password;
@@ -219,20 +219,20 @@ class G
 
     /**
      * Check password strong
-     * 
+     *
      * $availableSets set next options:
      * l: lowercase set a-z
      * u: uppercase set A-Z
      * n: numbers set 0-9
      * s: symbols set _-+=!@#$%*&,.;:?^()[]{}<>
-     * 
+     *
      * @param string $password
      * @param int $min
      * @param int $max
      * @param string $availableSets
      * @return \stdClass
      */
-    public function check_password($password, $min = 2, $max = 20, $availableSets = "luns")
+    public static function check_password($password, $min = 2, $max = 20, $availableSets = "luns")
     {
         $info = new stdClass();
         $info->isValid = true;
@@ -272,13 +272,13 @@ class G
      * @param Array
      * @return Array
      */
-    public function array_concat ()
+    public function array_concat()
     {
         $nums = func_num_args();
         $vars = func_get_args();
-        $ret = Array ();
+        $ret = array();
         for ($i = 0; $i < $nums; $i ++) {
-            if (is_array( $vars[$i] )) {
+            if (is_array($vars[$i])) {
                 foreach ($vars[$i] as $key => $value) {
                     $ret[$key] = $value;
                 }
@@ -295,14 +295,14 @@ class G
      * @param  void $var1-N
      * @return Boolean
      */
-    public function var_compare ($value = true)
+    public function var_compare($value = true)
     {
         $nums = func_num_args();
         if ($nums < 2) {
-              return true;
+            return true;
         }
         $vars = func_get_args();
-        $ret = Array ();
+        $ret = array();
         for ($i = 1; $i < $nums; $i ++) {
             if ($vars[$i] !== $value) {
                 return false;
@@ -317,7 +317,7 @@ class G
      * @param  void
      * @return void
      */
-    public function var_probe ()
+    public function var_probe()
     {
         //return (!$variable)?
         $nums = func_num_args();
@@ -337,7 +337,7 @@ class G
      * @access public
      * @return string
      */
-    public function &getVersion ()
+    public function &getVersion()
     {
         //majorVersion.minorVersion-SvnRevision
         return '3.0-1';
@@ -347,14 +347,14 @@ class G
      * getIpAddress
      * @return string $ip
      */
-    public static function getIpAddress ()
+    public static function getIpAddress()
     {
-        if (getenv( 'HTTP_CLIENT_IP' )) {
-            $ip = getenv( 'HTTP_CLIENT_IP' );
-        } elseif (getenv( 'HTTP_X_FORWARDED_FOR' )) {
-            $ip = getenv( 'HTTP_X_FORWARDED_FOR' );
+        if (getenv('HTTP_CLIENT_IP')) {
+            $ip = getenv('HTTP_CLIENT_IP');
+        } elseif (getenv('HTTP_X_FORWARDED_FOR')) {
+            $ip = getenv('HTTP_X_FORWARDED_FOR');
         } else {
-            $ip = getenv( 'REMOTE_ADDR' );
+            $ip = getenv('REMOTE_ADDR');
         }
         return $ip;
     }
@@ -364,16 +364,16 @@ class G
      *
      * @return string $mac
     */
-    public function getMacAddress ()
+    public function getMacAddress()
     {
-        if (strstr( getenv( 'OS' ), 'Windows' )) {
+        if (strstr(getenv('OS'), 'Windows')) {
             $ipconfig = `ipconfig /all`;
-            preg_match( '/[\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}/i', $ipconfig, $mac );
+            preg_match('/[\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}/i', $ipconfig, $mac);
         } else {
             $ifconfig = `/sbin/ifconfig`;
-            preg_match( '/[\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}/i', $ifconfig, $mac );
+            preg_match('/[\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}[\:-][\dA-Z]{2,2}/i', $ifconfig, $mac);
         }
-        return isset( $mac[0] ) ? $mac[0] : '00:00:00:00:00:00';
+        return isset($mac[0]) ? $mac[0] : '00:00:00:00:00:00';
     }
 
     /**
@@ -382,9 +382,9 @@ class G
      * @return array_sum(explode(' ',microtime()))
      */
     /*public static*/
-    public function microtime_float ()
+    public function microtime_float()
     {
-        return array_sum( explode( ' ', microtime() ) );
+        return array_sum(explode(' ', microtime()));
     }
 
     /**
@@ -469,13 +469,13 @@ class G
      * @param string $target
      * @return void
      */
-    public function lookup ($target)
+    public function lookup($target)
     {
         //Made compatible to PHP 5.3
-        if (preg_match( "[a-zA-Z]", $target )) {
-            $ntarget = gethostbyname( $target );
+        if (preg_match("[a-zA-Z]", $target)) {
+            $ntarget = gethostbyname($target);
         } else {
-            $ntarget = gethostbyaddr( $target );
+            $ntarget = gethostbyaddr($target);
         }
         return ($ntarget);
     }
@@ -483,18 +483,18 @@ class G
     /**
      * ************* path functions ****************
      */
-    public static function mk_dir ($strPath, $rights = 0770)
+    public static function mk_dir($strPath, $rights = 0770)
     {
-        $folder_path = array ($strPath);
-        $oldumask = umask( 0 );
-        while (! @is_dir( dirname( end( $folder_path ) ) ) && dirname( end( $folder_path ) ) != '/' && dirname( end( $folder_path ) ) != '.' && dirname( end( $folder_path ) ) != '') {
-            array_push( $folder_path, dirname( end( $folder_path ) ) ); //var_dump($folder_path); die;
+        $folder_path = array($strPath);
+        $oldumask = umask(0);
+        while (! @is_dir(dirname(end($folder_path))) && dirname(end($folder_path)) != '/' && dirname(end($folder_path)) != '.' && dirname(end($folder_path)) != '') {
+            array_push($folder_path, dirname(end($folder_path))); //var_dump($folder_path); die;
         }
 
-        while ($parent_folder_path = array_pop( $folder_path )) {
-            if (! @is_dir( $parent_folder_path )) {
-                if (! @mkdir( $parent_folder_path, $rights)) {
-                    error_log( "Can't create folder \"$parent_folder_path\"");
+        while ($parent_folder_path = array_pop($folder_path)) {
+            if (! @is_dir($parent_folder_path)) {
+                if (! @mkdir($parent_folder_path, $rights)) {
+                    error_log("Can't create folder \"$parent_folder_path\"");
                     //umask( $oldumask );
                 }
             }
@@ -509,22 +509,22 @@ class G
      *
      * @return void
      */
-    public static function rm_dir ($dirName)
+    public static function rm_dir($dirName)
     {
-        if (! is_writable( $dirName )) {
+        if (! is_writable($dirName)) {
             return false;
         }
 
-        if (is_dir( $dirName )) {
-            foreach (glob( $dirName . '/{,.}*', GLOB_BRACE ) as $file) {
+        if (is_dir($dirName)) {
+            foreach (glob($dirName . '/{,.}*', GLOB_BRACE) as $file) {
                 if ($file == $dirName . '/.' || $file == $dirName . '/..') {
                     continue;
                 }
 
-                if (is_dir( $file )) {
-                    G::rm_dir( $file );
+                if (is_dir($file)) {
+                    G::rm_dir($file);
                 } else {
-                    @unlink( $file );
+                    @unlink($file);
                 }
             }
 
@@ -537,7 +537,7 @@ class G
                 @rmdir($dirName);
             }
         } else {
-            @unlink( $dirName );
+            @unlink($dirName);
         }
     }
 
@@ -548,16 +548,16 @@ class G
      */
     public function delTree($dir)
     {
-        $files = glob( $dir . '*', GLOB_MARK );
-        foreach ($files as $file ) {
-            if (substr( $file, -1 ) == '/' ) {
-                self::delTree( $file );
+        $files = glob($dir . '*', GLOB_MARK);
+        foreach ($files as $file) {
+            if (substr($file, -1) == '/') {
+                self::delTree($file);
             } else {
-                unlink( $file );
+                unlink($file);
             }
         }
         if (is_dir($dir)) {
-            rmdir( $dir );
+            rmdir($dir);
         }
     }
 
@@ -567,7 +567,8 @@ class G
      * @param string $destination
      * @return boolean
      */
-    function recursive_copy ($source, $destination) {
+    public function recursive_copy($source, $destination)
+    {
         if ($source == $destination) {
             return false;
         }
@@ -577,9 +578,9 @@ class G
             G::mk_dir($destination, 0777);
         }
 
-        while (false !== ( $file = readdir($dir))) {
-            if (( $file != '.' ) && ( $file != '..' )) {
-                if ( is_dir($source . '/' . $file) ) {
+        while (false !== ($file = readdir($dir))) {
+            if (($file != '.') && ($file != '..')) {
+                if (is_dir($source . '/' . $file)) {
                     self::recursive_copy($source . '/' . $file, $destination . '/' . $file);
                 } else {
                     copy($source . '/' . $file, $destination . '/' . $file);
@@ -599,16 +600,16 @@ class G
      * @param boolean $createPath if true this public function will create the path
      * @return boolean
      */
-    public static function verifyPath ($strPath, $createPath = false)
+    public static function verifyPath($strPath, $createPath = false)
     {
-        $folder_path = strstr( $strPath, '.' ) ? dirname( $strPath ) : $strPath;
+        $folder_path = strstr($strPath, '.') ? dirname($strPath) : $strPath;
 
-        if (file_exists( $strPath ) || @is_dir( $strPath )) {
+        if (file_exists($strPath) || @is_dir($strPath)) {
             return true;
         } else {
             if ($createPath) {
                 //TODO:: Define Environment constants: Devel (0777), Production (0770), ...
-                G::mk_dir( $strPath, 0777 );
+                G::mk_dir($strPath, 0777);
             } else {
                 return false;
             }
@@ -624,7 +625,7 @@ class G
      * @param string $strPath
      * @return string
      */
-    public static function expandPath ($strPath = '')
+    public static function expandPath($strPath = '')
     {
         $res = "";
         $res = PATH_CORE;
@@ -645,7 +646,7 @@ class G
      * @param string $strSkin
      * @return void
      */
-    public static function RenderPage ($strTemplate = "default", $strSkin = SYS_SKIN, $objContent = null, $layout = '')
+    public static function RenderPage($strTemplate = "default", $strSkin = SYS_SKIN, $objContent = null, $layout = '')
     {
         global $G_CONTENT;
         global $G_TEMPLATE;
@@ -657,31 +658,31 @@ class G
         $G_SKIN = $strSkin;
 
         try {
-            $file = G::ExpandPath( 'skinEngine' ) . 'skinEngine.php';
+            $file = G::ExpandPath('skinEngine') . 'skinEngine.php';
             include $file;
-            $skinEngine = new SkinEngine( $G_TEMPLATE, $G_SKIN, $G_CONTENT );
-            $skinEngine->setLayout( $layout );
+            $skinEngine = new SkinEngine($G_TEMPLATE, $G_SKIN, $G_CONTENT);
+            $skinEngine->setLayout($layout);
             $skinEngine->dispatch();
         } catch (Exception $e) {
             global $G_PUBLISH;
-            if (is_null( $G_PUBLISH )) {
+            if (is_null($G_PUBLISH)) {
                 $G_PUBLISH = new Publisher();
             }
-            if (count( $G_PUBLISH->Parts ) == 1) {
-                array_shift( $G_PUBLISH->Parts );
+            if (count($G_PUBLISH->Parts) == 1) {
+                array_shift($G_PUBLISH->Parts);
             }
             global $oHeadPublisher;
             $leimnudInitString = $oHeadPublisher->leimnudInitString;
             $oHeadPublisher->clearScripts();
             $oHeadPublisher->leimnudInitString = $leimnudInitString;
-            $oHeadPublisher->addScriptFile( '/js/maborak/core/maborak.js' );
-            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', null, array ('MESSAGE' => self::getErrorMessage($e)
-            ) );
-            if (class_exists( 'SkinEngine' )) {
-                $skinEngine = new SkinEngine( 'publish', 'blank', '' );
+            $oHeadPublisher->addScriptFile('/js/maborak/core/maborak.js');
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', null, array('MESSAGE' => self::getErrorMessage($e)
+            ));
+            if (class_exists('SkinEngine')) {
+                $skinEngine = new SkinEngine('publish', 'blank', '');
                 $skinEngine->dispatch();
             } else {
-                die( self::getErrorMessage($e) );
+                die(self::getErrorMessage($e));
             }
         }
     }
@@ -694,25 +695,24 @@ class G
      * @param string $strSkinName
      * @return void
      */
-    public function LoadSkin ($strSkinName)
+    public function LoadSkin($strSkinName)
     {
         //print $strSkinName;
         //now, we are using the skin, a skin is a file in engine/skin directory
-        $file = G::ExpandPath( "skins" ) . $strSkinName . ".php";
+        $file = G::ExpandPath("skins") . $strSkinName . ".php";
         //G::pr($file);
-        if (file_exists( $file )) {
-            require_once ($file);
+        if (file_exists($file)) {
+            require_once($file);
             return;
         } else {
-            if (file_exists( PATH_HTML . 'errors/error703.php' )) {
-                header( 'location: /errors/error703.php' );
+            if (file_exists(PATH_HTML . 'errors/error703.php')) {
+                header('location: /errors/error703.php');
                 die();
             } else {
                 $text = "The Skin $file does not exist, please review the Skin Definition";
-                throw (new Exception( $text ));
+                throw (new Exception($text));
             }
         }
-
     }
 
 
@@ -725,26 +725,25 @@ class G
      * @access public
      * @return void
      */
-    public function LoadAllPluginModelClasses ()
+    public function LoadAllPluginModelClasses()
     {
         //Get the current Include path, where the plugins directories should be
-        if (! defined( 'PATH_SEPARATOR' )) {
-            define( 'PATH_SEPARATOR', (substr( PHP_OS, 0, 3 ) == 'WIN') ? ';' : ':' );
+        if (! defined('PATH_SEPARATOR')) {
+            define('PATH_SEPARATOR', (substr(PHP_OS, 0, 3) == 'WIN') ? ';' : ':');
         }
-        $path = explode( PATH_SEPARATOR, get_include_path() );
+        $path = explode(PATH_SEPARATOR, get_include_path());
 
         foreach ($path as $possiblePath) {
-            if (strstr( $possiblePath, "plugins" )) {
+            if (strstr($possiblePath, "plugins")) {
                 $baseDir = $possiblePath . 'classes' . PATH_SEP . 'model';
-                if (file_exists( $baseDir )) {
-                    if ($handle = opendir( $baseDir )) {
-                        while (false !== ($file = readdir( $handle ))) {
-                            if (strpos( $file, '.php', 1 ) && ! strpos( $file, 'Peer.php', 1 )) {
-                                require_once ($baseDir . PATH_SEP . $file);
+                if (file_exists($baseDir)) {
+                    if ($handle = opendir($baseDir)) {
+                        while (false !== ($file = readdir($handle))) {
+                            if (strpos($file, '.php', 1) && ! strpos($file, 'Peer.php', 1)) {
+                                require_once($baseDir . PATH_SEP . $file);
                             }
                         }
                     }
-                    
                 }
             }
         }
@@ -758,24 +757,24 @@ class G
      * @param string $strTemplateName
      * @return void
      */
-    public function LoadTemplate ($strTemplateName)
+    public function LoadTemplate($strTemplateName)
     {
         if ($strTemplateName == '') {
             return;
         }
 
         $temp = $strTemplateName . ".php";
-        $file = G::ExpandPath( 'templates' ) . $temp;
+        $file = G::ExpandPath('templates') . $temp;
         // Check if its a user template
-        if (file_exists( $file )) {
+        if (file_exists($file)) {
             //require_once( $file );
-            include ($file);
+            include($file);
         } else {
             // Try to get the global system template
             $file = PATH_TEMPLATE . PATH_SEP . $temp;
             //require_once( $file );
-            if (file_exists( $file )) {
-                include ($file);
+            if (file_exists($file)) {
+                include($file);
             }
         }
     }
@@ -788,10 +787,10 @@ class G
      * @param string $urlLink
      * @return string
      */
-    public function encryptlink ($url)
+    public function encryptlink($url)
     {
-        if (defined( 'ENABLE_ENCRYPT' ) && ENABLE_ENCRYPT == 'yes') {
-            return urlencode( G::encrypt( $url, URL_KEY ) );
+        if (defined('ENABLE_ENCRYPT') && ENABLE_ENCRYPT == 'yes') {
+            return urlencode(G::encrypt($url, URL_KEY));
         } else {
             return $url;
         }
@@ -805,25 +804,25 @@ class G
      * @param string $urlLink
      * @return string
      */
-    static public function parseURI ($uri, $isRestRequest = false)
+    public static function parseURI($uri, $isRestRequest = false)
     {
         //*** process the $_POST with magic_quotes enabled
         // The magic_quotes_gpc feature has been DEPRECATED as of PHP 5.3.0.
         if (get_magic_quotes_gpc() === 1) {
-            $_POST = G::strip_slashes( $_POST );
+            $_POST = G::strip_slashes($_POST);
         }
 
-        $aRequestUri = explode( '/', $uri );
+        $aRequestUri = explode('/', $uri);
         if ($isRestRequest) {
-            $args = self::parseRestUri( $aRequestUri );
+            $args = self::parseRestUri($aRequestUri);
         } else {
-            $args = self::parseNormalUri( $aRequestUri );
+            $args = self::parseNormalUri($aRequestUri);
         }
 
-        define( "SYS_LANG", $args['SYS_LANG'] );
-        define( "SYS_SKIN", $args['SYS_SKIN'] );
-        define( 'SYS_COLLECTION', $args['SYS_COLLECTION'] );
-        define( 'SYS_TARGET', $args['SYS_TARGET'] );
+        define("SYS_LANG", $args['SYS_LANG']);
+        define("SYS_SKIN", $args['SYS_SKIN']);
+        define('SYS_COLLECTION', $args['SYS_COLLECTION']);
+        define('SYS_TARGET', $args['SYS_TARGET']);
 
         if ($args['SYS_COLLECTION'] == 'js2') {
             print "ERROR";
@@ -831,17 +830,17 @@ class G
         }
     }
 
-    public function parseNormalUri ($aRequestUri)
+    public function parseNormalUri($aRequestUri)
     {
-        if (substr( $aRequestUri[1], 0, 3 ) == 'sys') {
-            define( 'SYS_TEMP', substr( $aRequestUri[1], 3 ) );
+        if (substr($aRequestUri[1], 0, 3) == 'sys') {
+            define('SYS_TEMP', substr($aRequestUri[1], 3));
         } else {
-            define( "ENABLE_ENCRYPT", 'yes' );
-            define( 'SYS_TEMP', $aRequestUri[1] );
+            define("ENABLE_ENCRYPT", 'yes');
+            define('SYS_TEMP', $aRequestUri[1]);
             $plain = '/sys' . SYS_TEMP;
 
-            for ($i = 2; $i < count( $aRequestUri ); $i ++) {
-                $decoded = G::decrypt( urldecode( $aRequestUri[$i] ), URL_KEY );
+            for ($i = 2; $i < count($aRequestUri); $i ++) {
+                $decoded = G::decrypt(urldecode($aRequestUri[$i]), URL_KEY);
                 if ($decoded == 'sWì›') {
                     $decoded = $VARS[$i]; //this is for the string  "../"
                 }
@@ -850,47 +849,47 @@ class G
             $_SERVER["REQUEST_URI"] = $plain;
         }
 
-        $work = explode( '?', $_SERVER["REQUEST_URI"] );
+        $work = explode('?', $_SERVER["REQUEST_URI"]);
 
-        if (count( $work ) > 1) {
-            define( 'SYS_CURRENT_PARMS', $work[1] );
+        if (count($work) > 1) {
+            define('SYS_CURRENT_PARMS', $work[1]);
         } else {
-            define( 'SYS_CURRENT_PARMS', '' );
+            define('SYS_CURRENT_PARMS', '');
         }
 
-        define( 'SYS_CURRENT_URI', $work[0] );
+        define('SYS_CURRENT_URI', $work[0]);
 
-        if (! defined( 'SYS_CURRENT_PARMS' )) {
-            define( 'SYS_CURRENT_PARMS', $work[1] );
+        if (! defined('SYS_CURRENT_PARMS')) {
+            define('SYS_CURRENT_PARMS', $work[1]);
         }
 
-        $preArray = explode( '&', SYS_CURRENT_PARMS );
-        $buffer = explode( '.', $work[0] );
+        $preArray = explode('&', SYS_CURRENT_PARMS);
+        $buffer = explode('.', $work[0]);
 
-        if (count( $buffer ) == 1) {
+        if (count($buffer) == 1) {
             $buffer[1] = '';
         }
 
         //request type
-        define( 'REQUEST_TYPE', ($buffer[1] != "" ? $buffer[1] : 'html') );
+        define('REQUEST_TYPE', ($buffer[1] != "" ? $buffer[1] : 'html'));
 
-        $toparse = substr( $buffer[0], 1, strlen( $buffer[0] ) - 1 );
-        $uriVars = explode( '/', $toparse );
+        $toparse = substr($buffer[0], 1, strlen($buffer[0]) - 1);
+        $uriVars = explode('/', $toparse);
 
-        unset( $work );
-        unset( $buffer );
-        unset( $toparse );
-        array_shift( $uriVars );
+        unset($work);
+        unset($buffer);
+        unset($toparse);
+        array_shift($uriVars);
 
-        $args = array ();
-        $args['SYS_LANG'] = array_shift( $uriVars );
-        $args['SYS_SKIN'] = array_shift( $uriVars );
-        $args['SYS_COLLECTION'] = array_shift( $uriVars );
-        $args['SYS_TARGET'] = array_shift( $uriVars );
+        $args = array();
+        $args['SYS_LANG'] = array_shift($uriVars);
+        $args['SYS_SKIN'] = array_shift($uriVars);
+        $args['SYS_COLLECTION'] = array_shift($uriVars);
+        $args['SYS_TARGET'] = array_shift($uriVars);
 
         //to enable more than 2 directories...in the methods structure
-        while (count( $uriVars ) > 0) {
-            $args['SYS_TARGET'] .= '/' . array_shift( $uriVars );
+        while (count($uriVars) > 0) {
+            $args['SYS_TARGET'] .= '/' . array_shift($uriVars);
         }
 
         /* Fix to prevent use uxs skin outside siplified interface,
@@ -903,14 +902,14 @@ class G
         return $args;
     }
 
-    public function parseRestUri ($requestUri)
+    public function parseRestUri($requestUri)
     {
-        $args = array ();
+        $args = array();
         //$args['SYS_TEMP'] = $requestUri[1];
-        define( 'SYS_TEMP', $requestUri[2] );
+        define('SYS_TEMP', $requestUri[2]);
         $restUri = '';
 
-        for ($i = 3; $i < count( $requestUri ); $i ++) {
+        for ($i = 3; $i < count($requestUri); $i ++) {
             $restUri .= '/' . $requestUri[$i];
         }
 
@@ -922,18 +921,18 @@ class G
         return $args;
     }
 
-    public function strip_slashes ($vVar)
+    public function strip_slashes($vVar)
     {
-        if (is_array( $vVar )) {
+        if (is_array($vVar)) {
             foreach ($vVar as $sKey => $vValue) {
-                if (is_array( $vValue )) {
-                    G::strip_slashes( $vVar[$sKey] );
+                if (is_array($vValue)) {
+                    G::strip_slashes($vVar[$sKey]);
                 } else {
-                    $vVar[$sKey] = stripslashes( $vVar[$sKey] );
+                    $vVar[$sKey] = stripslashes($vVar[$sKey]);
                 }
             }
         } else {
-            $vVar = stripslashes( $vVar );
+            $vVar = stripslashes($vVar);
         }
 
         return $vVar;
@@ -942,19 +941,19 @@ class G
     /**
      * function to calculate the time used to render a page
      */
-    public function logTimeByPage ()
+    public function logTimeByPage()
     {
-        if (! defined( PATH_DATA )) {
+        if (! defined(PATH_DATA)) {
             return false;
         }
 
         $serverAddr = $_SERVER['SERVER_ADDR'];
         global $startingTime;
-        $endTime = microtime( true );
+        $endTime = microtime(true);
         $time = $endTime - $startingTime;
-        $fpt = fopen( PATH_DATA . 'log/time.log', 'a' );
-        fwrite( $fpt, sprintf( "%s.%03d %15s %s %5.3f %s\n", date( 'Y-m-d H:i:s' ), $time, getenv( 'REMOTE_ADDR' ), substr( $serverAddr, - 4 ), $time, $_SERVER['REQUEST_URI'] ) );
-        fclose( $fpt );
+        $fpt = fopen(PATH_DATA . 'log/time.log', 'a');
+        fwrite($fpt, sprintf("%s.%03d %15s %s %5.3f %s\n", date('Y-m-d H:i:s'), $time, getenv('REMOTE_ADDR'), substr($serverAddr, - 4), $time, $_SERVER['REQUEST_URI']));
+        fclose($fpt);
     }
 
     /**
@@ -965,17 +964,17 @@ class G
      * @param string $file
      * @return string
      */
-    public function streamCSSBigFile ($filename)
+    public function streamCSSBigFile($filename)
     {
-        header( 'Content-Type: text/css' );
+        header('Content-Type: text/css');
 
         //First get Skin info
-        $filenameParts = explode( "-", $filename );
+        $filenameParts = explode("-", $filename);
         $skinName = $filenameParts[0];
         $skinVariant = "skin";
 
-        if (isset( $filenameParts[1] )) {
-            $skinVariant = strtolower( $filenameParts[1] );
+        if (isset($filenameParts[1])) {
+            $skinVariant = strtolower($filenameParts[1]);
         }
 
         $configurationFile = '';
@@ -986,34 +985,34 @@ class G
             $skinName = "classic";
         }
         if ($skinName == "classic") {
-            $configurationFile = G::ExpandPath( "skinEngine" ) . 'base' . PATH_SEP . 'config.xml';
+            $configurationFile = G::ExpandPath("skinEngine") . 'base' . PATH_SEP . 'config.xml';
         } else {
             $configurationFile = PATH_CUSTOM_SKINS . $skinName . PATH_SEP . 'config.xml';
 
-            if (! is_file( $configurationFile )) {
-                $configurationFile = G::ExpandPath( "skinEngine" ) . $skinName . PATH_SEP . 'config.xml';
+            if (! is_file($configurationFile)) {
+                $configurationFile = G::ExpandPath("skinEngine") . $skinName . PATH_SEP . 'config.xml';
             }
         }
 
         //Read Configuration File
-        $xmlConfiguration = file_get_contents( $configurationFile );
-        $xmlConfigurationObj = G::xmlParser( $xmlConfiguration );
-        $baseSkinDirectory = dirname( $configurationFile );
-        $directorySize = G::getDirectorySize( $baseSkinDirectory );
+        $xmlConfiguration = file_get_contents($configurationFile);
+        $xmlConfigurationObj = G::xmlParser($xmlConfiguration);
+        $baseSkinDirectory = dirname($configurationFile);
+        $directorySize = G::getDirectorySize($baseSkinDirectory);
         $mtime = $directorySize['maxmtime'];
 
         $outputHeader = "/* Autogenerated CSS file by gulliver framework \n";
         $outputHeader .= "   Skin: $filename\n";
-        $mtimeNow = date( 'U' );
-        $gmt_mtimeNow = gmdate( "D, d M Y H:i:s", $mtimeNow ) . " GMT";
+        $mtimeNow = date('U');
+        $gmt_mtimeNow = gmdate("D, d M Y H:i:s", $mtimeNow) . " GMT";
         $outputHeader .= "   Date: $gmt_mtimeNow*/\n";
         $output = "";
         //Base files
-        switch (strtolower( $skinVariant )) {
+        switch (strtolower($skinVariant)) {
             case "extjs":
                 //Base
                 $baseCSSPath = PATH_SKIN_ENGINE . "base" . PATH_SEP . "baseCss" . PATH_SEP;
-                $output .= file_get_contents( $baseCSSPath . 'ext-all-notheme.css' );
+                $output .= file_get_contents($baseCSSPath . 'ext-all-notheme.css');
 
                 //Classic Skin
                 $extJsSkin = 'xtheme-gray';
@@ -1023,16 +1022,16 @@ class G
         }
 
         //Get Browser Info
-        $infoBrowser = G::browser_detection( 'full_assoc' );
+        $infoBrowser = G::browser_detection('full_assoc');
         $browserName = $infoBrowser['browser_working'];
-        if (isset( $infoBrowser[$browserName . '_data'] )) {
+        if (isset($infoBrowser[$browserName . '_data'])) {
             if ($infoBrowser[$browserName . '_data'][0] != "") {
                 $browserName = $infoBrowser[$browserName . '_data'][0];
             }
         }
 
         //Read Configuration File
-        $xmlConfiguration = file_get_contents ( $configurationFile );
+        $xmlConfiguration = file_get_contents($configurationFile);
         $xmlConfigurationObj = G::xmlParser($xmlConfiguration);
 
         $skinFilesArray = $xmlConfigurationObj->result['skinConfiguration']['__CONTENT__']['cssFiles']['__CONTENT__'][$skinVariant]['__CONTENT__']['cssFile'] ;
@@ -1042,7 +1041,7 @@ class G
 
             if (((in_array($browserName, $enabledBrowsers)) || (in_array('ALL', $enabledBrowsers)))&&(!(in_array($browserName, $disabledBrowsers)))) {
                 if ($cssFileInfo['__ATTRIBUTES__']['file'] == 'rtl.css') {
-                    $oServerConf =& ServerConf::getSingleton();
+                    $oServerConf = ServerConf::getSingleton();
                     if (!(defined('SYS_LANG'))) {
                         if (isset($_SERVER['HTTP_REFERER'])) {
                             $syss = explode('://', $_SERVER['HTTP_REFERER']);
@@ -1055,17 +1054,17 @@ class G
                         $sysLang = SYS_LANG;
                     }
                     if ($oServerConf->isRtl($sysLang)) {
-                        $output .= file_get_contents ( $baseSkinDirectory . PATH_SEP.'css'.PATH_SEP.$cssFileInfo['__ATTRIBUTES__']['file'] );
+                        $output .= file_get_contents($baseSkinDirectory . PATH_SEP.'css'.PATH_SEP.$cssFileInfo['__ATTRIBUTES__']['file']);
                     }
                 } else {
-                    $output .= file_get_contents ( $baseSkinDirectory . PATH_SEP.'css'.PATH_SEP.$cssFileInfo['__ATTRIBUTES__']['file'] );
+                    $output .= file_get_contents($baseSkinDirectory . PATH_SEP.'css'.PATH_SEP.$cssFileInfo['__ATTRIBUTES__']['file']);
                 }
             }
         }
 
         //Remove comments..
-        $regex = array ("`^([\t\s]+)`ism" => '',"`^\/\*(.+?)\*\/`ism" => "","`([\n\A;]+)\/\*(.+?)\*\/`ism" => "$1","`([\n\A;\s]+)//(.+?)[\n\r]`ism" => "$1\n","`(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+`ism" => "\n" );
-        $output = preg_replace( array_keys( $regex ), $regex, $output );
+        $regex = array("`^([\t\s]+)`ism" => '',"`^\/\*(.+?)\*\/`ism" => "","`([\n\A;]+)\/\*(.+?)\*\/`ism" => "$1","`([\n\A;\s]+)//(.+?)[\n\r]`ism" => "$1\n","`(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+`ism" => "\n" );
+        $output = preg_replace(array_keys($regex), $regex, $output);
         $output = $outputHeader . $output;
 
         return $output;
@@ -1082,29 +1081,29 @@ class G
      * @param string $downloadFileName
      * @return string
      */
-    public function streamJSTranslationFile ($filename, $locale = 'en')
+    public function streamJSTranslationFile($filename, $locale = 'en')
     {
-        $defaultTranslations = Array ();
-        $foreignTranslations = Array ();
+        $defaultTranslations = array();
+        $foreignTranslations = array();
 
         //if the default translations table doesn't exist we can't proceed
-        if (! is_file( PATH_LANGUAGECONT . 'translation.en' )) {
+        if (! is_file(PATH_LANGUAGECONT . 'translation.en')) {
             return ;
         }
         //load the translations table
-        require_once (PATH_LANGUAGECONT . 'translation.en');
+        require_once(PATH_LANGUAGECONT . 'translation.en');
         $defaultTranslations = $translation;
 
         //if some foreign language was requested and its translation file exists
-        if ($locale != 'en' && file_exists( PATH_LANGUAGECONT . 'translation.' . $locale )) {
-            require_once (PATH_LANGUAGECONT . 'translation.' . $locale); //load the foreign translations table
+        if ($locale != 'en' && file_exists(PATH_LANGUAGECONT . 'translation.' . $locale)) {
+            require_once(PATH_LANGUAGECONT . 'translation.' . $locale); //load the foreign translations table
             $foreignTranslations = $translation;
         }
 
-        if (defined( "SHOW_UNTRANSLATED_AS_TAG" ) && SHOW_UNTRANSLATED_AS_TAG != 0) {
+        if (defined("SHOW_UNTRANSLATED_AS_TAG") && SHOW_UNTRANSLATED_AS_TAG != 0) {
             $translation = $foreignTranslations;
         } else {
-            $translation = array_merge( $defaultTranslations, $foreignTranslations );
+            $translation = array_merge($defaultTranslations, $foreignTranslations);
         }
 
         $calendarJs = '';
@@ -1114,7 +1113,7 @@ class G
         }
         $calendarJs = file_get_contents($calendarJsFile) . "\n";
 
-        return $calendarJs . 'var TRANSLATIONS = ' . G::json_encode( $translation ) . ';' ;
+        return $calendarJs . 'var TRANSLATIONS = ' . G::json_encode($translation) . ';' ;
     }
 
     /**
@@ -1127,91 +1126,90 @@ class G
      * @param string $downloadFileName
      * @return string
      */
-    public static function streamFile ($file, $download = false, $downloadFileName = '')
+    public static function streamFile($file, $download = false, $downloadFileName = '')
     {
-
         $filter = new InputFilter();
         $file = $filter->xssFilterHard($file);
-        if(isset($_SERVER['REQUEST_URI'])) {
-            $_SERVER['REQUEST_URI'] = $filter->xssFilterHard($_SERVER['REQUEST_URI'],"url");
+        if (isset($_SERVER['REQUEST_URI'])) {
+            $_SERVER['REQUEST_URI'] = $filter->xssFilterHard($_SERVER['REQUEST_URI'], "url");
         }
-        require_once (PATH_THIRDPARTY . 'jsmin/jsmin.php');
-        $folderarray = explode( '/', $file );
-        $typearray = explode( '.', basename( $file ) );
-        $typefile = $typearray[count( $typearray ) - 1];
+        require_once(PATH_THIRDPARTY . 'jsmin/jsmin.php');
+        $folderarray = explode('/', $file);
+        $typearray = explode('.', basename($file));
+        $typefile = $typearray[count($typearray) - 1];
         $filename = $file;
 
         //trick to generate the translation.language.js file , merging two files
-        if (strtolower( $typefile ) == 'js' && $typearray[0] == 'translation') {
+        if (strtolower($typefile) == 'js' && $typearray[0] == 'translation') {
             $download = $filter->xssFilterHard($download);
             $downloadFileName = $filter->xssFilterHard($downloadFileName);
-            G::sendHeaders( $filename, 'text/javascript', $download, $downloadFileName );
-            $output = G::streamJSTranslationFile( $filename, $typearray[1] );
+            G::sendHeaders($filename, 'text/javascript', $download, $downloadFileName);
+            $output = G::streamJSTranslationFile($filename, $typearray[1]);
             $output = $filter->xssFilterHard($output);
             print $output;
             return;
         }
 
         //trick to generate the big css file for ext style .
-        if (strtolower( $typefile ) == 'css' && $folderarray[count( $folderarray ) - 2] == 'css') {
-            G::sendHeaders( $filename, 'text/css', $download, $downloadFileName );
-            $output = G::streamCSSBigFile( $typearray[0] );
+        if (strtolower($typefile) == 'css' && $folderarray[count($folderarray) - 2] == 'css') {
+            G::sendHeaders($filename, 'text/css', $download, $downloadFileName);
+            $output = G::streamCSSBigFile($typearray[0]);
             $output = $filter->xssFilterHard($output);
             print $output;
             return;
         }
 
-        if (file_exists( $filename )) {
-            switch (strtolower( $typefile )) {
+        if (file_exists($filename)) {
+            switch (strtolower($typefile)) {
                 case 'swf':
-                    G::sendHeaders( $filename, 'application/x-shockwave-flash', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'application/x-shockwave-flash', $download, $downloadFileName);
                     break;
                 case 'js':
-                    G::sendHeaders( $filename, 'text/javascript', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'text/javascript', $download, $downloadFileName);
                     break;
                 case 'htm':
                 case 'html':
-                    G::sendHeaders( $filename, 'text/html', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'text/html', $download, $downloadFileName);
                     break;
                 case 'htc':
-                    G::sendHeaders( $filename, 'text/plain', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'text/plain', $download, $downloadFileName);
                     break;
                 case 'json':
-                    G::sendHeaders( $filename, 'text/plain', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'text/plain', $download, $downloadFileName);
                     break;
                 case 'gif':
-                    G::sendHeaders( $filename, 'image/gif', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'image/gif', $download, $downloadFileName);
                     break;
                 case 'png':
-                    G::sendHeaders( $filename, 'image/png', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'image/png', $download, $downloadFileName);
                     break;
                 case 'jpg':
-                    G::sendHeaders( $filename, 'image/jpg', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'image/jpg', $download, $downloadFileName);
                     break;
                 case 'css':
-                    G::sendHeaders( $filename, 'text/css', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'text/css', $download, $downloadFileName);
                     break;
                 case 'xml':
-                    G::sendHeaders( $filename, 'text/xml', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'text/xml', $download, $downloadFileName);
                     break;
                 case 'txt':
-                    G::sendHeaders( $filename, 'text/html', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'text/html', $download, $downloadFileName);
                     break;
                 case 'pdf':
-                    G::sendHeaders( $filename, 'application/pdf', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'application/pdf', $download, $downloadFileName);
                     break;
                 case 'doc':
                 case 'pm':
                 case 'po':
-                    G::sendHeaders( $filename, 'application/octet-stream', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'application/octet-stream', $download, $downloadFileName);
                     break;
                 case 'php':
                     if ($download) {
-                        G::sendHeaders( $filename, 'text/plain', $download, $downloadFileName );
+                        G::sendHeaders($filename, 'text/plain', $download, $downloadFileName);
                     } else {
                         if (\Bootstrap::getDisablePhpUploadExecution() === 0) {
                             \Bootstrap::registerMonologPhpUploadExecution('phpExecution', 200, 'Php Execution', $filename);
-                            require_once ($filename);
+                            require_once($filename);
                         } else {
                             $message = G::LoadTranslation('THE_PHP_FILES_EXECUTION_WAS_DISABLED');
                             \Bootstrap::registerMonologPhpUploadExecution('phpExecution', 550, $message, $filename);
@@ -1221,26 +1219,26 @@ class G
                     }
                     break;
                 case 'tar':
-                    G::sendHeaders( $filename, 'application/x-tar', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'application/x-tar', $download, $downloadFileName);
                     break;
                 default:
                     //throw new Exception ( "Unknown type of file '$file'. " );
-                    G::sendHeaders( $filename, 'application/octet-stream', $download, $downloadFileName );
+                    G::sendHeaders($filename, 'application/octet-stream', $download, $downloadFileName);
                     break;
             }
         } else {
-            if (strpos( $file, 'gulliver' ) !== false) {
-                list ($path, $filename) = explode( 'gulliver', $file );
+            if (strpos($file, 'gulliver') !== false) {
+                list($path, $filename) = explode('gulliver', $file);
             }
 
             $_SESSION['phpFileNotFound'] = $file;
-            G::header( "location: /errors/error404.php?l=" . $_SERVER['REQUEST_URI'] );
+            G::header("location: /errors/error404.php?l=" . $_SERVER['REQUEST_URI']);
         }
 
-        if ( substr($filename,-10) == "ext-all.js" ) {
+        if (substr($filename, -10) == "ext-all.js") {
             $filename = PATH_GULLIVER_HOME . 'js/ext/min/ext-all.js';
         }
-        @readfile( $filename );
+        @readfile($filename);
     }
 
     /**
@@ -1253,7 +1251,7 @@ class G
      *
      * @return void
      */
-    public function sendHeaders ($filename, $contentType = '', $download = false, $downloadFileName = '')
+    public function sendHeaders($filename, $contentType = '', $download = false, $downloadFileName = '')
     {
         if ($download) {
             if ($downloadFileName == '') {
@@ -1267,48 +1265,47 @@ class G
         header('Content-Type: ' . $contentType);
 
         //if userAgent (BROWSER) is MSIE we need special headers to avoid MSIE behaivor.
-        $userAgent = strtolower( $_SERVER['HTTP_USER_AGENT'] );
-        if (preg_match( "/msie/i", $userAgent )) {
+        $userAgent = strtolower($_SERVER['HTTP_USER_AGENT']);
+        if (preg_match("/msie/i", $userAgent)) {
             //if ( ereg("msie", $userAgent)) {
-            header( 'Pragma: cache' );
+            header('Pragma: cache');
 
-            if (file_exists( $filename )) {
-                $mtime = filemtime( $filename );
+            if (file_exists($filename)) {
+                $mtime = filemtime($filename);
             } else {
-                $mtime = date( 'U' );
+                $mtime = date('U');
             }
-            $gmt_mtime = gmdate( "D, d M Y H:i:s", $mtime ) . " GMT";
-            header( 'ETag: "' . G::encryptOld( $mtime . $filename ) . '"' );
-            header( "Last-Modified: " . $gmt_mtime );
-            header( 'Cache-Control: public' );
-            header( "Expires: " . gmdate( "D, d M Y H:i:s", time() + 60 * 10 ) . " GMT" ); //ten minutes
+            $gmt_mtime = gmdate("D, d M Y H:i:s", $mtime) . " GMT";
+            header('ETag: "' . G::encryptOld($mtime . $filename) . '"');
+            header("Last-Modified: " . $gmt_mtime);
+            header('Cache-Control: public');
+            header("Expires: " . gmdate("D, d M Y H:i:s", time() + 60 * 10) . " GMT"); //ten minutes
             return;
         }
 
         if (! $download) {
+            header('Pragma: cache');
 
-            header( 'Pragma: cache' );
-
-            if (file_exists( $filename )) {
-                $mtime = filemtime( $filename );
+            if (file_exists($filename)) {
+                $mtime = filemtime($filename);
             } else {
-                $mtime = date( 'U' );
+                $mtime = date('U');
             }
-            $gmt_mtime = gmdate( "D, d M Y H:i:s", $mtime ) . " GMT";
-            header( 'ETag: "' . G::encryptOld( $mtime . $filename ) . '"' );
-            header( "Last-Modified: " . $gmt_mtime );
-            header( 'Cache-Control: public' );
-            header( "Expires: " . gmdate( "D, d M Y H:i:s", time() + 90 * 60 * 60 * 24 ) . " GMT" );
-            if (isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] )) {
+            $gmt_mtime = gmdate("D, d M Y H:i:s", $mtime) . " GMT";
+            header('ETag: "' . G::encryptOld($mtime . $filename) . '"');
+            header("Last-Modified: " . $gmt_mtime);
+            header('Cache-Control: public');
+            header("Expires: " . gmdate("D, d M Y H:i:s", time() + 90 * 60 * 60 * 24) . " GMT");
+            if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
                 if ($_SERVER['HTTP_IF_MODIFIED_SINCE'] == $gmt_mtime) {
-                    header( 'HTTP/1.1 304 Not Modified' );
+                    header('HTTP/1.1 304 Not Modified');
                     exit();
                 }
             }
 
-            if (isset( $_SERVER['HTTP_IF_NONE_MATCH'] )) {
-                if (str_replace( '"', '', stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) ) == G::encryptOld( $mtime . $filename )) {
-                    header( "HTTP/1.1 304 Not Modified" );
+            if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+                if (str_replace('"', '', stripslashes($_SERVER['HTTP_IF_NONE_MATCH'])) == G::encryptOld($mtime . $filename)) {
+                    header("HTTP/1.1 304 Not Modified");
                     exit();
                 }
             }
@@ -1325,15 +1322,15 @@ class G
      * @param string $realPath = local path
      * @return boolean
      */
-    public function virtualURI ($url, $convertionTable, &$realPath)
+    public function virtualURI($url, $convertionTable, &$realPath)
     {
         foreach ($convertionTable as $urlPattern => $localPath) {
             //      $urlPattern = addcslashes( $urlPattern , '/');
-            $urlPattern = addcslashes( $urlPattern, './' );
-            $urlPattern = '/^' . str_replace( array ('*','?'
-            ), array ('.*','.?'
-            ), $urlPattern ) . '$/';
-            if (preg_match( $urlPattern, $url, $match )) {
+            $urlPattern = addcslashes($urlPattern, './');
+            $urlPattern = '/^' . str_replace(array('*','?'
+            ), array('.*','.?'
+            ), $urlPattern) . '$/';
+            if (preg_match($urlPattern, $url, $match)) {
                 if ($localPath === false) {
                     $realPath = $url;
                     return false;
@@ -1359,13 +1356,13 @@ class G
      * @param string $id
      * @return string
      */
-    public static function createUID ($scope, $id)
+    public static function createUID($scope, $id)
     {
         $e = $scope . $id;
-        $e = G::encrypt( $e, URL_KEY );
-        $e = str_replace( array ('+','/','='
-        ), array ('__','_','___'
-        ), base64_encode( $e ) );
+        $e = G::encrypt($e, URL_KEY);
+        $e = str_replace(array('+','/','='
+        ), array('__','_','___'
+        ), base64_encode($e));
         return $e;
     }
 
@@ -1379,14 +1376,14 @@ class G
      * @param string $scope
      * @return string
      */
-    public function getUIDName ($uid, $scope = '')
+    public function getUIDName($uid, $scope = '')
     {
-        $e = str_replace( array ('=','+','/'
-        ), array ('___','__','_'
-        ), $uid );
-        $e = base64_decode( $e );
-        $e = G::decrypt( $e, URL_KEY );
-        $e = substr( $e, strlen( $scope ) );
+        $e = str_replace(array('=','+','/'
+        ), array('___','__','_'
+        ), $uid);
+        $e = base64_decode($e);
+        $e = G::decrypt($e, URL_KEY);
+        $e = substr($e, strlen($scope));
         return $e;
     }
 
@@ -1396,7 +1393,7 @@ class G
      * @param  int/string $num
      * @return string number
     */
-    public function formatNumber ($num, $language = 'latin')
+    public function formatNumber($num, $language = 'latin')
     {
         switch ($language) {
             default:
@@ -1410,32 +1407,32 @@ class G
      * @param string $format     The format of the outputted date string
      * @param string $datetime   Date in the format YYYY-MM-DD HH:MM:SS
     */
-    public function formatDate ($datetime, $format = 'Y-m-d', $lang = '')
+    public function formatDate($datetime, $format = 'Y-m-d', $lang = '')
     {
         if ($lang === '') {
-            $lang = defined( SYS_LANG ) ? SYS_LANG : 'en';
+            $lang = defined(SYS_LANG) ? SYS_LANG : 'en';
         }
-        $aux = explode( ' ', $datetime ); //para dividir la fecha del dia
-        $date = explode( '-', isset( $aux[0] ) ? $aux[0] : '00-00-00' ); //para obtener los dias, el mes, y el año.
-        $time = explode( ':', isset( $aux[1] ) ? $aux[1] : '00:00:00' ); //para obtener las horas, minutos, segundos.
-        $date[0] = (int) ((isset( $date[0] )) ? $date[0] : '0');
-        $date[1] = (int) ((isset( $date[1] )) ? $date[1] : '0');
-        $date[2] = (int) ((isset( $date[2] )) ? $date[2] : '0');
-        $time[0] = (int) ((isset( $time[0] )) ? $time[0] : '0');
-        $time[1] = (int) ((isset( $time[1] )) ? $time[1] : '0');
-        $time[2] = (int) ((isset( $time[2] )) ? $time[2] : '0');
+        $aux = explode(' ', $datetime); //para dividir la fecha del dia
+        $date = explode('-', isset($aux[0]) ? $aux[0] : '00-00-00'); //para obtener los dias, el mes, y el año.
+        $time = explode(':', isset($aux[1]) ? $aux[1] : '00:00:00'); //para obtener las horas, minutos, segundos.
+        $date[0] = (int) ((isset($date[0])) ? $date[0] : '0');
+        $date[1] = (int) ((isset($date[1])) ? $date[1] : '0');
+        $date[2] = (int) ((isset($date[2])) ? $date[2] : '0');
+        $time[0] = (int) ((isset($time[0])) ? $time[0] : '0');
+        $time[1] = (int) ((isset($time[1])) ? $time[1] : '0');
+        $time[2] = (int) ((isset($time[2])) ? $time[2] : '0');
         // Spanish months
-        $ARR_MONTHS['es'] = array ("Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"
+        $ARR_MONTHS['es'] = array("Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"
         );
         // English months
-        $ARR_MONTHS['en'] = array ("January","February","March","April","May","June","July","August","September","October","November","December"
+        $ARR_MONTHS['en'] = array("January","February","March","April","May","June","July","August","September","October","November","December"
         );
 
         // Spanish days
-        $ARR_WEEKDAYS['es'] = array ("Domingo","Lunes","Martes","Miércoles","Jueves","Viernes","Sábado"
+        $ARR_WEEKDAYS['es'] = array("Domingo","Lunes","Martes","Miércoles","Jueves","Viernes","Sábado"
         );
         // English days
-        $ARR_WEEKDAYS['en'] = array ("Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"
+        $ARR_WEEKDAYS['en'] = array("Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"
         );
 
         if ($lang == 'fa') {
@@ -1444,33 +1441,33 @@ class G
             $number = 'latin';
         }
         $d = '0' . $date[2];
-        $d = G::formatNumber( substr( $d, strlen( $d ) - 2, 2 ), $number );
-        $j = G::formatNumber( $date[2], $number );
-        $F = isset( $ARR_MONTHS[$lang][$date[1] - 1] ) ? $ARR_MONTHS[$lang][$date[1] - 1] : '';
+        $d = G::formatNumber(substr($d, strlen($d) - 2, 2), $number);
+        $j = G::formatNumber($date[2], $number);
+        $F = isset($ARR_MONTHS[$lang][$date[1] - 1]) ? $ARR_MONTHS[$lang][$date[1] - 1] : '';
         $m = '0' . $date[1];
-        $m = G::formatNumber( substr( $m, strlen( $m ) - 2, 2 ), $number );
-        $n = G::formatNumber( $date[1], $number );
-        $y = G::formatNumber( substr( $date[0], strlen( $date[0] ) - 2, 2 ), $number );
+        $m = G::formatNumber(substr($m, strlen($m) - 2, 2), $number);
+        $n = G::formatNumber($date[1], $number);
+        $y = G::formatNumber(substr($date[0], strlen($date[0]) - 2, 2), $number);
         $Y = '0000' . $date[0];
-        $Y = G::formatNumber( substr( $Y, strlen( $Y ) - 4, 4 ), $number );
+        $Y = G::formatNumber(substr($Y, strlen($Y) - 4, 4), $number);
         $g = ($time[0] % 12);
         if ($g === 0) {
             $g = 12;
         }
         $G = $time[0];
         $h = '0' . $g;
-        $h = G::formatNumber( substr( $h, strlen( $h ) - 2, 2 ), $number );
+        $h = G::formatNumber(substr($h, strlen($h) - 2, 2), $number);
         $H = '0' . $G;
-        $H = G::formatNumber( substr( $H, strlen( $H ) - 2, 2 ), $number );
+        $H = G::formatNumber(substr($H, strlen($H) - 2, 2), $number);
         $i = '0' . $time[1];
-        $i = G::formatNumber( substr( $i, strlen( $i ) - 2, 2 ), $number );
+        $i = G::formatNumber(substr($i, strlen($i) - 2, 2), $number);
         $s = '0' . $time[2];
-        $s = G::formatNumber( substr( $s, strlen( $s ) - 2, 2 ), $number );
-        $names = array ('d','j','F','m','n','y','Y','g','G','h','H','i','s'
+        $s = G::formatNumber(substr($s, strlen($s) - 2, 2), $number);
+        $names = array('d','j','F','m','n','y','Y','g','G','h','H','i','s'
         );
-        $values = array ($d,$j,$F,$m,$n,$y,$Y,$g,$G,$h,$H,$i,$s
+        $values = array($d,$j,$F,$m,$n,$y,$Y,$g,$G,$h,$H,$i,$s
         );
-        $_formatedDate = str_replace( $names, $values, $format );
+        $_formatedDate = str_replace($names, $values, $format);
         return $_formatedDate;
     }
 
@@ -1483,7 +1480,7 @@ class G
      *
      * @return string $ret
      */
-    public static function getformatedDate ($date, $format = 'yyyy-mm-dd', $lang = '')
+    public static function getformatedDate($date, $format = 'yyyy-mm-dd', $lang = '')
     {
         /**
          * ******************************************************************************************************
@@ -1503,71 +1500,71 @@ class G
         //scape the literal
         switch ($lang) {
             case 'es':
-                $format = str_replace( ' del ', '[ofl]', $format );
-                $format = str_replace( ' de ', '[of]', $format );
+                $format = str_replace(' del ', '[ofl]', $format);
+                $format = str_replace(' de ', '[of]', $format);
                 break;
         }
 
         //first we must formatted the string
-        $format = str_replace( 'h', '{h}', $format );
-        $format = str_replace( 'i', '{i}', $format );
-        $format = str_replace( 's', '{s}', $format );
+        $format = str_replace('h', '{h}', $format);
+        $format = str_replace('i', '{i}', $format);
+        $format = str_replace('s', '{s}', $format);
 
-        $format = str_replace( 'yyyy', '{YEAR}', $format );
-        $format = str_replace( 'yy', '{year}', $format );
+        $format = str_replace('yyyy', '{YEAR}', $format);
+        $format = str_replace('yy', '{year}', $format);
 
-        $format = str_replace( 'mm', '{YONTH}', $format );
-        $format = str_replace( 'm', '{month}', $format );
-        $format = str_replace( 'M', '{XONTH}', $format );
+        $format = str_replace('mm', '{YONTH}', $format);
+        $format = str_replace('m', '{month}', $format);
+        $format = str_replace('M', '{XONTH}', $format);
 
-        $format = str_replace( 'dd', '{DAY}', $format );
-        $format = str_replace( 'd', '{day}', $format );
+        $format = str_replace('dd', '{DAY}', $format);
+        $format = str_replace('d', '{day}', $format);
 
         if ($lang === '') {
-            $lang = defined( SYS_LANG ) ? SYS_LANG : 'en';
+            $lang = defined(SYS_LANG) ? SYS_LANG : 'en';
         }
 
-        $aux = explode( ' ', $date ); //para dividir la fecha del dia
-        $date = explode( '-', isset( $aux[0] ) ? $aux[0] : '00-00-00' ); //para obtener los dias, el mes, y el año.
-        $time = explode( ':', isset( $aux[1] ) ? $aux[1] : '00:00:00' ); //para obtener las horas, minutos, segundos.
+        $aux = explode(' ', $date); //para dividir la fecha del dia
+        $date = explode('-', isset($aux[0]) ? $aux[0] : '00-00-00'); //para obtener los dias, el mes, y el año.
+        $time = explode(':', isset($aux[1]) ? $aux[1] : '00:00:00'); //para obtener las horas, minutos, segundos.
 
-        $year = (int) ((isset( $date[0] )) ? $date[0] : '0'); //year
-        $month = (int) ((isset( $date[1] )) ? $date[1] : '0'); //month
-        $day = (int) ((isset( $date[2] )) ? $date[2] : '0'); //day
+        $year = (int) ((isset($date[0])) ? $date[0] : '0'); //year
+        $month = (int) ((isset($date[1])) ? $date[1] : '0'); //month
+        $day = (int) ((isset($date[2])) ? $date[2] : '0'); //day
 
-        $h = isset( $time[0] ) ? $time[0] : '00'; //hour
-        $i = isset( $time[1] ) ? $time[1] : '00'; //minute
-        $s = isset( $time[2] ) ? $time[2] : '00'; //second
+        $h = isset($time[0]) ? $time[0] : '00'; //hour
+        $i = isset($time[1]) ? $time[1] : '00'; //minute
+        $s = isset($time[2]) ? $time[2] : '00'; //second
 
-        $MONTHS = Array ();
+        $MONTHS = array();
         for ($j = 1; $j <= 12; $j ++) {
-          $MONTHS[$j] = G::LoadTranslation( "ID_MONTH_$j", $lang );
+            $MONTHS[$j] = G::LoadTranslation("ID_MONTH_$j", $lang);
         }
 
         $d = (int) $day;
-        $dd = G::complete_field( $day, 2, 1 );
+        $dd = G::complete_field($day, 2, 1);
 
         //missing D
 
         $M = $MONTHS[$month];
         $m = (int) $month;
-        $mm = G::complete_field( $month, 2, 1 );
+        $mm = G::complete_field($month, 2, 1);
 
-        $yy = substr( $year, strlen( $year ) - 2, 2 );
+        $yy = substr($year, strlen($year) - 2, 2);
         $yyyy = $year;
 
-        $names = array ('{day}','{DAY}','{month}','{YONTH}','{XONTH}','{year}','{YEAR}','{h}','{i}','{s}'
+        $names = array('{day}','{DAY}','{month}','{YONTH}','{XONTH}','{year}','{YEAR}','{h}','{i}','{s}'
         );
-        $values = array ($d,$dd,$m,$mm,$M,$yy,$yyyy,$h,$i,$s
+        $values = array($d,$dd,$m,$mm,$M,$yy,$yyyy,$h,$i,$s
         );
 
-        $ret = str_replace( $names, $values, $format );
+        $ret = str_replace($names, $values, $format);
 
         //recovering the original literal
         switch ($lang) {
             case 'es':
-                $ret = str_replace( '[ofl]', ' del ', $ret );
-                $ret = str_replace( '[of]', ' de ', $ret );
+                $ret = str_replace('[ofl]', ' del ', $ret);
+                $ret = str_replace('[of]', ' de ', $ret);
                 break;
         }
 
@@ -1579,21 +1576,21 @@ class G
      * Here's a little wrapper for array_diff - I found myself needing
      * to iterate through the edited array, and I didn't need to original keys for anything.
      */
-    public function arrayDiff ($array1, $array2)
+    public function arrayDiff($array1, $array2)
     {
-        if (! is_array( $array1 )) {
+        if (! is_array($array1)) {
             $array1 = (array) $array1;
         }
 
-        if (! is_array( $array2 )) {
+        if (! is_array($array2)) {
             $array2 = (array) $array2;
         }
 
         // This wrapper for array_diff rekeys the array returned
-        $valid_array = array_diff( $array1, $array2 );
+        $valid_array = array_diff($array1, $array2);
 
         // reinstantiate $array1 variable
-        $array1 = array ();
+        $array1 = array();
 
         // loop through the validated array and move elements to $array1
         // this is necessary because the array_diff function returns arrays that retain their original keys
@@ -1608,49 +1605,49 @@ class G
      * @author Erik Amaru Ortiz <erik@colosa.com>
      * @name complete_field($string, $lenght, $type={1:number/2:string/3:float})
      */
-    public static function complete_field ($campo, $long, $tipo)
+    public static function complete_field($campo, $long, $tipo)
     {
-        $campo = trim( $campo );
+        $campo = trim($campo);
         switch ($tipo) {
             case 1: //number
-                $long = $long - strlen( $campo );
+                $long = $long - strlen($campo);
                 for ($i = 1; $i <= $long; $i ++) {
                     $campo = "0" . $campo;
                 }
                 break;
             case 2: //string
-                $long = $long - strlen( $campo );
+                $long = $long - strlen($campo);
                 for ($i = 1; $i <= $long; $i ++) {
                     $campo = " " . $campo;
                 }
                 break;
             case 3: //float
                 if ($campo != "0") {
-                    $vals = explode( ".", $long );
+                    $vals = explode(".", $long);
                     $ints = $vals[0];
 
                     $decs = $vals[1];
 
-                    $valscampo = explode( ".", $campo );
+                    $valscampo = explode(".", $campo);
 
                     $intscampo = $valscampo[0];
                     $decscampo = $valscampo[1];
 
-                    $ints = $ints - strlen( $intscampo );
+                    $ints = $ints - strlen($intscampo);
 
                     for ($i = 1; $i <= $ints; $i ++) {
                         $intscampo = "0" . $intscampo;
                     }
 
                     //los decimales pueden ser 0 uno o dos
-                    $decs = $decs - strlen( $decscampo );
+                    $decs = $decs - strlen($decscampo);
                     for ($i = 1; $i <= $decs; $i ++) {
                         $decscampo = $decscampo . "0";
                     }
 
                     $campo = $intscampo . "." . $decscampo;
                 } else {
-                    $vals = explode( ".", $long );
+                    $vals = explode(".", $long);
                     $ints = $vals[0];
                     $decs = $vals[1];
 
@@ -1671,24 +1668,23 @@ class G
     }
 
     /* Escapes special characters in a string for use in a SQL statement
-     * @author David Callizaya <calidavidx21@hotmail.com>
      * @param string $sqlString  The string to be escaped
      * @param string $DBEngine   Target DBMS
     */
-    public function sqlEscape ($sqlString, $DBEngine = DB_ADAPTER)
+    public function sqlEscape($sqlString, $DBEngine = DB_ADAPTER)
     {
         $DBEngine = DB_ADAPTER;
         switch ($DBEngine) {
             case 'mysql':
-                $con = Propel::getConnection( 'workflow' );
-                return mysql_real_escape_string( stripslashes( $sqlString ), $con->getResource() );
+                $con = Propel::getConnection('workflow');
+                return mysqli_real_escape_string($con->getResource(), stripslashes($sqlString));
                 break;
             case 'myxml':
-                $sqlString = str_replace( '"', '""', $sqlString );
-                return str_replace( "'", "''", $sqlString );
+                $sqlString = str_replace('"', '""', $sqlString);
+                return str_replace("'", "''", $sqlString);
                 break;
             default:
-                return addslashes( stripslashes( $sqlString ) );
+                return addslashes(stripslashes($sqlString));
                 break;
         }
     }
@@ -1700,7 +1696,7 @@ class G
      * @return Boolean
      *
      */
-    public function MySQLSintaxis ()
+    public function MySQLSintaxis()
     {
         $DBEngine = DB_ADAPTER;
         switch ($DBEngine) {
@@ -1726,26 +1722,26 @@ class G
      *     @fn()  Evaluate string with the function "fn"
      * @author David Callizaya <calidavidx21@hotmail.com>
      */
-    public static function replaceDataField ($sqlString, $result, $DBEngine = 'mysql')
+    public static function replaceDataField($sqlString, $result, $DBEngine = 'mysql')
     {
-        if (! is_array( $result )) {
-            $result = array ();
+        if (! is_array($result)) {
+            $result = array();
         }
         $result = $result + G::getSystemConstants();
         $__textoEval = "";
         $u = 0;
-        $count = preg_match_all( '/\@(?:([\@\%\#\?\$\=\&Qq\!])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+|\-\>([a-zA-Z\_]\w*))?/', $sqlString, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE );
+        $count = preg_match_all('/\@(?:([\@\%\#\?\$\=\&Qq\!])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+|\-\>([a-zA-Z\_]\w*))?/', $sqlString, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
         if ($count) {
             for ($r = 0; $r < $count; $r ++) {
-                if (! isset( $result[$match[2][$r][0]] )) {
+                if (! isset($result[$match[2][$r][0]])) {
                     $result[$match[2][$r][0]] = '';
                 }
-                if (! is_array( $result[$match[2][$r][0]] )) {
-                    $__textoEval .= substr( $sqlString, $u, $match[0][$r][1] - $u );
-                    $u = $match[0][$r][1] + strlen( $match[0][$r][0] );
+                if (! is_array($result[$match[2][$r][0]])) {
+                    $__textoEval .= substr($sqlString, $u, $match[0][$r][1] - $u);
+                    $u = $match[0][$r][1] + strlen($match[0][$r][0]);
                     //Mysql quotes scape
-                    if (($match[1][$r][0] == '@') && (isset( $result[$match[2][$r][0]] ))) {
-                        $__textoEval .= "\"" . G::sqlEscape( $result[$match[2][$r][0]], $DBEngine ) . "\"";
+                    if (($match[1][$r][0] == '@') && (isset($result[$match[2][$r][0]]))) {
+                        $__textoEval .= "\"" . G::sqlEscape($result[$match[2][$r][0]], $DBEngine) . "\"";
                         continue;
                     }
                     //URL encode
@@ -1755,22 +1751,22 @@ class G
                     }
                     //Double quoted parameter
                     if (($match[1][$r][0]=='Q')&&(isset($result[$match[2][$r][0]]))) {
-                        $__textoEval.='"'.addcslashes($result[$match[2][$r][0]],'\\"').'"';
+                        $__textoEval.='"'.addcslashes($result[$match[2][$r][0]], '\\"').'"';
                         continue;
                     }
                     //Single quoted parameter
                     if (($match[1][$r][0]=='q')&&(isset($result[$match[2][$r][0]]))) {
-                        $__textoEval.="'".addcslashes($result[$match[2][$r][0]],'\\\'')."'";
+                        $__textoEval.="'".addcslashes($result[$match[2][$r][0]], '\\\'')."'";
                         continue;
                     }
                     //Substring (Sub replaceDataField)
                     if (($match[1][$r][0]=='!')&&(isset($result[$match[2][$r][0]]))) {
-                        $__textoEval.=G::replaceDataField($result[$match[2][$r][0]],$result);
+                        $__textoEval.=G::replaceDataField($result[$match[2][$r][0]], $result);
                         continue;
                     }
                     //Call function
                     if (($match[1][$r][0]==='')&&($match[2][$r][0]==='')&&($match[3][$r][0]!=='')) {
-                        eval('$strAux = ' . $match[3][$r][0] . '(\'' . addcslashes(G::replaceDataField(stripslashes($match[4][$r][0]),$result),'\\\'') . '\');');
+                        eval('$strAux = ' . $match[3][$r][0] . '(\'' . addcslashes(G::replaceDataField(stripslashes($match[4][$r][0]), $result), '\\\'') . '\');');
 
                         if ($match[3][$r][0] == "G::LoadTranslation") {
                             $arraySearch  = array("'");
@@ -1783,12 +1779,12 @@ class G
                     }
                     //Non-quoted
                     if (($match[1][$r][0]=='#')&&(isset($result[$match[2][$r][0]]))) {
-                        $__textoEval.=G::replaceDataField($result[$match[2][$r][0]],$result);
+                        $__textoEval.=G::replaceDataField($result[$match[2][$r][0]], $result);
                         continue;
                     }
                     //Non-quoted =
                     if (($match[1][$r][0]=='=')&&(isset($result[$match[2][$r][0]]))) {
-                        $__textoEval.=G::replaceDataField($result[$match[2][$r][0]],$result);
+                        $__textoEval.=G::replaceDataField($result[$match[2][$r][0]], $result);
                         continue;
                     }
                     //Objects attributes
@@ -1801,7 +1797,7 @@ class G
                 }
             }
         }
-        $__textoEval.=substr($sqlString,$u);
+        $__textoEval.=substr($sqlString, $u);
         return $__textoEval;
     }
 
@@ -1832,16 +1828,16 @@ class G
 
             $arrayGrid = array_unique($arrayGrid);
 
-            //Given the set: 'valueOne', 'valueOneTwo', where the second string 
-            //contains the first string, this causes the larger string to take 
-            //the second, resulting in a delimitation error, to avoid this problem 
+            //Given the set: 'valueOne', 'valueOneTwo', where the second string
+            //contains the first string, this causes the larger string to take
+            //the second, resulting in a delimitation error, to avoid this problem
             //we first search the string larger size.
-            usort($arrayGrid, function($a, $b) {
+            usort($arrayGrid, function ($a, $b) {
                 return strlen($b) - strlen($a);
             });
 
             foreach ($arrayGrid as $index => $value) {
-                if($value !== "") {
+                if ($value !== "") {
                     $grdName = $value;
 
                     $strContentAux1 = $strContentAux;
@@ -1870,7 +1866,6 @@ class G
                     }
 
                     $strContentAux = $strContentAux1 . $strContentAux;
-
                 }
             }
         }
@@ -1898,35 +1893,35 @@ class G
      * @parameter $languageId   (es|en|...).
      * @parameter $forceParse   Force to read and parse the xml file.
      */
-    public function loadLanguageFile ($filename, $languageId = '', $forceParse = false)
+    public function loadLanguageFile($filename, $languageId = '', $forceParse = false)
     {
         global $arrayXmlMessages;
         if ($languageId === '') {
-            $languageId = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
+            $languageId = defined('SYS_LANG') ? SYS_LANG : 'en';
         }
-        $languageFile = basename( $filename, '.xml' );
-        $cacheFile = substr( $filename, 0, - 3 ) . $languageId;
-        if (($forceParse) || (! file_exists( $cacheFile )) || (filemtime( $filename ) > filemtime( $cacheFile ))) {
+        $languageFile = basename($filename, '.xml');
+        $cacheFile = substr($filename, 0, - 3) . $languageId;
+        if (($forceParse) || (! file_exists($cacheFile)) || (filemtime($filename) > filemtime($cacheFile))) {
             $languageDocument = new Xml_document();
-            $languageDocument->parseXmlFile( $filename );
-            if (! is_array( $arrayXmlMessages )) {
-                $arrayXmlMessages = array ();
+            $languageDocument->parseXmlFile($filename);
+            if (! is_array($arrayXmlMessages)) {
+                $arrayXmlMessages = array();
             }
-            $arrayXmlMessages[$languageFile] = array ();
-            for ($r = 0; $r < sizeof( $languageDocument->children[0]->children ); $r ++) {
-                $n = $languageDocument->children[0]->children[$r]->findNode( $languageId );
+            $arrayXmlMessages[$languageFile] = array();
+            for ($r = 0; $r < sizeof($languageDocument->children[0]->children); $r ++) {
+                $n = $languageDocument->children[0]->children[$r]->findNode($languageId);
                 if ($n) {
                     $k = $languageDocument->children[0]->children[$r]->name;
                     $arrayXmlMessages[$languageFile][$k] = $n->value;
                 }
             }
-            $f = fopen( $cacheFile, 'w' );
-            fwrite( $f, "<?php\n" );
-            fwrite( $f, '$arrayXmlMessages[\'' . $languageFile . '\']=' . 'unserialize(\'' . addcslashes( serialize( $arrayXmlMessages[$languageFile] ), '\\\'' ) . "');\n" );
-            fwrite( $f, "?>" );
-            fclose( $f );
+            $f = fopen($cacheFile, 'w');
+            fwrite($f, "<?php\n");
+            fwrite($f, '$arrayXmlMessages[\'' . $languageFile . '\']=' . 'unserialize(\'' . addcslashes(serialize($arrayXmlMessages[$languageFile]), '\\\'') . "');\n");
+            fwrite($f, "?>");
+            fclose($f);
         } else {
-            require ($cacheFile);
+            require($cacheFile);
         }
     }
 
@@ -1934,15 +1929,17 @@ class G
      *   Registra en la base de datos los labels xml usados en el sistema
      * @author David Callizaya <calidavidx21@hotmail.com>
      */
-    public function registerLabel ($id, $label)
+    public function registerLabel($id, $label)
     {
         return 1;
         $dbc = new DBConnection();
-        $ses = new DBSession( $dbc );
-        $ses->Execute( G::replaceDataField(
+        $ses = new DBSession($dbc);
+        $ses->Execute(G::replaceDataField(
             'REPLACE INTO `TRANSLATION` (`TRN_CATEGORY`, `TRN_ID`, `TRN_LANG`, `TRN_VALUE`) VALUES
-        ("LABEL", @@ID, "' . SYS_LANG . '", @@LABEL);', array ('ID' => $id,'LABEL' => ($label !== null ? $label : '')
-        ) ) );
+        ("LABEL", @@ID, "' . SYS_LANG . '", @@LABEL);',
+            array('ID' => $id,'LABEL' => ($label !== null ? $label : '')
+        )
+        ));
     }
 
     /**
@@ -1953,13 +1950,13 @@ class G
      * @param eter string msgID
      * @return string
      */
-    public function LoadMenuXml ($msgID)
+    public function LoadMenuXml($msgID)
     {
         global $arrayXmlMessages;
-        if (! isset( $arrayXmlMessages['menus'] )) {
-            G::loadLanguageFile( G::ExpandPath( 'content' ) . 'languages/menus.xml' );
+        if (! isset($arrayXmlMessages['menus'])) {
+            G::loadLanguageFile(G::ExpandPath('content') . 'languages/menus.xml');
         }
-        G::registerLabel( $msgID, $arrayXmlMessages['menus'][$msgID] );
+        G::registerLabel($msgID, $arrayXmlMessages['menus'][$msgID]);
         return $arrayXmlMessages['menus'][$msgID];
     }
 
@@ -1973,15 +1970,15 @@ class G
      * @param eter string file
      * @return string
      */
-    public function SendMessageXml ($msgID, $strType, $file = "labels")
+    public function SendMessageXml($msgID, $strType, $file = "labels")
     {
         global $arrayXmlMessages;
-        if (! isset( $arrayXmlMessages[$file] )) {
-            G::loadLanguageFile( G::ExpandPath( 'content' ) . 'languages/' . $file . '.xml' );
+        if (! isset($arrayXmlMessages[$file])) {
+            G::loadLanguageFile(G::ExpandPath('content') . 'languages/' . $file . '.xml');
         }
         $_SESSION['G_MESSAGE_TYPE'] = $strType;
-        G::registerLabel( $msgID, $arrayXmlMessages[$file][$msgID] );
-        $_SESSION['G_MESSAGE'] = nl2br( $arrayXmlMessages[$file][$msgID] );
+        G::registerLabel($msgID, $arrayXmlMessages[$file][$msgID]);
+        $_SESSION['G_MESSAGE'] = nl2br($arrayXmlMessages[$file][$msgID]);
     }
 
     /**
@@ -1996,29 +1993,29 @@ class G
      *
      * @return void
      */
-    public static function SendTemporalMessage ($msgID, $strType, $sType = 'LABEL', $time = null, $width = null, $customLabels = null)
+    public static function SendTemporalMessage($msgID, $strType, $sType = 'LABEL', $time = null, $width = null, $customLabels = null)
     {
-        if (isset( $width )) {
+        if (isset($width)) {
             $_SESSION['G_MESSAGE_WIDTH'] = $width;
         }
-        if (isset( $time )) {
+        if (isset($time)) {
             $_SESSION['G_MESSAGE_TIME'] = $time;
         }
-        switch (strtolower( $sType )) {
+        switch (strtolower($sType)) {
             case 'label':
             case 'labels':
                 $_SESSION['G_MESSAGE_TYPE'] = $strType;
-                $_SESSION['G_MESSAGE'] = nl2br( G::LoadTranslation( $msgID ) );
+                $_SESSION['G_MESSAGE'] = nl2br(G::LoadTranslation($msgID));
                 break;
             case 'string':
                 $_SESSION['G_MESSAGE_TYPE'] = $strType;
-                $_SESSION['G_MESSAGE'] = nl2br( $msgID );
+                $_SESSION['G_MESSAGE'] = nl2br($msgID);
                 break;
         }
         if ($customLabels != null) {
             $message = $_SESSION['G_MESSAGE'];
             foreach ($customLabels as $key => $val) {
-                $message = str_replace( '{' . nl2br( $key ) . '}', nl2br( $val ), $message );
+                $message = str_replace('{' . nl2br($key) . '}', nl2br($val), $message);
             }
             $_SESSION['G_MESSAGE'] = $message;
         }
@@ -2033,11 +2030,11 @@ class G
      *
      * @return void
      */
-    public function SendMessage ($msgID, $strType, $file = "labels")
+    public function SendMessage($msgID, $strType, $file = "labels")
     {
         global $arrayXmlMessages;
         $_SESSION['G_MESSAGE_TYPE'] = $strType;
-        $_SESSION['G_MESSAGE'] = nl2br( G::LoadTranslation( $msgID ) );
+        $_SESSION['G_MESSAGE'] = nl2br(G::LoadTranslation($msgID));
     }
 
     /**
@@ -2049,11 +2046,11 @@ class G
      *
      * @return void
      */
-    public function SendMessageText ($text, $strType)
+    public function SendMessageText($text, $strType)
     {
         global $arrayXmlMessages;
         $_SESSION['G_MESSAGE_TYPE'] = $strType;
-        $_SESSION['G_MESSAGE'] = nl2br( $text );
+        $_SESSION['G_MESSAGE'] = nl2br($text);
     }
 
     /**
@@ -2064,24 +2061,24 @@ class G
      * @param string $msgID
      * @return void
      */
-    public function LoadMessage ($msgID, $file = "messages")
+    public function LoadMessage($msgID, $file = "messages")
     {
         global $_SESSION;
         global $arrayXmlMessages;
 
-        if (! is_array( $arrayXmlMessages )) {
-            $arrayXmlMessages = G::LoadArrayFile( G::ExpandPath( 'content' ) . $file . "." . SYS_LANG );
+        if (! is_array($arrayXmlMessages)) {
+            $arrayXmlMessages = G::LoadArrayFile(G::ExpandPath('content') . $file . "." . SYS_LANG);
         }
         $aux = $arrayXmlMessages[$msgID];
         $msg = "";
-        for ($i = 0; $i < strlen( $aux ); $i ++) {
+        for ($i = 0; $i < strlen($aux); $i ++) {
             if ($aux[$i] == "$") {
                 $token = "";
                 $i ++;
-                while ($i < strlen( $aux ) && $aux[$i] != " " && $aux[$i] != "." && $aux[$i] != "'" && $aux[$i] != '"') {
+                while ($i < strlen($aux) && $aux[$i] != " " && $aux[$i] != "." && $aux[$i] != "'" && $aux[$i] != '"') {
                     $token .= $aux[$i ++];
                 }
-                eval( "\$msg.= \$_SESSION['" . $token . "'] ; " );
+                eval("\$msg.= \$_SESSION['" . $token . "'] ; ");
                 $msg .= $aux[$i];
             } else {
                 $msg = $msg . $aux[$i];
@@ -2094,7 +2091,7 @@ class G
      * Function LoadXmlLabel
      * deprecated
      */
-    public function LoadXmlLabel ($msgID, $file = 'labels')
+    public function LoadXmlLabel($msgID, $file = 'labels')
     {
         return 'xxxxxx';
     }
@@ -2108,17 +2105,17 @@ class G
      * @param eter string file
      * @return string
      */
-    public function LoadMessageXml ($msgID, $file = 'labels')
+    public function LoadMessageXml($msgID, $file = 'labels')
     {
         global $arrayXmlMessages;
-        if (! isset( $arrayXmlMessages[$file] )) {
-            G::loadLanguageFile( G::ExpandPath( 'content' ) . 'languages/' . $file . '.xml' );
+        if (! isset($arrayXmlMessages[$file])) {
+            G::loadLanguageFile(G::ExpandPath('content') . 'languages/' . $file . '.xml');
         }
-        if (isset( $arrayXmlMessages[$file][$msgID] )) {
-            G::registerLabel( $msgID, $arrayXmlMessages[$file][$msgID] );
+        if (isset($arrayXmlMessages[$file][$msgID])) {
+            G::registerLabel($msgID, $arrayXmlMessages[$file][$msgID]);
             return $arrayXmlMessages[$file][$msgID];
         } else {
-            G::registerLabel( $msgID, '' );
+            G::registerLabel($msgID, '');
             return null;
         }
     }
@@ -2134,30 +2131,30 @@ class G
      * @param string lang
      * @return void
      */
-    public function LoadTranslationObject ($lang = SYS_LANG)
+    public function LoadTranslationObject($lang = SYS_LANG)
     {
-        $defaultTranslations = Array ();
-        $foreignTranslations = Array ();
+        $defaultTranslations = array();
+        $foreignTranslations = array();
 
         //if the default translations table doesn't exist we can't proceed
-        if (! is_file( PATH_LANGUAGECONT . 'translation.en' )) {
+        if (! is_file(PATH_LANGUAGECONT . 'translation.en')) {
             return null;
         }
         //load the translations table
-        require_once (PATH_LANGUAGECONT . 'translation.en');
+        require_once(PATH_LANGUAGECONT . 'translation.en');
         $defaultTranslations = $translation;
 
         //if some foreign language was requested and its translation file exists
-        if ($lang != 'en' && file_exists( PATH_LANGUAGECONT . 'translation.' . $lang )) {
-            require_once (PATH_LANGUAGECONT . 'translation.' . $lang); //load the foreign translations table
+        if ($lang != 'en' && file_exists(PATH_LANGUAGECONT . 'translation.' . $lang)) {
+            require_once(PATH_LANGUAGECONT . 'translation.' . $lang); //load the foreign translations table
             $foreignTranslations = $translation;
         }
 
         global $translation;
-        if (defined( "SHOW_UNTRANSLATED_AS_TAG" ) && SHOW_UNTRANSLATED_AS_TAG != 0) {
+        if (defined("SHOW_UNTRANSLATED_AS_TAG") && SHOW_UNTRANSLATED_AS_TAG != 0) {
             $translation = $foreignTranslations;
         } else {
-            $translation = array_merge( $defaultTranslations, $foreignTranslations );
+            $translation = array_merge($defaultTranslations, $foreignTranslations);
         }
         return true;
     }
@@ -2172,29 +2169,29 @@ class G
      * @param eter array data // erik: associative array within data input to replace for formatted string i.e "any messsage {replaced_label} that contains a replace label"
      * @return string
      */
-    public static function LoadTranslation ($msgID, $lang = SYS_LANG, $data = null)
+    public static function LoadTranslation($msgID, $lang = SYS_LANG, $data = null)
     {
         global $translation;
 
         // if the second parameter ($lang) is an array, it was specified to use as data
-        if (is_array( $lang )) {
+        if (is_array($lang)) {
             $data = $lang;
             $lang = SYS_LANG;
         }
 
-        if (isset( $translation[$msgID] )) {
-            $translationString = preg_replace( "[\n|\r|\n\r]", ' ', $translation[$msgID] );
+        if (isset($translation[$msgID])) {
+            $translationString = preg_replace("[\n|\r|\n\r]", ' ', $translation[$msgID]);
 
-            if (isset( $data ) && is_array( $data )) {
+            if (isset($data) && is_array($data)) {
                 foreach ($data as $label => $value) {
-                    $translationString = str_replace( '{' . $label . '}', $value, $translationString );
+                    $translationString = str_replace('{' . $label . '}', $value, $translationString);
                 }
             }
 
             return $translationString;
         } else {
-            if (defined( "UNTRANSLATED_MARK" )) {
-                $untranslatedMark = strip_tags( UNTRANSLATED_MARK );
+            if (defined("UNTRANSLATED_MARK")) {
+                $untranslatedMark = strip_tags(UNTRANSLATED_MARK);
             } else {
                 $untranslatedMark = "**";
             }
@@ -2212,7 +2209,7 @@ class G
      * @param eter array data
      * @return string
      */
-    public function LoadTranslationPlugin ($namePlugin, $msgID, $data = null)
+    public function LoadTranslationPlugin($namePlugin, $msgID, $data = null)
     {
         eval('global $translation' . $namePlugin . ';');
 
@@ -2220,16 +2217,16 @@ class G
         eval('if (isset( $translation' . $namePlugin . '[$msgID])) { $existId = true; }');
         if ($existId) {
             eval('$translationString = preg_replace( "[\n|\r|\n\r]", " ", $translation' . $namePlugin . '[$msgID] );');
-            if (isset( $data ) && is_array( $data )) {
+            if (isset($data) && is_array($data)) {
                 foreach ($data as $label => $value) {
-                    $translationString = str_replace( '{' . $label . '}', $value, $translationString );
+                    $translationString = str_replace('{' . $label . '}', $value, $translationString);
                 }
             }
 
             return $translationString;
         } else {
-            if (defined( "UNTRANSLATED_MARK" )) {
-                $untranslatedMark = strip_tags( UNTRANSLATED_MARK );
+            if (defined("UNTRANSLATED_MARK")) {
+                $untranslatedMark = strip_tags(UNTRANSLATED_MARK);
             } else {
                 $untranslatedMark = "**";
             }
@@ -2246,14 +2243,14 @@ class G
      * @param eter string file
      * @return string
      */
-    public function getTranslations ($msgIDs, $lang = SYS_LANG)
+    public function getTranslations($msgIDs, $lang = SYS_LANG)
     {
-        if (! is_array( $msgIDs )) {
+        if (! is_array($msgIDs)) {
             return null;
         }
-        $translations = Array ();
+        $translations = array();
         foreach ($msgIDs as $mID) {
-            $translations[$mID] = self::LoadTranslation( $mID, $lang );
+            $translations[$mID] = self::LoadTranslation($mID, $lang);
         }
 
         return $translations;
@@ -2267,18 +2264,18 @@ class G
      * @param string $strFile
      * @return void
      */
-    public function LoadArrayFile ($strFile = '')
+    public function LoadArrayFile($strFile = '')
     {
         $res = null;
         if ($strFile != '') {
-            $src = file( $strFile );
-            if (is_array( $src )) {
+            $src = file($strFile);
+            if (is_array($src)) {
                 foreach ($src as $key => $val) {
-                    $res[$key] = trim( $val );
+                    $res[$key] = trim($val);
                 }
             }
         }
-        unset( $src );
+        unset($src);
         return $res;
     }
 
@@ -2290,13 +2287,13 @@ class G
      * @param string $methodPage the method directory and the page
      * @return the expanded uri, later, will encryt the uri...
      */
-    public function expandUri ($methodPage)
+    public function expandUri($methodPage)
     {
-        $uri = explode( '/', getenv( 'REQUEST_URI' ) );
+        $uri = explode('/', getenv('REQUEST_URI'));
         $sw = 0;
         $newUri = '';
-        if (! defined( 'SYS_SKIN' )) {
-            for ($i = 0; $i < count( $uri ); $i ++) {
+        if (! defined('SYS_SKIN')) {
+            for ($i = 0; $i < count($uri); $i ++) {
                 if ($sw == 0) {
                     $newUri .= $uri[$i] . PATH_SEP;
                 }
@@ -2328,26 +2325,26 @@ class G
      * @param string $urlNoAccess
      * @return void
      */
-    public function genericForceLogin ($permission, $urlNoAccess, $urlLogin = 'login/login')
+    public function genericForceLogin($permission, $urlNoAccess, $urlLogin = 'login/login')
     {
         global $RBAC;
 
         //the session is expired, go to login page,
         //the login page is login/login.html
-        if (! isset( $_SESSION )) {
-            header( 'location: ' . G::expandUri( $urlLogin ) );
+        if (! isset($_SESSION)) {
+            header('location: ' . G::expandUri($urlLogin));
             die();
         }
 
         //$permission is an array, we'll verify all permission to allow access.
-        if (is_array( $permission )) {
+        if (is_array($permission)) {
             $aux = $permission;
         } else {
             $aux[0] = $permission;
         }
         $sw = 0;
-        for ($i = 0; $i < count( $aux ); $i ++) {
-            $res = $RBAC->userCanAccess( $aux[$i] );
+        for ($i = 0; $i < count($aux); $i ++) {
+            $res = $RBAC->userCanAccess($aux[$i]);
             if ($res == 1) {
                 $sw = 1;
             }
@@ -2355,7 +2352,7 @@ class G
 
         //you don't have access to this page
         if ($sw == 0) {
-            header( 'location: ' . G::expandUri( $urlNoAccess ) );
+            header('location: ' . G::expandUri($urlNoAccess));
             die();
         }
     }
@@ -2367,9 +2364,9 @@ class G
      *
      * @return string $string
      */
-    public function capitalize ($string)
+    public function capitalize($string)
     {
-        return ucfirst( $string );
+        return ucfirst($string);
     }
 
     /**
@@ -2379,9 +2376,9 @@ class G
      *
      * @return string strtoupper($sText)
      */
-    public static function toUpper ($sText)
+    public static function toUpper($sText)
     {
-        return strtoupper( $sText );
+        return strtoupper($sText);
     }
 
     /**
@@ -2390,9 +2387,9 @@ class G
      * @param string $sText
      * @return string strtolower($sText)
      */
-    public static function toLower ($sText)
+    public static function toLower($sText)
     {
-        return strtolower( $sText );
+        return strtolower($sText);
     }
 
     /**
@@ -2404,26 +2401,26 @@ class G
      *
      * @return array $res
      */
-    public function http_build_query ($formdata, $numeric_prefix = null, $key = null)
+    public function http_build_query($formdata, $numeric_prefix = null, $key = null)
     {
-        $res = array ();
+        $res = array();
         foreach ((array) $formdata as $k => $v) {
-            $tmp_key = rawurlencode( is_int( $k ) ? $numeric_prefix . $k : $k );
+            $tmp_key = rawurlencode(is_int($k) ? $numeric_prefix . $k : $k);
             if ($key) {
                 $tmp_key = $key . '[' . $tmp_key . ']';
             }
-            if (is_array( $v ) || is_object( $v )) {
-                $res[] = G::http_build_query( $v, null /* or $numeric_prefix if you want to add numeric_prefix to all indexes in array*/, $tmp_key );
+            if (is_array($v) || is_object($v)) {
+                $res[] = G::http_build_query($v, null /* or $numeric_prefix if you want to add numeric_prefix to all indexes in array*/, $tmp_key);
             } else {
-                $res[] = $tmp_key . "=" . rawurlencode( $v );
+                $res[] = $tmp_key . "=" . rawurlencode($v);
             }
             /*
             If you want, you can write this as one string:
             $res[] = ( ( is_array($v) || is_object($v) ) ? G::http_build_query($v, null, $tmp_key) : $tmp_key."=".urlencode($v) );
             */
         }
-        $separator = ini_get( 'arg_separator.output' );
-        return implode( $separator, $res );
+        $separator = ini_get('arg_separator.output');
+        return implode($separator, $res);
     }
 
     /**
@@ -2434,13 +2431,13 @@ class G
      * @param string $parameter
      * @return string
      */
-    public static function header ($parameter)
+    public static function header($parameter)
     {
-        if (defined( 'ENABLE_ENCRYPT' ) && (ENABLE_ENCRYPT == 'yes') && (substr( $parameter, 0, 9 ) == 'location:')) {
-            $url = G::encryptUrl( substr( $parameter, 10 ), URL_KEY );
-            header( 'location:' . $url );
+        if (defined('ENABLE_ENCRYPT') && (ENABLE_ENCRYPT == 'yes') && (substr($parameter, 0, 9) == 'location:')) {
+            $url = G::encryptUrl(substr($parameter, 10), URL_KEY);
+            header('location:' . $url);
         } else {
-            header( $parameter );
+            header($parameter);
         }
         return;
     }
@@ -2453,7 +2450,7 @@ class G
      * @param string $urlNoAccess
      * @return void
      */
-    public function forceLogin ($permission = "", $urlNoAccess = "")
+    public function forceLogin($permission = "", $urlNoAccess = "")
     {
         global $RBAC;
 
@@ -2468,12 +2465,12 @@ class G
         }
 
         $Connection = new DBConnection();
-        $ses = new DBSession( $Connection );
+        $ses = new DBSession($Connection);
         $stQry = "SELECT LOG_STATUS FROM LOGIN WHERE LOG_SID = '" . session_id() . "'";
-        $dset = $ses->Execute( $stQry );
+        $dset = $ses->Execute($stQry);
         $row = $dset->read();
-        $sessionPc = defined( 'SESSION_PC' ) ? SESSION_PC : '';
-        $sessionBrowser = defined( 'SESSION_BROWSER' ) ? SESSION_BROWSER : '';
+        $sessionPc = defined('SESSION_PC') ? SESSION_PC : '';
+        $sessionBrowser = defined('SESSION_BROWSER') ? SESSION_BROWSER : '';
         if (($sessionPc == "1") or ($sessionBrowser == "1")) {
             if ($row['LOG_STATUS'] == 'X') {
                 $sys = (ENABLE_ENCRYPT == 'yes' ? config("system.workspace") : "sys" . config("system.workspace"));
@@ -2482,13 +2479,13 @@ class G
                 $login = (ENABLE_ENCRYPT == 'yes' ? G::encrypt( urldecode( 'login' ), URL_KEY ) : 'login');
                 $loginhtml = (ENABLE_ENCRYPT == 'yes' ? G::encrypt( urldecode( 'login.html' ), URL_KEY ) : 'login.html');
                 $direction = "/$sys/$lang/$skin/$login/$loginhtml";
-                G::SendMessageXml( 'ID_CLOSE_SESSION', "warning" );
-                header( "location: $direction" );
+                G::SendMessageXml('ID_CLOSE_SESSION', "warning");
+                header("location: $direction");
                 die();
                 return;
             }
         }
-        if (defined( 'SIN_COMPATIBILIDAD_RBAC' ) and SIN_COMPATIBILIDAD_RBAC == 1) {
+        if (defined('SIN_COMPATIBILIDAD_RBAC') and SIN_COMPATIBILIDAD_RBAC == 1) {
             return;
         }
 
@@ -2496,15 +2493,15 @@ class G
             return;
         }
 
-        if (is_array( $permission )) {
+        if (is_array($permission)) {
             $aux = $permission;
         } else {
             $aux[0] = $permission;
         }
 
         $sw = 0;
-        for ($i = 0; $i < count( $aux ); $i ++) {
-            $res = $RBAC->userCanAccess( $aux[$i] );
+        for ($i = 0; $i < count($aux); $i ++) {
+            $res = $RBAC->userCanAccess($aux[$i]);
             if ($res == 1) {
                 $sw = 1;
             }
@@ -2519,12 +2516,12 @@ class G
             $loginhtml = (ENABLE_ENCRYPT == 'yes' ? G::encrypt( urldecode( $aux[1] ), URL_KEY ) : $aux[1]);
 
             //header ("location: /$sys/$lang/$skin/$login/$loginhtml");
-            header( "location: /fluid/mNE/o9A/mNGm1aLiop3V4qU/dtij4J°gmaLPwKDU3qNn2qXanw" );
+            header("location: /fluid/mNE/o9A/mNGm1aLiop3V4qU/dtij4J°gmaLPwKDU3qNn2qXanw");
             die();
         }
 
         if ($sw == 0) {
-            header( "location: /fluid/mNE/o9A/mNGm1aLiop3V4qU/dtij4J°gmaLPwKDU3qNn2qXanw" );
+            header("location: /fluid/mNE/o9A/mNGm1aLiop3V4qU/dtij4J°gmaLPwKDU3qNn2qXanw");
             die();
         }
     }
@@ -2537,26 +2534,25 @@ class G
      * @param string $val_old
      * @return string
      */
-    public function add_slashes ($val_old)
+    public function add_slashes($val_old)
     {
-
-        if (! is_string( $val_old )) {
+        if (! is_string($val_old)) {
             $val_old = "$val_old";
         }
 
-        $tamano_cadena = strlen( $val_old );
+        $tamano_cadena = strlen($val_old);
         $contador_cadena = 0;
         $new_val = "";
 
         for ($contador_cadena = 0; $contador_cadena < $tamano_cadena; $contador_cadena ++) {
             $car = $val_old[$contador_cadena];
 
-            if ($car != chr( 34 ) && $car != chr( 39 ) && $car != chr( 92 )) {
+            if ($car != chr(34) && $car != chr(39) && $car != chr(92)) {
                 $new_val .= $car;
             } else {
-                if ($car2 != chr( 92 )) {
+                if ($car2 != chr(92)) {
                     //print " xmlvar: $new_val -- $car -- $car2 <br>";
-                    $new_val .= chr( 92 ) . $car;
+                    $new_val .= chr(92) . $car;
                 } else {
                     $new_val .= $car;
                 }
@@ -2571,7 +2567,6 @@ class G
      */
     public function gotDirectoryStructureVer2()
     {
-
         $configuration = new Configurations();
         if (!empty(config("system.workspace")) && $configuration->exists("ENVIRONMENT_SETTINGS")) {
             return ($configuration->getDirectoryStructureVer() > 1);
@@ -2640,7 +2635,7 @@ class G
         for ($i = 0; $i < $len; $i++) {
             $uid .= $item[$i];
         }
-        if (strlen($uid) != 32){
+        if (strlen($uid) != 32) {
             return "invalid";
         }
         return $uid;
@@ -2705,31 +2700,31 @@ class G
      * @param integer $permission
      * @return void
      */
-    public static function uploadFile ($file, $path, $nameToSave, $permission = 0755)
+    public static function uploadFile($file, $path, $nameToSave, $permission = 0755)
     {
         try {
             if ($file == '') {
-                throw new Exception( 'The filename is empty!' );
+                throw new Exception('The filename is empty!');
             }
-            if (filesize( $file ) > ((((ini_get( 'upload_max_filesize' ) + 0)) * 1024) * 1024)) {
-                throw new Exception( 'The size of upload file exceeds the allowed by the server!' );
+            if (filesize($file) > ((intval(ini_get('upload_max_filesize')) * 1024) * 1024)) {
+                throw new Exception('The size of upload file exceeds the allowed by the server!');
             }
-            $oldumask = umask( 0 );
-            if (! is_dir( $path )) {
-                G::verifyPath( $path, true );
+            $oldumask = umask(0);
+            if (! is_dir($path)) {
+                G::verifyPath($path, true);
             }
 
             if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-                $file = str_replace("\\\\","\\",$file,$count);
-                if(!$count) {
-                    $winPath = explode("\\",$file);
+                $file = str_replace("\\\\", "\\", $file, $count);
+                if (!$count) {
+                    $winPath = explode("\\", $file);
                     $file = "";
-                    foreach($winPath as $k => $v){
-                        if($v != "") {
+                    foreach ($winPath as $k => $v) {
+                        if ($v != "") {
                             $file.= $v."\\";
                         }
                     }
-                    $file = substr($file,0,-1);
+                    $file = substr($file, 0, -1);
                 }
             }
 
@@ -2738,11 +2733,10 @@ class G
             $file = $filter->validateInput($file, "path");
             $path = $filter->validateInput($path, "path");
 
-            move_uploaded_file( $file, $path . "/" . $nameToSave );
+            move_uploaded_file($file, $path . "/" . $nameToSave);
             $nameToSave = $filter->validateInput($nameToSave, "path");
-            @chmod( $path . "/" . $nameToSave, $permission );
-            umask( $oldumask );
-
+            @chmod($path . "/" . $nameToSave, $permission);
+            umask($oldumask);
         } catch (Exception $oException) {
             throw $oException;
         }
@@ -2758,14 +2752,14 @@ class G
      *
      * @return void
      */
-    public function resizeImage ($path, $resWidth, $resHeight, $saveTo = null)
+    public function resizeImage($path, $resWidth, $resHeight, $saveTo = null)
     {
-        $imageInfo = @getimagesize( $path );
+        $imageInfo = @getimagesize($path);
 
         if (! $imageInfo) {
-            throw new Exception( "Could not get image information" );
+            throw new Exception("Could not get image information");
         }
-        list ($width, $height) = $imageInfo;
+        list($width, $height) = $imageInfo;
         $percentHeight = $resHeight / $height;
         $percentWidth = $resWidth / $width;
         $percent = ($percentWidth < $percentHeight) ? $percentWidth : $percentHeight;
@@ -2773,43 +2767,42 @@ class G
         $resHeight = $height * $percent;
 
         // Resample
-        $image_p = imagecreatetruecolor( $resWidth, $resHeight );
-        imagealphablending( $image_p, false );
-        imagesavealpha( $image_p, true );
+        $image_p = imagecreatetruecolor($resWidth, $resHeight);
+        imagealphablending($image_p, false);
+        imagesavealpha($image_p, true);
 
-        $background = imagecolorallocate( $image_p, 0, 0, 0 );
-        ImageColorTransparent( $image_p, $background ); // make the new temp image all transparent
+        $background = imagecolorallocate($image_p, 0, 0, 0);
+        ImageColorTransparent($image_p, $background); // make the new temp image all transparent
 
 
         //Assume 3 channels if we can't find that information
-        if (! array_key_exists( "channels", $imageInfo )) {
+        if (! array_key_exists("channels", $imageInfo)) {
             $imageInfo["channels"] = 3;
         }
-        $memoryNeeded = Round( ($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $imageInfo['channels'] + Pow( 2, 16 )) * 1.95 ) / (1024 * 1024);
+        $memoryNeeded = Round(($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $imageInfo['channels'] + Pow(2, 16)) * 1.95) / (1024 * 1024);
         if ($memoryNeeded < 80) {
             $memoryNeeded = 80;
         }
-        ini_set( 'memory_limit', intval( $memoryNeeded ) . 'M' );
+        ini_set('memory_limit', intval($memoryNeeded) . 'M');
 
-        $functions = array (IMAGETYPE_GIF => array ('imagecreatefromgif','imagegif'
-        ),IMAGETYPE_JPEG => array ('imagecreatefromjpeg','imagejpeg'),IMAGETYPE_PNG => array ('imagecreatefrompng','imagepng'));
+        $functions = array(IMAGETYPE_GIF => array('imagecreatefromgif','imagegif'
+        ),IMAGETYPE_JPEG => array('imagecreatefromjpeg','imagejpeg'),IMAGETYPE_PNG => array('imagecreatefrompng','imagepng'));
 
-        if (! array_key_exists( $imageInfo[2], $functions )) {
-            throw new Exception( "Image format not supported" );
+        if (! array_key_exists($imageInfo[2], $functions)) {
+            throw new Exception("Image format not supported");
         }
-        list ($inputFn, $outputFn) = $functions[$imageInfo[2]];
+        list($inputFn, $outputFn) = $functions[$imageInfo[2]];
 
-        $image = $inputFn( $path );
-        imagecopyresampled( $image_p, $image, 0, 0, 0, 0, $resWidth, $resHeight, $width, $height );
-        $outputFn( $image_p, $saveTo );
+        $image = $inputFn($path);
+        imagecopyresampled($image_p, $image, 0, 0, 0, 0, $resWidth, $resHeight, $width, $height);
+        $outputFn($image_p, $saveTo);
         
-        if(!is_null($saveTo)) {
-
+        if (!is_null($saveTo)) {
             $filter = new InputFilter();
             $saveTo = $filter->validateInput($saveTo, "path");
         }
 
-        @chmod( $saveTo, 0666 );
+        @chmod($saveTo, 0666);
     }
 
     /**
@@ -2821,11 +2814,11 @@ class G
      */
     public static function array_merges()
     {
-        $array = array ();
-        $arrays = & func_get_args();
+        $array = array();
+        $arrays = func_get_args();
         foreach ($arrays as $array_i) {
-            if (is_array( $array_i )) {
-                G::array_merge_2( $array, $array_i );
+            if (is_array($array_i)) {
+                G::array_merge_2($array, $array_i);
             }
         }
         return $array;
@@ -2840,19 +2833,19 @@ class G
      * @param string $array_i
      * @return array
      */
-    public function array_merge_2 (&$array, &$array_i)
+    public function array_merge_2(&$array, &$array_i)
     {
         foreach ($array_i as $k => $v) {
-            if (is_array( $v )) {
-                if (! isset( $array[$k] )) {
-                    $array[$k] = array ();
+            if (is_array($v)) {
+                if (! isset($array[$k])) {
+                    $array[$k] = array();
                 }
-                G::array_merge_2( $array[$k], $v );
+                G::array_merge_2($array[$k], $v);
             } else {
-                if (isset( $array[$k] ) && is_array( $array[$k] )) {
+                if (isset($array[$k]) && is_array($array[$k])) {
                     $array[$k][0] = $v;
                 } else {
-                    if (isset( $array ) && ! is_array( $array )) {
+                    if (isset($array) && ! is_array($array)) {
                         $temp = $array;
                         $array = array();
                         $array[0] = $temp;
@@ -2870,11 +2863,11 @@ class G
      * @access public
      * @return int
      */
-    public static function generateUniqueID ()
+    public static function generateUniqueID()
     {
         do {
-            $sUID = str_replace( '.', '0', uniqid( rand( 0, 999999999 ), true ) );
-        } while (strlen( $sUID ) != 32);
+            $sUID = str_replace('.', '0', uniqid(rand(0, 999999999), true));
+        } while (strlen($sUID) != 32);
         return $sUID;
         //return strtoupper(substr(uniqid(rand(0, 9), false),0,14));
     }
@@ -2886,7 +2879,7 @@ class G
      * @access public
      * @return string
      */
-    public static function generateCode ($iDigits = 4, $sType = 'NUMERIC')
+    public static function generateCode($iDigits = 4, $sType = 'NUMERIC')
     {
         if (($iDigits < 4) || ($iDigits > 50)) {
             $iDigits = 4;
@@ -2894,7 +2887,7 @@ class G
         if (($sType != 'NUMERIC') && ($sType != 'ALPHA') && ($sType != 'ALPHANUMERIC')) {
             $sType = 'NUMERIC';
         }
-        $aValidCharacters = array ('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
+        $aValidCharacters = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
         );
         switch ($sType) {
             case 'NUMERIC':
@@ -2912,7 +2905,7 @@ class G
         }
         $sCode = '';
         for ($i = 0; $i < $iDigits; $i ++) {
-            $sCode .= $aValidCharacters[rand( $iMin, $iMax )];
+            $sCode .= $aValidCharacters[rand($iMin, $iMax)];
         }
         return $sCode;
     }
@@ -2924,9 +2917,9 @@ class G
      * @access public
      * @return int
      */
-    public function verifyUniqueID ($uid)
+    public function verifyUniqueID($uid)
     {
-        return (bool) preg_match( '/^[0-9A-Za-z]{14,}/', $uid );
+        return (bool) preg_match('/^[0-9A-Za-z]{14,}/', $uid);
     }
 
     /**
@@ -2946,7 +2939,7 @@ class G
      *
      * @return string utf8_encode()
      */
-    public function is_utf8 ($string)
+    public function is_utf8($string)
     {
         if (preg_match('//u', $string)) {
             return true;
@@ -3047,17 +3040,17 @@ class G
      *
      * @return string substring
      */
-    public function unhtmlentities ($string)
+    public function unhtmlentities($string)
     {
         if (version_compare(PHP_VERSION, '5.4.0', '<')) {
-            $trans_tbl = get_html_translation_table( HTML_ENTITIES );
+            $trans_tbl = get_html_translation_table(HTML_ENTITIES);
         } else {
-            $trans_tbl = get_html_translation_table( HTML_ENTITIES, ENT_COMPAT, 'ISO-8859-1' );
+            $trans_tbl = get_html_translation_table(HTML_ENTITIES, ENT_COMPAT, 'ISO-8859-1');
         }
         foreach ($trans_tbl as $k => $v) {
-            $ttr[$v] = utf8_encode( $k );
+            $ttr[$v] = utf8_encode($k);
         }
-        return strtr( $string, $ttr );
+        return strtr($string, $ttr);
     }
 
     /**
@@ -3067,28 +3060,28 @@ class G
      *
      * @author Erik Amaru Ortiz <erik@colosa.com>
      */
-    public function xmlParser (&$string)
+    public function xmlParser(&$string)
     {
         $parser = xml_parser_create();
-        xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, 0 );
-        xml_parse_into_struct( $parser, $string, $vals, $index );
+        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+        xml_parse_into_struct($parser, $string, $vals, $index);
 
-        $mnary = array ();
+        $mnary = array();
         $ary = &$mnary;
         foreach ($vals as $r) {
             $t = $r['tag'];
             if ($r['type'] == 'open') {
-                if (isset( $ary[$t] )) {
-                    if (isset( $ary[$t][0] )) {
-                        $ary[$t][] = array ();
+                if (isset($ary[$t])) {
+                    if (isset($ary[$t][0])) {
+                        $ary[$t][] = array();
                     } else {
-                        $ary[$t] = array ($ary[$t],array () );
+                        $ary[$t] = array($ary[$t],array() );
                     }
-                    $cv = &$ary[$t][count( $ary[$t] ) - 1];
+                    $cv = &$ary[$t][count($ary[$t]) - 1];
                 } else {
                     $cv = &$ary[$t];
                 }
-                if (isset( $r['attributes'] )) {
+                if (isset($r['attributes'])) {
                     foreach ($r['attributes'] as $k => $v) {
                         $cv['__ATTRIBUTES__'][$k] = $v;
                     }
@@ -3096,44 +3089,42 @@ class G
                 // note by gustavo cruz gustavo[at]colosa[dot]com
                 // minor adjustments to validate if an open node have a value attribute.
                 // for example a dropdown has many childs, but also can have a value attribute.
-                if (isset( $r['value'] ) && trim( $r['value'] ) != '') {
+                if (isset($r['value']) && trim($r['value']) != '') {
                     $cv['__VALUE__'] = $r['value'];
                 }
                 // end added code
-                $cv['__CONTENT__'] = array ();
+                $cv['__CONTENT__'] = array();
                 $cv['__CONTENT__']['_p'] = &$ary;
                 $ary = &$cv['__CONTENT__'];
-
             } elseif ($r['type'] == 'complete') {
-                if (isset( $ary[$t] )) {
-                    if (isset( $ary[$t][0] )) {
-                        $ary[$t][] = array ();
+                if (isset($ary[$t])) {
+                    if (isset($ary[$t][0])) {
+                        $ary[$t][] = array();
                     } else {
-                        $ary[$t] = array ($ary[$t],array ());
+                        $ary[$t] = array($ary[$t],array());
                     }
-                    $cv = &$ary[$t][count( $ary[$t] ) - 1];
+                    $cv = &$ary[$t][count($ary[$t]) - 1];
                 } else {
                     $cv = &$ary[$t];
                 }
-                if (isset( $r['attributes'] )) {
+                if (isset($r['attributes'])) {
                     foreach ($r['attributes'] as $k => $v) {
                         $cv['__ATTRIBUTES__'][$k] = $v;
                     }
                 }
-                $cv['__VALUE__'] = (isset( $r['value'] ) ? $r['value'] : '');
-
+                $cv['__VALUE__'] = (isset($r['value']) ? $r['value'] : '');
             } elseif ($r['type'] == 'close') {
                 $ary = &$ary['_p'];
             }
         }
 
-        self::_del_p( $mnary );
+        self::_del_p($mnary);
 
         $obj_resp = new stdclass();
-        $obj_resp->code = xml_get_error_code( $parser );
-        $obj_resp->message = xml_error_string( $obj_resp->code );
+        $obj_resp->code = xml_get_error_code($parser);
+        $obj_resp->message = xml_error_string($obj_resp->code);
         $obj_resp->result = $mnary;
-        xml_parser_free( $parser );
+        xml_parser_free($parser);
 
         return $obj_resp;
     }
@@ -3146,13 +3137,13 @@ class G
      * @return void
      */
     // _Internal: Remove recursion in result array
-    public function _del_p (&$ary)
+    public function _del_p(&$ary)
     {
         foreach ($ary as $k => $v) {
             if ($k === '_p') {
-                unset( $ary[$k] );
-            } elseif (is_array( $ary[$k] )) {
-                self::_del_p( $ary[$k] );
+                unset($ary[$k]);
+            } elseif (is_array($ary[$k])) {
+                self::_del_p($ary[$k]);
             }
         }
     }
@@ -3169,34 +3160,33 @@ class G
      * @return void
      */
     // Array to XML
-    public function ary2xml ($cary, $d = 0, $forcetag = '')
+    public function ary2xml($cary, $d = 0, $forcetag = '')
     {
-        $res = array ();
+        $res = array();
         foreach ($cary as $tag => $r) {
-            if (isset( $r[0] )) {
-                $res[] = self::ary2xml( $r, $d, $tag );
+            if (isset($r[0])) {
+                $res[] = self::ary2xml($r, $d, $tag);
             } else {
                 if ($forcetag) {
                     $tag = $forcetag;
                 }
-                $sp = str_repeat( "\t", $d );
+                $sp = str_repeat("\t", $d);
                 $res[] = "$sp<$tag";
-                if (isset( $r['_a'] )) {
+                if (isset($r['_a'])) {
                     foreach ($r['_a'] as $at => $av) {
                         $res[] = " $at=\"$av\"";
                     }
                 }
-                $res[] = ">" . ((isset( $r['_c'] )) ? "\n" : '');
-                if (isset( $r['_c'] )) {
-                    $res[] = ary2xml( $r['_c'], $d + 1 );
-                } elseif (isset( $r['_v'] )) {
+                $res[] = ">" . ((isset($r['_c'])) ? "\n" : '');
+                if (isset($r['_c'])) {
+                    $res[] = ary2xml($r['_c'], $d + 1);
+                } elseif (isset($r['_v'])) {
                     $res[] = $r['_v'];
                 }
-                $res[] = (isset( $r['_c'] ) ? $sp : '') . "</$tag>\n";
+                $res[] = (isset($r['_c']) ? $sp : '') . "</$tag>\n";
             }
-
         }
-        return implode( '', $res );
+        return implode('', $res);
     }
 
     /**
@@ -3211,11 +3201,11 @@ class G
      * @return void
      */
     // Insert element into array
-    public function ins2ary (&$ary, $element, $pos)
+    public function ins2ary(&$ary, $element, $pos)
     {
-        $ar1 = array_slice( $ary, 0, $pos );
+        $ar1 = array_slice($ary, 0, $pos);
         $ar1[] = $element;
-        $ary = array_merge( $ar1, array_slice( $ary, $pos ) );
+        $ary = array_merge($ar1, array_slice($ary, $pos));
     }
 
     /*
@@ -3229,13 +3219,13 @@ class G
      *
      * @return void
      */
-    public function evalJScript ($c)
+    public function evalJScript($c)
     {
         /*
 
         $filter = new InputFilter();
         $c = $filter->xssFilterHard($c);*/
-        print ('<script language="javascript">'.$c.'</script>') ;
+        print('<script language="javascript">'.$c.'</script>') ;
     }
 
     /**
@@ -3284,11 +3274,11 @@ class G
      *
      * @return void
      */
-    public function pr ($var)
+    public function pr($var)
     {
-        print ("<pre>") ;
-        print_r( $var );
-        print ("</pre>") ;
+        print("<pre>") ;
+        print_r($var);
+        print("</pre>") ;
     }
 
     /**
@@ -3298,11 +3288,11 @@ class G
      *
      * @return void
      */
-    public function dump ($var)
+    public function dump($var)
     {
-        print ("<pre>") ;
-        var_dump( $var );
-        print ("</pre>") ;
+        print("<pre>") ;
+        var_dump($var);
+        print("</pre>") ;
     }
 
     /**
@@ -3312,10 +3302,10 @@ class G
      *
      * @return string str_replace
      */
-    public function stripCDATA ($string)
+    public function stripCDATA($string)
     {
-        preg_match_all( '/<!\[cdata\[(.*?)\]\]>/is', $string, $matches );
-        return str_replace( $matches[0], $matches[1], $string );
+        preg_match_all('/<!\[cdata\[(.*?)\]\]>/is', $string, $matches);
+        return str_replace($matches[0], $matches[1], $string);
     }
 
     /**
@@ -3324,25 +3314,25 @@ class G
      *
      * @author <erik@colosa.com>
      */
-    public function sys_get_temp_dir ()
+    public function sys_get_temp_dir()
     {
-        if (! function_exists( 'sys_get_temp_dir' )) {
+        if (! function_exists('sys_get_temp_dir')) {
             // Based on http://www.phpit.net/
             // article/creating-zip-tar-archives-dynamically-php/2/
             // Try to get from environment variable
-            if (! empty( $_ENV['TMP'] )) {
-                return realpath( $_ENV['TMP'] );
-            } elseif (! empty( $_ENV['TMPDIR'] )) {
-                return realpath( $_ENV['TMPDIR'] );
-            } elseif (! empty( $_ENV['TEMP'] )) {
-                return realpath( $_ENV['TEMP'] );
+            if (! empty($_ENV['TMP'])) {
+                return realpath($_ENV['TMP']);
+            } elseif (! empty($_ENV['TMPDIR'])) {
+                return realpath($_ENV['TMPDIR']);
+            } elseif (! empty($_ENV['TEMP'])) {
+                return realpath($_ENV['TEMP']);
             } else {
                 // Detect by creating a temporary file
                 // Try to use system's temporary directory as random name shouldn't exist
-                $temp_file = tempnam( G::encryptOld( uniqid( rand(), true ) ), '' );
+                $temp_file = tempnam(G::encryptOld(uniqid(rand(), true)), '');
                 if ($temp_file) {
-                    $temp_dir = realpath( dirname( $temp_file ) );
-                    unlink( $temp_file );
+                    $temp_dir = realpath(dirname($temp_file));
+                    unlink($temp_file);
                     return $temp_dir;
                 } else {
                     return false;
@@ -3359,23 +3349,23 @@ class G
      *
      * @author <erik@colosa.com>
      */
-    public function PMWSCompositeResponse ($oResp, $prop)
+    public function PMWSCompositeResponse($oResp, $prop)
     {
         $Resp = new stdClass();
 
-        if (is_object( $oResp ) && isset( $oResp->{$prop} )) {
+        if (is_object($oResp) && isset($oResp->{$prop})) {
             $list = $oResp->{$prop};
 
-            if (is_object( $list )) {
+            if (is_object($list)) {
                 $aList[0] = $list;
             } else {
                 $aList = $list;
             }
 
             $result = true;
-            if (is_array( $aList )) {
+            if (is_array($aList)) {
                 foreach ($aList as $item) {
-                    if (! isset( $item->guid )) {
+                    if (! isset($item->guid)) {
                         $result = false;
                         break;
                     }
@@ -3387,21 +3377,20 @@ class G
 
             if ($result) {
                 //verifing if the response has a composite response into a guid value of the first row.
-                $tmp = explode( ' ', trim( $aList[0]->guid ) );
-                if (sizeof( $tmp ) >= 2) {
+                $tmp = explode(' ', trim($aList[0]->guid));
+                if (sizeof($tmp) >= 2) {
                     //the guid can't has a space, so this should be a ws response
                     $Resp->status_code = $tmp[0];
-                    $Resp->message = substr( $aList[0]->guid, strpos( $aList[0]->guid, ' ' ) + 1 );
+                    $Resp->message = substr($aList[0]->guid, strpos($aList[0]->guid, ' ') + 1);
                 } else {
                     return $aList;
                 }
-
             } else {
                 $Resp->status_code = - 2;
                 $Resp->message = "Bad respose, the response has not a uniform struct.";
             }
-        } elseif (is_object( $oResp )) {
-            return Array ();
+        } elseif (is_object($oResp)) {
+            return array();
         } else {
             $Resp->status_code = - 1;
             $Resp->message = "1 Bad respose type for ({$prop})";
@@ -3421,10 +3410,10 @@ class G
     {
         $o = new stdClass();
 
-        if ( strpos($sEmail, '<') !== false ) {
+        if (strpos($sEmail, '<') !== false) {
             preg_match('/([\"\w@\.-_\s]*\s*)?(<(\w+[\.-]?\w+]*@\w+([\.-]?\w+)*\.\w{2,3})+>)/', $sEmail, $matches);
 
-            if ( isset($matches[1]) && $matches[3]) {
+            if (isset($matches[1]) && $matches[3]) {
                 $o->email = $matches[3];
                 $o->name = $matches[1];
                 return $o;
@@ -3432,7 +3421,7 @@ class G
             return false;
         } else {
             preg_match('/\w+[\.-]?\w+]*@\w+([\.-]?\w+)*\.\w{2,3}+/', $sEmail, $matches);
-            if ( isset($matches[0]) ) {
+            if (isset($matches[0])) {
                 $o->email = $matches[0];
                 $o->name = '';
                 return $o;
@@ -3449,10 +3438,9 @@ class G
      */
     public static function json_encode($Json)
     {
-        if ( function_exists('json_encode') ) {
+        if (function_exists('json_encode')) {
             return json_encode($Json);
         } else {
-
             $oJSON = new Services_JSON();
             return $oJSON->encode($Json);
         }
@@ -3468,7 +3456,6 @@ class G
         if (function_exists('json_decode')) {
             return json_decode($Json, $assoc);
         } else {
-
             $oJSON = new Services_JSON();
             return $oJSON->decode($Json);
         }
@@ -3503,7 +3490,7 @@ class G
      * @param string $body contains the email body (text plain or html)
      * @return mixed boolean or string : if the email was sent successfully returns true, otherwise returns a string within error message
      */
-    public function sendMail ($from, $fromName, $address, $subject, $body)
+    public function sendMail($from, $fromName, $address, $subject, $body)
     {
         // require_once "classes/class.pmFunctions.php";
 
@@ -3524,7 +3511,7 @@ class G
         }
 
         $passwd    = $setup['MESS_PASSWORD'];
-        $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
+        $passwdDec = G::decrypt($passwd, 'EMAILENCRYPT');
         $auxPass = explode('hash:', $passwdDec);
         if (count($auxPass) > 1) {
             if (count($auxPass) == 2) {
@@ -3540,7 +3527,7 @@ class G
         $mail->FromName = $fromName;
         $mail->Subject = $subject;
         $mail->Body = $body;
-        $mail->IsHTML (true);
+        $mail->IsHTML(true);
         $mail->IsSMTP();
         $mail->Host = $setup['MESS_SERVER'];
         $mail->Port = $setup['MESS_PORT'];
@@ -3558,7 +3545,7 @@ class G
             $mail->AddCC($emails[0], $emails[1]);
         }
         foreach ($emailAddressList['bcc'] as $emails) {
-             $mail->AddBCC($emails[0], $emails[1]);
+            $mail->AddBCC($emails[0], $emails[1]);
         }
 
         return $mail->Send() ? true : $mail->ErrorInfo;
@@ -3691,7 +3678,7 @@ class G
     {
         $size = memory_get_usage(true);
         $unit=array('B','Kb','Mb','Gb','Tb','Pb');
-        return @round($size/pow(1024,($i=floor(log($size,1024)))),2).' '.$unit[$i];
+        return @round($size/pow(1024, ($i=floor(log($size, 1024)))), 2).' '.$unit[$i];
     }
 
     public function getFormatUserList($format, $aUserInfo)
@@ -3787,7 +3774,7 @@ class G
         static $a_full_assoc_data, $a_mobile_data, $a_moz_data, $a_webkit_data, $b_dom_browser, $b_repeat, $b_safe_browser, $browser_name, $browser_number, $browser_math_number, $browser_user_agent, $browser_working, $ie_version, $mobile_test, $moz_number, $moz_rv, $moz_rv_full, $moz_release_date, $moz_type, $os_number, $os_type, $true_ie_number, $ua_type, $webkit_type, $webkit_type_number;
 
         // switch off the optimization for external ua string testing.
-        if ( $external_ua_string ) {
+        if ($external_ua_string) {
             $b_repeat = false;
         }
 
@@ -3796,7 +3783,7 @@ class G
         all the variables are filled on the first run through, it's only a matter of
         returning the the right ones
         */
-        if ( !$b_repeat ) {
+        if (!$b_repeat) {
             //initialize all variables with default values to prevent error
             $a_browser_math_number = '';
             $a_full_assoc_data = '';
@@ -3831,8 +3818,8 @@ class G
             $webkit_type_number = '';
 
             // set the excludes if required
-            if ( $test_excludes ) {
-                switch ( $test_excludes ){
+            if ($test_excludes) {
+                switch ($test_excludes) {
                     case '1':
                         $b_os_test = false;
                         break;
@@ -3844,7 +3831,7 @@ class G
                         $b_mobile_test = false;
                         break;
                     default:
-                        die( 'Error: bad $test_excludes parameter 2 used: ' . $test_excludes );
+                        die('Error: bad $test_excludes parameter 2 used: ' . $test_excludes);
                         break;
                 }
             }
@@ -3854,10 +3841,10 @@ class G
             isset protects against blank user agent failure. tolower also lets the script use
             strstr instead of stristr, which drops overhead slightly.
             */
-            if ( $external_ua_string ) {
-                $browser_user_agent = strtolower( $external_ua_string );
-            } elseif ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) {
-                $browser_user_agent = strtolower( $_SERVER['HTTP_USER_AGENT'] );
+            if ($external_ua_string) {
+                $browser_user_agent = strtolower($external_ua_string);
+            } elseif (isset($_SERVER['HTTP_USER_AGENT'])) {
+                $browser_user_agent = strtolower($_SERVER['HTTP_USER_AGENT']);
             } else {
                 $browser_user_agent = '';
             }
@@ -3955,12 +3942,12 @@ class G
             run through the browser_types array, break if you hit a match, if no match, assume old browser
             or non dom browser, assigns false value to $b_success.
             */
-            $i_count = count( $a_browser_types );
+            $i_count = count($a_browser_types);
             for ($i = 0; $i < $i_count; $i++) {
                 //unpacks browser array, assigns to variables, need to not assign til found in string
                 $browser_temp = $a_browser_types[$i][0];// text string to id browser from array
 
-                if ( strstr( $browser_user_agent, $browser_temp ) ) {
+                if (strstr($browser_user_agent, $browser_temp)) {
                     /*
                     it defaults to true, will become false below if needed
                     this keeps it easier to keep track of what is safe, only
@@ -3974,12 +3961,12 @@ class G
                     $browser_working = $a_browser_types[$i][2];// working name for browser
                     $ua_type = $a_browser_types[$i][3];// sets whether bot or browser
 
-                    switch ( $browser_working ) {
+                    switch ($browser_working) {
                         // this is modified quite a bit, now will return proper netscape version number
                         // check your implementation to make sure it works
                         case 'ns':
                             $b_safe_browser = false;
-                            $browser_number = G::get_item_version( $browser_user_agent, 'mozilla' );
+                            $browser_number = G::get_item_version($browser_user_agent, 'mozilla');
                             break;
                         case 'moz':
                             /*
@@ -3989,16 +3976,16 @@ class G
                             numbering conventions here: http://www.mozilla.org/releases/cvstags.html
                             */
                             // this will return alpha and beta version numbers, if present
-                            $moz_rv_full = G::get_item_version( $browser_user_agent, 'rv' );
+                            $moz_rv_full = G::get_item_version($browser_user_agent, 'rv');
                             // this slices them back off for math comparisons
-                            $moz_rv = substr( $moz_rv_full, 0, 3 );
+                            $moz_rv = substr($moz_rv_full, 0, 3);
 
                             // this is to pull out specific mozilla versions, firebird, netscape etc..
-                            $j_count = count( $a_moz_types );
+                            $j_count = count($a_moz_types);
                             for ($j = 0; $j < $j_count; $j++) {
-                                if ( strstr( $browser_user_agent, $a_moz_types[$j] ) ) {
+                                if (strstr($browser_user_agent, $a_moz_types[$j])) {
                                     $moz_type = $a_moz_types[$j];
-                                    $moz_number = G::get_item_version( $browser_user_agent, $moz_type );
+                                    $moz_number = G::get_item_version($browser_user_agent, $moz_type);
                                     break;
                                 }
                             }
@@ -4006,31 +3993,31 @@ class G
                             this is necesary to protect against false id'ed moz'es and new moz'es.
                             this corrects for galeon, or any other moz browser without an rv number
                             */
-                            if ( !$moz_rv ) {
+                            if (!$moz_rv) {
                                 // you can use this if you are running php >= 4.2
-                                if ( function_exists( 'floatval' ) ) {
-                                    $moz_rv = floatval( $moz_number );
+                                if (function_exists('floatval')) {
+                                    $moz_rv = floatval($moz_number);
                                 } else {
-                                    $moz_rv = substr( $moz_number, 0, 3 );
+                                    $moz_rv = substr($moz_number, 0, 3);
                                 }
                                 $moz_rv_full = $moz_number;
                             }
                             // this corrects the version name in case it went to the default 'rv' for the test
-                            if ( $moz_type == 'rv' ) {
+                            if ($moz_type == 'rv') {
                                 $moz_type = 'mozilla';
                             }
 
                             //the moz version will be taken from the rv number, see notes above for rv problems
                             $browser_number = $moz_rv;
                             // gets the actual release date, necessary if you need to do functionality tests
-                            G::get_set_count( 'set', 0 );
-                            $moz_release_date = G::get_item_version( $browser_user_agent, 'gecko/' );
+                            G::get_set_count('set', 0);
+                            $moz_release_date = G::get_item_version($browser_user_agent, 'gecko/');
                             /*
                             Test for mozilla 0.9.x / netscape 6.x
                             test your javascript/CSS to see if it works in these mozilla releases, if it
                             does, just default it to: $b_safe_browser = true;
                             */
-                            if ( ( $moz_release_date < 20020400 ) || ( $moz_rv < 1 ) ) {
+                            if (($moz_release_date < 20020400) || ($moz_rv < 1)) {
                                 $b_safe_browser = false;
                             }
                             break;
@@ -4040,25 +4027,25 @@ class G
                             of msie 8, and we're triggering the  break last condition in the test, as well
                             as the test for a second search string, trident/
                             */
-                            $browser_number = G::get_item_version( $browser_user_agent, $browser_name, true, 'trident/' );
+                            $browser_number = G::get_item_version($browser_user_agent, $browser_name, true, 'trident/');
                             // construct the proper real number if it's in compat mode and msie 8.0/9.0
-                            if ( strstr( $browser_number, '7.' ) && strstr( $browser_user_agent, 'trident/5' ) ) {
+                            if (strstr($browser_number, '7.') && strstr($browser_user_agent, 'trident/5')) {
                                 // note that 7.0 becomes 9 when adding 1, but if it's 7.1 it will be 9.1
                                 $true_ie_number = $browser_number + 2;
-                            } elseif ( strstr( $browser_number, '7.' ) && strstr( $browser_user_agent, 'trident/4' ) ) {
+                            } elseif (strstr($browser_number, '7.') && strstr($browser_user_agent, 'trident/4')) {
                                 // note that 7.0 becomes 8 when adding 1, but if it's 7.1 it will be 8.1
                                 $true_ie_number = $browser_number + 1;
                             }
                             // the 9 series is finally standards compatible, html 5 etc, so worth a new id
-                            if ( $browser_number >= 9 ) {
+                            if ($browser_number >= 9) {
                                 $ie_version = 'ie9x';
-                            } elseif ( $browser_number >= 7 ) {
+                            } elseif ($browser_number >= 7) {
                                 $ie_version = 'ie7x';
-                            } elseif ( strstr( $browser_user_agent, 'mac') ) {
+                            } elseif (strstr($browser_user_agent, 'mac')) {
                                 $ie_version = 'ieMac';
-                            } elseif ( $browser_number >= 5 ) {
+                            } elseif ($browser_number >= 5) {
                                 $ie_version = 'ie5x';
-                            } elseif ( ( $browser_number > 3 ) && ( $browser_number < 5 ) ) {
+                            } elseif (($browser_number > 3) && ($browser_number < 5)) {
                                 $b_dom_browser = false;
                                 $ie_version = 'ie4';
                                 // this depends on what you're using the script for, make sure this fits your needs
@@ -4070,32 +4057,32 @@ class G
                             }
                             break;
                         case 'op':
-                            $browser_number = G::get_item_version( $browser_user_agent, $browser_name );
+                            $browser_number = G::get_item_version($browser_user_agent, $browser_name);
                             // opera is leaving version at 9.80 (or xx) for 10.x - see this for explanation
                             // http://dev.opera.com/articles/view/opera-ua-string-changes/
-                            if ( strstr( $browser_number, '9.' ) && strstr( $browser_user_agent, 'version/' ) ) {
-                                G::get_set_count( 'set', 0 );
-                                $browser_number = G::get_item_version( $browser_user_agent, 'version/' );
+                            if (strstr($browser_number, '9.') && strstr($browser_user_agent, 'version/')) {
+                                G::get_set_count('set', 0);
+                                $browser_number = G::get_item_version($browser_user_agent, 'version/');
                             }
 
-                            if ( $browser_number < 5 ) {
+                            if ($browser_number < 5) {
                                 $b_safe_browser = false;
                             }
                             break;
                         case 'webkit':
                             // note that this is the Webkit version number
-                            $browser_number = G::get_item_version( $browser_user_agent, $browser_name );
+                            $browser_number = G::get_item_version($browser_user_agent, $browser_name);
                             // this is to pull out specific webkit versions, safari, google-chrome etc..
-                            $j_count = count( $a_webkit_types );
+                            $j_count = count($a_webkit_types);
                             for ($j = 0; $j < $j_count; $j++) {
-                                if (strstr( $browser_user_agent, $a_webkit_types[$j])) {
+                                if (strstr($browser_user_agent, $a_webkit_types[$j])) {
                                     $webkit_type = $a_webkit_types[$j];
-                                    if ( $webkit_type == 'omniweb' ) {
-                                        G::get_set_count( 'set', 2 );
+                                    if ($webkit_type == 'omniweb') {
+                                        G::get_set_count('set', 2);
                                     }
-                                    $webkit_type_number = G::get_item_version( $browser_user_agent, $webkit_type );
+                                    $webkit_type_number = G::get_item_version($browser_user_agent, $webkit_type);
                                     // epiphany hack
-                                    if ( $a_webkit_types[$j] == 'gtklauncher' ) {
+                                    if ($a_webkit_types[$j] == 'gtklauncher') {
                                         $browser_name = 'epiphany';
                                     } else {
                                         $browser_name = $a_webkit_types[$j];
@@ -4105,7 +4092,7 @@ class G
                             }
                             break;
                         default:
-                            $browser_number = G::get_item_version( $browser_user_agent, $browser_name );
+                            $browser_number = G::get_item_version($browser_user_agent, $browser_name);
                             break;
                     }
                     // the browser was id'ed
@@ -4115,7 +4102,7 @@ class G
             }
 
             //assigns defaults if the browser was not found in the loop test
-            if ( !$b_success ) {
+            if (!$b_success) {
                 /*
                 this will return the first part of the browser string if the above id's failed
                 usually the first part of the browser string has the navigator useragent name/version in it.
@@ -4126,14 +4113,14 @@ class G
                 the browser_name is '', you can always test for that
                 */
                 // delete this part if you want an unknown browser returned
-                $browser_name = substr( $browser_user_agent, 0, strcspn( $browser_user_agent , '();') );
+                $browser_name = substr($browser_user_agent, 0, strcspn($browser_user_agent, '();'));
                 // this extracts just the browser name from the string, if something usable was found
-                if ( $browser_name && preg_match( '/[^0-9][a-z]*-*\ *[a-z]*\ *[a-z]*/', $browser_name, $a_unhandled_browser ) ) {
+                if ($browser_name && preg_match('/[^0-9][a-z]*-*\ *[a-z]*\ *[a-z]*/', $browser_name, $a_unhandled_browser)) {
                     $browser_name = $a_unhandled_browser[0];
-                    if ( $browser_name == 'blackberry' ) {
-                        G::get_set_count( 'set', 0 );
+                    if ($browser_name == 'blackberry') {
+                        G::get_set_count('set', 0);
                     }
-                    $browser_number = G::get_item_version( $browser_user_agent, $browser_name );
+                    $browser_number = G::get_item_version($browser_user_agent, $browser_name);
                 } else {
                     $browser_name = 'NA';
                     $browser_number = 'NA';
@@ -4141,7 +4128,7 @@ class G
             }
             // get os data, mac os x test requires browser/version information, this is a change from older scripts
             if ($b_os_test) {
-                $a_os_data = G::get_os_data( $browser_user_agent, $browser_working, $browser_number );
+                $a_os_data = G::get_os_data($browser_user_agent, $browser_working, $browser_number);
                 $os_type = $a_os_data[0];// os name, abbreviated
                 $os_number = $a_os_data[1];// os number or version if available
             }
@@ -4150,13 +4137,13 @@ class G
             to true so the function won't retest everything
             */
             $b_repeat = true;
-            if ($browser_number && preg_match( '/[0-9]*\.*[0-9]*/', $browser_number, $a_browser_math_number ) ) {
+            if ($browser_number && preg_match('/[0-9]*\.*[0-9]*/', $browser_number, $a_browser_math_number)) {
                 $browser_math_number = $a_browser_math_number[0];
             }
-            if ( $b_mobile_test ) {
-                $mobile_test = G::check_is_mobile( $browser_user_agent );
-                if ( $mobile_test ) {
-                    $a_mobile_data = G::get_mobile_data( $browser_user_agent );
+            if ($b_mobile_test) {
+                $mobile_test = G::check_is_mobile($browser_user_agent);
+                if ($mobile_test) {
+                    $a_mobile_data = G::get_mobile_data($browser_user_agent);
                     $ua_type = 'mobile';
                 }
             }
@@ -4197,7 +4184,7 @@ class G
         }
         $run_time = G::script_time();
 
-        if ( !$a_full_assoc_data ) {
+        if (!$a_full_assoc_data) {
             $a_full_assoc_data = array(
                 'browser_working' => $browser_working,
                 'browser_number' => $browser_number,
@@ -4247,17 +4234,17 @@ class G
                 break;
             default:
                 # check to see if the data is available, otherwise it's user typo of unsupported option
-                if (isset( $a_full_assoc_data[$which_test])) {
+                if (isset($a_full_assoc_data[$which_test])) {
                     return $a_full_assoc_data[$which_test];
                 } else {
-                    die( "You passed the browser detector an unsupported option for parameter 1: " . $which_test );
+                    die("You passed the browser detector an unsupported option for parameter 1: " . $which_test);
                 }
                 break;
         }
     }
 
     // gets which os from the browser string
-    public function get_os_data ($pv_browser_string, $pv_browser_name, $pv_version_number)
+    public function get_os_data($pv_browser_string, $pv_browser_name, $pv_version_number)
     {
         // initialize variables
         $os_working_type = '';
@@ -4271,12 +4258,12 @@ class G
         $a_unix_types = array( 'dragonfly', 'freebsd', 'openbsd', 'netbsd', 'bsd', 'unixware', 'solaris', 'sunos', 'sun4', 'sun5', 'suni86', 'sun', 'irix5', 'irix6', 'irix', 'hpux9', 'hpux10', 'hpux11', 'hpux', 'hp-ux', 'aix1', 'aix2', 'aix3', 'aix4', 'aix5', 'aix', 'sco', 'unixware', 'mpras', 'reliant', 'dec', 'sinix', 'unix' );
         // only sometimes will you get a linux distro to id itself...
         $a_linux_distros = array( 'ubuntu', 'kubuntu', 'xubuntu', 'mepis', 'xandros', 'linspire', 'winspire', 'jolicloud', 'sidux', 'kanotix', 'debian', 'opensuse', 'suse', 'fedora', 'redhat', 'slackware', 'slax', 'mandrake', 'mandriva', 'gentoo', 'sabayon', 'linux' );
-        $a_linux_process = array ( 'i386', 'i586', 'i686' );// not use currently
+        $a_linux_process = array( 'i386', 'i586', 'i686' );// not use currently
         // note, order of os very important in os array, you will get failed ids if changed
         $a_os_types = array( 'android', 'blackberry', 'iphone', 'palmos', 'palmsource', 'symbian', 'beos', 'os2', 'amiga', 'webtv', 'mac', 'nt', 'win', $a_unix_types, $a_linux_distros );
 
         //os tester
-        $i_count = count( $a_os_types );
+        $i_count = count($a_os_types);
         for ($i = 0; $i < $i_count; $i++) {
             // unpacks os array, assigns to variable $a_os_working
             $os_working_data = $a_os_types[$i];
@@ -4284,58 +4271,48 @@ class G
             assign os to global os variable, os flag true on success
             !strstr($pv_browser_string, "linux" ) corrects a linux detection bug
             */
-            if (!is_array($os_working_data) && strstr($pv_browser_string, $os_working_data ) && !strstr( $pv_browser_string, "linux")) {
+            if (!is_array($os_working_data) && strstr($pv_browser_string, $os_working_data) && !strstr($pv_browser_string, "linux")) {
                 $os_working_type = $os_working_data;
 
                 switch ($os_working_type) {
                     // most windows now uses: NT X.Y syntax
                     case 'nt':
-                        if (strstr( $pv_browser_string, 'nt 6.1' )) {
+                        if (strstr($pv_browser_string, 'nt 6.1')) {
                             $os_working_number = 6.1;
-                        } elseif (strstr( $pv_browser_string, 'nt 6.0')) {
+                        } elseif (strstr($pv_browser_string, 'nt 6.0')) {
                             $os_working_number = 6.0;
-                        } elseif (strstr( $pv_browser_string, 'nt 5.2')) {
+                        } elseif (strstr($pv_browser_string, 'nt 5.2')) {
                             $os_working_number = 5.2;
-                        } elseif (strstr( $pv_browser_string, 'nt 5.1') || strstr( $pv_browser_string, 'xp')) {
+                        } elseif (strstr($pv_browser_string, 'nt 5.1') || strstr($pv_browser_string, 'xp')) {
                             $os_working_number = 5.1;//
-                        } elseif (strstr( $pv_browser_string, 'nt 5') || strstr( $pv_browser_string, '2000')) {
+                        } elseif (strstr($pv_browser_string, 'nt 5') || strstr($pv_browser_string, '2000')) {
                             $os_working_number = 5.0;
-                        } elseif (strstr( $pv_browser_string, 'nt 4')) {
+                        } elseif (strstr($pv_browser_string, 'nt 4')) {
                             $os_working_number = 4;
-                        } elseif (strstr( $pv_browser_string, 'nt 3')) {
+                        } elseif (strstr($pv_browser_string, 'nt 3')) {
                             $os_working_number = 3;
                         }
                         break;
                     case 'win':
-                        if (strstr( $pv_browser_string, 'vista')) {
+                        if (strstr($pv_browser_string, 'vista')) {
                             $os_working_number = 6.0;
                             $os_working_type = 'nt';
-                        } elseif ( strstr( $pv_browser_string, 'xp')) {
+                        } elseif (strstr($pv_browser_string, 'xp')) {
                             $os_working_number = 5.1;
                             $os_working_type = 'nt';
-                        } elseif ( strstr( $pv_browser_string, '2003')) {
+                        } elseif (strstr($pv_browser_string, '2003')) {
                             $os_working_number = 5.2;
                             $os_working_type = 'nt';
-                        }
-                        elseif ( strstr( $pv_browser_string, 'windows ce' ) )// windows CE
-                        {
+                        } elseif (strstr($pv_browser_string, 'windows ce')) {// windows CE
                             $os_working_number = 'ce';
                             $os_working_type = 'nt';
-                        }
-                        elseif ( strstr( $pv_browser_string, '95' ) )
-                        {
+                        } elseif (strstr($pv_browser_string, '95')) {
                             $os_working_number = '95';
-                        }
-                        elseif ( ( strstr( $pv_browser_string, '9x 4.9' ) ) || ( strstr( $pv_browser_string, ' me' ) ) )
-                        {
+                        } elseif ((strstr($pv_browser_string, '9x 4.9')) || (strstr($pv_browser_string, ' me'))) {
                             $os_working_number = 'me';
-                        }
-                        elseif ( strstr( $pv_browser_string, '98' ) )
-                        {
+                        } elseif (strstr($pv_browser_string, '98')) {
                             $os_working_number = '98';
-                        }
-                        elseif ( strstr( $pv_browser_string, '2000' ) )// windows 2000, for opera ID
-                        {
+                        } elseif (strstr($pv_browser_string, '2000')) {// windows 2000, for opera ID
                             $os_working_number = 5.0;
                             $os_working_type = 'nt';
                         }
@@ -4343,13 +4320,13 @@ class G
                     case 'mac':
                         if (strstr($pv_browser_string, 'os x')) {
                             if (strstr($pv_browser_string, 'os x ')) {
-                                $os_working_number = str_replace( '_', '.', G::get_item_version( $pv_browser_string, 'os x' ) );
+                                $os_working_number = str_replace('_', '.', G::get_item_version($pv_browser_string, 'os x'));
                             } else {
                                 $os_working_number = 10;
                             }
-                        } elseif ( ( $pv_browser_name == 'saf' ) || ( $pv_browser_name == 'cam' ) ||
-                            ( ( $pv_browser_name == 'moz' ) && ( $pv_version_number >= 1.3 ) ) ||
-                            ( ( $pv_browser_name == 'ie' ) && ( $pv_version_number >= 5.2 ) ) ) {
+                        } elseif (($pv_browser_name == 'saf') || ($pv_browser_name == 'cam') ||
+                            (($pv_browser_name == 'moz') && ($pv_version_number >= 1.3)) ||
+                            (($pv_browser_name == 'ie') && ($pv_version_number >= 5.2))) {
                             $os_working_number = 10;
                         }
                         break;
@@ -4360,23 +4337,23 @@ class G
                         break;
                 }
                 break;
-            } elseif ( is_array( $os_working_data ) && ( $i == ( $i_count - 2 ) ) ) {
+            } elseif (is_array($os_working_data) && ($i == ($i_count - 2))) {
                 $j_count = count($os_working_data);
                 for ($j = 0; $j < $j_count; $j++) {
-                    if (strstr( $pv_browser_string, $os_working_data[$j])) {
+                    if (strstr($pv_browser_string, $os_working_data[$j])) {
                         $os_working_type = 'unix'; //if the os is in the unix array, it's unix, obviously...
-                        $os_working_number = ( $os_working_data[$j] != 'unix' ) ? $os_working_data[$j] : '';// assign sub unix version from the unix array
+                        $os_working_number = ($os_working_data[$j] != 'unix') ? $os_working_data[$j] : '';// assign sub unix version from the unix array
                         break;
                     }
                 }
-            } elseif (is_array( $os_working_data ) && ( $i == ( $i_count - 1 ))) {
+            } elseif (is_array($os_working_data) && ($i == ($i_count - 1))) {
                 $j_count = count($os_working_data);
                 for ($j = 0; $j < $j_count; $j++) {
-                    if ( strstr( $pv_browser_string, $os_working_data[$j] )) {
+                    if (strstr($pv_browser_string, $os_working_data[$j])) {
                         $os_working_type = 'lin';
                         // assign linux distro from the linux array, there's a default
                         //search for 'lin', if it's that, set version to ''
-                        $os_working_number = ( $os_working_data[$j] != 'linux' ) ? $os_working_data[$j] : '';
+                        $os_working_number = ($os_working_data[$j] != 'linux') ? $os_working_data[$j] : '';
                         break;
                     }
                 }
@@ -4396,9 +4373,9 @@ class G
         $string_working_number = '';
         for ($i = 0; $i < 4; $i++) {
             //start the search after the first string occurrence
-            if (strpos( $pv_browser_user_agent, $pv_search_string, $start_pos ) !== false) {
-                $start_pos = strpos( $pv_browser_user_agent, $pv_search_string, $start_pos ) + strlen( $pv_search_string );
-                if (!$pv_b_break_last || ( $pv_extra_search && strstr( $pv_browser_user_agent, $pv_extra_search ) )) {
+            if (strpos($pv_browser_user_agent, $pv_search_string, $start_pos) !== false) {
+                $start_pos = strpos($pv_browser_user_agent, $pv_search_string, $start_pos) + strlen($pv_search_string);
+                if (!$pv_b_break_last || ($pv_extra_search && strstr($pv_browser_user_agent, $pv_extra_search))) {
                     break;
                 }
             } else {
@@ -4406,10 +4383,10 @@ class G
             }
         }
 
-        $start_pos += G::get_set_count( 'get' );
-        $string_working_number = substr( $pv_browser_user_agent, $start_pos, $substring_length );
-        $string_working_number = substr( $string_working_number, 0, strcspn($string_working_number, ' );/') );
-        if (!is_numeric( substr( $string_working_number, 0, 1 ))) {
+        $start_pos += G::get_set_count('get');
+        $string_working_number = substr($pv_browser_user_agent, $start_pos, $substring_length);
+        $string_working_number = substr($string_working_number, 0, strcspn($string_working_number, ' );/'));
+        if (!is_numeric(substr($string_working_number, 0, 1))) {
             $string_working_number = '';
         }
         return $string_working_number;
@@ -4419,9 +4396,9 @@ class G
     {
         static $slice_increment;
         $return_value = '';
-        switch ( $pv_type ) {
+        switch ($pv_type) {
             case 'get':
-                if ( is_null( $slice_increment ) ) {
+                if (is_null($slice_increment)) {
                     $slice_increment = 1;
                 }
                 $return_value = $slice_increment;
@@ -4448,9 +4425,9 @@ class G
         );
 
         // then do basic mobile type search, this uses data from: get_mobile_data()
-        $j_count = count( $a_mobile_search );
+        $j_count = count($a_mobile_search);
         for ($j = 0; $j < $j_count; $j++) {
-            if (strstr( $pv_browser_user_agent, $a_mobile_search[$j] )) {
+            if (strstr($pv_browser_user_agent, $a_mobile_search[$j])) {
                 $mobile_working_test = $a_mobile_search[$j];
                 break;
             }
@@ -4458,7 +4435,7 @@ class G
         return $mobile_working_test;
     }
 
-    public function get_mobile_data ($pv_browser_user_agent)
+    public function get_mobile_data($pv_browser_user_agent)
     {
         $mobile_browser = '';
         $mobile_browser_number = '';
@@ -4474,53 +4451,53 @@ class G
         $a_mobile_os = array( 'android', 'epoc', 'cpu os', 'iphone os', 'palmos', 'palmsource', 'windows phone os', 'windows ce', 'symbianos', 'symbian os', 'symbian', 'webos', 'linux armv'  );
         $a_mobile_server = array( 'astel', 'docomo', 'novarra-vision', 'portalmmm', 'reqwirelessweb', 'vodafone' );
 
-        $k_count = count( $a_mobile_browser );
+        $k_count = count($a_mobile_browser);
         for ($k = 0; $k < $k_count; $k++) {
-            if (strstr( $pv_browser_user_agent, $a_mobile_browser[$k] )) {
+            if (strstr($pv_browser_user_agent, $a_mobile_browser[$k])) {
                 $mobile_browser = $a_mobile_browser[$k];
-                $mobile_browser_number = G::get_item_version( $pv_browser_user_agent, $mobile_browser );
+                $mobile_browser_number = G::get_item_version($pv_browser_user_agent, $mobile_browser);
                 break;
             }
         }
-        $k_count = count( $a_mobile_device );
+        $k_count = count($a_mobile_device);
         for ($k = 0; $k < $k_count; $k++) {
-            if (strstr( $pv_browser_user_agent, $a_mobile_device[$k] )) {
-                $mobile_device = trim ( $a_mobile_device[$k], '-_' ); // but not space trims yet
+            if (strstr($pv_browser_user_agent, $a_mobile_device[$k])) {
+                $mobile_device = trim($a_mobile_device[$k], '-_'); // but not space trims yet
                 if ($mobile_device == 'blackberry') {
-                    G::get_set_count( 'set', 0 );
+                    G::get_set_count('set', 0);
                 }
-                $mobile_device_number = G::get_item_version( $pv_browser_user_agent, $mobile_device );
-                $mobile_device = trim( $mobile_device ); // some of the id search strings have white space
+                $mobile_device_number = G::get_item_version($pv_browser_user_agent, $mobile_device);
+                $mobile_device = trim($mobile_device); // some of the id search strings have white space
                 break;
             }
         }
-        $k_count = count( $a_mobile_os );
+        $k_count = count($a_mobile_os);
         for ($k = 0; $k < $k_count; $k++) {
-            if (strstr( $pv_browser_user_agent, $a_mobile_os[$k] )) {
+            if (strstr($pv_browser_user_agent, $a_mobile_os[$k])) {
                 $mobile_os = $a_mobile_os[$k];
-                $mobile_os_number = str_replace( '_', '.', G::get_item_version( $pv_browser_user_agent, $mobile_os ) );
+                $mobile_os_number = str_replace('_', '.', G::get_item_version($pv_browser_user_agent, $mobile_os));
                 break;
             }
         }
-        $k_count = count( $a_mobile_server );
+        $k_count = count($a_mobile_server);
         for ($k = 0; $k < $k_count; $k++) {
-            if (strstr( $pv_browser_user_agent, $a_mobile_server[$k] )) {
+            if (strstr($pv_browser_user_agent, $a_mobile_server[$k])) {
                 $mobile_server = $a_mobile_server[$k];
-                $mobile_server_number = G::get_item_version( $pv_browser_user_agent, $mobile_server );
+                $mobile_server_number = G::get_item_version($pv_browser_user_agent, $mobile_server);
                 break;
             }
         }
         // just for cases where we know it's a mobile device already
-        if (!$mobile_os && ( $mobile_browser || $mobile_device || $mobile_server ) && strstr( $pv_browser_user_agent, 'linux' ) ) {
+        if (!$mobile_os && ($mobile_browser || $mobile_device || $mobile_server) && strstr($pv_browser_user_agent, 'linux')) {
             $mobile_os = 'linux';
-            $mobile_os_number = G::get_item_version( $pv_browser_user_agent, 'linux' );
+            $mobile_os_number = G::get_item_version($pv_browser_user_agent, 'linux');
         }
 
         $a_mobile_data = array( $mobile_device, $mobile_browser, $mobile_browser_number, $mobile_os, $mobile_os_number, $mobile_server, $mobile_server_number, $mobile_device_number );
         return $a_mobile_data;
     }
 
-    public function getBrowser ()
+    public function getBrowser()
     {
         $u_agent = $_SERVER['HTTP_USER_AGENT'];
         $bname = 'Unknown';
@@ -4529,49 +4506,49 @@ class G
         $ub = "other";
 
         //First get the platform?
-        if (preg_match( '/linux/i', $u_agent )) {
+        if (preg_match('/linux/i', $u_agent)) {
             $platform = 'linux';
-        } elseif (preg_match( '/macintosh|mac os x/i', $u_agent )) {
+        } elseif (preg_match('/macintosh|mac os x/i', $u_agent)) {
             $platform = 'mac';
-        } elseif (preg_match( '/windows|win32/i', $u_agent )) {
+        } elseif (preg_match('/windows|win32/i', $u_agent)) {
             $platform = 'windows';
         }
 
         // Next get the name of the useragent yes seperately and for good reason
-        if ((preg_match('~Trident/7.0; rv:11.0~', $u_agent) || preg_match( '/MSIE/i', $u_agent )) && ! preg_match( '/Opera/i', $u_agent )) {
+        if ((preg_match('~Trident/7.0; rv:11.0~', $u_agent) || preg_match('/MSIE/i', $u_agent)) && ! preg_match('/Opera/i', $u_agent)) {
             $bname = 'Internet Explorer';
             $ub = "MSIE";
-        } elseif (preg_match( '/Firefox/i', $u_agent )) {
+        } elseif (preg_match('/Firefox/i', $u_agent)) {
             $bname = 'Mozilla Firefox';
             $ub = "Firefox";
-        } elseif ((preg_match( '/Opera/i', $u_agent )) || (preg_match( '/OPR/i', $u_agent ))) {
+        } elseif ((preg_match('/Opera/i', $u_agent)) || (preg_match('/OPR/i', $u_agent))) {
             $bname = 'Opera';
             $ub = "Opera";
-        } elseif (preg_match( '/Chrome/i', $u_agent )) {
+        } elseif (preg_match('/Chrome/i', $u_agent)) {
             $bname = 'Google Chrome';
             $ub = "Chrome";
-        } elseif (preg_match( '/Safari/i', $u_agent )) {
+        } elseif (preg_match('/Safari/i', $u_agent)) {
             $bname = 'Apple Safari';
             $ub = "Safari";
-        } elseif (preg_match( '/Netscape/i', $u_agent )) {
+        } elseif (preg_match('/Netscape/i', $u_agent)) {
             $bname = 'Netscape';
             $ub = "Netscape";
-        } elseif (preg_match( '/bingbot/i', $u_agent )) {
+        } elseif (preg_match('/bingbot/i', $u_agent)) {
             $bname = 'Bing Bot';
             $ub = "bingbot";
         }
 
         // finally get the correct version number
-        $known = array ('Version',$ub,'other');
-        $pattern = '#(?P<browser>' . join( '|', $known ) . ')[/ ]+(?P<version>[0-9.|a-zA-Z.]*)#';
-        @preg_match_all( $pattern, $u_agent, $matches );
+        $known = array('Version',$ub,'other');
+        $pattern = '#(?P<browser>' . join('|', $known) . ')[/ ]+(?P<version>[0-9.|a-zA-Z.]*)#';
+        @preg_match_all($pattern, $u_agent, $matches);
 
         // see how many we have
-        $i = count( $matches['browser'] );
+        $i = count($matches['browser']);
         if ($i != 1) {
             //we will have two since we are not using 'other' argument yet
             //see if version is before or after the name
-            if (strripos( $u_agent, "Version" ) < strripos( $u_agent, $ub )) {
+            if (strripos($u_agent, "Version") < strripos($u_agent, $ub)) {
                 $version = $matches['version'][0];
             } else {
                 $version = isset($matches['version'][1]) ? $matches['version'][1] : '';
@@ -4582,68 +4559,68 @@ class G
 
         // check if we have a number
         if ($version == null || $version == "") {
-        	if($ub == 'MSIE'){
-        		$parent = 'RV';
-        	} elseif ($ub == 'Opera'){
-        		$parent = 'OPR';
-        	}
-        	if (isset($parent) && $parent != ""){
-        		$s = strpos(strtoupper($u_agent), $parent);
-        		$f = $s + strlen($parent);
-        		$version = substr($u_agent, $f, 15);
-        		$version = preg_replace('/[^0-9,.]/','',$version);
-            }else {
+            if ($ub == 'MSIE') {
+                $parent = 'RV';
+            } elseif ($ub == 'Opera') {
+                $parent = 'OPR';
+            }
+            if (isset($parent) && $parent != "") {
+                $s = strpos(strtoupper($u_agent), $parent);
+                $f = $s + strlen($parent);
+                $version = substr($u_agent, $f, 15);
+                $version = preg_replace('/[^0-9,.]/', '', $version);
+            } else {
                 $version = "?";
-        	}
+            }
         }
 
-        return array ('userAgent' => $u_agent,'name' => strtolower( $ub ),'longName' => $bname,'version' => $version,'platform' => $platform,'pattern' => $pattern
+        return array('userAgent' => $u_agent,'name' => strtolower($ub),'longName' => $bname,'version' => $version,'platform' => $platform,'pattern' => $pattern
         );
     }
 
     // track total script execution time
-    public function script_time ()
+    public function script_time()
     {
         static $script_time;
         $elapsed_time = '';
         /*
         note that microtime(true) requires php 5 or greater for microtime(true)
         */
-        if (sprintf( "%01.1f", phpversion() ) >= 5) {
-            if (is_null( $script_time )) {
-                $script_time = microtime( true );
+        if (sprintf("%01.1f", phpversion()) >= 5) {
+            if (is_null($script_time)) {
+                $script_time = microtime(true);
             } else {
                 // note: (string)$var is same as strval($var)
                 // $elapsed_time = (string)( microtime(true) - $script_time );
-                $elapsed_time = (microtime( true ) - $script_time);
-                $elapsed_time = sprintf( "%01.8f", $elapsed_time );
+                $elapsed_time = (microtime(true) - $script_time);
+                $elapsed_time = sprintf("%01.8f", $elapsed_time);
                 $script_time = null; // can't unset a static variable
                 return $elapsed_time;
             }
         }
     }
 
-    public function getDirectorySize ($path, $maxmtime = 0)
+    public function getDirectorySize($path, $maxmtime = 0)
     {
         $totalsize = 0;
         $totalcount = 0;
         $dircount = 0;
-        if ($handle = opendir( $path )) {
-            while (false !== ($file = readdir( $handle ))) {
+        if ($handle = opendir($path)) {
+            while (false !== ($file = readdir($handle))) {
                 $nextpath = $path . '/' . $file;
-                if ($file != '.' && $file != '..' && ! is_link( $nextpath ) && $file != '.svn') {
-                    if (is_dir( $nextpath )) {
+                if ($file != '.' && $file != '..' && ! is_link($nextpath) && $file != '.svn') {
+                    if (is_dir($nextpath)) {
                         $dircount ++;
-                        $result = G::getDirectorySize( $nextpath, $maxmtime );
+                        $result = G::getDirectorySize($nextpath, $maxmtime);
                         $totalsize += $result['size'];
                         $totalcount += $result['count'];
                         $dircount += $result['dircount'];
                         $maxmtime = $result['maxmtime'] > $maxmtime ? $result['maxmtime'] : $maxmtime;
-                    } elseif (is_file( $nextpath )) {
-                        $totalsize += filesize( $nextpath );
+                    } elseif (is_file($nextpath)) {
+                        $totalsize += filesize($nextpath);
                         $totalcount ++;
 
-                        $mtime = filemtime( $nextpath );
+                        $mtime = filemtime($nextpath);
                         if ($mtime > $maxmtime) {
                             $maxmtime = $mtime;
                         }
@@ -4651,7 +4628,7 @@ class G
                 }
             }
         }
-        closedir( $handle );
+        closedir($handle);
         $total['size'] = $totalsize;
         $total['count'] = $totalcount;
         $total['dircount'] = $dircount;
@@ -4665,14 +4642,14 @@ class G
      *
      * @author erik amaru ortiz <erik@colosa.com>
      */
-    public function getCacheFileNameByPattern ($path, $pattern)
+    public function getCacheFileNameByPattern($path, $pattern)
     {
-        if ($file = glob( $path . $pattern )) {
-            preg_match( '/[a-f0-9]{32}/', $file[0], $match );
+        if ($file = glob($path . $pattern)) {
+            preg_match('/[a-f0-9]{32}/', $file[0], $match);
         } else {
             $file[0] = '';
         }
-        return array ('filename' => $file[0],'checksum' => (isset( $match[0] ) ? $match[0] : ''));
+        return array('filename' => $file[0],'checksum' => (isset($match[0]) ? $match[0] : ''));
     }
 
     /**
@@ -4680,23 +4657,23 @@ class G
      *
      * @author erik amaru ortiz <erik@colosa.com>
      */
-    public function getCheckSum ($files)
+    public function getCheckSum($files)
     {
         $key = System::getVersion();
 
-        if (! is_array( $files )) {
+        if (! is_array($files)) {
             $tmp = $files;
-            $files = array ();
+            $files = array();
             $files[0] = $tmp;
         }
 
         $checkSum = '';
         foreach ($files as $file) {
-            if (is_file( $file )) {
-                $checkSum .= G::encryptFileOld( $file );
+            if (is_file($file)) {
+                $checkSum .= G::encryptFileOld($file);
             }
         }
-        return G::encryptOld( $checkSum . $key );
+        return G::encryptOld($checkSum . $key);
     }
 
     /**
@@ -4705,23 +4682,23 @@ class G
      * Does accept lines starting with ; as comments
      * Does not accept comments after values
      */
-    public function parse_ini_string ($string)
+    public static function parse_ini_string($string)
     {
-        if (function_exists( 'parse_ini_string' )) {
-            return parse_ini_string( $string );
+        if (function_exists('parse_ini_string')) {
+            return parse_ini_string($string);
         } else {
-            $array = Array ();
-            $lines = explode( "\n", $string );
+            $array = array();
+            $lines = explode("\n", $string);
 
             foreach ($lines as $line) {
-                $statement = preg_match( "/^(?!;)(?P<key>[\w+\.\-]+?)\s*=\s*(?P<value>.+?)\s*$/", $line, $match );
+                $statement = preg_match("/^(?!;)(?P<key>[\w+\.\-]+?)\s*=\s*(?P<value>.+?)\s*$/", $line, $match);
                 if ($statement) {
                     $key = $match['key'];
                     $value = $match['value'];
 
                     //Remove quote
-                    if (preg_match( "/^\".*\"$/", $value ) || preg_match( "/^'.*'$/", $value )) {
-                        $value = mb_substr( $value, 1, mb_strlen( $value ) - 2 );
+                    if (preg_match("/^\".*\"$/", $value) || preg_match("/^'.*'$/", $value)) {
+                        $value = mb_substr($value, 1, mb_strlen($value) - 2);
                     }
                     $array[$key] = $value;
                 }
@@ -4735,82 +4712,82 @@ class G
      * disable or enable a variable in ini file, this is useful for editing the env.ini file
      * automatically get the value, and change to inverse value, I mean from true to false and viceversa
      */
-    public function disableEnableINIvariable ($inifile, $variable)
+    public function disableEnableINIvariable($inifile, $variable)
     {
         $enabled = 'false';
-        if (file_exists( $inifile )) {
-            $fp = fopen( $inifile, 'r' );
-            $line = fgets( $fp );
+        if (file_exists($inifile)) {
+            $fp = fopen($inifile, 'r');
+            $line = fgets($fp);
             $found = false;
             $buffer = null;
 
-            while (! feof( $fp )) {
-                $config = G::parse_ini_string( $line );
-                if (isset( $config[$variable] )) {
+            while (! feof($fp)) {
+                $config = G::parse_ini_string($line);
+                if (isset($config[$variable])) {
                     $enabled = $config[$variable];
-                    $buffer .= sprintf( "%s = %d \n", $variable, 1 - $enabled );
+                    $buffer .= sprintf("%s = %d \n", $variable, 1 - $enabled);
                     $found = true;
                 } else {
-                    $buffer .= trim( $line ) . "\n";
+                    $buffer .= trim($line) . "\n";
                 }
-                $line = fgets( $fp );
+                $line = fgets($fp);
             }
-            fclose( $fp );
+            fclose($fp);
             if (! $found) {
-                $buffer .= sprintf( "\n%s = 1 \n", $variable );
+                $buffer .= sprintf("\n%s = 1 \n", $variable);
             }
-            @file_put_contents( $inifile, $buffer );
+            @file_put_contents($inifile, $buffer);
         } else {
-            $contents = file_put_contents( $inifile, sprintf( "\n%s = 1\n", $variable ) );
+            $contents = file_put_contents($inifile, sprintf("\n%s = 1\n", $variable));
         }
     }
 
     /**
      * set a variable in ini file
      */
-    public function setINIvariable ($inifile, $variable, $value)
+    public function setINIvariable($inifile, $variable, $value)
     {
-        if (file_exists( $inifile )) {
-            $fp = fopen( $inifile, 'r' );
-            $line = fgets( $fp );
+        if (file_exists($inifile)) {
+            $fp = fopen($inifile, 'r');
+            $line = fgets($fp);
             $found = false;
             $buffer = null;
 
-            while (! feof( $fp )) {
-                $config = G::parse_ini_string( $line );
-                if (isset( $config[$variable] )) {
+            while (! feof($fp)) {
+                $config = G::parse_ini_string($line);
+                if (isset($config[$variable])) {
                     $enabled = $config[$variable];
-                    $buffer .= sprintf( "%s = %s \n", $variable, $value );
+                    $buffer .= sprintf("%s = %s \n", $variable, $value);
                     $found = true;
                 } else {
-                    $buffer .= trim( $line ) . "\n";
+                    $buffer .= trim($line) . "\n";
                 }
-                $line = fgets( $fp );
+                $line = fgets($fp);
             }
-            fclose( $fp );
+            fclose($fp);
             if (! $found) {
-                $buffer .= sprintf( "\n%s = %s \n", $variable, $value );
+                $buffer .= sprintf("\n%s = %s \n", $variable, $value);
             }
-            file_put_contents( $inifile, $buffer );
+            file_put_contents($inifile, $buffer);
         } else {
-            $contents = file_put_contents( $inifile, sprintf( "\n%s = $s\n", $variable, $value ) );
+            $contents = file_put_contents($inifile, sprintf("\n%s = $s\n", $variable, $value));
         }
     }
 
-    public function write_php_ini ($file, $array)
+    public function write_php_ini($file, $array)
     {
-        $res = array ();
+        $res = array();
         foreach ($array as $key => $val) {
-            if (is_array( $val )) {
+            if (is_array($val)) {
                 $res[] = "[$key]";
                 foreach ($val as $skey => $sval) {
-                    $res[] = "$skey = " . (is_numeric( $sval ) ? $sval : '"' . $sval . '"');
+                    $res[] = "$skey = " . (is_numeric($sval) ? $sval : '"' . $sval . '"');
                 }
             } else {
-                $res[] = "$key = " . (is_numeric( $val ) ? $val : '"' . $val . '"');
+                $res[] = "$key = " . (is_numeric($val) ? $val : '"' . $val . '"');
             }
         }
-        file_put_contents( $file, implode( "\r\n", $res ) );
+        file_put_contents($file, implode("\r\n", $res));
     }
 
     /**
@@ -4820,17 +4797,17 @@ class G
      * @author Erik Amaru Ortiz <erik@colosa.com>
      * @param $resources array a list of files to verify write access
      */
-    public function verifyWriteAccess ($resources)
+    public function verifyWriteAccess($resources)
     {
-        $noWritable = array ();
+        $noWritable = array();
         foreach ($resources as $i => $resource) {
-            if (! is_writable( $resource )) {
+            if (! is_writable($resource)) {
                 $noWritable[] = $resource;
             }
         }
 
-        if (count( $noWritable ) > 0) {
-            $e = new Exception( "Write access not allowed for ProcessMaker resources" );
+        if (count($noWritable) > 0) {
+            $e = new Exception("Write access not allowed for ProcessMaker resources");
             $e->files = $noWritable;
             throw $e;
         }
@@ -4843,13 +4820,13 @@ class G
      * @param $template string containing the template filename on /gulliver/templates/ directory
      * @param $data associative array containig the template data
      */
-    public function renderTemplate ($template, $data = array())
+    public function renderTemplate($template, $data = array())
     {
-        if (! defined( 'PATH_THIRDPARTY' )) {
-            throw new Exception( 'System constant (PATH_THIRDPARTY) is not defined!' );
+        if (! defined('PATH_THIRDPARTY')) {
+            throw new Exception('System constant (PATH_THIRDPARTY) is not defined!');
         }
 
-        $fInfo = pathinfo( $template );
+        $fInfo = pathinfo($template);
 
         $tplExists = true;
 
@@ -4859,26 +4836,26 @@ class G
         }
 
         // fix for template that have dot in its name but is not a valid extension
-        if (isset( $fInfo['extension'] ) && ($fInfo['extension'] != 'tpl' || $fInfo['extension'] != 'html')) {
-            unset( $fInfo['extension'] );
+        if (isset($fInfo['extension']) && ($fInfo['extension'] != 'tpl' || $fInfo['extension'] != 'html')) {
+            unset($fInfo['extension']);
         }
 
-        if (! isset( $fInfo['extension'] )) {
-            if (file_exists( $template . '.tpl' )) {
+        if (! isset($fInfo['extension'])) {
+            if (file_exists($template . '.tpl')) {
                 $template .= '.tpl';
-            } elseif (file_exists( $template . '.html' )) {
+            } elseif (file_exists($template . '.html')) {
                 $template .= '.html';
             } else {
                 $tplExists = false;
             }
         } else {
-            if (! file_exists( $template )) {
+            if (! file_exists($template)) {
                 $tplExists = false;
             }
         }
 
         if (! $tplExists) {
-            throw new Exception( "Template: $template, doesn't exist!" );
+            throw new Exception("Template: $template, doesn't exist!");
         }
 
         $smarty = new Smarty();
@@ -4890,10 +4867,10 @@ class G
         $smarty->force_compile = true;
 
         foreach ($data as $key => $value) {
-            $smarty->assign( $key, $value );
+            $smarty->assign($key, $value);
         }
 
-        $smarty->display( $template );
+        $smarty->display($template);
     }
 
     /**
@@ -4904,12 +4881,12 @@ class G
      * @param $data associative array containig the template data
      * @return $content string containing the parsed template content
      */
-    public function parseTemplate ($template, $data = array())
+    public function parseTemplate($template, $data = array())
     {
         $content = '';
 
         ob_start();
-        G::renderTemplate( $template, $data );
+        G::renderTemplate($template, $data);
         $content = ob_get_contents();
         ob_get_clean();
 
@@ -4925,39 +4902,39 @@ class G
      * @param $file string containing the ini file to update
      * @param $array associative array containing the config data
      */
-    public function update_php_ini ($file, $array)
+    public static function update_php_ini($file, $array)
     {
-        $iniLines = array ();
-        $iniContent = array ();
+        $iniLines = array();
+        $iniContent = array();
 
-        if (file_exists( $file ) && ! is_writable( $file )) {
-            throw new Exception( "File $file, is not writable." );
+        if (file_exists($file) && ! is_writable($file)) {
+            throw new Exception("File $file, is not writable.");
         }
 
-        if (file_exists( $file )) {
-            $iniContent = file( $file );
+        if (file_exists($file)) {
+            $iniContent = file($file);
         }
 
         foreach ($iniContent as $line) {
-            $line = trim( $line );
-            $lineParts = explode( ';', $line );
-            $setting = G::parse_ini_string( $lineParts[0] );
+            $line = trim($line);
+            $lineParts = explode(';', $line);
+            $setting = G::parse_ini_string($lineParts[0]);
 
-            if (is_array( $setting ) && count( $setting ) > 0) {
-                list ($key, ) = array_keys( $setting );
+            if (is_array($setting) && count($setting) > 0) {
+                list($key, ) = array_keys($setting);
 
-                if (isset( $array[$key] )) {
+                if (isset($array[$key])) {
                     $value = $array[$key];
-                    $line = "$key = " . (is_numeric( $value ) ? $value : '"' . $value . '"');
-                    $line .= isset( $lineParts[1] ) ? ' ;' . $lineParts[1] : '';
-                    unset( $array[$key] );
+                    $line = "$key = " . (is_numeric($value) ? $value : '"' . $value . '"');
+                    $line .= isset($lineParts[1]) ? ' ;' . $lineParts[1] : '';
+                    unset($array[$key]);
 
-                    $lastComment = array_pop( $iniLines );
-                    if (strpos( $lastComment, "Setting $key" ) === false) {
+                    $lastComment = array_pop($iniLines);
+                    if (strpos($lastComment, "Setting $key") === false) {
                         $iniLines[] = $lastComment;
                     }
 
-                    $iniLines[] = ";Setting $key - Updated by System on " . date( 'D d M, Y H:i:s' );
+                    $iniLines[] = ";Setting $key - Updated by System on " . date('D d M, Y H:i:s');
                 }
             }
             $iniLines[] = $line;
@@ -4965,20 +4942,20 @@ class G
 
         // inserting new values
         foreach ($array as $key => $value) {
-            $line = "$key = " . (is_numeric( $value ) ? $value : '"' . $value . '"');
+            $line = "$key = " . (is_numeric($value) ? $value : '"' . $value . '"');
             $iniLines[] = '';
-            $iniLines[] = ";Setting $key - Created by System on " . date( 'D d M, Y H:i:s' );
+            $iniLines[] = ";Setting $key - Created by System on " . date('D d M, Y H:i:s');
             $iniLines[] = $line;
         }
 
-        $content = implode( "\r\n", $iniLines );
+        $content = implode("\r\n", $iniLines);
 
-        if (@file_put_contents( $file, $content ) === false) {
-            throw new Exception( "G::update_php_ini() -> can't update file: $file" );
-         } else {
+        if (@file_put_contents($file, $content) === false) {
+            throw new Exception("G::update_php_ini() -> can't update file: $file");
+        } else {
             //first a raw permission check
-            if(fileperms($file) != 33200) {
-                @chmod ($file, 0660);
+            if (fileperms($file) != 33200) {
+                @chmod($file, 0660);
             }
         }
     }
@@ -4986,25 +4963,24 @@ class G
     /**
      * recursive file & directories write permission detect
      *
-     * @author Erik Amaru Ortiz <erik@colosa.com>
      * @licence GPL v2 (http://www.gnu.org/licenses/gpl-2.0.html)
      *
      * @param $path string of directory or file to verify recursively
      * @param $noWritableFiles (alternative) array passed by reference to store all no-writable files
      * @return bool true if all files inside a directory path are writable, false in another case
      */
-    public function is_writable_r ($path, &$noWritableFiles = array())
+    public static function is_writable_r($path, &$noWritableFiles = array())
     {
-        if (is_writable( $path )) {
-            if (! is_dir( $path )) {
+        if (is_writable($path)) {
+            if (! is_dir($path)) {
                 return true;
             }
-            $list = glob( rtrim( $path, DIRECTORY_SEPARATOR ) . DIRECTORY_SEPARATOR . '*' );
+            $list = glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*');
 
             $sw = true;
-            if(is_array($list)){
+            if (is_array($list)) {
                 foreach ($list as $f) {
-                    if (! G::is_writable_r( $f, $noWritableFiles )) {
+                    if (! G::is_writable_r($f, $noWritableFiles)) {
                         $sw = false;
                     }
                 }
@@ -5014,7 +4990,7 @@ class G
 
             return $sw;
         } else {
-            if (! in_array( $path, $noWritableFiles )) {
+            if (! in_array($path, $noWritableFiles)) {
                 $noWritableFiles[] = $path;
             }
             return false;
@@ -5026,110 +5002,110 @@ class G
      *
      * @author Erik Amaru Ortiz <aortiz.erik@gmail.com>
      */
-    public function dispatchRestService ($uri, $config, $apiClassesPath = '')
+    public function dispatchRestService($uri, $config, $apiClassesPath = '')
     {
         require_once 'restler/restler.php';
 
         $rest = new Restler();
-        $rest->setSupportedFormats( 'JsonFormat', 'XmlFormat' );
+        $rest->setSupportedFormats('JsonFormat', 'XmlFormat');
         // getting all services class
-        $restClasses = array ();
-        $restClassesList = G::rglob( '*', 0, PATH_CORE . 'services/' );
+        $restClasses = array();
+        $restClassesList = G::rglob('*', 0, PATH_CORE . 'services/');
         foreach ($restClassesList as $classFile) {
-            if (substr( $classFile, - 4 ) === '.php') {
-                $restClasses[str_replace( '.php', '', basename( $classFile ) )] = $classFile;
+            if (substr($classFile, - 4) === '.php') {
+                $restClasses[str_replace('.php', '', basename($classFile))] = $classFile;
             }
         }
-        if (! empty( $apiClassesPath )) {
-            $pluginRestClasses = array ();
-            $restClassesList = G::rglob( '*', 0, $apiClassesPath . 'services/' );
+        if (! empty($apiClassesPath)) {
+            $pluginRestClasses = array();
+            $restClassesList = G::rglob('*', 0, $apiClassesPath . 'services/');
             foreach ($restClassesList as $classFile) {
-                if (substr( $classFile, - 4 ) === '.php') {
-                    $pluginRestClasses[str_replace( '.php', '', basename( $classFile ) )] = $classFile;
+                if (substr($classFile, - 4) === '.php') {
+                    $pluginRestClasses[str_replace('.php', '', basename($classFile))] = $classFile;
                 }
             }
-            $restClasses = array_merge( $restClasses, $pluginRestClasses );
+            $restClasses = array_merge($restClasses, $pluginRestClasses);
         }
         // hook to get rest api classes from plugins
-        if (class_exists( 'ProcessMaker\Plugins\PluginRegistry' )) {
+        if (class_exists('ProcessMaker\Plugins\PluginRegistry')) {
             $pluginRegistry = PluginRegistry::loadSingleton();
             $pluginClasses = $pluginRegistry->getRegisteredRestServices();
-            $restClasses = array_merge( $restClasses, $pluginClasses );
+            $restClasses = array_merge($restClasses, $pluginClasses);
         }
         foreach ($restClasses as $key => $classFile) {
-            if (! file_exists( $classFile )) {
-                unset( $restClasses[$key] );
+            if (! file_exists($classFile)) {
+                unset($restClasses[$key]);
                 continue;
             }
             //load the file, and check if exist the class inside it.
             require_once $classFile;
             $namespace = 'Services_Rest_';
-            $className = str_replace( '.php', '', basename( $classFile ) );
+            $className = str_replace('.php', '', basename($classFile));
 
             // if the core class does not exists try resolve the for a plugin
-            if (! class_exists( $namespace . $className )) {
+            if (! class_exists($namespace . $className)) {
                 $namespace = 'Plugin_Services_Rest_';
                 // Couldn't resolve the class name, just skipp it
-                if (! class_exists( $namespace . $className )) {
-                    unset( $restClasses[$key] );
+                if (! class_exists($namespace . $className)) {
+                    unset($restClasses[$key]);
                     continue;
                 }
             }
             // verify if there is an auth class implementing 'iAuthenticate'
             $classNameAuth = $namespace . $className;
-            $reflClass = new ReflectionClass( $classNameAuth );
+            $reflClass = new ReflectionClass($classNameAuth);
             // that wasn't from plugin
-            if ($reflClass->implementsInterface( 'iAuthenticate' ) && $namespace != 'Plugin_Services_Rest_') {
+            if ($reflClass->implementsInterface('iAuthenticate') && $namespace != 'Plugin_Services_Rest_') {
                 // auth class found, set as restler authentication class handler
-                $rest->addAuthenticationClass( $classNameAuth );
+                $rest->addAuthenticationClass($classNameAuth);
             } else {
                 // add api class
-                $rest->addAPIClass( $classNameAuth );
+                $rest->addAPIClass($classNameAuth);
             }
         }
         //end foreach rest class
         // resolving the class for current request
-        $uriPart = explode( '/', $uri );
+        $uriPart = explode('/', $uri);
         $requestedClass = '';
-        if (isset( $uriPart[1] )) {
-            $requestedClass = ucfirst( $uriPart[1] );
+        if (isset($uriPart[1])) {
+            $requestedClass = ucfirst($uriPart[1]);
         }
-        if (class_exists( 'Services_Rest_' . $requestedClass )) {
+        if (class_exists('Services_Rest_' . $requestedClass)) {
             $namespace = 'Services_Rest_';
-        } elseif (class_exists( 'Plugin_Services_Rest_' . $requestedClass )) {
+        } elseif (class_exists('Plugin_Services_Rest_' . $requestedClass)) {
             $namespace = 'Plugin_Services_Rest_';
         } else {
             $namespace = '';
         }
         // end resolv.
         // Send additional headers (if exists) configured on rest-config.ini
-        if (array_key_exists( 'HEADERS', $config )) {
+        if (array_key_exists('HEADERS', $config)) {
             foreach ($config['HEADERS'] as $name => $value) {
-                header( "$name: $value" );
+                header("$name: $value");
             }
         }
         // to handle a request with "OPTIONS" method
-        if (! empty( $namespace ) && $_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
-            $reflClass = new ReflectionClass( $namespace . $requestedClass );
+        if (! empty($namespace) && $_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
+            $reflClass = new ReflectionClass($namespace . $requestedClass);
             // if the rest class has not a "options" method
-            if (! $reflClass->hasMethod( 'options' )) {
-                header( 'Access-Control-Allow-Methods: GET, POST, PUT, DELETE, OPTIONS, HEADERS' );
-                header( 'Access-Control-Allow-Headers: authorization, content-type' );
-                header( "Access-Control-Allow-Credentials", "false" );
-                header( 'Access-Control-Max-Age: 60' );
+            if (! $reflClass->hasMethod('options')) {
+                header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE, OPTIONS, HEADERS');
+                header('Access-Control-Allow-Headers: authorization, content-type');
+                header("Access-Control-Allow-Credentials", "false");
+                header('Access-Control-Max-Age: 60');
                 exit();
             }
         }
         // override global REQUEST_URI to pass to Restler library
-        $_SERVER['REQUEST_URI'] = '/' . strtolower( $namespace ) . ltrim( $uri, '/' );
+        $_SERVER['REQUEST_URI'] = '/' . strtolower($namespace) . ltrim($uri, '/');
         // handle the rest request
         $rest->handle();
     }
 
-    public static function reservedWordsSql ()
+    public static function reservedWordsSql()
     {
         //Reserved words SQL
-        $reservedWordsSql = array ("ACCESSIBLE","ACTION","ADD","ALL","ALTER","ANALYZE","AND","ANY","AS","ASC","ASENSITIVE","AUTHORIZATION","BACKUP","BEFORE","BEGIN","BETWEEN","BIGINT","BINARY","BIT","BLOB","BOTH","BREAK","BROWSE","BULK","BY","CALL","CASCADE","CASE","CHANGE","CHAR","CHARACTER","CHECK","CHECKPOINT","CLOSE","CLUSTERED","COALESCE","COLLATE","COLUMN","COMMIT","COMPUTE","CONDITION","CONSTRAINT","CONTAINS","CONTAINSTABLE","CONTINUE","CONVERT","CREATE","CROSS","CURRENT","CURRENT_DATE","CURRENT_TIME","CURRENT_TIMESTAMP","CURRENT_USER","CURSOR","DATABASE","DATABASES","DATE","DAY_HOUR","DAY_MICROSECOND","DAY_MINUTE","DAY_SECOND","DBCC","DEALLOCATE","DEC","DECIMAL","DECLARE","DEFAULT","DELAYED","DELETE","DENY","DESC","DESCRIBE","DETERMINISTIC","DISK","DISTINCT","DISTINCTROW",
+        $reservedWordsSql = array("ACCESSIBLE","ACTION","ADD","ALL","ALTER","ANALYZE","AND","ANY","AS","ASC","ASENSITIVE","AUTHORIZATION","BACKUP","BEFORE","BEGIN","BETWEEN","BIGINT","BINARY","BIT","BLOB","BOTH","BREAK","BROWSE","BULK","BY","CALL","CASCADE","CASE","CHANGE","CHAR","CHARACTER","CHECK","CHECKPOINT","CLOSE","CLUSTERED","COALESCE","COLLATE","COLUMN","COMMIT","COMPUTE","CONDITION","CONSTRAINT","CONTAINS","CONTAINSTABLE","CONTINUE","CONVERT","CREATE","CROSS","CURRENT","CURRENT_DATE","CURRENT_TIME","CURRENT_TIMESTAMP","CURRENT_USER","CURSOR","DATABASE","DATABASES","DATE","DAY_HOUR","DAY_MICROSECOND","DAY_MINUTE","DAY_SECOND","DBCC","DEALLOCATE","DEC","DECIMAL","DECLARE","DEFAULT","DELAYED","DELETE","DENY","DESC","DESCRIBE","DETERMINISTIC","DISK","DISTINCT","DISTINCTROW",
                         "DISTRIBUTED","DIV","DOUBLE","DROP","DUAL","DUMMY","DUMP","EACH","ELSE","ELSEIF","ENCLOSED","END","ENUM","ERRLVL","ESCAPE","ESCAPED","EXCEPT","EXEC","EXECUTE","EXISTS","EXIT","EXPLAIN","FALSE","FETCH","FILE","FILLFACTOR","FLOAT","FLOAT4","FLOAT8","FOR","FORCE","FOREIGN","FREETEXT","FREETEXTTABLE","FROM","FULL","FULLTEXT","FUNCTION","GENERAL","GOTO","GRANT","GROUP","HAVING","HIGH_PRIORITY","HOLDLOCK","HOUR_MICROSECOND","HOUR_MINUTE","HOUR_SECOND","IDENTITY","IDENTITYCOL","IDENTITY_INSERT","IF","IGNORE","IGNORE_SERVER_IDS","IN","INDEX","INFILE","INNER","INOUT","INSENSITIVE","INSERT","INT","INT1","INT2","INT3","INT4","INT8","INTEGER","INTERSECT","INTERVAL","INTO","IS","ITERATE","JOIN","KEY","KEYS","KILL","LEADING","LEAVE","LEFT","LIKE","LIMIT","LINEAR","LINENO","LINES",
                         "LOAD","LOCALTIME","LOCALTIMESTAMP","LOCK","LONG","LONGBLOB","LONGTEXT","LOOP","LOW_PRIORITY","MASTER_HEARTBEAT_PERIOD","MASTER_SSL_VERIFY_SERVER_CERT","MATCH","MAXVALUE","MEDIUMBLOB","MEDIUMINT","MEDIUMTEXT","MIDDLEINT","MINUTE_MICROSECOND","MINUTE_SECOND","MOD","MODIFIES","NATIONAL","NATURAL","NO","NOCHECK","NONCLUSTERED","NOT","NO_WRITE_TO_BINLOG","NULL","NULLIF","NUMERIC","OF","OFF","OFFSETS","ON","OPEN","OPENDATASOURCE","OPENQUERY","OPENROWSET","OPENXML","OPTIMIZE","OPTION","OPTIONALLY","OR","ORDER","OUT","OUTER","OUTFILE","OVER","PERCENT","PLAN","PRECISION","PRIMARY","PRINT","PROC","PROCEDURE","PUBLIC","PURGE","RAISERROR","RANGE","READ","READS","READTEXT","READ_WRITE","REAL","RECONFIGURE","REFERENCES","REGEXP","RELEASE","RENAME","REPEAT","REPLACE",
                         "REPLICATION","REQUIRE","RESIGNAL","RESTORE","RESTRICT","RETURN","REVOKE","RIGHT","RLIKE","ROLLBACK","ROWCOUNT","ROWGUIDCOL","RULE","SAVE","SCHEMA","SCHEMAS","SECOND_MICROSECOND","SELECT","SENSITIVE","SEPARATOR","SESSION_USER","SET","SETUSER","SHOW","SHUTDOWN","SIGNAL","SLOW","SMALLINT","SOME","SPATIAL","SPECIFIC","SQL","SQLEXCEPTION","SQLSTATE","SQLWARNING","SQL_BIG_RESULT","SQL_CALC_FOUND_ROWS","SQL_SMALL_RESULT","SSL","STARTING","STATISTICS","STRAIGHT_JOIN","SYSTEM_USER","TABLE","TERMINATED","TEXT","TEXTSIZE","THEN","TIME","TIMESTAMP","TINYBLOB","TINYINT","TINYTEXT","TO","TOP","TRAILING","TRAN","TRANSACTION","TRIGGER","TRUE","TRUNCATE","TSEQUAL","UNDO","UNION","UNIQUE","UNLOCK","UNSIGNED","UPDATE","UPDATETEXT","USAGE","USE","USER","USING","UTC_DATE","UTC_TIME",
@@ -5157,11 +5133,11 @@ class G
         $fileCheck = PATH_DATA."UPDATE.dat";
         if ($setFlag == 0) {
             if (file_exists($fileCheck)) {
-                unlink ($fileCheck);
+                unlink($fileCheck);
             }
         } elseif ($setFlag == 1) {
-            $fp = fopen($fileCheck,'w');
-            $line = fputs($fp,$content);
+            $fp = fopen($fileCheck, 'w');
+            $line = fputs($fp, $content);
         }
         //checking temporary file
         if ($setFlag >= 1) {
@@ -5372,7 +5348,6 @@ class G
                 if (isset($_SESSION["currentSkin"])) {
                     $skin = $_SESSION["currentSkin"];
                 } else {
-
                     if (isset($sysConf["default_skin"])) {
                         $skin = $sysConf["default_skin"];
                     }
@@ -5402,7 +5377,8 @@ class G
         return $path;
     }
 
-    public function isUserFunction($functionName) {
+    public function isUserFunction($functionName)
+    {
         $allFunctions = get_defined_functions();
         if (!isset($allFunctions['user'])) {
             $allFunctions['user'] = array();
@@ -5423,8 +5399,7 @@ class G
       */
     public function sanitizeInput($data, $tagsArray = array(), $attrArray = array(), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1)
     {
-
-        $filtro = new InputFilter($tagsArray , $attrArray, $tagsMethod, $attrMethod, $xssAuto);
+        $filtro = new InputFilter($tagsArray, $attrArray, $tagsMethod, $attrMethod, $xssAuto);
         return $filtro->process($data);
     }
 
@@ -5506,7 +5481,8 @@ class G
         return $arrayData;
     }
 
-    public static function buildFrom($configuration, $from = '') {
+    public static function buildFrom($configuration, $from = '')
+    {
         if (!isset($configuration['MESS_FROM_NAME'])) {
             $configuration['MESS_FROM_NAME'] = '';
         }
@@ -5517,7 +5493,7 @@ class G
             if (!preg_match('/(.+)@(.+)\.(.+)/', $from, $match)) {
                 if ($configuration['MESS_FROM_MAIL'] != '') {
                     $from .= ' <' . $configuration['MESS_FROM_MAIL'] . '>';
-                } else if ($configuration['MESS_ENGINE'] == 'PHPMAILER' && preg_match('/(.+)@(.+)\.(.+)/', $configuration['MESS_ACCOUNT'], $match)) {
+                } elseif ($configuration['MESS_ENGINE'] == 'PHPMAILER' && preg_match('/(.+)@(.+)\.(.+)/', $configuration['MESS_ACCOUNT'], $match)) {
                     $from .= ' <' . $configuration['MESS_ACCOUNT'] . '>';
                 } else {
                     $from .= ' <info@' . ((isset($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] != '')? $_SERVER['HTTP_HOST'] : 'processmaker.com') . '>';
@@ -5526,15 +5502,15 @@ class G
         } else {
             if ($configuration['MESS_FROM_NAME'] != '' && $configuration['MESS_FROM_MAIL'] != '') {
                 $from = $configuration['MESS_FROM_NAME'] . ' <' . $configuration['MESS_FROM_MAIL'] . '>';
-            } else if ($configuration['MESS_FROM_NAME'] != '' && $configuration['MESS_ENGINE'] == 'PHPMAILER' && preg_match('/(.+)@(.+)\.(.+)/', $configuration['MESS_ACCOUNT'], $match)) {
+            } elseif ($configuration['MESS_FROM_NAME'] != '' && $configuration['MESS_ENGINE'] == 'PHPMAILER' && preg_match('/(.+)@(.+)\.(.+)/', $configuration['MESS_ACCOUNT'], $match)) {
                 $from = $configuration['MESS_FROM_NAME'] . ' <' . $configuration['MESS_ACCOUNT'] . '>';
-            } else if ($configuration['MESS_FROM_NAME'] != '') {
+            } elseif ($configuration['MESS_FROM_NAME'] != '') {
                 $from = $configuration['MESS_FROM_NAME'] . ' <info@' . ((isset($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] != '')? $_SERVER['HTTP_HOST'] : 'processmaker.com') . '>';
-            } else if ($configuration['MESS_FROM_MAIL'] != '') {
+            } elseif ($configuration['MESS_FROM_MAIL'] != '') {
                 $from = $configuration['MESS_FROM_MAIL'];
-            } else if ($configuration['MESS_ENGINE'] == 'PHPMAILER' && preg_match('/(.+)@(.+)\.(.+)/', $configuration['MESS_ACCOUNT'], $match)) {
+            } elseif ($configuration['MESS_ENGINE'] == 'PHPMAILER' && preg_match('/(.+)@(.+)\.(.+)/', $configuration['MESS_ACCOUNT'], $match)) {
                 $from = $configuration['MESS_ACCOUNT'];
-            } else if ($configuration['MESS_ENGINE'] == 'PHPMAILER' && $configuration['MESS_ACCOUNT'] != '' && !preg_match('/(.+)@(.+)\.(.+)/', $configuration['MESS_ACCOUNT'], $match)) {
+            } elseif ($configuration['MESS_ENGINE'] == 'PHPMAILER' && $configuration['MESS_ACCOUNT'] != '' && !preg_match('/(.+)@(.+)\.(.+)/', $configuration['MESS_ACCOUNT'], $match)) {
                 $from = $configuration['MESS_ACCOUNT'] . ' <info@' . ((isset($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] != '')? $_SERVER['HTTP_HOST'] : 'processmaker.com') . '>';
             } else {
                 $from = 'info@' . ((isset($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] != '')? $_SERVER['HTTP_HOST'] : 'processmaker.com');
@@ -5543,17 +5519,18 @@ class G
         return $from;
     }
 
-    public function getRealExtension($extensionInpDoc) {
+    public function getRealExtension($extensionInpDoc)
+    {
         $aux = explode('.', strtolower($extensionInpDoc));
         return isset($aux[1]) ? $aux[1] : '';
     }
 
-   /**
-    * Verify the InputDoc extension, cheking the file name extension (.pdf, .ppt) and the file content.
-    *
-    *
-    *
-    */
+    /**
+     * Verify the InputDoc extension, cheking the file name extension (.pdf, .ppt) and the file content.
+     *
+     *
+     *
+     */
     public function verifyInputDocExtension($InpDocAllowedFiles, $fileName, $filesTmpName)
     {
         // Initialize variables
@@ -5583,7 +5560,7 @@ class G
         $validExtension = in_array($fileExtension, $allowedTypes);
         if (!$validExtension) {
             $res->status = false;
-            $res->message = G::LoadTranslation('ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION' ) . ' ' . $fileName;
+            $res->message = G::LoadTranslation('ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION') . ' ' . $fileName;
             return $res;
         }
 
@@ -5595,7 +5572,7 @@ class G
 
         // If enabled fileinfo extension check the content
         $finfo = new finfo(FILEINFO_MIME_TYPE);
-        $mimeType = $finfo->file($filesTmpName);    
+        $mimeType = $finfo->file($filesTmpName);
         $docType = explode('/', $mimeType);
 
         // If is a empty file finish validation
@@ -5712,10 +5689,9 @@ class G
 
         // If content don't match return error
         if (!$res->status) {
-            $res->message = G::LoadTranslation('ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION' ) . ' ' . $fileName;
+            $res->message = G::LoadTranslation('ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION') . ' ' . $fileName;
         }
         return $res;
-
     }
 
     /**
@@ -5757,33 +5733,33 @@ class G
      */
     public function sanitizeString ($string, $lowercase = true, $alpha = false)
     {
-       $strip = array("~", "`", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "=", "+", "[", "{", "]",
+        $strip = array("~", "`", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "=", "+", "[", "{", "]",
                       "}", "\\", "|", ";", ":", "\"", "'", "&#8216;", "&#8217;", "&#8220;", "&#8221;", "&#8211;", "&#8212;",
                       "—", "–", ",", "<", ".", ">", "/", "?");
-       $clean = trim(str_replace($strip, "", strip_tags($string)));
-       $clean = preg_replace('/\s+/', "-", $clean);
-       $clean = ($alpha) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean ;
-       $clean = ($lowercase) ? (function_exists('mb_strtolower')) ? mb_strtolower($clean, 'UTF-8') : strtolower($clean) : $clean;
-       return $clean;
-   }
-   /**
-    * Out the result
-    *
-    * @param string $sVar
-    *
-    * @return showRes($string)
-    */
-    public static function outRes ($sInfVar)
+        $clean = trim(str_replace($strip, "", strip_tags($string)));
+        $clean = preg_replace('/\s+/', "-", $clean);
+        $clean = ($alpha) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean ;
+        $clean = ($lowercase) ? (function_exists('mb_strtolower')) ? mb_strtolower($clean, 'UTF-8') : strtolower($clean) : $clean;
+        return $clean;
+    }
+    /**
+     * Out the result
+     *
+     * @param string $sVar
+     *
+     * @return showRes($string)
+     */
+    public static function outRes($sInfVar)
     {
         echo $sInfVar;
     }
-   /**
-    * encryptOld
-    *
-    * @param string $string
-    *
-    * @return md5($string)
-    */
+    /**
+     * encryptOld
+     *
+     * @param string $string
+     *
+     * @return md5($string)
+     */
     public static function encryptOld($string)
     {
         $consthashFx = self::hashFx;
@@ -5808,7 +5784,7 @@ class G
     *
     * @return md5_file($string)
     */
-    public function encryptFileOld ($string)
+    public function encryptFileOld($string)
     {
         $consthashFx = self::hashFile;
         return $consthashFx($string);
@@ -5820,7 +5796,7 @@ class G
     *
     * @return crc32($string)
     */
-    public static function encryptCrc32 ($string)
+    public static function encryptCrc32($string)
     {
         $consthashFx = self::hashCrc;
         return $consthashFx($string);
@@ -5865,7 +5841,10 @@ class G
                 (empty($sError)) ? 'TriggerExecution' : 'TriggerExecutionError',
                 (empty($sError)) ? 200 : 400,
                 (empty($sError)) ? 'Trigger Execution' : 'Trigger Execution Error',
-                $lg, $lg['workspace'], 'processmaker.log');
+                $lg,
+                $lg['workspace'],
+                'processmaker.log'
+            );
 
             $_SESSION['_DATA_TRIGGER_']['_TRI_LOG_'] = true;
         }
@@ -5879,7 +5858,7 @@ class G
     {
         //Moved from Enterprise class.
         if (file_exists(PATH_METHODS . "login/version-pmos.php")) {
-            include (PATH_METHODS . "login/version-pmos.php");
+            include(PATH_METHODS . "login/version-pmos.php");
         }
         //Removed default version from code.
         
@@ -5916,7 +5895,7 @@ class G
      * Instanciate an adapter by name.
      *
      * @param string $name Adapter name or class name                                                                                                     :P
-     * 
+     *
      * @param string[] $parameters Constructor parameters
      */
     public static function factory($name, ...$parameters)
diff --git a/gulliver/system/class.headPublisher.php b/gulliver/system/class.headPublisher.php
index 0f0503c61..8204a05e0 100644
--- a/gulliver/system/class.headPublisher.php
+++ b/gulliver/system/class.headPublisher.php
@@ -96,7 +96,7 @@ class headPublisher
         $this->addScriptCode(' var __usernameLogged__ = "' . (isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '') . '";var SYS_LANG = "' . SYS_LANG . '";');
     }
 
-    public function &getSingleton()
+    public static function &getSingleton()
     {
         if (self::$instance == null) {
             self::$instance = new headPublisher();
@@ -360,7 +360,7 @@ class headPublisher
         //$head .= $this->getExtJsStylesheets();
         $head .= $this->getExtJsScripts();
         $head .= $this->getExtJsVariablesScript();
-        $oServerConf = & ServerConf::getSingleton();
+        $oServerConf = ServerConf::getSingleton();
         if ($oServerConf->isRtl(SYS_LANG)) {
             $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/extjs_rtl.js") . "\"></script>\n";
         }
@@ -752,7 +752,7 @@ class headPublisher
         $views = array();
         $keyState = "extJsViewState";
         $prefixExtJs = "ys-";
-        $oServerConf = &ServerConf::getSingleton();
+        $oServerConf = ServerConf::getSingleton();
         $deleteCache = true;
 
         $sjson = $oServerConf->getProperty($keyState);
diff --git a/gulliver/system/class.httpProxyController.php b/gulliver/system/class.httpProxyController.php
index 84ffbfab1..8f4bdc04f 100644
--- a/gulliver/system/class.httpProxyController.php
+++ b/gulliver/system/class.httpProxyController.php
@@ -14,7 +14,7 @@ class HttpProxyController
      *
      * @var array - private array to store proxy data
      */
-    private $__data__ = array ();
+    private $__data__ = array();
 
     /**
      *
@@ -26,7 +26,8 @@ class HttpProxyController
 
     private $sendResponse = true;
 
-    public function __construct() {
+    public function __construct()
+    {
         $this->__request__ = new stdclass();
     }
 
@@ -36,7 +37,7 @@ class HttpProxyController
      * @param string $name
      * @param string $value
      */
-    public function __set ($name, $value)
+    public function __set($name, $value)
     {
         //echo "Setting '$name' to '$value'\n";
         $this->__data__[$name] = $value;
@@ -48,10 +49,10 @@ class HttpProxyController
      * @param string $name
      * @return string or NULL if the internal var doesn't exist
      */
-    public function __get ($name)
+    public function __get($name)
     {
         //echo "Getting '$name'\n";
-        if (array_key_exists( $name, $this->__data__ )) {
+        if (array_key_exists($name, $this->__data__)) {
             return $this->__data__[$name];
         }
 
@@ -69,10 +70,10 @@ class HttpProxyController
      *
      * @param string $name
      */
-    public function __isset ($name)
+    public function __isset($name)
     {
         //echo "Is '$name' set?\n";
-        return isset( $this->__data__[$name] );
+        return isset($this->__data__[$name]);
     }
 
     /**
@@ -80,10 +81,10 @@ class HttpProxyController
      *
      * @param string $name
      */
-    public function __unset ($name)
+    public function __unset($name)
     {
         //echo "Unsetting '$name'\n";
-        unset( $this->__data__[$name] );
+        unset($this->__data__[$name]);
     }
 
     /**
@@ -91,11 +92,11 @@ class HttpProxyController
      *
      * @param string $name
      */
-    public function call ($name)
+    public function call($name)
     {
         $result = new stdClass();
         try {
-            $result = $this->$name( $this->__request__ );
+            $result = $this->$name($this->__request__);
 
             if (! $this->jsonResponse) {
                 return null;
@@ -104,11 +105,10 @@ class HttpProxyController
             if (! $result) {
                 $result = $this->__data__;
             }
-
         } catch (Exception $e) {
             $result->success = false;
             $result->message = $result->msg = $e->getMessage();
-            switch (get_class( $e )) {
+            switch (get_class($e)) {
                 case 'Exception':
                     $error = "SYSTEM ERROR";
                     break;
@@ -124,13 +124,13 @@ class HttpProxyController
             }
             $result->error = $e->getMessage();
             $result->exception = new stdClass();
-            $result->exception->class = get_class( $e );
+            $result->exception->class = get_class($e);
             $result->exception->code = $e->getCode();
             $result->exception->trace = $e->getTraceAsString();
         }
 
         if ($this->sendResponse) {
-            print G::json_encode( $result );
+            print G::json_encode($result);
         }
     }
 
@@ -139,18 +139,18 @@ class HttpProxyController
      *
      * @param array $data
      */
-    public function setHttpRequestData ($data)
+    public function setHttpRequestData($data)
     {
-        if (is_array( $data )) {
-            while ($var = each( $data )) {
-                $this->__request__->$var['key'] = $var['value'];
+        if (is_array($data)) {
+            while ($var = each($data)) {
+                $this->__request__->{$var['key']} = $var['value'];
             }
         } else {
             $this->__request__ = $data;
         }
     }
 
-    public function setJsonResponse ($bool)
+    public function setJsonResponse($bool)
     {
         $this->jsonResponse = $bool;
     }
@@ -160,9 +160,8 @@ class HttpProxyController
      *
      * @param boolean $val
      */
-    public function setSendResponse ($val)
+    public function setSendResponse($val)
     {
         $this->sendResponse = $val;
     }
 }
-
diff --git a/gulliver/system/class.inputfilter.php b/gulliver/system/class.inputfilter.php
index 60cbfe689..1a27eadba 100644
--- a/gulliver/system/class.inputfilter.php
+++ b/gulliver/system/class.inputfilter.php
@@ -1,15 +1,15 @@
 <?php
 
 /** @class: InputFilter (PHP4 & PHP5, with comments)
-  * @project: PHP Input Filter
-  * @date: 10-05-2005
-  * @version: 1.2.2_php4/php5
-  * @author: Daniel Morris
-  * @contributors: Gianpaolo Racca, Ghislain Picard, Marco Wandschneider, Chris Tobin and Andrew Eddie.
-  * @copyright: Daniel Morris
-  * @email: dan@rootcube.com
-  * @license: GNU General Public License (GPL)
-  */
+ * @project: PHP Input Filter
+ * @date: 10-05-2005
+ * @version: 1.2.2_php4/php5
+ * @author: Daniel Morris
+ * @contributors: Gianpaolo Racca, Ghislain Picard, Marco Wandschneider, Chris Tobin and Andrew Eddie.
+ * @copyright: Daniel Morris
+ * @email: dan@rootcube.com
+ * @license: GNU General Public License (GPL)
+ */
 class InputFilter
 {
     public $tagsArray;// default = empty array
@@ -22,15 +22,15 @@ class InputFilter
     public $tagBlacklist = array('applet', 'body', 'bgsound', 'base', 'basefont', 'embed', 'frame', 'frameset', 'head', 'html', 'id', 'iframe', 'ilayer', 'layer', 'link', 'meta', 'name', 'object', 'script', 'style', 'title', 'xml');
     public $attrBlacklist = array('action', 'background', 'codebase', 'dynsrc', 'lowsrc');  // also will strip ALL event handlers
 
-    /** 
-      * Constructor for inputFilter class. Only first parameter is required.
-      * @access constructor
-      * @param Array $tagsArray - list of user-defined tags
-      * @param Array $attrArray - list of user-defined attributes
-      * @param int $tagsMethod - 0= allow just user-defined, 1= allow all but user-defined
-      * @param int $attrMethod - 0= allow just user-defined, 1= allow all but user-defined
-      * @param int $xssAuto - 0= only auto clean essentials, 1= allow clean blacklisted tags/attr
-      */
+    /**
+     * Constructor for inputFilter class. Only first parameter is required.
+     * @access constructor
+     * @param Array $tagsArray - list of user-defined tags
+     * @param Array $attrArray - list of user-defined attributes
+     * @param int $tagsMethod - 0= allow just user-defined, 1= allow all but user-defined
+     * @param int $attrMethod - 0= allow just user-defined, 1= allow all but user-defined
+     * @param int $xssAuto - 0= only auto clean essentials, 1= allow clean blacklisted tags/attr
+     */
     public function inputFilter($tagsArray = array(), $attrArray = array(), $tagsMethod = 0, $attrMethod = 0, $xssAuto = 1)
     {
         // make sure user defined arrays are in lowercase
@@ -41,19 +41,19 @@ class InputFilter
             $attrArray[$i] = strtolower($attrArray[$i]);
         }
         // assign to member vars
-        $this->tagsArray = (array) $tagsArray;
-        $this->attrArray = (array) $attrArray;
+        $this->tagsArray = (array)$tagsArray;
+        $this->attrArray = (array)$attrArray;
         $this->tagsMethod = $tagsMethod;
         $this->attrMethod = $attrMethod;
         $this->xssAuto = $xssAuto;
     }
 
-    /** 
-      * Method to be called by another php script. Processes for XSS and specified bad code.
-      * @access public
-      * @param Mixed $source - input string/array-of-string to be 'cleaned'
-      * @return String $source - 'cleaned' version of input parameter
-      */
+    /**
+     * Method to be called by another php script. Processes for XSS and specified bad code.
+     * @access public
+     * @param Mixed $source - input string/array-of-string to be 'cleaned'
+     * @return String $source - 'cleaned' version of input parameter
+     */
     public function process($source)
     {
         // clean all elements in this array
@@ -75,15 +75,15 @@ class InputFilter
         }
     }
 
-    /** 
-      * Internal method to iteratively remove all unwanted tags and attributes
-      * @access protected
-      * @param String $source - input string to be 'cleaned'
-      * @return String $source - 'cleaned' version of input parameter
-      */
+    /**
+     * Internal method to iteratively remove all unwanted tags and attributes
+     * @access protected
+     * @param String $source - input string to be 'cleaned'
+     * @return String $source - 'cleaned' version of input parameter
+     */
     public function remove($source)
     {
-        $loopCounter=0;
+        $loopCounter = 0;
         // provides nested-tag protection
         while ($source != $this->filterTags($source)) {
             $source = $this->filterTags($source);
@@ -92,12 +92,12 @@ class InputFilter
         return $source;
     }
 
-    /** 
-      * Internal method to strip a string of certain tags
-      * @access protected
-      * @param String $source - input string to be 'cleaned'
-      * @return String $source - 'cleaned' version of input parameter
-      */
+    /**
+     * Internal method to strip a string of certain tags
+     * @access protected
+     * @param String $source - input string to be 'cleaned'
+     * @return String $source - 'cleaned' version of input parameter
+     */
     public function filterTags($source)
     {
         // filter pass setup
@@ -119,8 +119,8 @@ class InputFilter
             // next start of tag (for nested tag assessment)
             $tagOpen_nested = strpos($fromTagOpen, '<');
             if (($tagOpen_nested !== false) && ($tagOpen_nested < $tagOpen_end)) {
-                $preTag .= substr($postTag, 0, ($tagOpen_nested+1));
-                $postTag = substr($postTag, ($tagOpen_nested+1));
+                $preTag .= substr($postTag, 0, ($tagOpen_nested + 1));
+                $postTag = substr($postTag, ($tagOpen_nested + 1));
                 $tagOpen_start = strpos($postTag, '<');
                 continue;
             }
@@ -146,7 +146,7 @@ class InputFilter
                 list($tagName) = explode(' ', $currentTag);
             }
             // excludes all "non-regular" tagnames OR no tagname OR remove if xssauto is on and tag is blacklisted
-            if ((!preg_match("/^[a-z][a-z0-9]*$/i",$tagName)) || (!$tagName) || ((in_array(strtolower($tagName), $this->tagBlacklist)) && ($this->xssAuto))) {
+            if ((!preg_match("/^[a-z][a-z0-9]*$/i", $tagName)) || (!$tagName) || ((in_array(strtolower($tagName), $this->tagBlacklist)) && ($this->xssAuto))) {
                 $postTag = substr($postTag, ($tagLength + 2));
                 $tagOpen_start = strpos($postTag, '<');
                 // don't append this tag
@@ -154,15 +154,15 @@ class InputFilter
             }
             // this while is needed to support attribute values with spaces in!
             while ($currentSpace !== false) {
-                $fromSpace = substr($tagLeft, ($currentSpace+1));
+                $fromSpace = substr($tagLeft, ($currentSpace + 1));
                 $nextSpace = strpos($fromSpace, ' ');
                 $openQuotes = strpos($fromSpace, '"');
-                $closeQuotes = strpos(substr($fromSpace, ($openQuotes+1)), '"') + $openQuotes + 1;
+                $closeQuotes = strpos(substr($fromSpace, ($openQuotes + 1)), '"') + $openQuotes + 1;
                 // another equals exists
                 if (strpos($fromSpace, '=') !== false) {
                     // opening and closing quotes exists
-                    if (($openQuotes !== false) && (strpos(substr($fromSpace, ($openQuotes+1)), '"') !== false)) {
-                        $attr = substr($fromSpace, 0, ($closeQuotes+1));
+                    if (($openQuotes !== false) && (strpos(substr($fromSpace, ($openQuotes + 1)), '"') !== false)) {
+                        $attr = substr($fromSpace, 0, ($closeQuotes + 1));
                     } else {
                         // one or neither exist
                         $attr = substr($fromSpace, 0, $nextSpace);
@@ -212,17 +212,17 @@ class InputFilter
         return $preTag;
     }
 
-    /** 
-      * Internal method to strip a tag of certain attributes
-      * @access protected
-      * @param Array $attrSet
-      * @return Array $newSet
-      */
+    /**
+     * Internal method to strip a tag of certain attributes
+     * @access protected
+     * @param Array $attrSet
+     * @return Array $newSet
+     */
     public function filterAttr($attrSet)
     {
         $newSet = array();
         // process attributes
-        for ($i = 0; $i <count($attrSet); $i++) {
+        for ($i = 0; $i < count($attrSet); $i++) {
             // skip blank spaces in tag
             if (!$attrSet[$i]) {
                 continue;
@@ -231,7 +231,7 @@ class InputFilter
             $attrSubSet = explode('=', trim($attrSet[$i]));
             list($attrSubSet[0]) = explode(' ', $attrSubSet[0]);
             // removes all "non-regular" attr names AND also attr blacklisted
-            if ((!eregi("^[a-z]*$",$attrSubSet[0])) || (($this->xssAuto) && ((in_array(strtolower($attrSubSet[0]), $this->attrBlacklist)) || (substr($attrSubSet[0], 0, 2) == 'on')))) {
+            if ((!preg_match("/^[a-z]*$/i", $attrSubSet[0])) || (($this->xssAuto) && ((in_array(strtolower($attrSubSet[0]), $this->attrBlacklist)) || (substr($attrSubSet[0], 0, 2) == 'on')))) {
                 continue;
             }
             // xss attr value filtering
@@ -250,12 +250,12 @@ class InputFilter
                 $attrSubSet[1] = stripslashes($attrSubSet[1]);
             }
             // auto strip attr's with "javascript:
-            if (((strpos(strtolower($attrSubSet[1]), 'expression') !== false) &&(strtolower($attrSubSet[0]) == 'style')) ||
-                    (strpos(strtolower($attrSubSet[1]), 'javascript:') !== false) ||
-                    (strpos(strtolower($attrSubSet[1]), 'behaviour:') !== false) ||
-                    (strpos(strtolower($attrSubSet[1]), 'vbscript:') !== false) ||
-                    (strpos(strtolower($attrSubSet[1]), 'mocha:') !== false) ||
-                    (strpos(strtolower($attrSubSet[1]), 'livescript:') !== false)
+            if (((strpos(strtolower($attrSubSet[1]), 'expression') !== false) && (strtolower($attrSubSet[0]) == 'style')) ||
+                (strpos(strtolower($attrSubSet[1]), 'javascript:') !== false) ||
+                (strpos(strtolower($attrSubSet[1]), 'behaviour:') !== false) ||
+                (strpos(strtolower($attrSubSet[1]), 'vbscript:') !== false) ||
+                (strpos(strtolower($attrSubSet[1]), 'mocha:') !== false) ||
+                (strpos(strtolower($attrSubSet[1]), 'livescript:') !== false)
             ) {
                 continue;
             }
@@ -279,30 +279,34 @@ class InputFilter
         return $newSet;
     }
 
-    /** 
-      * Try to convert to plaintext
-      * @access protected
-      * @param String $source
-      * @return String $source
-      */
+    /**
+     * Try to convert to plaintext
+     * @access protected
+     * @param String $source
+     * @return String $source
+     */
     public function decode($source)
     {
         // url decode
         $source = html_entity_decode($source, ENT_QUOTES, "ISO-8859-1");
         // convert decimal
-        $source = preg_replace('/&#(\d+);/me',"chr(\\1)", $source);// decimal notation
+        $source = preg_replace_callback('/&#(\d+);/m', function ($matches) {
+            return utf8_encode(chr($matches[1]));
+        }, $source);// decimal notation
         // convert hex
-        $source = preg_replace('/&#x([a-f0-9]+);/mei',"chr(0x\\1)", $source);// hex notation
+        $source = preg_replace_callback('/&#x([a-f0-9]+);/mi', function ($matches) {
+            return utf8_encode(chr('0x' . $matches[1]));
+        }, $source);// hex notation
         return $source;
     }
 
-    /** 
-      * Method to be called by another php script. Processes for SQL injection
-      * @access public
-      * @param Mixed $source - input string/array-of-string to be 'cleaned'
-      * @param Buffer $connection - An open MySQL connection
-      * @return String $source - 'cleaned' version of input parameter
-      */
+    /**
+     * Method to be called by another php script. Processes for SQL injection
+     * @access public
+     * @param Mixed $source - input string/array-of-string to be 'cleaned'
+     * @param Buffer $connection - An open MySQL connection
+     * @return String $source - 'cleaned' version of input parameter
+     */
     public function safeSQL($source, &$connection)
     {
         // clean all elements in this array
@@ -326,14 +330,14 @@ class InputFilter
         }
     }
 
-    /** 
-      * @author Chris Tobin
-      * @author Daniel Morris
-      * @access protected
-      * @param String $source
-      * @param Resource $connection - An open MySQL connection
-      * @return String $source
-      */
+    /**
+     * @author Chris Tobin
+     * @author Daniel Morris
+     * @access protected
+     * @param String $source
+     * @param Resource $connection - An open MySQL connection
+     * @return String $source
+     */
     public function quoteSmart($source, &$connection)
     {
         // strip slashes
@@ -345,44 +349,37 @@ class InputFilter
         return $source;
     }
 
-    /** 
-      * @author Chris Tobin
-      * @author Daniel Morris
-      * @access protected
-      * @param String $source
-      * @param Resource $connection - An open MySQL connection
-      * @return String $source
-      */
+    /**
+     * @author Chris Tobin
+     * @author Daniel Morris
+     * @access protected
+     * @param String $source
+     * @param Resource $connection - An open MySQL connection
+     * @return String $source
+     */
     public function escapeString($string, &$connection)
     {
-        // depreciated function
-        if (version_compare(phpversion(),"4.3.0", "<")) {
-            mysql_escape_string($string);
-        } else {
-            // current function
-            mysql_real_escape_string($string);
-        }
-        return $string;
+        return mysqli_real_escape_string($connection, $string);
     }
-    
-    /** 
-      * Internal method removes tags/special characters
-      * @author Marcelo Cuiza
-      * @access protected
-      * @param Array or String $input
-      * @param String $type
-      * @return Array or String $input
-      */
+
+    /**
+     * Internal method removes tags/special characters
+     * @author Marcelo Cuiza
+     * @access protected
+     * @param Array or String $input
+     * @param String $type
+     * @return Array or String $input
+     */
     public function xssFilter($input, $type = "")
     {
-        if(is_array($input)) {
-            if(sizeof($input)) {
-                foreach($input as $i => $val) {
-                    if(is_array($val) && sizeof($val)) {
+        if (is_array($input)) {
+            if (count($input)) {
+                foreach ($input as $i => $val) {
+                    if (is_array($val) && count($val)) {
                         $input[$i] = $this->xssFilter($val);
                     } else {
-                        if(!empty($val)) {
-                            if($type != "url") {
+                        if (!empty($val)) {
+                            if ($type != "url") {
                                 $inputFiltered = addslashes(htmlspecialchars(filter_var($val, FILTER_SANITIZE_STRING), ENT_COMPAT, 'UTF-8'));
                             } else {
                                 $inputFiltered = filter_var($val, FILTER_SANITIZE_STRING);
@@ -393,13 +390,13 @@ class InputFilter
                         $input[$i] = $inputFiltered;
                     }
                 }
-            }    
+            }
             return $input;
         } else {
-            if(!isset($input) || trim($input) === '' || $input === NULL ) {
+            if (!isset($input) || trim($input) === '' || $input === null) {
                 return '';
             } else {
-                if($type != "url") {
+                if ($type != "url") {
                     return addslashes(htmlspecialchars(filter_var($input, FILTER_SANITIZE_STRING), ENT_COMPAT, 'UTF-8'));
                 } else {
                     return filter_var($input, FILTER_SANITIZE_STRING);
@@ -407,41 +404,41 @@ class InputFilter
             }
         }
     }
-    
-    /** 
-      * Internal method: remove malicious code, fix missing end tags, fix illegal nesting, convert deprecated tags, validate CSS, preserve rich formatting 
-      * @author Marcelo Cuiza
-      * @access protected
-      * @param Array or String $input
-      * @param String $type (url)
-      * @return Array or String $input
-      */
-    function xssFilterHard($input, $type = "")
-    { 
+
+    /**
+     * Internal method: remove malicious code, fix missing end tags, fix illegal nesting, convert deprecated tags, validate CSS, preserve rich formatting
+     * @author Marcelo Cuiza
+     * @access protected
+     * @param Array or String $input
+     * @param String $type (url)
+     * @return Array or String $input
+     */
+    public function xssFilterHard($input, $type = "")
+    {
         $config = HTMLPurifier_Config::createDefault();
         $purifier = new HTMLPurifier($config);
-        if(is_array($input)) {
-            if(sizeof($input)) {
-                foreach($input as $i => $val) { 
-                    if(is_array($val) || is_object($val) && sizeof($val)) {
+        if (is_array($input)) {
+            if (count($input)) {
+                foreach ($input as $i => $val) {
+                    if (is_array($val) || is_object($val) && count($val)) {
                         $input[$i] = $this->xssFilterHard($val);
                     } else {
-                        if(!empty($val)) {
-                            if(!is_object(G::json_decode($val))) {
+                        if (!empty($val)) {
+                            if (!is_object(G::json_decode($val))) {
                                 $inputFiltered = $purifier->purify($val);
-                                if($type != "url" && !strpos(basename($val), "=")) {
-                                    $inputFiltered = htmlspecialchars($inputFiltered, ENT_NOQUOTES, 'UTF-8');   
+                                if ($type != "url" && !strpos(basename($val), "=")) {
+                                    $inputFiltered = htmlspecialchars($inputFiltered, ENT_NOQUOTES, 'UTF-8');
                                 } else {
-                                    $inputFiltered = str_replace('&amp;','&',$inputFiltered);
+                                    $inputFiltered = str_replace('&amp;', '&', $inputFiltered);
                                 }
                             } else {
-                                $jsArray = G::json_decode($val,true);  
-                                if(is_array($jsArray) && sizeof($jsArray)) {
-                                    foreach($jsArray as $j => $jsVal){
-                                        if(is_array($jsVal) && sizeof($jsVal)) {
+                                $jsArray = G::json_decode($val, true);
+                                if (is_array($jsArray) && count($jsArray)) {
+                                    foreach ($jsArray as $j => $jsVal) {
+                                        if (is_array($jsVal) && count($jsVal)) {
                                             $jsArray[$j] = $this->xssFilterHard($jsVal);
                                         } else {
-                                            if(!empty($jsVal)) {
+                                            if (!empty($jsVal)) {
                                                 $jsArray[$j] = $purifier->purify($jsVal);
                                             }
                                         }
@@ -450,7 +447,7 @@ class InputFilter
                                 } else {
                                     $inputFiltered = $val;
                                 }
-                            }    
+                            }
                         } else {
                             $inputFiltered = "";
                         }
@@ -460,16 +457,16 @@ class InputFilter
             }
             return $input;
         } else {
-            if(!isset($input) || empty($input)) {
+            if (!isset($input) || empty($input)) {
                 return '';
             } else {
-                if(is_object($input)) {
-                    if(sizeof($input)) {
-                        foreach($input as $j => $jsVal){
-                            if(is_array($jsVal) || is_object($jsVal) && sizeof($jsVal)) {
+                if (is_object($input)) {
+                    if (count($input)) {
+                        foreach ($input as $j => $jsVal) {
+                            if (is_array($jsVal) || is_object($jsVal) && count($jsVal)) {
                                 $input->j = $this->xssFilterHard($jsVal);
                             } else {
-                                if(!empty($jsVal)) {
+                                if (!empty($jsVal)) {
                                     $input->j = $purifier->purify($jsVal);
                                 }
                             }
@@ -477,97 +474,101 @@ class InputFilter
                     }
                     return $input;
                 }
-                if(!is_object(G::json_decode($input))) {
+                if (!is_object(G::json_decode($input))) {
                     $input = $purifier->purify($input);
-                    if($type != "url" && !strpos(basename($input), "=")) {
+                    if ($type != "url" && !strpos(basename($input), "=")) {
                         $input = addslashes(htmlspecialchars($input, ENT_COMPAT, 'UTF-8'));
                     } else {
-                        $input = str_replace('&amp;','&',$input);
+                        $input = str_replace('&amp;', '&', $input);
                     }
                 } else {
-                    $jsArray = G::json_decode($input,true);
-                    if(is_array($jsArray) && sizeof($jsArray)) {
-                        foreach($jsArray as $j => $jsVal){
-                            if(is_array($jsVal) || is_object($jsVal) && sizeof($jsVal)) {
+                    $jsArray = G::json_decode($input, true);
+                    if (is_array($jsArray) && count($jsArray)) {
+                        foreach ($jsArray as $j => $jsVal) {
+                            if (is_array($jsVal) || is_object($jsVal) && count($jsVal)) {
                                 $jsArray[$j] = $this->xssFilterHard($jsVal);
                             } else {
-                                if(!empty($jsVal)) {
+                                if (!empty($jsVal)) {
                                     $jsArray[$j] = $purifier->purify($jsVal);
                                 }
                             }
                         }
                         $input = G::json_encode($jsArray);
                     }
-                }        
+                }
                 return $input;
             }
         }
     }
-    
-    /** 
-      * Internal method: protect against SQL injection 
-      * @author Marcelo Cuiza
-      * @access protected
-      * @param String $con
-      * @param String $query
-      * @param Array $values
-      * @return String $query
-      */
-    function preventSqlInjection($query, $values = Array(), $con = NULL)
+
+    /**
+     * Internal method: protect against SQL injection
+     * @author Marcelo Cuiza
+     * @access protected
+     * @param String $con
+     * @param String $query
+     * @param array $values
+     * @return String $query
+     */
+    public function preventSqlInjection($query, $values = array(), $con = null)
     {
-        if(is_array($values) && sizeof($values)) {
-            foreach($values as $k1 => $val1) {
-                    $values[$k1] = mysql_real_escape_string($val1);
+        if (empty($con)) {
+            $con = Propel::getConnection('workflow');
+            $con = $con->getResource();
+        }
+        if (is_array($values) && count($values)) {
+
+            foreach ($values as $k1 => $val1) {
+                $values[$k1] = mysqli_real_escape_string($con, $val1);
             }
-            
-            if ( get_magic_quotes_gpc() ) {
-                foreach($values as $k => $val) {
+
+            if (get_magic_quotes_gpc()) {
+                foreach ($values as $k => $val) {
                     $values[$k] = stripslashes($val);
                 }
             }
-            $newquery = vsprintf($query,$values);
+            $newQuery = vsprintf($query, $values);
         } else {
-            //$newquery = mysql_real_escape_string($query);
-            $newquery = $this->quoteSmart($this->decode($query), $con);
+            $newQuery = $this->quoteSmart($this->decode($query), $con);
         }
-        return $newquery;
+        return $newQuery;
     }
-    
-    /** 
-      * Internal method: validate user input 
-      * @author Marcelo Cuiza
-      * @access protected
-      * @param String $value (required)
-      * @param Array or String $types ( string | int | float | boolean | path | nosql )
-      * @param String $valType ( validate | sanitize )
-      * @return String $value
-      */
-    function validateInput($value, $types = 'string', $valType = 'sanitize')
+
+    /**
+     * Internal method: validate user input
+     * @author Marcelo Cuiza
+     * @access protected
+     * @param String $value (required)
+     * @param Array or String $types ( string | int | float | boolean | path | nosql )
+     * @param String $valType ( validate | sanitize )
+     * @return String $value
+     */
+    public function validateInput($value, $types = 'string', $valType = 'sanitize')
     {
-        if(!isset($value) || empty($value)) {
+        if (!isset($value) || empty($value)) {
             return '';
-        } 
-        
-        if(is_array($types) && sizeof($types)){
-            foreach($types as $type){
-                if($valType == 'sanitize') {
+        }
+
+        if (is_array($types) && count($types)) {
+            foreach ($types as $type) {
+                if ($valType == 'sanitize') {
                     $value = $this->sanitizeInputValue($value, $type);
                 } else {
-                    $value = $this->validateInputValue($value, $type);        
+                    $value = $this->validateInputValue($value, $type);
                 }
-            }    
-        } elseif(is_string($types)) {
-            if($types == 'sanitize' || $types == 'validate') {
+            }
+        } elseif (is_string($types)) {
+            if ($types === 'sanitize' || $types === 'validate') {
                 $valType = $types;
                 $types = 'string';
             }
-            if($valType == 'sanitize') {
+            if ($valType === 'sanitize') {
                 $value = $this->sanitizeInputValue($value, $types);
             } else {
-                $value = $this->validateInputValue($value, $types);        
+                $value = $this->validateInputValue($value, $types);
             }
         }
-         
+
         return $value;
     }
 
@@ -576,36 +577,36 @@ class InputFilter
      * @param $type
      * @return bool|int|mixed|string
      */
-    function sanitizeInputValue($value, $type) {
-        
-        switch($type) {
+    public function sanitizeInputValue($value, $type)
+    {
+        switch ($type) {
             case 'float':
                 $value = filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION | FILTER_FLAG_ALLOW_THOUSAND);
-            break;
+                break;
             case 'int':
                 $value = (int)filter_var($value, FILTER_SANITIZE_NUMBER_INT);
-            break;
+                break;
             case 'boolean':
-                $value = (boolean)filter_var($value, FILTER_VALIDATE_BOOLEAN,FILTER_NULL_ON_FAILURE);
-            break;
+                $value = (boolean)filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+                break;
             case 'path':
-                if(!file_exists($value)) {
-                    if(!is_dir($value)) {
+                if (!file_exists($value)) {
+                    if (!is_dir($value)) {
                         $value = '';
                     }
                 }
-            break;
+                break;
             case 'nosql':
                 $value = (string)filter_var($value, FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH);
-                if(preg_match('/\b(or|and|xor|drop|insert|update|delete|select)\b/i' , $value, $matches, PREG_OFFSET_CAPTURE)) {
-                       $value = substr($value,0,$matches[0][1]);
+                if (preg_match('/\b(or|and|xor|drop|insert|update|delete|select)\b/i', $value, $matches, PREG_OFFSET_CAPTURE)) {
+                    $value = substr($value, 0, $matches[0][1]);
                 }
-            break;
+                break;
             default:
                 $value = (string)filter_var($value, FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW);
         }
-        
-        return $value;    
+
+        return $value;
     }
 
     /**
@@ -613,39 +614,39 @@ class InputFilter
      * @param $type
      * @throws Exception
      */
-    function validateInputValue($value, $type) {
-        
-        switch($type) {
+    public function validateInputValue($value, $type)
+    {
+        switch ($type) {
             case 'float':
                 $value = str_replace(',', '.', $value);
-                if(!filter_var($value, FILTER_VALIDATE_FLOAT)) {
-                    throw new Exception('not a float value'); 
+                if (!filter_var($value, FILTER_VALIDATE_FLOAT)) {
+                    throw new Exception('not a float value');
                 }
-            break;
+                break;
             case 'int':
-                if(!filter_var($value, FILTER_VALIDATE_INT)) {
-                    throw new Exception('not a int value');    
+                if (!filter_var($value, FILTER_VALIDATE_INT)) {
+                    throw new Exception('not a int value');
                 }
-            break;
+                break;
             case 'boolean':
-                if(!preg_match('/\b(yes|no|false|true|1|0)\b/i' , $value)) {
+                if (!preg_match('/\b(yes|no|false|true|1|0)\b/i', $value)) {
                     throw new Exception('not a boolean value');
                 }
-            break;
+                break;
             case 'path':
-                if(!file_exists($value)) {
-                    if(!is_dir($value)) {
+                if (!file_exists($value)) {
+                    if (!is_dir($value)) {
                         throw new Exception('not a valid path');
                     }
                 }
-            break;
+                break;
             case 'nosql':
-                if(preg_match('/\b(or|and|xor|drop|insert|update|delete|select)\b/i' , $value)) {
+                if (preg_match('/\b(or|and|xor|drop|insert|update|delete|select)\b/i', $value)) {
                     throw new Exception('sql command found');
                 }
-            break;
+                break;
             default:
-                if(!is_string($value)) {
+                if (!is_string($value)) {
                     throw new Exception('not a string value');
                 }
         }
@@ -655,7 +656,8 @@ class InputFilter
      * @param $pathFile
      * @return string
      */
-    function validatePath($pathFile) {
+    public function validatePath($pathFile)
+    {
         $sanitizefilteredPath = mb_ereg_replace("([\.]{2,})", '', $pathFile);
         $sanitizefilteredPath = mb_ereg_replace("(^~)", '', $sanitizefilteredPath);
         return $sanitizefilteredPath;
@@ -664,23 +666,23 @@ class InputFilter
     /**
      * Filter only characters valids by regular expression
      *
-     * @param mixed $data  Data
+     * @param mixed $data Data
      * @param mixed $regex Regular expression
      *
      * @return mixed Returns data with the characters valids by regular expression
      */
-    function xssRegexFilter($data, $regex)
+    public function xssRegexFilter($data, $regex)
     {
         try {
             switch (gettype($data)) {
                 case 'array':
                     foreach ($data as $key => $value) {
-                        $data[$key] = $this->xssRegexFilter($value, (is_array($regex))? ((isset($regex[$key]))? $regex[$key] : '') : $regex);
+                        $data[$key] = $this->xssRegexFilter($value, (is_array($regex)) ? ((isset($regex[$key])) ? $regex[$key] : '') : $regex);
                     }
                     break;
                 default:
                     if ($regex != '') {
-                        $data = (preg_match_all($regex, $data, $arrayMatch))? implode('', $arrayMatch[0]) : '';
+                        $data = (preg_match_all($regex, $data, $arrayMatch)) ? implode('', $arrayMatch[0]) : '';
                     }
                     break;
             }
diff --git a/gulliver/system/class.monologProvider.php b/gulliver/system/class.monologProvider.php
index 5bbb5b3b4..1bc0710d4 100644
--- a/gulliver/system/class.monologProvider.php
+++ b/gulliver/system/class.monologProvider.php
@@ -55,7 +55,7 @@ class MonologProvider
      * @access public
      * @return object
      */
-    public function getSingleton ($channel, $fileLog)
+    public static function getSingleton ($channel, $fileLog)
     {
         if (self::$instance == null) {
             self::$instance = new MonologProvider($channel, $fileLog);
diff --git a/gulliver/system/class.pagedTable.php b/gulliver/system/class.pagedTable.php
index ce030655d..4df9fd8a7 100644
--- a/gulliver/system/class.pagedTable.php
+++ b/gulliver/system/class.pagedTable.php
@@ -33,20 +33,19 @@
  * @package gulliver.system
  * @access public
  */
-
 class pagedTable
 {
     public $xmlFormFile;
     public $currentPage;
     public $orderBy = '';
-    public $filter = array ();
-    public $filterType = array ();
+    public $filter = array();
+    public $filterType = array();
     public $searchBy = '';
     public $fastSearch = '';
     public $order = '';
     public $template = 'templates/paged-table.html';
     public $tpl;
-    public $style = array ();
+    public $style = array();
     public $rowsPerPage = 25;
     public $ownerPage;
     public $popupPage;
@@ -105,30 +104,30 @@ class pagedTable
      * @access public
      * @return string
      */
-    public function analizeSql ()
+    public function analizeSql()
     {
-        if (1 === preg_match( '/^\s*SELECT\s+(.+?)(?:\s+FROM\s+(.+?))(?:\s+WHERE\s+(.+?))?(?:\s+GROUP\s+BY\s+(.+?))?(?:\s+ORDER\s+BY\s+(.+?))?(?:\s+BETWEEN\s+(.+?)\s+AND\s+(.+?))?\s*$/im', $this->sqlSelect, $matches )) {
+        if (1 === preg_match('/^\s*SELECT\s+(.+?)(?:\s+FROM\s+(.+?))(?:\s+WHERE\s+(.+?))?(?:\s+GROUP\s+BY\s+(.+?))?(?:\s+ORDER\s+BY\s+(.+?))?(?:\s+BETWEEN\s+(.+?)\s+AND\s+(.+?))?\s*$/im', $this->sqlSelect, $matches)) {
             $this->sqlSelect = 'SELECT ' . $matches[1] . (($matches[2] != '') ? ' FROM ' . $matches[2] : '');
             $this->sqlSelect = 'SELECT ' . $matches[1] . (($matches[2] != '') ? ' FROM ' . $matches[2] : '');
         } else {
             //echo('Warning: SQL Query is not well formed.');
             return;
         }
-        $this->sqlFrom = isset( $matches[2] ) ? $matches[2] : '';
-        $this->sqlWhere = isset( $matches[3] ) ? $matches[3] : '';
-        $this->sqlGroupBy = isset( $matches[4] ) ? $matches[4] : '';
-        $this->sqlOrderBy = isset( $matches[5] ) ? $matches[5] : '';
+        $this->sqlFrom = isset($matches[2]) ? $matches[2] : '';
+        $this->sqlWhere = isset($matches[3]) ? $matches[3] : '';
+        $this->sqlGroupBy = isset($matches[4]) ? $matches[4] : '';
+        $this->sqlOrderBy = isset($matches[5]) ? $matches[5] : '';
         $this->order = '';
         if ($this->sqlOrderBy != '') {
-            if ($n = preg_match_all( '/\b([\w\.]+)\b(?:\s+(ASC|DESC))?,?/im', $this->sqlOrderBy, $matches, PREG_SET_ORDER )) {
-                for ($r = 0; $r < $n; $r ++) {
-                    if (! isset( $matches[$r][2] )) {
+            if ($n = preg_match_all('/\b([\w\.]+)\b(?:\s+(ASC|DESC))?,?/im', $this->sqlOrderBy, $matches, PREG_SET_ORDER)) {
+                for ($r = 0; $r < $n; $r++) {
+                    if (!isset($matches[$r][2])) {
                         $matches[$r][2] = '';
                     }
                     if ($matches[$r][2] == '') {
                         $matches[$r][2] = 'ASC';
                     }
-                    $ord = G::createUID( '', $matches[$r][1] ) . '=' . urlencode( $matches[$r][2] );
+                    $ord = G::createUID('', $matches[$r][1]) . '=' . urlencode($matches[$r][2]);
                     if ($this->order == '') {
                         $this->order = $ord;
                     } else {
@@ -137,7 +136,7 @@ class pagedTable
                 }
                 //Orden ascendente
                 if ($n == 1) {
-                    $this->order = G::createUID( '', $matches[0][1] ) . '=' . $matches[0][2];
+                    $this->order = G::createUID('', $matches[0][1]) . '=' . $matches[0][2];
                 }
             }
         }
@@ -146,7 +145,7 @@ class pagedTable
         $uniqueWhere = '';
         $this->fieldDataList = '';
         foreach ($this->fields as $r => $field) {
-            if ((strpos( $this->notFields, ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
+            if ((strpos($this->notFields, ' ' . $this->fields[$r]['Type'] . ' ') === false)) {
                 if ($uniqueWhere == '') {
                     $uniqueWhere = (($this->sqlWhere != '') ? ('(' . $this->sqlWhere . ') AND (') : '(');
                 } else {
@@ -173,77 +172,78 @@ class pagedTable
      * @access public
      * @return string
      */
-    public function prepareQuery ()
+    public function prepareQuery()
     {
         //DBConnection
-        if (! $this->sqlConnection) {
+        if (!$this->sqlConnection) {
             $this->dbc = new DBConnection();
         } else {
-            if (defined( 'DB_' . $this->sqlConnection . '_USER' )) {
-                if (defined( 'DB_' . $this->sqlConnection . '_HOST' )) {
-                    eval( '$res[\'DBC_SERVER\'] = DB_' . $this->sqlConnection . '_HOST;' );
+            if (defined('DB_' . $this->sqlConnection . '_USER')) {
+                if (defined('DB_' . $this->sqlConnection . '_HOST')) {
+                    eval('$res[\'DBC_SERVER\'] = DB_' . $this->sqlConnection . '_HOST;');
                 } else {
                     $res['DBC_SERVER'] = DB_HOST;
                 }
-                if (defined( 'DB_' . $this->sqlConnection . '_USER' )) {
-                    eval( '$res[\'DBC_USERNAME\'] = DB_' . $this->sqlConnection . '_USER;' );
+                if (defined('DB_' . $this->sqlConnection . '_USER')) {
+                    eval('$res[\'DBC_USERNAME\'] = DB_' . $this->sqlConnection . '_USER;');
                 }
-                if (defined( 'DB_' . $this->sqlConnection . '_PASS' )) {
-                    eval( '$res[\'DBC_PASSWORD\'] = DB_' . $this->sqlConnection . '_PASS;' );
+                if (defined('DB_' . $this->sqlConnection . '_PASS')) {
+                    eval('$res[\'DBC_PASSWORD\'] = DB_' . $this->sqlConnection . '_PASS;');
                 } else {
                     $res['DBC_PASSWORD'] = DB_PASS;
                 }
-                if (defined( 'DB_' . $this->sqlConnection . '_NAME' )) {
-                    eval( '$res[\'DBC_DATABASE\'] = DB_' . $this->sqlConnection . '_NAME;' );
+                if (defined('DB_' . $this->sqlConnection . '_NAME')) {
+                    eval('$res[\'DBC_DATABASE\'] = DB_' . $this->sqlConnection . '_NAME;');
                 } else {
                     $res['DBC_DATABASE'] = DB_NAME;
                 }
-                if (defined( 'DB_' . $this->sqlConnection . '_TYPE' )) {
-                    eval( '$res[\'DBC_TYPE\'] = DB_' . $this->sqlConnection . '_TYPE;' );
+                if (defined('DB_' . $this->sqlConnection . '_TYPE')) {
+                    eval('$res[\'DBC_TYPE\'] = DB_' . $this->sqlConnection . '_TYPE;');
                 } else {
-                    $res['DBC_TYPE'] = defined( 'DB_TYPE' ) ? DB_TYPE : 'mysql';
+                    $res['DBC_TYPE'] = defined('DB_TYPE') ? DB_TYPE : 'mysql';
                 }
-                $this->dbc = new DBConnection( $res['DBC_SERVER'], $res['DBC_USERNAME'], $res['DBC_PASSWORD'], $res['DBC_DATABASE'], $res['DBC_TYPE'] );
+                $this->dbc = new DBConnection($res['DBC_SERVER'], $res['DBC_USERNAME'], $res['DBC_PASSWORD'], $res['DBC_DATABASE'], $res['DBC_TYPE']);
             } else {
                 $dbc = new DBConnection();
-                $dbs = new DBSession( $dbc );
-                $res = $dbs->execute( "select * from  DB_CONNECTION WHERE DBC_UID=" . $this->sqlConnection );
+                $dbs = new DBSession($dbc);
+                $res = $dbs->execute("select * from  DB_CONNECTION WHERE DBC_UID=" . $this->sqlConnection);
                 $res = $res->read();
-                $this->dbc = new DBConnection( $res['DBC_SERVER'], $res['DBC_USERNAME'], $res['DBC_PASSWORD'], $res['DBC_DATABASE'] );
+                $this->dbc = new DBConnection($res['DBC_SERVER'], $res['DBC_USERNAME'], $res['DBC_PASSWORD'], $res['DBC_DATABASE']);
             }
         }
-        $this->ses = new DBSession( $this->dbc );
+        $this->ses = new DBSession($this->dbc);
         //Query
         //Filter
-        if (is_array( $this->filter )) {
+        if (is_array($this->filter)) {
             $filterFields = $this->filter;
         } else {
-            parse_str( $this->filter, $filterFields );
+            parse_str($this->filter, $filterFields);
         }
         $this->aFilter = $filterFields;
         $filter = '';
         foreach ($filterFields as $field => $like) {
-            if ($like != '') {
+            if ($like !== '') {
                 if ($filter !== '') {
                     $filter .= ' AND ';
                 }
-                if (isset( $this->filterType[$field] )) {
+                $like = mysqli_real_escape_string($this->dbc, $like);
+                if (isset($this->filterType[$field])) {
                     switch ($this->filterType[$field]) {
                         case '=':
-                            $filter .= $field . ' = "' . mysql_real_escape_string( $like ) . '"';
+                            $filter .= $field . ' = "' . $like . '"';
                             break;
                         case '<>':
-                            $filter .= $field . ' <> "' . mysql_real_escape_string( $like ) . '"';
+                            $filter .= $field . ' <> "' . $like . '"';
                             break;
                         case 'contains':
-                            $filter .= $field . ' LIKE "%' . mysql_real_escape_string( $like ) . '%"';
+                            $filter .= $field . ' LIKE "%' . $like . '%"';
                             break;
                         case 'like':
-                            $filter .= $field . ' LIKE "' . mysql_real_escape_string( $like ) . '"';
+                            $filter .= $field . ' LIKE "' . $like . '"';
                             break;
                     }
                 } else {
-                    $filter .= $field . ' = "' . mysql_real_escape_string( $like ) . '"';
+                    $filter .= $field . ' = "' . $like . '"';
                 }
             }
         }
@@ -251,11 +251,11 @@ class pagedTable
         * QuickSearch
         */
         if ($this->searchBy !== '') {
-            $aSB = explode( '|', $this->searchBy );
+            $aSB = explode('|', $this->searchBy);
             $subFilter = '';
             foreach ($aSB as $sBy) {
                 $subFilter .= ($subFilter !== '') ? ' OR ' : '';
-                $subFilter .= $sBy . ' LIKE "%' . G::sqlEscape( $this->fastSearch, $this->dbc->type ) . '%"';
+                $subFilter .= $sBy . ' LIKE "%' . G::sqlEscape($this->fastSearch, $this->dbc->type) . '%"';
             }
             if ($subFilter !== '') {
                 $filter .= ($filter !== '') ? ' AND ' : '';
@@ -263,18 +263,18 @@ class pagedTable
             }
         }
         //Merge sort array defined by USER with the array defined by SQL
-        parse_str( $this->order, $orderFields );
-        parse_str( $this->orderBy, $orderFields2 );
+        parse_str($this->order, $orderFields);
+        parse_str($this->orderBy, $orderFields2);
         //User sort is more important (first in merge).
-        $orderFields3 = array_merge( $orderFields2, $orderFields );
+        $orderFields3 = array_merge($orderFields2, $orderFields);
         //User sort is overwrites XMLs definition.
-        $orderFields = array_merge( $orderFields3, $orderFields2 );
+        $orderFields = array_merge($orderFields3, $orderFields2);
         //Order (BY SQL DEFINITION AND USER'S DEFINITION)
-        $this->aOrder = array ();
+        $this->aOrder = array();
         $order = '';
         foreach ($orderFields as $field => $fieldOrder) {
-            $field = G::getUIDName( $field, '' );
-            $fieldOrder = strtoupper( $fieldOrder );
+            $field = G::getUIDName($field, '');
+            $fieldOrder = strtoupper($fieldOrder);
             if ($fieldOrder === 'A') {
                 $fieldOrder = 'ASC';
             }
@@ -305,57 +305,57 @@ class pagedTable
      * @param string xmlForm
      * @return string
      */
-    public function setupFromXmlform ($xmlForm)
+    public function setupFromXmlform($xmlForm)
     {
         $this->xmlForm = $xmlForm;
         //Config
         $this->name = $xmlForm->name;
         $this->id = $xmlForm->id;
-        $this->sqlConnection = ((isset( $this->xmlForm->sqlConnection )) ? $this->xmlForm->sqlConnection : '');
-        if (isset( $_GET['page'] )) {
+        $this->sqlConnection = ((isset($this->xmlForm->sqlConnection)) ? $this->xmlForm->sqlConnection : '');
+        if (isset($_GET['page'])) {
             $this->currentPage = $_GET['page'];
         } else {
             $this->currentPage = 1;
         }
-        if (isset( $_GET['order'] )) {
-            $this->orderBy = urldecode( $_GET['order'] );
+        if (isset($_GET['order'])) {
+            $this->orderBy = urldecode($_GET['order']);
         } else {
             $this->orderBy = "";
         }
-        if (isset( $_GET['filter'] )) {
-            $this->filter = urldecode( $_GET['filter'] );
+        if (isset($_GET['filter'])) {
+            $this->filter = urldecode($_GET['filter']);
         } else {
             $this->filter = "";
         }
-        $this->ajaxServer = G::encryptLink( '../gulliver/pagedTableAjax' );
-        $this->ownerPage = G::encryptLink( SYS_CURRENT_URI );
+        $this->ajaxServer = G::encryptLink('../gulliver/pagedTableAjax');
+        $this->ownerPage = G::encryptLink(SYS_CURRENT_URI);
         //Needed for $mysql_real_escape_string
         $auxDbc = new DBConnection();
-        if (isset( $this->xmlForm->sql )) {
-            $this->sqlSelect = G::replaceDataField( $this->xmlForm->sql, $this->xmlForm->values );
+        if (isset($this->xmlForm->sql)) {
+            $this->sqlSelect = G::replaceDataField($this->xmlForm->sql, $this->xmlForm->values);
         } else {
-            trigger_Error( 'Warning: sql query is empty', E_USER_WARNING );
+            trigger_Error('Warning: sql query is empty', E_USER_WARNING);
         }
         // Config attributes from XMLFORM file
-        $myAttributes = get_class_vars( get_class( $this ) );
+        $myAttributes = get_class_vars(get_class($this));
         foreach ($this->xmlForm->xmlform->tree->attribute as $atrib => $value) {
-            if (array_key_exists( $atrib, $myAttributes )) {
-                eval( 'settype($value,gettype($this->' . $atrib . '));' );
+            if (array_key_exists($atrib, $myAttributes)) {
+                eval('settype($value,gettype($this->' . $atrib . '));');
                 if ($value !== '') {
-                    eval( '$this->' . $atrib . '=$value;' );
+                    eval('$this->' . $atrib . '=$value;');
                 }
             }
         }
         //Prepare the fields
-        $this->style = array ();
+        $this->style = array();
         $this->gridWidth = "";
         $this->gridFields = "";
-        $this->fieldsType = array ();
+        $this->fieldsType = array();
         foreach ($this->xmlForm->fields as $f => $v) {
             $r = $f;
             $this->fields[$r]['Name'] = $this->xmlForm->fields[$f]->name;
             $this->fields[$r]['Type'] = $this->xmlForm->fields[$f]->type;
-            if (isset( $this->xmlForm->fields[$f]->size )) {
+            if (isset($this->xmlForm->fields[$f]->size)) {
                 $this->fields[$r]['Size'] = $this->xmlForm->fields[$f]->size;
             }
             $this->fields[$r]['Label'] = $this->xmlForm->fields[$f]->label;
@@ -372,7 +372,7 @@ class pagedTable
             $r = $f;
             //Parse the column properties
             foreach ($this->xmlForm->fields[$f] as $attribute => $value) {
-                if (! is_object( $value )) {
+                if (!is_object($value)) {
                     $this->style[$r][$attribute] = $value;
                 }
             }
@@ -533,7 +533,7 @@ class pagedTable
      * @access public
      * @return string
      */
-    public function count ()
+    public function count()
     {
         $this->prepareQuery();
         return $this->query->count();
@@ -546,51 +546,51 @@ class pagedTable
      * @access public
      * @return string
      */
-    public function renderTitle ()
+    public function renderTitle()
     {
         //Render Title
         $thereisnotitle = true;
         foreach ($this->fields as $r => $rval) {
             if ($this->fields[$r]['Type'] === 'title') {
-                $this->tpl->assign( "title", $this->fields[$r]['Label'] );
+                $this->tpl->assign("title", $this->fields[$r]['Label']);
                 $thereisnotitle = false;
             }
         }
         if ($thereisnotitle) {
-            $this->tpl->assign( "title", '  ' );
+            $this->tpl->assign("title", '  ');
         }
         //Render headers
         $this->colCount = 0;
         $this->shownFields = '[';
         foreach ($this->fields as $r => $rval) {
             if ($this->style[$r]['showInTable'] != '0') {
-                $this->tpl->newBlock( "headers" );
-                $sortOrder = (((isset( $this->aOrder[$this->fields[$r]['Name']] )) && ($this->aOrder[$this->fields[$r]['Name']] === 'ASC')) ? 'DESC' : 'ASC');
-                $sortOrder = (((isset( $this->aOrder[$this->fields[$r]['Name']] )) && ($this->aOrder[$this->fields[$r]['Name']] === 'DESC')) ? '' : $sortOrder);
-                $this->style[$r]['href'] = $this->ownerPage . '?order=' . ($sortOrder !== '' ? urlencode( G::createUID( '', $this->fields[$r]['Name'] ) . '=' . $sortOrder ) : '') . '&page=' . $this->currentPage;
-                $this->style[$r]['onsort'] = $this->id . '.doSort("' . G::createUID( '', $this->fields[$r]['Name'] ) . '" , "' . $sortOrder . '");return false;';
-                if (isset( $this->style[$r]['href'] )) {
-                    $this->tpl->assign( "href", $this->style[$r]['href'] );
+                $this->tpl->newBlock("headers");
+                $sortOrder = (((isset($this->aOrder[$this->fields[$r]['Name']])) && ($this->aOrder[$this->fields[$r]['Name']] === 'ASC')) ? 'DESC' : 'ASC');
+                $sortOrder = (((isset($this->aOrder[$this->fields[$r]['Name']])) && ($this->aOrder[$this->fields[$r]['Name']] === 'DESC')) ? '' : $sortOrder);
+                $this->style[$r]['href'] = $this->ownerPage . '?order=' . ($sortOrder !== '' ? urlencode(G::createUID('', $this->fields[$r]['Name']) . '=' . $sortOrder) : '') . '&page=' . $this->currentPage;
+                $this->style[$r]['onsort'] = $this->id . '.doSort("' . G::createUID('', $this->fields[$r]['Name']) . '" , "' . $sortOrder . '");return false;';
+                if (isset($this->style[$r]['href'])) {
+                    $this->tpl->assign("href", $this->style[$r]['href']);
                 }
-                if (isset( $this->style[$r]['onsort'] )) {
-                    $this->tpl->assign( "onclick", htmlentities( $this->style[$r]['onsort'], ENT_QUOTES, 'UTF-8' ) );
+                if (isset($this->style[$r]['onsort'])) {
+                    $this->tpl->assign("onclick", htmlentities($this->style[$r]['onsort'], ENT_QUOTES, 'UTF-8'));
                 }
-                if (isset( $this->style[$r]['colWidth'] )) {
-                    $this->tpl->assign( "width", $this->style[$r]['colWidth'] );
+                if (isset($this->style[$r]['colWidth'])) {
+                    $this->tpl->assign("width", $this->style[$r]['colWidth']);
                 }
-                if (isset( $this->style[$r]['colWidth'] )) {
-                    $this->tpl->assign( "widthPercent", ($this->style[$r]['colWidth'] * 100 / $this->totalWidth) . "%" );
+                if (isset($this->style[$r]['colWidth'])) {
+                    $this->tpl->assign("widthPercent", ($this->style[$r]['colWidth'] * 100 / $this->totalWidth) . "%");
                 }
-                if (isset( $this->style[$r]['titleAlign'] )) {
-                    $this->tpl->assign( "align", 'text-align:' . $this->style[$r]['titleAlign'] . ';' );
+                if (isset($this->style[$r]['titleAlign'])) {
+                    $this->tpl->assign("align", 'text-align:' . $this->style[$r]['titleAlign'] . ';');
                 }
                 if ($this->style[$r]['titleVisibility'] != '0') {
-                    $sortOrder = (((isset( $this->aOrder[$this->fields[$r]['Name']] )) && ($this->aOrder[$this->fields[$r]['Name']] === 'ASC')) ? 'b2' : '');
-                    $sortOrder = (((isset( $this->aOrder[$this->fields[$r]['Name']] )) && ($this->aOrder[$this->fields[$r]['Name']] === 'DESC')) ? 'b<' : $sortOrder);
-                    $this->tpl->assign( "header", $this->fields[$r]['Label'] . $sortOrder );
-                    $this->tpl->assign( 'displaySeparator', (($this->colCount == 0) || (! isset( $this->fields[$r]['Label'] )) || ($this->fields[$r]['Label'] === '')) ? 'display:none;' : '' );
+                    $sortOrder = (((isset($this->aOrder[$this->fields[$r]['Name']])) && ($this->aOrder[$this->fields[$r]['Name']] === 'ASC')) ? 'b2' : '');
+                    $sortOrder = (((isset($this->aOrder[$this->fields[$r]['Name']])) && ($this->aOrder[$this->fields[$r]['Name']] === 'DESC')) ? 'b<' : $sortOrder);
+                    $this->tpl->assign("header", $this->fields[$r]['Label'] . $sortOrder);
+                    $this->tpl->assign('displaySeparator', (($this->colCount == 0) || (!isset($this->fields[$r]['Label'])) || ($this->fields[$r]['Label'] === '')) ? 'display:none;' : '');
                 } else {
-                    $this->tpl->assign( 'displaySeparator', 'display:none;' );
+                    $this->tpl->assign('displaySeparator', 'display:none;');
                 }
                 $this->colCount += 2;
                 $this->shownFields .= ($this->shownFields !== '[') ? ',' : '';
@@ -610,7 +610,7 @@ class pagedTable
      * @param eter string result
      * @return string
      */
-    public function renderField ($row, $r, $result)
+    public function renderField($row, $r, $result)
     {
         global $G_DATE_FORMAT;
         //BEGIN: Special content: __sqlEdit__,__sqlDelete__
@@ -620,10 +620,10 @@ class pagedTable
         $result['row__'] = $row;
         //END: Special content.
         //Merge $result with $xmlForm values (for default valuesSettings)
-        $result = array_merge( $this->xmlForm->values, $result );
+        $result = array_merge($this->xmlForm->values, $result);
         switch (true) {
             case ($this->style[$r]['data'] != ''):
-                $value = ((isset( $result[$this->style[$r]['data']] )) ? $result[$this->style[$r]['data']] : '');
+                $value = ((isset($result[$this->style[$r]['data']])) ? $result[$this->style[$r]['data']] : '');
                 break;
             default:
                 $value = $this->fields[$r]['Label'];
@@ -631,37 +631,37 @@ class pagedTable
         switch ($this->fields[$r]['Type']) {
             case 'date':
                 /*Accept dates like 20070515 without - or / to separate its parts*/
-                if (strlen( $value ) <= 10 && strlen( $value ) > 4) {
-                    $value = str_replace( '/', '-', $value );
-                    if (strpos( $value, '-' ) === false) {
-                        $value = substr( $value, 0, 4 ) . '-' . substr( $value, 4, 2 ) . '-' . substr( $value, 6, 2 );
+                if (strlen($value) <= 10 && strlen($value) > 4) {
+                    $value = str_replace('/', '-', $value);
+                    if (strpos($value, '-') === false) {
+                        $value = substr($value, 0, 4) . '-' . substr($value, 4, 2) . '-' . substr($value, 6, 2);
                     }
                 }
         }
-        $this->tpl->newBlock( "field" );
-        $this->tpl->assign( 'width', $this->style[$r]['colWidth'] );
-        $this->tpl->assign( 'widthPercent', ($this->style[$r]['colWidth'] * 100 / $this->totalWidth) . '%' );
-        $this->tpl->assign( 'className', (isset( $this->style[$r]['colClassName'] ) && ($this->style[$r]['colClassName'])) ? $this->style[$r]['colClassName'] : $this->tdClass );
-        $this->tpl->assign( 'style', $this->tdStyle );
-        if (isset( $this->style[$r]['align'] )) {
-            $this->tpl->assign( "align", $this->style[$r]['align'] );
+        $this->tpl->newBlock("field");
+        $this->tpl->assign('width', $this->style[$r]['colWidth']);
+        $this->tpl->assign('widthPercent', ($this->style[$r]['colWidth'] * 100 / $this->totalWidth) . '%');
+        $this->tpl->assign('className', (isset($this->style[$r]['colClassName']) && ($this->style[$r]['colClassName'])) ? $this->style[$r]['colClassName'] : $this->tdClass);
+        $this->tpl->assign('style', $this->tdStyle);
+        if (isset($this->style[$r]['align'])) {
+            $this->tpl->assign("align", $this->style[$r]['align']);
         }
-        if (isset( $this->style[$r]['colAlign'] )) {
-            $this->tpl->assign( "align", $this->style[$r]['colAlign'] );
+        if (isset($this->style[$r]['colAlign'])) {
+            $this->tpl->assign("align", $this->style[$r]['colAlign']);
         }
         /**
          * BEGIN : Reeplace of @@, @%,...
          * in field's attributes like onclick, link,
          * ...
          */
-        if (isset( $this->xmlForm->fields[$this->fields[$r]['Name']]->onclick )) {
-            $this->xmlForm->fields[$this->fields[$r]['Name']]->onclick = G::replaceDataField( $this->style[$r]['onclick'], $result );
+        if (isset($this->xmlForm->fields[$this->fields[$r]['Name']]->onclick)) {
+            $this->xmlForm->fields[$this->fields[$r]['Name']]->onclick = G::replaceDataField($this->style[$r]['onclick'], $result);
         }
-        if (isset( $this->xmlForm->fields[$this->fields[$r]['Name']]->link )) {
-            $this->xmlForm->fields[$this->fields[$r]['Name']]->link = G::replaceDataField( $this->style[$r]['link'], $result );
+        if (isset($this->xmlForm->fields[$this->fields[$r]['Name']]->link)) {
+            $this->xmlForm->fields[$this->fields[$r]['Name']]->link = G::replaceDataField($this->style[$r]['link'], $result);
         }
-        if (isset( $this->xmlForm->fields[$this->fields[$r]['Name']]->value )) {
-            $this->xmlForm->fields[$this->fields[$r]['Name']]->value = G::replaceDataField( $this->style[$r]['value'], $result );
+        if (isset($this->xmlForm->fields[$this->fields[$r]['Name']]->value)) {
+            $this->xmlForm->fields[$this->fields[$r]['Name']]->value = G::replaceDataField($this->style[$r]['value'], $result);
         }
         /**
          * BREAK : Reeplace of @@, @%,...
@@ -670,24 +670,24 @@ class pagedTable
          * Rendering of the field
          */
         $this->xmlForm->setDefaultValues();
-        $this->xmlForm->setValues( $result );
+        $this->xmlForm->setValues($result);
         $this->xmlForm->fields[$this->fields[$r]['Name']]->mode = 'view';
-        if ((array_search( 'rendergrid', get_class_methods( get_class( $this->xmlForm->fields[$this->fields[$r]['Name']] ) ) ) !== false) || (array_search( 'renderGrid', get_class_methods( get_class( $this->xmlForm->fields[$this->fields[$r]['Name']] ) ) ) !== false)) {
-            $htmlField = $this->xmlForm->fields[$this->fields[$r]['Name']]->renderGrid( array ($value
-            ), $this->xmlForm );
-            $this->tpl->assign( "value", $htmlField[0] );
+        if ((array_search('rendergrid', get_class_methods(get_class($this->xmlForm->fields[$this->fields[$r]['Name']]))) !== false) || (array_search('renderGrid', get_class_methods(get_class($this->xmlForm->fields[$this->fields[$r]['Name']]))) !== false)) {
+            $htmlField = $this->xmlForm->fields[$this->fields[$r]['Name']]->renderGrid(array($value
+            ), $this->xmlForm);
+            $this->tpl->assign("value", $htmlField[0]);
         } else {
         }
         /**
          * CONTINUE : Reeplace of @@, @%,...
          */
-        if (isset( $this->xmlForm->fields[$this->fields[$r]['Name']]->onclick )) {
+        if (isset($this->xmlForm->fields[$this->fields[$r]['Name']]->onclick)) {
             $this->xmlForm->fields[$this->fields[$r]['Name']]->onclick = $this->style[$r]['onclick'];
         }
-        if (isset( $this->xmlForm->fields[$this->fields[$r]['Name']]->link )) {
+        if (isset($this->xmlForm->fields[$this->fields[$r]['Name']]->link)) {
             $this->xmlForm->fields[$this->fields[$r]['Name']]->link = $this->style[$r]['link'];
         }
-        if (isset( $this->xmlForm->fields[$this->fields[$r]['Name']]->value )) {
+        if (isset($this->xmlForm->fields[$this->fields[$r]['Name']]->value)) {
             $this->xmlForm->fields[$this->fields[$r]['Name']]->value = $this->style[$r]['value'];
         }
         /**
@@ -703,43 +703,43 @@ class pagedTable
      * @access public
      * @return string
      */
-    public function defaultStyle ()
+    public function defaultStyle()
     {
         //    for($r=1;$r<=sizeof($this->fields);$r++)
         foreach ($this->fields as $r => $rval) {
-            $this->style[$r] = array ('showInTable' => '1','titleVisibility' => '1','colWidth' => '150','onclick' => '','event' => ''
+            $this->style[$r] = array('showInTable' => '1', 'titleVisibility' => '1', 'colWidth' => '150', 'onclick' => '', 'event' => ''
             );
             //Some widths
-            if (! (strpos( '  date linknew ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
+            if (!(strpos('  date linknew ', ' ' . $this->fields[$r]['Type'] . ' ') === false)) {
                 $this->style[$r]['colWidth'] = '70';
                 //Data source:
             }
-            if (! (strpos( '  title button linknew image-text jslink ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
+            if (!(strpos('  title button linknew image-text jslink ', ' ' . $this->fields[$r]['Type'] . ' ') === false)) {
                 $this->style[$r]['data'] = ''; //If the control is a link it shows the label
             } else {
                 $this->style[$r]['data'] = $this->fields[$r]['Name']; //ELSE: The data value for that field
             }
-                //Hidden fields
-            if (! isset( $this->style[$r]['showInTable'] )) {
-                if (! (strpos( '  title button endgrid2 submit password ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
+            //Hidden fields
+            if (!isset($this->style[$r]['showInTable'])) {
+                if (!(strpos('  title button endgrid2 submit password ', ' ' . $this->fields[$r]['Type'] . ' ') === false)) {
                     $this->style[$r]['showInTable'] = '0';
                 } else {
                     $this->style[$r]['showInTable'] = '1';
                 }
             }
             //Hidden titles
-            if (! (strpos( '  linknew button endgrid2 ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
+            if (!(strpos('  linknew button endgrid2 ', ' ' . $this->fields[$r]['Type'] . ' ') === false)) {
                 $this->style[$r]['titleVisibility'] = '0';
             }
             //Align titles
             $this->style[$r]['titleAlign'] = 'center';
             //Align fields
-            if (isset( $_SESSION['SET_DIRECTION'] ) && (strcasecmp( $_SESSION['SET_DIRECTION'], 'rtl' ) === 0)) {
+            if (isset($_SESSION['SET_DIRECTION']) && (strcasecmp($_SESSION['SET_DIRECTION'], 'rtl') === 0)) {
                 $this->style[$r]['align'] = 'right';
             } else {
                 $this->style[$r]['align'] = 'left';
             }
-            if (! (strpos( ' linknew date ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
+            if (!(strpos(' linknew date ', ' ' . $this->fields[$r]['Type'] . ' ') === false)) {
                 $this->style[$r]['align'] = 'center';
             }
         }
@@ -774,77 +774,76 @@ class pagedTable
      * @access public
      * @return string
      */
-    public function renderTable ($block = '')
+    public function renderTable($block = '')
     {
-
         $filter = new InputFilter();
-        $this->orderBy  = $filter->xssFilterHard($this->orderBy);
-        $this->currentPage  = $filter->xssFilterHard($this->currentPage);
-        $this->id  = $filter->xssFilterHard($this->id);
-        $this->name  = $filter->xssFilterHard($this->name);
-        $this->ownerPage  = $filter->xssFilterHard($this->ownerPage);
+        $this->orderBy = $filter->xssFilterHard($this->orderBy);
+        $this->currentPage = $filter->xssFilterHard($this->currentPage);
+        $this->id = $filter->xssFilterHard($this->id);
+        $this->name = $filter->xssFilterHard($this->name);
+        $this->ownerPage = $filter->xssFilterHard($this->ownerPage);
         // DBConnection
         $this->prepareQuery();
         //Query for get the number of rows
-        $this->query = $this->ses->execute( $this->sql );
+        $this->query = $this->ses->execute($this->sql);
         $this->totRows = $this->query->count();
-        $this->totpages = ceil( $this->query->count() / $this->rowsPerPage );
+        $this->totpages = ceil($this->query->count() / $this->rowsPerPage);
         //Query for obtain the records
-        $this->query = $this->ses->execute( $this->sql . ' LIMIT ' . (($this->currentPage - 1) * $this->rowsPerPage) . ', ' . $this->rowsPerPage );
+        $this->query = $this->ses->execute($this->sql . ' LIMIT ' . (($this->currentPage - 1) * $this->rowsPerPage) . ', ' . $this->rowsPerPage);
         // Prepare the template
-        $this->tpl = new TemplatePower( PATH_CORE . $this->template );
+        $this->tpl = new TemplatePower(PATH_CORE . $this->template);
         $this->tpl->prepare();
         /**
          * ******** HEAD BLOCK **************
          */
         if (($block === '') || ($block === 'head')) {
-            $this->tpl->newBlock( 'headBlock' );
-            $this->tpl->assign( 'pagedTable_Id', $this->id );
-            $this->tpl->assign( 'pagedTable_Name', $this->name );
-            $this->tpl->assign( 'pagedTable_Height', $this->xmlForm->height );
-            $this->xmlForm->home  = $filter->xssFilterHard($this->xmlForm->home);
-            $this->filterForm  = $filter->xssFilterHard($this->filterForm);
-            $this->menu  = $filter->xssFilterHard($this->menu);
-            if (file_exists( $this->xmlForm->home . $this->filterForm . '.xml' )) {
-                $filterForm = new filterForm( $this->filterForm, $this->xmlForm->home );
+            $this->tpl->newBlock('headBlock');
+            $this->tpl->assign('pagedTable_Id', $this->id);
+            $this->tpl->assign('pagedTable_Name', $this->name);
+            $this->tpl->assign('pagedTable_Height', $this->xmlForm->height);
+            $this->xmlForm->home = $filter->xssFilterHard($this->xmlForm->home);
+            $this->filterForm = $filter->xssFilterHard($this->filterForm);
+            $this->menu = $filter->xssFilterHard($this->menu);
+            if (file_exists($this->xmlForm->home . $this->filterForm . '.xml')) {
+                $filterForm = new filterForm($this->filterForm, $this->xmlForm->home);
                 if ($this->menu === '') {
                     $this->menu = 'gulliver/pagedTable_Options';
                 }
             }
-            if (file_exists( $this->xmlForm->home . $this->menu . '.xml' )) {
-                $menu = new xmlMenu( $this->menu, $this->xmlForm->home );
-                $this->tpl->newBlock( 'headerBlock' );
+            if (file_exists($this->xmlForm->home . $this->menu . '.xml')) {
+                $menu = new xmlMenu($this->menu, $this->xmlForm->home);
+                $this->tpl->newBlock('headerBlock');
                 $template = PATH_CORE . 'templates' . PATH_SEP . $menu->type . '.html';
-                $menu->setValues( $this->xmlForm->values );
-                $menu->setValues( array ('PAGED_TABLE_ID' => $this->id
-                ) );
-                $menu->setValues( array ('PAGED_TABLE_FAST_SEARCH' => $this->fastSearch
-                ) );
-                if (isset( $filterForm->name )) {
-                    $menu->setValues( array ('SEARCH_FILTER_FORM' => $filterForm->name
-                    ) );
+                $menu->setValues($this->xmlForm->values);
+                $menu->setValues(array('PAGED_TABLE_ID' => $this->id
+                ));
+                $menu->setValues(array('PAGED_TABLE_FAST_SEARCH' => $this->fastSearch
+                ));
+                if (isset($filterForm->name)) {
+                    $menu->setValues(array('SEARCH_FILTER_FORM' => $filterForm->name
+                    ));
                 }
-                $this->tpl->assign( 'content', $menu->render( $template, $scriptCode ) );
-                $oHeadPublisher = & headPublisher::getSingleton();
-                $oHeadPublisher->addScriptFile( $menu->scriptURL );
-                $oHeadPublisher->addScriptCode( $scriptCode );
+                $this->tpl->assign('content', $menu->render($template, $scriptCode));
+                $oHeadPublisher = headPublisher::getSingleton();
+                $oHeadPublisher->addScriptFile($menu->scriptURL);
+                $oHeadPublisher->addScriptCode($scriptCode);
             }
-            if (file_exists( $this->xmlForm->home . $this->filterForm . '.xml' )) {
-                $this->tpl->newBlock( 'headerBlock' );
+            if (file_exists($this->xmlForm->home . $this->filterForm . '.xml')) {
+                $this->tpl->newBlock('headerBlock');
                 $this->filterForm_Id = $filterForm->id;
                 $filterForm->type = 'filterform';
                 $filterForm->ajaxServer = '../gulliver/defaultAjax';
                 $template = PATH_CORE . 'templates/' . $filterForm->type . '.html';
-                $filterForm->setValues( $this->xmlForm->values );
-                $filterForm->setValues( array ('PAGED_TABLE_ID' => $this->id
-                ) );
-                $filterForm->setValues( array ('PAGED_TABLE_FAST_SEARCH' => $this->fastSearch
-                ) );
-                $this->tpl->assign( 'content', $filterForm->render( $template, $scriptCode ) );
-                $oHeadPublisher = & headPublisher::getSingleton();
-                $oHeadPublisher->addScriptFile( $filterForm->scriptURL );
-                $oHeadPublisher->addScriptCode( $scriptCode );
-                if (isset( $_SESSION )) {
+                $filterForm->setValues($this->xmlForm->values);
+                $filterForm->setValues(array('PAGED_TABLE_ID' => $this->id
+                ));
+                $filterForm->setValues(array('PAGED_TABLE_FAST_SEARCH' => $this->fastSearch
+                ));
+                $this->tpl->assign('content', $filterForm->render($template, $scriptCode));
+                $oHeadPublisher = headPublisher::getSingleton();
+                $oHeadPublisher->addScriptFile($filterForm->scriptURL);
+                $oHeadPublisher->addScriptCode($scriptCode);
+                if (isset($_SESSION)) {
                     $_SESSION[$filterForm->id] = $filterForm->values;
                 }
             }
@@ -853,169 +852,170 @@ class pagedTable
          * ******** CONTENT BLOCK **************
          */
         if (($block === '') || ($block === 'content')) {
-            $this->tpl->newBlock( 'contentBlock' );
-            $this->tpl->assign( 'gridWidth', '=[' . substr( $this->gridWidth, 1 ) . ']' );
-            $this->tpl->assign( 'fieldNames', '=[' . substr( $this->gridFields, 1 ) . ']' );
-            $this->tpl->assign( 'ajaxUri', '="' . addslashes( $this->ajaxServer ) . '"' );
-            $this->tpl->assign( 'currentUri', '="' . addslashes( $this->ownerPage ) . '"' );
-            $this->tpl->assign( 'currentOrder', '="' . addslashes( $this->orderBy ) . '"' );
-            $this->tpl->assign( 'currentPage', '=' . $this->currentPage );
-            $this->tpl->assign( 'currentFilter', '="' . '"' );
-            $this->tpl->assign( 'totalRows', '=' . $this->query->count() );
-            $this->tpl->assign( 'rowsPerPage', '=' . $this->rowsPerPage );
-            $this->tpl->assign( 'popupPage', '="' . addslashes( $this->popupPage ) . '"' );
-            $this->tpl->assign( 'popupWidth', '=' . $this->popupWidth );
-            $this->tpl->assign( 'popupHeight', '=' . $this->popupHeight );
-            $this->tpl->assign( 'pagedTable_Id', $this->id );
-            $this->tpl->assign( 'pagedTable_Name', $this->name );
-            $this->tpl->assign( "pagedTable_JS", "{$this->id}.element=document.getElementById('pagedtable[{$this->id}]');" );
+            $this->tpl->newBlock('contentBlock');
+            $this->tpl->assign('gridWidth', '=[' . substr($this->gridWidth, 1) . ']');
+            $this->tpl->assign('fieldNames', '=[' . substr($this->gridFields, 1) . ']');
+            $this->tpl->assign('ajaxUri', '="' . addslashes($this->ajaxServer) . '"');
+            $this->tpl->assign('currentUri', '="' . addslashes($this->ownerPage) . '"');
+            $this->tpl->assign('currentOrder', '="' . addslashes($this->orderBy) . '"');
+            $this->tpl->assign('currentPage', '=' . $this->currentPage);
+            $this->tpl->assign('currentFilter', '="' . '"');
+            $this->tpl->assign('totalRows', '=' . $this->query->count());
+            $this->tpl->assign('rowsPerPage', '=' . $this->rowsPerPage);
+            $this->tpl->assign('popupPage', '="' . addslashes($this->popupPage) . '"');
+            $this->tpl->assign('popupWidth', '=' . $this->popupWidth);
+            $this->tpl->assign('popupHeight', '=' . $this->popupHeight);
+            $this->tpl->assign('pagedTable_Id', $this->id);
+            $this->tpl->assign('pagedTable_Name', $this->name);
+            $this->tpl->assign("pagedTable_JS", "{$this->id}.element=document.getElementById('pagedtable[{$this->id}]');");
             $this->renderTitle();
             //Render rows
             $gridRows = 0;
-            for ($j = 0; $j < $this->query->count(); $j ++) {
+            for ($j = 0; $j < $this->query->count(); $j++) {
                 $result = $this->query->read();
                 //if (($j>=(($this->currentPage-1)*$this->rowsPerPage))&&($j<(($this->currentPage)*$this->rowsPerPage)))
                 //{
-                $gridRows ++;
-                $this->tpl->newBlock( "row" );
-                $this->tpl->assign( "class", "Row" . (($j % 2) + 1) );
+                $gridRows++;
+                $this->tpl->newBlock("row");
+                $this->tpl->assign("class", "Row" . (($j % 2) + 1));
                 $this->tdStyle = '';
                 $this->tdClass = '';
                 foreach ($this->fields as $r => $rval) {
-                    if (strcasecmp( $this->fields[$r]['Type'], 'cellMark' ) == 0) {
+                    if (strcasecmp($this->fields[$r]['Type'], 'cellMark') == 0) {
                         $result1 = $result;
                         $result1['row__'] = $j + 1;
                         $this->xmlForm->setDefaultValues();
-                        $this->xmlForm->setValues( $result1 );
-                        $result1 = array_merge( $this->xmlForm->values, $result1 );
-                        $this->tdStyle = $this->xmlForm->fields[$this->fields[$r]['Name']]->tdStyle( $result1, $this->xmlForm );
-                        $this->tdClass = $this->xmlForm->fields[$this->fields[$r]['Name']]->tdClass( $result1, $this->xmlForm );
+                        $this->xmlForm->setValues($result1);
+                        $result1 = array_merge($this->xmlForm->values, $result1);
+                        $this->tdStyle = $this->xmlForm->fields[$this->fields[$r]['Name']]->tdStyle($result1, $this->xmlForm);
+                        $this->tdClass = $this->xmlForm->fields[$this->fields[$r]['Name']]->tdClass($result1, $this->xmlForm);
                     } elseif ($this->style[$r]['showInTable'] != '0') {
-                        $this->renderField( $j + 1, $r, $result );
+                        $this->renderField($j + 1, $r, $result);
                     }
                 }
                 //}
             }
-            $this->tpl->assign( '_ROOT.gridRows', '=' . $gridRows ); //number of rows in the current page
-            $this->tpl->newBlock( 'rowTag' );
-            $this->tpl->assign( 'rowId', 'insertAtLast' );
+            $this->tpl->assign('_ROOT.gridRows', '=' . $gridRows); //number of rows in the current page
+            $this->tpl->newBlock('rowTag');
+            $this->tpl->assign('rowId', 'insertAtLast');
             if ($this->currentPage > 1) {
                 $firstUrl = $this->ownerPage . '?order=' . $this->orderBy . '&page=1';
-                $firstUrl  = $filter->xssFilterHard($firstUrl);
+                $firstUrl = $filter->xssFilterHard($firstUrl);
                 $firstAjax = $this->id . ".doGoToPage(1);return false;";
-                $firstAjax  = $filter->xssFilterHard($firstAjax);
+                $firstAjax = $filter->xssFilterHard($firstAjax);
                 $prevpage = $this->currentPage - 1;
                 $prevUrl = $this->ownerPage . '?order=' . $this->orderBy . '&page=' . $prevpage;
-                $prevUrl  = $filter->xssFilterHard($prevUrl);
+                $prevUrl = $filter->xssFilterHard($prevUrl);
                 $prevAjax = $this->id . ".doGoToPage(" . $prevpage . ");return false;";
-                $prevAjax  = $filter->xssFilterHard($prevAjax);
-                $first = "<a href=\"" . htmlentities( $firstUrl, ENT_QUOTES, 'utf-8' ) . "\" onclick=\"" . $firstAjax . "\" class='firstPage'>&nbsp;</a>";
-                $prev = "<a href=\"" . htmlentities( $prevUrl, ENT_QUOTES, 'utf-8' ) . "\"  onclick=\"" . $prevAjax . "\" class='previousPage'>&nbsp;</a>";
+                $prevAjax = $filter->xssFilterHard($prevAjax);
+                $first = "<a href=\"" . htmlentities($firstUrl, ENT_QUOTES, 'utf-8') . "\" onclick=\"" . $firstAjax . "\" class='firstPage'>&nbsp;</a>";
+                $prev = "<a href=\"" . htmlentities($prevUrl, ENT_QUOTES, 'utf-8') . "\"  onclick=\"" . $prevAjax . "\" class='previousPage'>&nbsp;</a>";
             } else {
                 $first = "<a class='noFirstPage'>&nbsp;</a>";
                 $prev = "<a class='noPreviousPage'>&nbsp;</a>";
             }
             if ($this->currentPage < $this->totpages) {
                 $lastUrl = $this->ownerPage . '?order=' . $this->orderBy . '&page=' . $this->totpages;
-                $lastUrl  = $filter->xssFilterHard($lastUrl);
+                $lastUrl = $filter->xssFilterHard($lastUrl);
                 $lastAjax = $this->id . ".doGoToPage(" . $this->totpages . ");return false;";
-                $lastAjax  = $filter->xssFilterHard($lastAjax);
+                $lastAjax = $filter->xssFilterHard($lastAjax);
                 $nextpage = $this->currentPage + 1;
                 $nextUrl = $this->ownerPage . '?order=' . $this->orderBy . '&page=' . $nextpage;
-                $nextUrl  = $filter->xssFilterHard($nextUrl);
+                $nextUrl = $filter->xssFilterHard($nextUrl);
                 $nextAjax = $this->id . ".doGoToPage(" . $nextpage . ");return false;";
-                $nextAjax  = $filter->xssFilterHard($nextAjax);
-                $next = "<a href=\"" . htmlentities( $nextUrl, ENT_QUOTES, 'utf-8' ) . "\" onclick=\"" . $nextAjax . "\" class='nextPage'>&nbsp;</a>";
-                $last = "<a href=\"" . htmlentities( $lastUrl, ENT_QUOTES, 'utf-8' ) . "\" onclick=\"" . $lastAjax . "\" class='lastPage'>&nbsp;</a>";
+                $nextAjax = $filter->xssFilterHard($nextAjax);
+                $next = "<a href=\"" . htmlentities($nextUrl, ENT_QUOTES, 'utf-8') . "\" onclick=\"" . $nextAjax . "\" class='nextPage'>&nbsp;</a>";
+                $last = "<a href=\"" . htmlentities($lastUrl, ENT_QUOTES, 'utf-8') . "\" onclick=\"" . $lastAjax . "\" class='lastPage'>&nbsp;</a>";
             } else {
                 $next = "<a class='noNextPage'>&nbsp;</a>";
                 $last = "<a class='noLastPage'>&nbsp;</a>";
             }
             $pagesEnum = '';
-            for ($r = 1; $r <= $this->totpages; $r ++) {
+            for ($r = 1; $r <= $this->totpages; $r++) {
                 if (($r >= ($this->currentPage - 5)) && ($r <= ($this->currentPage + 5))) {
                     $pageAjax = $this->id . ".doGoToPage(" . $r . ");return false;";
-                    if ($r != $this->currentPage) {                        
-                        $pageAjax  = $filter->xssFilterHard($pageAjax);
-                        $pagesEnum .= "&nbsp;<a href=\"" . htmlentities( $this->ownerPage . '?order=' . $this->orderBy . '&page=' . $r, ENT_QUOTES, 'utf-8' ) . "\" onclick=\"" . $pageAjax . "\">" . $r . "</a>";
+                    if ($r != $this->currentPage) {
+                        $pageAjax = $filter->xssFilterHard($pageAjax);
+                        $pagesEnum .= "&nbsp;<a href=\"" . htmlentities($this->ownerPage . '?order=' . $this->orderBy . '&page=' . $r, ENT_QUOTES, 'utf-8') . "\" onclick=\"" . $pageAjax . "\">" . $r . "</a>";
                     } else {
                         $pagesEnum .= "&nbsp;<a>" . $r . "</a>";
                     }
                 }
             }
             if ($this->query->count() === 0) {
-                $this->tpl->newBlock( 'norecords' );
-                $this->tpl->assign( "columnCount", $this->colCount );
+                $this->tpl->newBlock('norecords');
+                $this->tpl->assign("columnCount", $this->colCount);
                 $noRecordsFound = 'ID_NO_RECORDS_FOUND';
-                if (G::LoadTranslation( $noRecordsFound )) {
-                    $noRecordsFound = G::LoadTranslation( $noRecordsFound );
+                if (G::LoadTranslation($noRecordsFound)) {
+                    $noRecordsFound = G::LoadTranslation($noRecordsFound);
                 }
-                $this->tpl->assign( "noRecordsFound", $noRecordsFound );
+                $this->tpl->assign("noRecordsFound", $noRecordsFound);
             }
-            if (! $this->disableFooter) {
-                $this->tpl->newBlock( "bottomFooter" );
-                $this->tpl->assign( "columnCount", $this->colCount );
-                $this->tpl->assign( "pagedTableId", $this->id );
+            if (!$this->disableFooter) {
+                $this->tpl->newBlock("bottomFooter");
+                $this->tpl->assign("columnCount", $this->colCount);
+                $this->tpl->assign("pagedTableId", $this->id);
                 if (($this->query->count() !== 0)) {
                     if ($this->totpages > 1) {
-                        $this->tpl->assign( "first", $first );
-                        $this->tpl->assign( "prev", $prev );
-                        $this->tpl->assign( "next", $next );
-                        $this->tpl->assign( "last", $last );
+                        $this->tpl->assign("first", $first);
+                        $this->tpl->assign("prev", $prev);
+                        $this->tpl->assign("next", $next);
+                        $this->tpl->assign("last", $last);
                     }
-                    $this->tpl->assign( "currentPage", $this->currentPage );
-                    $this->tpl->assign( "totalPages", $this->totpages );
+                    $this->tpl->assign("currentPage", $this->currentPage);
+                    $this->tpl->assign("totalPages", $this->totpages);
                     $firstRow = ($this->currentPage - 1) * $this->rowsPerPage + 1;
                     $lastRow = $firstRow + $this->query->count() - 1;
-                    $this->tpl->assign( "firstRow", $firstRow );
-                    $this->tpl->assign( "lastRow", $lastRow );
-                    $this->tpl->assign( "totalRows", $this->totRows );
+                    $this->tpl->assign("firstRow", $firstRow);
+                    $this->tpl->assign("lastRow", $lastRow);
+                    $this->tpl->assign("totalRows", $this->totRows);
                 } else {
-                    $this->tpl->assign( "indexStyle", 'visibility:hidden;' );
+                    $this->tpl->assign("indexStyle", 'visibility:hidden;');
                 }
                 if ($this->searchBy) {
-                    $this->tpl->assign( "fastSearchValue", $this->fastSearch );
+                    $this->tpl->assign("fastSearchValue", $this->fastSearch);
                 } else {
-                    $this->tpl->assign( "fastSearchStyle", 'visibility:hidden;' );
+                    $this->tpl->assign("fastSearchStyle", 'visibility:hidden;');
                 }
                 if ($this->addRow) {
                     if ($this->sqlInsert != '') {
-                        $this->tpl->assign( "insert", '<a href="#" onclick="pagedTable.event=\'Insert\';popup(\'' . $this->popupPage . '\');return false;">'./*G::LoadXml('labels','ID_ADD_NEW')*/ 'ID_ADD_NEW' . '</a>' );
+                        $this->tpl->assign("insert", '<a href="#" onclick="pagedTable.event=\'Insert\';popup(\'' . $this->popupPage . '\');return false;">' ./*G::LoadXml('labels','ID_ADD_NEW')*/
+                            'ID_ADD_NEW' . '</a>');
                     }
                 }
-                $this->tpl->assign( "pagesEnum", $pagesEnum );
-            }
-            ?>
-    <script language='JavaScript'>
-            var <?php echo $this->id?><?php echo ($this->name != '' ? '='.$this->name : '')?>=new G_PagedTable();
-    <?php echo $this->id?>.id<?php echo '="'. addslashes($this->id) . '"'?>;
-    <?php echo $this->id?>.name<?php echo '="'. addslashes($this->name) . '"'?>;
-    <?php echo $this->id?>.ajaxUri<?php echo '="'. addslashes($this->ajaxServer) . '?ptID='.$this->id.'"'?>;
-    <?php echo $this->id?>.currentOrder<?php echo '="'. addslashes($this->orderBy) . '"'?>;
-    <?php echo $this->id?>.currentFilter;
-    <?php echo $this->id?>.currentPage<?php echo '='. $this->currentPage?>;
-    <?php echo $this->id?>.totalRows<?php echo '='.$this->query->count()?>;
-    <?php echo $this->id?>.rowsPerPage<?php echo '='.$this->rowsPerPage?>;
-    <?php echo $this->id?>.popupPage<?php echo '="'. addslashes($this->popupPage) . '?ptID='.$this->id.'"'?>;
-    <?php echo $this->id?>.onUpdateField<?php echo '="'. addslashes($this->onUpdateField) . '"'?>;
-    <?php echo $this->id?>.shownFields<?php echo '='.$this->shownFields ?>;
+                $this->tpl->assign("pagesEnum", $pagesEnum);
+            } ?>
+            <script language='JavaScript'>
+                var <?php echo $this->id?><?php echo($this->name != '' ? '=' . $this->name : '')?>=
+                new G_PagedTable();
+                <?php echo $this->id?>.id<?php echo '="' . addslashes($this->id) . '"'?>;
+                <?php echo $this->id?>.name<?php echo '="' . addslashes($this->name) . '"'?>;
+                <?php echo $this->id?>.ajaxUri<?php echo '="' . addslashes($this->ajaxServer) . '?ptID=' . $this->id . '"'?>;
+                <?php echo $this->id?>.currentOrder<?php echo '="' . addslashes($this->orderBy) . '"'?>;
+                <?php echo $this->id?>.currentFilter;
+                <?php echo $this->id?>.currentPage<?php echo '=' . $this->currentPage?>;
+                <?php echo $this->id?>.totalRows<?php echo '=' . $this->query->count()?>;
+                <?php echo $this->id?>.rowsPerPage<?php echo '=' . $this->rowsPerPage?>;
+                <?php echo $this->id?>.popupPage<?php echo '="' . addslashes($this->popupPage) . '?ptID=' . $this->id . '"'?>;
+                <?php echo $this->id?>.onUpdateField<?php echo '="' . addslashes($this->onUpdateField) . '"'?>;
+                <?php echo $this->id?>.shownFields<?php echo '=' . $this->shownFields ?>;
 
-            var panelPopup;
-            var popupWidth<?php echo '='.$this->popupWidth?>;
-            var popupHeight<?php echo '='.$this->popupHeight?>;
+                var panelPopup;
+                var popupWidth<?php echo '=' . $this->popupWidth?>;
+                var popupHeight<?php echo '=' . $this->popupHeight?>;
             </script>
-    <?php
+            <?php
         }
         /**
          * ******** CLOSE BLOCK **************
          */
         if (($block === '') || ($block === 'close')) {
-            $this->tpl->newBlock( "closeBlock" );
+            $this->tpl->newBlock("closeBlock");
         }
         $this->tpl->printToScreen();
-        unset( $this->tpl );
-        unset( $this->dbc );
-        unset( $this->ses );
+        unset($this->tpl);
+        unset($this->dbc);
+        unset($this->ses);
         $_SESSION['pagedTable[' . $this->id . ']'] = base64_encode(serialize($this));
         return;
     }
@@ -1028,14 +1028,14 @@ class pagedTable
      * @param array $data
      * @return void
      */
-    public function printForm ($filename, $data = array())
+    public function printForm($filename, $data = array())
     {
         //    $G_FORM = new Form($filename, PATH_XMLFORM);
         //    echo $G_FORM->render(PATH_TPL . 'xmlform.html', $scriptContent);
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', $filename, '', $data, $this->popupSubmit );
-        G::RenderPage( "publish", "blank" );
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', $filename, '', $data, $this->popupSubmit);
+        G::RenderPage("publish", "blank");
     }
 }
 
@@ -1046,18 +1046,17 @@ class pagedTable
  * @param string $o
  * @return void
  */
-function var_dump2 ($o)
+function var_dump2($o)
 {
-    if (is_object( $o ) || is_array( $o )) {
+    if (is_object($o) || is_array($o)) {
         foreach ($o as $key => $value) {
-            echo ('<b>');
-            var_dump( $key );
-            echo ('</b>');
-            print_r( $value );
-            echo ('<br>');
+            echo('<b>');
+            var_dump($key);
+            echo('</b>');
+            print_r($value);
+            echo('<br>');
         }
     } else {
-        var_dump( $o );
+        var_dump($o);
     }
 }
-
diff --git a/gulliver/system/class.publisher.php b/gulliver/system/class.publisher.php
index 64fd1769f..8ba2f9797 100644
--- a/gulliver/system/class.publisher.php
+++ b/gulliver/system/class.publisher.php
@@ -276,7 +276,7 @@ class Publisher
                 if ($Part['Template'] == 'grid') {
                     print ('</form>') ;
                 }
-                $oHeadPublisher = & headPublisher::getSingleton();
+                $oHeadPublisher = headPublisher::getSingleton();
                 $oHeadPublisher->addScriptFile( $G_FORM->scriptURL );
                 $oHeadPublisher->addScriptCode( $scriptCode );
 
@@ -535,7 +535,7 @@ class Publisher
                 $mainPanelScript .= '});';
                 $mainPanelScript .= 'function ' . $panelName . 'Clear(){';
                 $mainPanelScript .= 'for(var r=0;r<' . $tabCount . ';r++)' . 'if (' . $panelName . 'Tabs[r])' . $panelName . 'Tabs[r].style.display="none";}';
-                $oHeadPublisher = & headPublisher::getSingleton();
+                $oHeadPublisher = headPublisher::getSingleton();
                 $oHeadPublisher->addScriptCode( $mainPanelScript );
 
                 break;
diff --git a/gulliver/system/class.rbac.php b/gulliver/system/class.rbac.php
index bfd54aa5a..7b2c4c4d8 100644
--- a/gulliver/system/class.rbac.php
+++ b/gulliver/system/class.rbac.php
@@ -204,7 +204,6 @@ class RBAC
         ];
         $this->aliasPermissions['PM_CASES'] = [self::PM_GUEST_CASE];
         $this->aliasPermissions['PM_LOGIN'] = [self::PM_GUEST_CASE];
-
     }
 
     /**
@@ -231,37 +230,30 @@ class RBAC
     public function initRBAC()
     {
         if (is_null($this->userObj)) {
-
             $this->userObj = new RbacUsers();
         }
 
         if (is_null($this->systemObj)) {
-
             $this->systemObj = new Systems();
         }
 
         if (is_null($this->usersRolesObj)) {
-
             $this->usersRolesObj = new UsersRoles();
         }
 
         if (is_null($this->rolesObj)) {
-
             $this->rolesObj = new Roles();
         }
 
         if (is_null($this->permissionsObj)) {
-
             $this->permissionsObj = new Permissions();
         }
 
         if (is_null($this->rolesPermissionsObj)) {
-
             $this->rolesPermissionsObj = new RolesPermissions();
         }
 
         if (is_null($this->authSourcesObj)) {
-
             $this->authSourcesObj = new AuthenticationSource();
         }
         //hook for RBAC plugins
@@ -269,13 +261,11 @@ class RBAC
         if (is_dir($pathPlugins)) {
             if ($handle = opendir($pathPlugins)) {
                 while (false !== ($file = readdir($handle))) {
-                    if (strpos($file, '.php', 1) && is_file($pathPlugins . PATH_SEP . $file) && substr($file, 0,
-                            6) == 'class.' && substr($file, -4) == '.php') {
-
+                    if (strpos($file, '.php', 1) && is_file($pathPlugins . PATH_SEP . $file) &&
+                        substr($file, 0, 6) === 'class.' && substr($file, -4) === '.php') {
                         $className = substr($file, 6, strlen($file) - 10);
                         require_once($pathPlugins . PATH_SEP . $file);
                         $this->aRbacPlugins[] = $className;
-
                     }
                 }
             }
@@ -873,9 +863,9 @@ class RBAC
      */
     public function VerifyWithOtherAuthenticationSource($authType, $userFields, $strPass)
     {
-        if ($authType == '' || $authType == 'MYSQL') {
+        if ($authType === '' || $authType === 'MYSQL') {
             //check if the user is active
-            if ($userFields['USR_STATUS'] != 1) {
+            if ($userFields['USR_STATUS'] !== 1) {
                 return -3; //inactive user
             }
 
@@ -886,13 +876,12 @@ class RBAC
         }
 
         foreach ($this->aRbacPlugins as $className) {
-            if (strtolower($className) == strtolower($authType)) {
+            if (strtolower($className) === strtolower($authType)) {
                 $plugin = new $className();
-                $plugin->sAuthSource = $userFields["UID_AUTH_SOURCE"];
+                $plugin->sAuthSource = $userFields['UID_AUTH_SOURCE'];
                 $plugin->sSystem = $this->sSystem;
 
-                $bValidUser = false;
-                $bValidUser = $plugin->VerifyLogin($userFields["USR_AUTH_USER_DN"], $strPass);
+                $bValidUser = $plugin->VerifyLogin($userFields['USR_AUTH_USER_DN'], $strPass);
                 if ($bValidUser === true) {
                     return ($userFields['USR_UID']);
                 } else {
@@ -924,14 +913,16 @@ class RBAC
     {
         /*----------------------------------********---------------------------------*/
 
-        $licenseManager =& PmLicenseManager::getSingleton();
-        if (in_array(G::encryptOld($licenseManager->result),
-            array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) {
+        $licenseManager = PmLicenseManager::getSingleton();
+        if (in_array(
+            G::encryptOld($licenseManager->result),
+            ['38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb']
+        )) {
             return -7;
         }
         /*----------------------------------********---------------------------------*/
 
-        if (strlen($strPass) == 0) {
+        if (strlen($strPass) === 0) {
             return -2;
         }
         //check if the user exists in the table RB_WORKFLOW.USERS
@@ -955,12 +946,10 @@ class RBAC
         //Hook for RBAC plugins
         if ($authType != "mysql" && $authType != "") {
             $res = $this->VerifyWithOtherAuthenticationSource($authType, $this->userObj->fields, $strPass);
-
             return $res;
         } else {
             $this->userObj->reuseUserFields = true;
             $res = $this->userObj->VerifyLogin($strUser, $strPass);
-
             return $res;
         }
     }
@@ -976,7 +965,6 @@ class RBAC
     public function verifyUser($strUser)
     {
         $res = $this->userObj->verifyUser($strUser);
-
         return $res;
     }
 
@@ -990,7 +978,6 @@ class RBAC
     public function verifyUserId($strUserId)
     {
         $res = $this->userObj->verifyUserId($strUserId);
-
         return $res;
     }
 
@@ -1051,24 +1038,24 @@ class RBAC
      */
     public function createUser($dataCase = [], $rolCode = '')
     {
-        if ($dataCase["USR_STATUS"] . "" == "1") {
-            $dataCase["USR_STATUS"] = "ACTIVE";
+        if ($dataCase['USR_STATUS'] . '' === '1') {
+            $dataCase['USR_STATUS'] = 'ACTIVE';
         }
 
-        if ($dataCase["USR_STATUS"] . "" == "0") {
-            $dataCase["USR_STATUS"] = "INACTIVE";
+        if ($dataCase['USR_STATUS'] . '' === '0') {
+            $dataCase['USR_STATUS'] = 'INACTIVE';
         }
 
-        if ($dataCase['USR_STATUS'] == 'ACTIVE') {
+        if ($dataCase['USR_STATUS'] === 'ACTIVE') {
             $dataCase['USR_STATUS'] = 1;
         }
-        if ($dataCase['USR_STATUS'] == 'INACTIVE') {
+        if ($dataCase['USR_STATUS'] === 'INACTIVE') {
             $dataCase['USR_STATUS'] = 0;
         }
 
         $userUid = $this->userObj->create($dataCase);
 
-        if ($rolCode != '') {
+        if ($rolCode !== '') {
             $this->assignRoleToUser($userUid, $rolCode);
         }
 
@@ -1086,7 +1073,7 @@ class RBAC
     public function updateUser($dataCase = [], $rolCode = '')
     {
         if (isset($dataCase['USR_STATUS'])) {
-            if ($dataCase['USR_STATUS'] == 'ACTIVE') {
+            if ($dataCase['USR_STATUS'] === 'ACTIVE') {
                 $dataCase['USR_STATUS'] = 1;
             }
         }
@@ -1141,9 +1128,9 @@ class RBAC
             $userStatus = 1;
         }
 
-        $aFields = $this->userObj->load($userUid);
-        $aFields['USR_STATUS'] = $userStatus;
-        $this->userObj->update($aFields);
+        $fields = $this->userObj->load($userUid);
+        $fields['USR_STATUS'] = $userStatus;
+        $this->userObj->update($fields);
     }
 
     /**
@@ -1194,7 +1181,7 @@ class RBAC
      */
     public function createPermision($code)
     {
-        return $this->permissionsObj->create(array('PER_CODE' => $code));
+        return $this->permissionsObj->create(['PER_CODE' => $code]);
     }
 
     /**
@@ -1650,8 +1637,10 @@ class RBAC
      */
     public function createAuthSource($dataCase)
     {
-        $dataCase['AUTH_SOURCE_PASSWORD'] = G::encrypt($dataCase['AUTH_SOURCE_PASSWORD'],
-                $dataCase['AUTH_SOURCE_SERVER_NAME']) . "_2NnV3ujj3w";
+        $dataCase['AUTH_SOURCE_PASSWORD'] = G::encrypt(
+                $dataCase['AUTH_SOURCE_PASSWORD'],
+                $dataCase['AUTH_SOURCE_SERVER_NAME']
+            ) . "_2NnV3ujj3w";
         $this->authSourcesObj->create($dataCase);
     }
 
@@ -1666,8 +1655,10 @@ class RBAC
      */
     public function updateAuthSource($dataCase)
     {
-        $dataCase['AUTH_SOURCE_PASSWORD'] = G::encrypt($dataCase['AUTH_SOURCE_PASSWORD'],
-                $dataCase['AUTH_SOURCE_SERVER_NAME']) . "_2NnV3ujj3w";
+        $dataCase['AUTH_SOURCE_PASSWORD'] = G::encrypt(
+                $dataCase['AUTH_SOURCE_PASSWORD'],
+                $dataCase['AUTH_SOURCE_SERVER_NAME']
+            ) . "_2NnV3ujj3w";
         $this->authSourcesObj->update($dataCase);
     }
 
@@ -1928,14 +1919,18 @@ class RBAC
                 $isAssignedNewpermissions = $this->getPermissionAssignedRole($aRow['ROL_UID'], $item['PER_UID']);
                 $assignPermissions = true;
                 if (!$isAssignedNewpermissions) {
-                    if ($aRow['ROL_CODE'] == 'PROCESSMAKER_OPERATOR' && in_array($item['PER_CODE'],
-                            $permissionsForOperator)) {
+                    if ($aRow['ROL_CODE'] == 'PROCESSMAKER_OPERATOR' && in_array(
+                            $item['PER_CODE'],
+                            $permissionsForOperator
+                        )) {
                         $assignPermissions = false;
                     }
                     if (!in_array($aRow['ROL_CODE'], $perCodePM)) {
                         $assignPermissions = false;
-                        $checkPermisionEdit = $this->getPermissionAssignedRole($aRow['ROL_UID'],
-                            '00000000000000000000000000000014');
+                        $checkPermisionEdit = $this->getPermissionAssignedRole(
+                            $aRow['ROL_UID'],
+                            '00000000000000000000000000000014'
+                        );
                         if ($checkPermisionEdit && !in_array($item['PER_CODE'], $permissionsForOperator)) {
                             $assignPermissions = true;
                         }
@@ -2025,4 +2020,3 @@ class RBAC
         return self::GUEST_USER_UID === $usrUid;
     }
 }
-
diff --git a/gulliver/system/class.wysiwygEditor.php b/gulliver/system/class.wysiwygEditor.php
index 9d76da2df..77f0fdcdc 100644
--- a/gulliver/system/class.wysiwygEditor.php
+++ b/gulliver/system/class.wysiwygEditor.php
@@ -29,13 +29,12 @@
  * XmlFormFieldWYSIWYGEditor class definition
  * It is useful to see dynaforms how are built
  *
- * @package gulliver.system
+ * @package       gulliver.system
  * @author
  *
  * @copyright (C) 2012 by Colosa Development Team.
  *
  */
-
 class XmlFormFieldWYSIWYGEditor extends XmlFormField
 {
     public $width = '100%';
@@ -50,15 +49,18 @@ class XmlFormFieldWYSIWYGEditor extends XmlFormField
      *
      * @author
      * @access public
+     *
      * @param string $value
      * @param string $owner
+     *
      * @return string
      *
      */
-    public function render ($value, $owner = null)
+    public function render($value, $owner = null)
     {
         $value = ($value == '') ? '<br/>' : $value;
-        $html  = "<textArea class='tmceEditor' id='form[" . $this->name . "]' name='form[" . $this->name . "]' >" . htmlentities( $value, ENT_QUOTES, 'UTF-8' ) . "</textarea>";
+        $html = "<textArea class='tmceEditor' id='form[" . $this->name . "]' name='form[" . $this->name . "]' >" . htmlentities($value,
+                ENT_QUOTES, 'UTF-8') . "</textarea>";
         return $html;
     }
 
@@ -68,19 +70,21 @@ class XmlFormFieldWYSIWYGEditor extends XmlFormField
      *
      * @author
      * @access public
+     *
      * @param string $element
+     *
      * @return string
      *
      */
-    public function attachEvents ($element)
+    public function attachEvents($element)
     {
-        $editorDefinition  = 'tinyMCE.baseURL = "/js/tinymce/jscripts/tiny_mce"; ';
-        $editorDefinition .= 'var domainURL   = "/sys'.config("system.workspace").'/'.SYS_LANG.'/'.SYS_SKIN.'/"';
-        $serverConf =& ServerConf::getSingleton();
+        $editorDefinition = 'tinyMCE.baseURL = "/js/tinymce/jscripts/tiny_mce"; ';
+        $editorDefinition .= 'var domainURL   = "/sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN . '/"';
+        $serverConf = ServerConf::getSingleton();
 
-        switch ($this->editorType){
+        switch ($this->editorType) {
             case 'EMAIL_TEMPLATE':
-                $editorDefinition.= '
+                $editorDefinition .= '
                 // is necessary the process uid variable in order to load the picker correctly
                 var actualCaretPositionBookmark;
                 var formProcessID = document.getElementById("form[pro_uid]").value;
@@ -118,7 +122,7 @@ class XmlFormFieldWYSIWYGEditor extends XmlFormField
                 ';
                 break;
             case 'OUTPUT_DOCUMENT':
-                $editorDefinition.= '
+                $editorDefinition .= '
                 // is necessary the process uid variable in order to load the picker correctly
                 var formProcessID = document.getElementById("form[PRO_UID]").value;
                 tinyMCE.init({
@@ -156,7 +160,7 @@ class XmlFormFieldWYSIWYGEditor extends XmlFormField
                 break;
 
             case 'DYNAFORM_TEMPLATE':
-                $editorDefinition.= '
+                $editorDefinition .= '
                 var formProcessID = document.getElementById("form[PRO_UID]").value;
                 var formDynaformID = document.getElementById("form[DYN_UID]").value;
                 var actualCaretPositionBookmark;
@@ -177,7 +181,7 @@ class XmlFormFieldWYSIWYGEditor extends XmlFormField
                     popup_css : "/js/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css",
                     skin : "o2k7",
                     skin_variant : "silver",
-                    content_css : "/css/'.SYS_SKIN.'.css",
+                    content_css : "/css/' . SYS_SKIN . '.css",
                     template_external_list_url : "js/template_list.js",
                     external_link_list_url : "js/link_list.js",
                     external_image_list_url : "js/image_list.js",
@@ -207,7 +211,7 @@ class XmlFormFieldWYSIWYGEditor extends XmlFormField
                 ';
                 break;
             default:
-                $editorDefinition.= '
+                $editorDefinition .= '
                     tinyMCE.init({
                         // General options
                         mode : "textareas",
diff --git a/gulliver/system/class.xmlMenu.php b/gulliver/system/class.xmlMenu.php
index 2bba1b6e7..763ad1b3d 100644
--- a/gulliver/system/class.xmlMenu.php
+++ b/gulliver/system/class.xmlMenu.php
@@ -84,7 +84,7 @@ class XmlFormFieldXmlMenu extends XmlFormField
         $this->type = 'xmlmenuDyn';
         $template = PATH_CORE . 'templates/' . $this->type . '.html';
         $out = $this->xmlMenu->render( $template, $scriptCode );
-        $oHeadPublisher = & headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         $oHeadPublisher->addScriptFile( $this->xmlMenu->scriptURL );
         $oHeadPublisher->addScriptCode( $scriptCode );
         return $out;
diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 0c0f13c76..261aaddce 100644
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -64,26 +64,26 @@ class XmlFormField
      * @param string home
      * @return string
      */
-    public function __construct ($xmlNode, $lang = 'en', $home = '', $owner = null)
+    public function __construct($xmlNode, $lang = 'en', $home = '', $owner = null)
     {
         //Loads any attribute that were defined in the xmlNode
         //except name and label.
-        $myAttributes = get_class_vars( get_class( $this ) );
+        $myAttributes = get_class_vars(get_class($this));
         foreach ($myAttributes as $k => $v) {
-            $myAttributes[$k] = strtoupper( $k );
+            $myAttributes[$k] = strtoupper($k);
         }
         //$data: Includes labels and options.
-        $data = &$xmlNode->findNode( $lang );
-        if (! isset( $data->value )) {
+        $data = &$xmlNode->findNode($lang);
+        if (!isset($data->value)) {
             //It seems that in the actual language there are no value for the current field, so get the value in English
-            $data = &$xmlNode->findNode( "en" );
-            if (! isset( $data->value )) {
+            $data = &$xmlNode->findNode("en");
+            if (!isset($data->value)) {
                 //It seems that in the actual language there are no value for the current field, so get the value in First language
-                if (isset( $xmlNode->children[0] )) {
+                if (isset($xmlNode->children[0])) {
                     //Lets find first child
-                    if ((isset( $xmlNode->children[0]->name )) && (strlen( $xmlNode->children[0]->name ) == 2)) {
+                    if ((isset($xmlNode->children[0]->name)) && (strlen($xmlNode->children[0]->name) == 2)) {
                         //Just to be sure that the node ocrresponds to a valid lang
-                        $data = &$xmlNode->findNode( $xmlNode->children[0]->name );
+                        $data = &$xmlNode->findNode($xmlNode->children[0]->name);
                     }
                 }
             }
@@ -92,18 +92,18 @@ class XmlFormField
 
         /*Loads the field attributes*/
         foreach ($xmlNode->attributes as $k => $v) {
-            $key = array_search( strtoupper( $k ), $myAttributes );
+            $key = array_search(strtoupper($k), $myAttributes);
             if ($key) {
-                eval( '$this->' . $key . '=$v;' );
+                eval('$this->' . $key . '=$v;');
             }
         }
         //Loads the main attributes
         $this->name = $xmlNode->name;
-        $this->type = strtolower( $xmlNode->attributes['type'] );
-        preg_match( '/\s*([^\s][\w\W]*)?/m', $xmlNode->value, $matches );
-        $this->sql = (isset( $matches[1] )) ? $matches[1] : '';
+        $this->type = strtolower($xmlNode->attributes['type']);
+        preg_match('/\s*([^\s][\w\W]*)?/m', $xmlNode->value, $matches);
+        $this->sql = (isset($matches[1])) ? $matches[1] : '';
         //List Options
-        if (isset( $data->children )) {
+        if (isset($data->children)) {
             foreach ($data->children as $k => $v) {
                 if ($v->type !== 'cdata') {
                     if (isset($v->name) && isset($v->attributes["name"])) {
@@ -112,10 +112,10 @@ class XmlFormField
                 }
             }
         }
-        $this->options = (isset( $this->option )) ? $this->option : array ();
+        $this->options = (isset($this->option)) ? $this->option : [];
         //Sql Options : cause warning because values are not setted yet.
-        if (isset( $owner )) {
-            if (isset( $owner->mode )) {
+        if (isset($owner)) {
+            if (isset($owner->mode)) {
                 $ownerMode = $owner->mode;
             } else {
                 $ownerMode = '';
@@ -138,9 +138,9 @@ class XmlFormField
      * @param $value
      * @return boolean true/false
      */
-    public function validateValue ($value)
+    public function validateValue($value)
     {
-        return isset( $value );
+        return isset($value);
     }
 
     /**
@@ -150,49 +150,48 @@ class XmlFormField
      * @param $row
      * @return $result array of results
      */
-    private function executeXmlDB (&$owner, $row = -1)
+    private function executeXmlDB(&$owner, $row = -1)
     {
-        if (! $this->sqlConnection) {
+        if (!$this->sqlConnection) {
             $dbc = new DBConnection();
         } else {
-
-            if (defined( 'DB_' . $this->sqlConnection . '_USER' )) {
-                if (defined( 'DB_' . $this->sqlConnection . '_HOST' )) {
-                    eval( '$res[\'DBC_SERVER\'] = DB_' . $this->sqlConnection . '_HOST;' );
+            if (defined('DB_' . $this->sqlConnection . '_USER')) {
+                if (defined('DB_' . $this->sqlConnection . '_HOST')) {
+                    eval('$res[\'DBC_SERVER\'] = DB_' . $this->sqlConnection . '_HOST;');
                 } else {
                     $res['DBC_SERVER'] = DB_HOST;
                 }
-                if (defined( 'DB_' . $this->sqlConnection . '_USER' )) {
-                    eval( '$res[\'DBC_USERNAME\'] = DB_' . $this->sqlConnection . '_USER;' );
+                if (defined('DB_' . $this->sqlConnection . '_USER')) {
+                    eval('$res[\'DBC_USERNAME\'] = DB_' . $this->sqlConnection . '_USER;');
                 }
-                if (defined( 'DB_' . $this->sqlConnection . '_PASS' )) {
-                    eval( '$res[\'DBC_PASSWORD\'] = DB_' . $this->sqlConnection . '_PASS;' );
+                if (defined('DB_' . $this->sqlConnection . '_PASS')) {
+                    eval('$res[\'DBC_PASSWORD\'] = DB_' . $this->sqlConnection . '_PASS;');
                 } else {
                     $res['DBC_PASSWORD'] = DB_PASS;
                 }
-                if (defined( 'DB_' . $this->sqlConnection . '_NAME' )) {
-                    eval( '$res[\'DBC_DATABASE\'] = DB_' . $this->sqlConnection . '_NAME;' );
+                if (defined('DB_' . $this->sqlConnection . '_NAME')) {
+                    eval('$res[\'DBC_DATABASE\'] = DB_' . $this->sqlConnection . '_NAME;');
                 } else {
                     $res['DBC_DATABASE'] = DB_NAME;
                 }
-                if (defined( 'DB_' . $this->sqlConnection . '_TYPE' )) {
-                    eval( '$res[\'DBC_TYPE\'] = DB_' . $this->sqlConnection . '_TYPE;' );
+                if (defined('DB_' . $this->sqlConnection . '_TYPE')) {
+                    eval('$res[\'DBC_TYPE\'] = DB_' . $this->sqlConnection . '_TYPE;');
                 } else {
-                    $res['DBC_TYPE'] = defined( 'DB_TYPE' ) ? DB_TYPE : 'mysql';
+                    $res['DBC_TYPE'] = defined('DB_TYPE') ? DB_TYPE : 'mysql';
                 }
-                $dbc = new DBConnection( $res['DBC_SERVER'], $res['DBC_USERNAME'], $res['DBC_PASSWORD'], $res['DBC_DATABASE'], $res['DBC_TYPE'] );
+                $dbc = new DBConnection($res['DBC_SERVER'], $res['DBC_USERNAME'], $res['DBC_PASSWORD'], $res['DBC_DATABASE'], $res['DBC_TYPE']);
             } else {
                 $dbc0 = new DBConnection();
-                $dbs0 = new DBSession( $dbc0 );
-                $res = $dbs0->execute( "select * from  DB_CONNECTION WHERE DBC_UID=" . $this->sqlConnection );
+                $dbs0 = new DBSession($dbc0);
+                $res = $dbs0->execute("select * from  DB_CONNECTION WHERE DBC_UID=" . $this->sqlConnection);
                 $res = $res->read();
-                $dbc = new DBConnection( $res['DBC_SERVER'], $res['DBC_USERNAME'], $res['DBC_PASSWORD'], $res['DBC_DATABASE'] );
+                $dbc = new DBConnection($res['DBC_SERVER'], $res['DBC_USERNAME'], $res['DBC_PASSWORD'], $res['DBC_DATABASE']);
             }
         }
-        $query = G::replaceDataField( $this->sql, $owner->values );
-        $dbs = new DBSession( $dbc );
-        $res = $dbs->execute( $query );
-        $result = array ();
+        $query = G::replaceDataField($this->sql, $owner->values);
+        $dbs = new DBSession($dbc);
+        $res = $dbs->execute($query);
+        $result = [];
         while ($row = $res->Read()) {
             $result[] = $row;
         }
@@ -206,28 +205,28 @@ class XmlFormField
      * @param $row
      * @return $result array of
      */
-    private function executePropel (&$owner, $row = -1)
+    private function executePropel(&$owner, $row = -1)
     {
         //g::pr($row);
-        if (! isset( $owner->values[$this->name] )) {
-            if ($row > - 1) {
-                $owner->values[$this->name] = array ();
+        if (!isset($owner->values[$this->name])) {
+            if ($row > -1) {
+                $owner->values[$this->name] = [];
             } else {
                 $owner->values[$this->name] = '';
             }
         }
-        if (! is_array( $owner->values[$this->name] )) {
+        if (!is_array($owner->values[$this->name])) {
             //echo '1';
-            $query = G::replaceDataField( $this->sql, $owner->values );
+            $query = G::replaceDataField($this->sql, $owner->values);
         } else {
-            $aAux = array ();
+            $aAux = [];
             foreach ($owner->values as $key => $data) {
-                if (is_array( $data )) {
+                if (is_array($data)) {
                     //echo '3:'.$key.' ';
-                    if (isset( $data[$row] )) {
+                    if (isset($data[$row])) {
                         $qValue = $data[$row];
                     } else {
-                        if (isset( $owner->fields[$key]->selectedValue )) {
+                        if (isset($owner->fields[$key]->selectedValue)) {
                             $qValue = $owner->fields[$key]->selectedValue;
                         } else {
                             $qValue = '';
@@ -243,31 +242,31 @@ class XmlFormField
 
             //echo '2';
             //g::pr($aAux);
-            $query = G::replaceDataField( $this->sql, $aAux );
+            $query = G::replaceDataField($this->sql, $aAux);
         }
         //echo $query;
 
-        $result = array ();
+        $result = [];
         if ($this->sqlConnection == 'dbarray') {
             try {
-                $con = Propel::getConnection( $this->sqlConnection );
+                $con = Propel::getConnection($this->sqlConnection);
                 $stmt = $con->createStatement();
-                $rs = $con->executeQuery( $query, ResultSet::FETCHMODE_NUM );
+                $rs = $con->executeQuery($query, ResultSet::FETCHMODE_NUM);
             } catch (Exception $e) {
                 //dismiss error because dbarray shouldnt be defined in some contexts.
-                $workspace = !empty(config("system.workspace"))? config("system.workspace") : "Undefined Workspace";
+                $workspace = !empty(config("system.workspace")) ? config("system.workspace") : "Undefined Workspace";
                 G::log($workspace . " | ip: | " . G::getIpAddress() . " | type error: | " . $e->getMessage() . " | query: " . $query, PATH_DATA, "queriesWithErrors.log");
 
                 return $result;
             }
         } else {
             try {
-                $con = Propel::getConnection( $this->sqlConnection );
+                $con = Propel::getConnection($this->sqlConnection);
                 $stmt = $con->createStatement();
-                $rs = $stmt->executeQuery( $query, ResultSet::FETCHMODE_NUM );
+                $rs = $stmt->executeQuery($query, ResultSet::FETCHMODE_NUM);
             } catch (Exception $e) {
                 //dismiss error because dbarray shouldnt be defined in some contexts.
-                $workspace = !empty(config("system.workspace"))? config("system.workspace") : "Undefined Workspace";
+                $workspace = !empty(config("system.workspace")) ? config("system.workspace") : "Undefined Workspace";
                 G::log($workspace . " | ip: | " . G::getIpAddress() . " | type error: | " . $e->getMessage() . " | query: " . $query, PATH_DATA, "queriesWithErrors.log");
 
                 return $result;
@@ -276,7 +275,7 @@ class XmlFormField
 
         $rs->next();
         $row = $rs->getRow();
-        while (is_array( $row )) {
+        while (is_array($row)) {
             $result[] = $row;
             $rs->next();
             $row = $rs->getRow();
@@ -291,52 +290,52 @@ class XmlFormField
      * @param string owner
      * @return string
      */
-    public function executeSQL (&$owner, $row = -1)
+    public function executeSQL(&$owner, $row = -1)
     {
-        if (! isset( $this->sql )) {
+        if (!isset($this->sql)) {
             return 1;
         }
         if ($this->sql === '') {
             return 1;
         }
 
-        if(isset($this->mode) && $this->mode == "edit" && (isset($this->owner->values[$this->name]) && $this->owner->values[$this->name] !== "") && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")){
-        	return 1;
+        if (isset($this->mode) && $this->mode == "edit" && (isset($this->owner->values[$this->name]) && $this->owner->values[$this->name] !== "") && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")) {
+            return 1;
         }
 
-        if(isset($this->mode) && $this->mode == "view" && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")){
-        	return 1;
+        if (isset($this->mode) && $this->mode == "view" && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")) {
+            return 1;
         }
 
-        if (! $this->sqlConnection) {
+        if (!$this->sqlConnection) {
             $this->sqlConnection = 'workflow';
         }
 
-            //Read the result of the query
+        //Read the result of the query
         if ($this->sqlConnection === "XMLDB") {
-            $result = $this->executeXmlDB( $owner, $row );
+            $result = $this->executeXmlDB($owner, $row);
         } else {
-            $result = $this->executePropel( $owner, $row );
+            $result = $this->executePropel($owner, $row);
         }
-        $this->sqlOption = array ();
-        $this->options = array ();
-        if (isset( $this->option )) {
+        $this->sqlOption = [];
+        $this->options = [];
+        if (isset($this->option)) {
             foreach ($this->option as $k => $v) {
                 $this->options[$k] = $v;
             }
         }
-        for ($r = 0; $r < sizeof( $result ); $r ++) {
-            $key = reset( $result[$r] );
-            $this->sqlOption[$key] = next( $result[$r] );
+        for ($r = 0; $r < sizeof($result); $r++) {
+            $key = reset($result[$r]);
+            $this->sqlOption[$key] = next($result[$r]);
             $this->options[$key] = $this->sqlOption[$key];
         }
 
         if ($this->type != 'listbox') {
-            if (isset( $this->options ) && isset( $this->owner ) && isset( $this->owner->values[$this->name] )) {
-                if ((! is_array( $this->owner->values[$this->name] )) && ! ((is_string( $this->owner->values[$this->name] ) || is_int( $this->owner->values[$this->name] )) && array_key_exists( $this->owner->values[$this->name], $this->options ))) {
-                    reset( $this->options );
-                    $firstElement = key( $this->options );
-                    if (isset( $firstElement )) {
+            if (isset($this->options) && isset($this->owner) && isset($this->owner->values[$this->name])) {
+                if ((!is_array($this->owner->values[$this->name])) && !((is_string($this->owner->values[$this->name]) || is_int($this->owner->values[$this->name])) && array_key_exists($this->owner->values[$this->name], $this->options))) {
+                    reset($this->options);
+                    $firstElement = key($this->options);
+                    if (isset($firstElement)) {
                         $this->owner->values[$this->name] = $firstElement;
                     } else {
                         $this->owner->values[$this->name] = '';
@@ -356,13 +355,12 @@ class XmlFormField
      * @return <any>
      */
 
-    public function htmlentities ($value, $flags = ENT_QUOTES, $encoding = 'utf-8')
+    public function htmlentities($value, $flags = ENT_QUOTES, $encoding = 'utf-8')
     {
-
         if ($this->enableHtml) {
             return $value;
         } else {
-            return htmlentities( $value, $flags, $encoding );
+            return htmlentities($value, $flags, $encoding);
         }
     }
 
@@ -376,7 +374,7 @@ class XmlFormField
     public function render($value = null, $paramDummy2 = null)
     {
         //this is an unknown field type.
-        return $this->htmlentities( $value != '' ? $value : $this->name, ENT_COMPAT, 'utf-8' );
+        return $this->htmlentities($value != '' ? $value : $this->name, ENT_COMPAT, 'utf-8');
     }
 
     /**
@@ -386,13 +384,13 @@ class XmlFormField
      * @param string values
      * @return string
      */
-    public function renderGrid ($values = array(), $owner = null, $onlyValue = false, $therow = -1)
+    public function renderGrid($values = array(), $owner = null, $onlyValue = false, $therow = -1)
     {
-        $result = array ();
+        $result = [];
         $r = 1;
         foreach ($values as $v) {
-            $result[] = $this->render( $v, $owner, '[' . $owner->name . '][' . $r . ']', $onlyValue, $r, $therow );
-            $r ++;
+            $result[] = $this->render($v, $owner, '[' . $owner->name . '][' . $r . ']', $onlyValue, $r, $therow);
+            $r++;
         }
         return $result;
     }
@@ -405,10 +403,10 @@ class XmlFormField
      * @param <Boolean> $onlyValue
      * @return <String> $result
      */
-    public function renderTable ($values = '', $owner = null, $onlyValue = false)
+    public function renderTable($values = '', $owner = null, $onlyValue = false)
     {
         $r = 1;
-        $result = $this->render( $values, $owner, '[' . $owner->name . '][' . $r . ']', $onlyValue );
+        $result = $this->render($values, $owner, '[' . $owner->name . '][' . $r . ']', $onlyValue);
         return $result;
     }
 
@@ -418,11 +416,11 @@ class XmlFormField
      * @access public
      * @return array
      */
-    public function dependentOf ()
+    public function dependentOf()
     {
-        $fields = array ();
-        if (isset( $this->formula )) {
-            preg_match_all( "/\b[a-zA-Z][a-zA-Z_0-9]*\b/", $this->formula, $matches, PREG_PATTERN_ORDER );
+        $fields = [];
+        if (isset($this->formula)) {
+            preg_match_all("/\b[a-zA-Z][a-zA-Z_0-9]*\b/", $this->formula, $matches, PREG_PATTERN_ORDER);
             /*      if ($this->formula!=''){
             var_dump($this->formula);
             var_dump($matches);
@@ -445,26 +443,27 @@ class XmlFormField
      * @param string value
      * @return string
      */
-    public function mask ($format, $value)
+    public function mask($format, $value)
     {
-        $value = explode( '', $value );
-        for ($j = 0; $j < strlen( $format ); $j ++) {
+        $value = explode('', $value);
+        for ($j = 0; $j < strlen($format); $j++) {
             $result = '';
             $correct = true;
-            for ($i = $j; $i < strlen( $format ); $i ++) {
-                $a = substr( $format, $i, 1 );
-                $e = $i < strlen( $value ) ? substr( $value, $i, 1 ) : '';
+            for ($i = $j; $i < strlen($format); $i++) {
+                $a = substr($format, $i, 1);
+                $e = $i < strlen($value) ? substr($value, $i, 1) : '';
                 //$e=$i<strlen($format)?substr($format, $i+1,1):'';
                 switch ($a) {
                     case '0':
                         if ($e === '') {
                             $e = '0';
                         }
+                    // no break
                     case '#':
                         if ($e === '') {
                             break 3;
                         }
-                        if (strpos( '0123456789', $e ) !== false) {
+                        if (strpos('0123456789', $e) !== false) {
                             $result .= $e;
                         } else {
                             $correct = false;
@@ -481,6 +480,7 @@ class XmlFormField
                         if ($e !== $a) {
                             break 2;
                         }
+                    // no break
                     default:
                         if ($e === '') {
                             break 3;
@@ -504,9 +504,9 @@ class XmlFormField
      * @access public
      * @return string
      */
-    public function getAttributes ()
+    public function getAttributes()
     {
-        $attributes = array ();
+        $attributes = [];
         foreach ($this as $attribute => $value) {
             switch ($attribute) {
                 case 'sql':
@@ -516,17 +516,17 @@ class XmlFormField
                 case 'owner':
                     break;
                 default:
-                    if (substr( $attribute, 0, 2 ) !== 'on') {
+                    if (substr($attribute, 0, 2) !== 'on') {
                         $attributes[$attribute] = $value;
                     }
             }
         }
-        if (sizeof( $attributes ) < 1) {
+        if (sizeof($attributes) < 1) {
             return '{}';
         }
         //$json = new Services_JSON();
         //return $json->encode( $attributes );
-        return G::json_encode( $attributes );
+        return G::json_encode($attributes);
     }
 
     /**
@@ -535,20 +535,20 @@ class XmlFormField
      * @access public
      * @return string
      */
-    public function getEvents ()
+    public function getEvents()
     {
-        $events = array ();
+        $events = [];
         foreach ($this as $attribute => $value) {
-            if (substr( $attribute, 0, 2 ) === 'on') {
+            if (substr($attribute, 0, 2) === 'on') {
                 $events[$attribute] = $value;
             }
         }
-        if (sizeof( $events ) < 1) {
+        if (sizeof($events) < 1) {
             return '{}';
         }
         //$json = new Services_JSON();
         //return $json->encode( $events );
-        return G::json_encode( $events );
+        return G::json_encode($events);
     }
 
     /**
@@ -558,12 +558,12 @@ class XmlFormField
      * @param $elementRef
      * @access public
      */
-    public function attachEvents ($elementRef)
+    public function attachEvents($elementRef)
     {
         $events = '';
         foreach ($this as $attribute => $value) {
-            if (substr( $attribute, 0, 2 ) == 'on') {
-                $events = 'if (' . $elementRef . ') leimnud.event.add(' . $elementRef . ',"' . substr( $attribute, 2 ) . '",function(){' . $value . '});' . "\n";
+            if (substr($attribute, 0, 2) == 'on') {
+                $events = 'if (' . $elementRef . ') leimnud.event.add(' . $elementRef . ',"' . substr($attribute, 2) . '",function(){' . $value . '});' . "\n";
             }
         }
     }
@@ -575,23 +575,23 @@ class XmlFormField
      * @access public
      * @return Xml_Node
      */
-    public function createXmlNode ($includeDefaultValues = false)
+    public function createXmlNode($includeDefaultValues = false)
     {
         /* Start Comment: Creates the corresponding XML Tag for $this
         *    object.
         */
-        $attributesList = $this->getXmlAttributes( $includeDefaultValues );
-        $node = new Xml_Node( $this->name, 'open', $this->sql, $attributesList );
+        $attributesList = $this->getXmlAttributes($includeDefaultValues);
+        $node = new Xml_Node($this->name, 'open', $this->sql, $attributesList);
         /* End Comment */
         /* Start Comment: Creates the languages nodes and options
         *   if exist.
         */
-        $node->addChildNode( new Xml_Node( '', 'cdata', "\n" ) );
-        $node->addChildNode( new Xml_Node( $this->language, 'open', $this->label ) );
-        if (isset( $this->option )) {
+        $node->addChildNode(new Xml_Node('', 'cdata', "\n"));
+        $node->addChildNode(new Xml_Node($this->language, 'open', $this->label));
+        if (isset($this->option)) {
             foreach ($this->option as $k => $v) {
-                $node->children[1]->addChildNode( new Xml_Node( 'option', 'open', $v, array ('name' => $k
-                ) ) );
+                $node->children[1]->addChildNode(new Xml_Node('option', 'open', $v, array('name' => $k
+                )));
             }
         }
         /* End Comment */
@@ -606,24 +606,24 @@ class XmlFormField
      * @param string value
      * @return Xml_Node
      */
-    public function &updateXmlNode (&$node, $includeDefaultValues = false)
+    public function &updateXmlNode(&$node, $includeDefaultValues = false)
     {
         /* Start Comment: Modify the node's attributes and value.
         */
-        $attributesList = $this->getXmlAttributes( $includeDefaultValues );
+        $attributesList = $this->getXmlAttributes($includeDefaultValues);
         $node->name = $this->name;
         $node->value = $this->sql;
         $node->attributes = $attributesList;
         /* End Comment */
         /* Start Comment: Modifies the languages nodes
         */
-        $langNode = & $node->findNode( $this->language );
+        $langNode = &$node->findNode($this->language);
         $langNode->value = $this->label;
-        if (isset( $this->option )) {
-            $langNode->children = array ();
+        if (isset($this->option)) {
+            $langNode->children = [];
             foreach ($this->option as $k => $v) {
-                $langNode->addChildNode( new Xml_Node( 'option', 'open', $v, array ('name' => $k
-                ) ) );
+                $langNode->addChildNode(new Xml_Node('option', 'open', $v, array('name' => $k
+                )));
             }
         }
         /* End Comment */
@@ -639,12 +639,12 @@ class XmlFormField
      * with default values.
      * @return Xml_Node
      */
-    public function getXmlAttributes ($includeDefaultValues = false)
+    public function getXmlAttributes($includeDefaultValues = false)
     {
-        $attributesList = array ();
-        $class = get_class( $this );
-        $default = new $class( new Xml_Node( 'DEFAULT', 'open', '', array ('type' => $this->type
-        ) ) );
+        $attributesList = [];
+        $class = get_class($this);
+        $default = new $class(new Xml_Node('DEFAULT', 'open', '', array('type' => $this->type
+        )));
         foreach ($this as $k => $v) {
             switch ($k) {
                 case 'owner':
@@ -669,7 +669,7 @@ class XmlFormField
      * @param &$owner
      * @return $value
      */
-    public function maskValue ($value, &$owner)
+    public function maskValue($value, &$owner)
     {
         return $value;
     }
@@ -679,7 +679,7 @@ class XmlFormField
      *
      * @return <Object>
      */
-    public function cloneObject ()
+    public function cloneObject()
     {
         //return unserialize( serialize( $this ) );//con este cambio los formularios ya no funcionan en php4
         return clone ($this);
@@ -691,69 +691,67 @@ class XmlFormField
      * @param <Object> $oOwner
      * @return <String> $sValue
      */
-    public function getPMTableValue ($oOwner)
+    public function getPMTableValue($oOwner)
     {
         $sValue = '';
-        if (isset( $oOwner->fields[$this->pmconnection] )) {
-            if (defined( 'PATH_CORE' )) {
-                if (file_exists( PATH_CORE . 'classes' . PATH_SEP . 'model' . PATH_SEP . 'AdditionalTables.php' )) {
-
+        if (isset($oOwner->fields[$this->pmconnection])) {
+            if (defined('PATH_CORE')) {
+                if (file_exists(PATH_CORE . 'classes' . PATH_SEP . 'model' . PATH_SEP . 'AdditionalTables.php')) {
                     $oAdditionalTables = new AdditionalTables();
                     try {
-                        $aData = $oAdditionalTables->load( $oOwner->fields[$this->pmconnection]->pmtable, true );
+                        $aData = $oAdditionalTables->load($oOwner->fields[$this->pmconnection]->pmtable, true);
                     } catch (Exception $oError) {
-                        $aData = array ('FIELDS' => array ());
+                        $aData = array('FIELDS' => array());
                     }
-                    $aKeys = array ();
-                    $aValues = explode( '|', $oOwner->fields[$this->pmconnection]->keys );
+                    $aKeys = [];
+                    $aValues = explode('|', $oOwner->fields[$this->pmconnection]->keys);
                     $i = 0;
-                    if($aData == "" || count($aData['FIELDS']) < 1){
-                    	$message = G::LoadTranslation( 'ID_PMTABLE_NOT_FOUND' );
-                        G::SendMessageText( $message, "WARNING" );
+                    if ($aData == "" || count($aData['FIELDS']) < 1) {
+                        $message = G::LoadTranslation('ID_PMTABLE_NOT_FOUND');
+                        G::SendMessageText($message, "WARNING");
                         $sValue = "";
                     } else {
-                    	foreach ($aData['FIELDS'] as $aField) {
-                    		if ($aField['FLD_KEY'] == '1') {
-                    			// note added by gustavo cruz gustavo[at]colosa[dot]com
-                    			// this additional [if] checks if a case variable has been set
-                    			// in the keys attribute, so it can be parsed and replaced for
-                    			// their respective value.
-                    			if (preg_match( "/@#/", $aValues[$i] )) {
-                    				// check if a case are running in order to prevent that preview is
-                    				// erroneous rendered.
-                    				if (isset( $_SESSION['APPLICATION'] )) {
-                    					$oApp = new Cases();
-                    					if ($oApp->loadCase( $_SESSION['APPLICATION'] ) != null) {
-                    						$aFields = $oApp->loadCase( $_SESSION['APPLICATION'] );
-                    						$formVariable = substr( $aValues[$i], 2 );
-                    						if (isset( $aFields['APP_DATA'][$formVariable] )) {
-                    							$formVariableValue = $aFields['APP_DATA'][$formVariable];
-                    							$aKeys[$aField['FLD_NAME']] = (isset( $formVariableValue ) ? G::replaceDataField( $formVariableValue, $oOwner->values ) : '');
-                    						} else {
-                    							$aKeys[$aField['FLD_NAME']] = '';
-                    						}
-                    					} else {
-                    						$aKeys[$aField['FLD_NAME']] = '';
-                    					}
-                    				} else {
-                    					$aKeys[$aField['FLD_NAME']] = '';
-                    				}
-                    			} else {
-                    				$aKeys[$aField['FLD_NAME']] = (isset( $aValues[$i] ) ? G::replaceDataField( $aValues[$i], $oOwner->values ) : '');
-                    			}
-                    			$i ++;
-                    		}
-                    	}
-                    	try {
-                    		$aData = $oAdditionalTables->getDataTable( $oOwner->fields[$this->pmconnection]->pmtable, $aKeys );
-                    	} catch (Exception $oError) {
-                    		$aData = array ();
-                    	}
-                    	if (isset( $aData[$this->pmfield] )) {
-                    		$sValue = $aData[$this->pmfield];
-                    	}
+                        foreach ($aData['FIELDS'] as $aField) {
+                            if ($aField['FLD_KEY'] == '1') {
+                                // note added by gustavo cruz gustavo[at]colosa[dot]com
+                                // this additional [if] checks if a case variable has been set
+                                // in the keys attribute, so it can be parsed and replaced for
+                                // their respective value.
+                                if (preg_match("/@#/", $aValues[$i])) {
+                                    // check if a case are running in order to prevent that preview is
+                                    // erroneous rendered.
+                                    if (isset($_SESSION['APPLICATION'])) {
+                                        $oApp = new Cases();
+                                        if ($oApp->loadCase($_SESSION['APPLICATION']) != null) {
+                                            $aFields = $oApp->loadCase($_SESSION['APPLICATION']);
+                                            $formVariable = substr($aValues[$i], 2);
+                                            if (isset($aFields['APP_DATA'][$formVariable])) {
+                                                $formVariableValue = $aFields['APP_DATA'][$formVariable];
+                                                $aKeys[$aField['FLD_NAME']] = (isset($formVariableValue) ? G::replaceDataField($formVariableValue, $oOwner->values) : '');
+                                            } else {
+                                                $aKeys[$aField['FLD_NAME']] = '';
+                                            }
+                                        } else {
+                                            $aKeys[$aField['FLD_NAME']] = '';
+                                        }
+                                    } else {
+                                        $aKeys[$aField['FLD_NAME']] = '';
+                                    }
+                                } else {
+                                    $aKeys[$aField['FLD_NAME']] = (isset($aValues[$i]) ? G::replaceDataField($aValues[$i], $oOwner->values) : '');
+                                }
+                                $i++;
+                            }
+                        }
+                        try {
+                            $aData = $oAdditionalTables->getDataTable($oOwner->fields[$this->pmconnection]->pmtable, $aKeys);
+                        } catch (Exception $oError) {
+                            $aData = [];
+                        }
+                        if (isset($aData[$this->pmfield])) {
+                            $sValue = $aData[$this->pmfield];
+                        }
                     }
-
                 }
             }
         }
@@ -768,9 +766,9 @@ class XmlFormField
      * @return string
      */
 
-    public function NSRequiredValue ($show = false)
+    public function NSRequiredValue($show = false)
     {
-        if (isset( $this->required )) {
+        if (isset($this->required)) {
             $req = ($this->required) ? '1' : '0';
         } else {
             $req = '0';
@@ -791,7 +789,7 @@ class XmlFormField
      * @return string
      */
 
-    public function NSGridLabel ($show = false)
+    public function NSGridLabel($show = false)
     {
         $idv = 'pm:label="' . htmlentities($this->pmLabel, ENT_COMPAT, 'utf-8') . '"';
         if ($show) {
@@ -808,7 +806,7 @@ class XmlFormField
      * @param boolean optional (true = always show, false = show only if not empty)
      * @return string
      */
-    public function NSDefaultValue ($show = false)
+    public function NSDefaultValue($show = false)
     {
         $idv = 'pm:defaultvalue="' . $this->defaultValue . '"';
         if ($show) {
@@ -824,7 +822,7 @@ class XmlFormField
      * @author Julio Cesar Laura <contact@julio-laura.com>
      * @return string
      */
-    public function NSFieldType ()
+    public function NSFieldType()
     {
         return 'pmfieldtype="' . $this->type . '"';
     }
@@ -836,7 +834,7 @@ class XmlFormField
      * @param boolean optional (true = always show, false = show only if not empty)
      * @return string
      */
-    public function NSGridType ($show = false)
+    public function NSGridType($show = false)
     {
         $igt = 'pmgridtype="' . $this->gridFieldType . '"';
 
@@ -854,7 +852,7 @@ class XmlFormField
      * @param boolean optional (true = always show, false = show only if not empty)
      * @return string
      */
-    public function NSDependentFields ($show = false)
+    public function NSDependentFields($show = false)
     {
         $idf = 'pm:dependent="' . (($this->dependentFields != '') ? '1' : '0') . '"';
         if ($show) {
@@ -873,7 +871,7 @@ class XmlFormField
      *
      */
 
-    public function renderHint ()
+    public function renderHint()
     {
         $_outHint = '';
         if ($this->hint != '' && $this->mode == 'edit') {
@@ -903,8 +901,8 @@ class XmlFormFieldTitle extends XmlFormField
      */
     public function render($value = null, $owner = null)
     {
-        $this->label = G::replaceDataField( $this->label, $owner->values );
-        return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\' ' . $this->NSFieldType() . ' >' . $this->htmlentities( $this->label ) . '</span>';
+        $this->label = G::replaceDataField($this->label, $owner->values);
+        return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\' ' . $this->NSFieldType() . ' >' . $this->htmlentities($this->label) . '</span>';
     }
 
     /**
@@ -913,7 +911,7 @@ class XmlFormFieldTitle extends XmlFormField
      * @param $value
      * @return false
      */
-    public function validateValue ($value)
+    public function validateValue($value)
     {
         return false;
     }
@@ -937,7 +935,7 @@ class XmlFormFieldSubtitle extends XmlFormField
      */
     public function render($value = null, $paramDummy2 = null)
     {
-        return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\' ' . $this->NSFieldType() . ' >' . $this->htmlentities( $this->label ) . '</span>';
+        return '<span id=\'form[' . $this->name . ']\' name=\'form[' . $this->name . ']\' ' . $this->NSFieldType() . ' >' . $this->htmlentities($this->label) . '</span>';
     }
 
     /**
@@ -946,7 +944,7 @@ class XmlFormFieldSubtitle extends XmlFormField
      * @param $value
      * @return false
      */
-    public function validateValue ($value)
+    public function validateValue($value)
     {
         return false;
     }
@@ -978,19 +976,19 @@ class XmlFormFieldSimpleText extends XmlFormField
     public function render($value = null, $owner = null)
     {
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         }
-        $onkeypress = G::replaceDataField( $this->onkeypress, $owner->values );
+        $onkeypress = G::replaceDataField($this->onkeypress, $owner->values);
         if ($this->mode === 'edit') {
             if ($this->readOnly) {
-                return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="text" size="' . $this->size . '" ' . (isset( $this->maxLength ) ? ' maxlength="' . $this->maxLength . '"' : '') . ' value=\'' . htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' ' . $this->NSRequiredValue() . ' ' . $this->NSFieldType() . ' readOnly="readOnly" style="' . htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" onkeypress="' . htmlentities( $onkeypress, ENT_COMPAT, 'utf-8' ) . '"/>';
+                return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="text" size="' . $this->size . '" ' . (isset($this->maxLength) ? ' maxlength="' . $this->maxLength . '"' : '') . ' value=\'' . htmlentities($value, ENT_COMPAT, 'utf-8') . '\' ' . $this->NSRequiredValue() . ' ' . $this->NSFieldType() . ' readOnly="readOnly" style="' . htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" onkeypress="' . htmlentities($onkeypress, ENT_COMPAT, 'utf-8') . '"/>';
             } else {
-                return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="text" size="' . $this->size . '" ' . (isset( $this->maxLength ) ? ' maxlength="' . $this->maxLength . '"' : '') . ' value=\'' . htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' ' . $this->NSRequiredValue() . ' ' . $this->NSFieldType() . ' style="' . htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" onkeypress="' . htmlentities( $onkeypress, ENT_COMPAT, 'utf-8' ) . '"/>';
+                return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="text" size="' . $this->size . '" ' . (isset($this->maxLength) ? ' maxlength="' . $this->maxLength . '"' : '') . ' value=\'' . htmlentities($value, ENT_COMPAT, 'utf-8') . '\' ' . $this->NSRequiredValue() . ' ' . $this->NSFieldType() . ' style="' . htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" onkeypress="' . htmlentities($onkeypress, ENT_COMPAT, 'utf-8') . '"/>';
             }
         } elseif ($this->mode === 'view') {
-            return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="text" size="' . $this->size . '" ' . (isset( $this->maxLength ) ? ' maxlength="' . $this->maxLength . '"' : '') . ' value=\'' . htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' ' . $this->NSRequiredValue() . ' ' . $this->NSFieldType() . ' style="display:none;' . htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" onkeypress="' . htmlentities( $onkeypress, ENT_COMPAT, 'utf-8' ) . '"/>' . htmlentities( $value, ENT_COMPAT, 'utf-8' );
+            return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="text" size="' . $this->size . '" ' . (isset($this->maxLength) ? ' maxlength="' . $this->maxLength . '"' : '') . ' value=\'' . htmlentities($value, ENT_COMPAT, 'utf-8') . '\' ' . $this->NSRequiredValue() . ' ' . $this->NSFieldType() . ' style="display:none;' . htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" onkeypress="' . htmlentities($onkeypress, ENT_COMPAT, 'utf-8') . '"/>' . htmlentities($value, ENT_COMPAT, 'utf-8');
         } else {
-            return $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+            return $this->htmlentities($value, ENT_COMPAT, 'utf-8');
         }
     }
 
@@ -1004,7 +1002,7 @@ class XmlFormFieldSimpleText extends XmlFormField
      */
     public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
     {
-        $result = array ();
+        $result = [];
         $r = 1;
         if ($owner->mode != 'view') {
             $this->renderMode = $this->modeForGrid;
@@ -1019,8 +1017,8 @@ class XmlFormFieldSimpleText extends XmlFormField
                 $html .= 'id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'type="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" ';
-                $html .= 'value="' . $this->htmlentities( $v, ENT_QUOTES, 'utf-8' ) . '" ';
-                $html .= 'style="' . $this->htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" ';
+                $html .= 'value="' . $this->htmlentities($v, ENT_QUOTES, 'utf-8') . '" ';
+                $html .= 'style="' . $this->htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" ';
                 $html .= $this->NSDefaultValue() . ' ';
                 $html .= $this->NSRequiredValue() . ' ';
                 $html .= $this->NSGridType() . ' ';
@@ -1028,14 +1026,14 @@ class XmlFormFieldSimpleText extends XmlFormField
                 $html .= '/>';
             } else {
                 //VIEW MODE
-                $html .= $this->htmlentities( $v, ENT_QUOTES, 'utf-8' );
+                $html .= $this->htmlentities($v, ENT_QUOTES, 'utf-8');
                 $html .= '<input ';
                 $html .= 'id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
-                $html .= 'type="hidden" value="' . $this->htmlentities( $v, ENT_QUOTES, 'utf-8' ) . '" />';
+                $html .= 'type="hidden" value="' . $this->htmlentities($v, ENT_QUOTES, 'utf-8') . '" />';
             }
             $result[] = $html;
-            $r ++;
+            $r++;
         }
         return $result;
     }
@@ -1062,7 +1060,7 @@ class XmlFormFieldText extends XmlFormFieldSimpleText
     public $readOnly = false;
     public $sqlConnection = 0;
     public $sql = '';
-    public $sqlOption = array ();
+    public $sqlOption = [];
     //Attributes only for grids
     public $gridFieldType = 'text';
     public $formula = '';
@@ -1080,7 +1078,7 @@ class XmlFormFieldText extends XmlFormFieldSimpleText
      * @param string owner
      * @return string
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
         if ($this->autocomplete === '1') {
             $this->autocomplete = "on";
@@ -1093,39 +1091,39 @@ class XmlFormFieldText extends XmlFormFieldSimpleText
             $this->renderMode = $this->mode;
         }
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         } else {
-            $this->executeSQL( $owner );
-            $firstElement = key( $this->sqlOption );
-            if (isset( $firstElement )) {
+            $this->executeSQL($owner);
+            $firstElement = key($this->sqlOption);
+            if (isset($firstElement)) {
                 $value = $firstElement;
             }
         }
 
         //NOTE: string functions must be in G class
         if ($this->strTo === 'UPPER') {
-            $value = strtoupper( $value );
+            $value = strtoupper($value);
         }
         if ($this->strTo === 'LOWER') {
-            $value = strtolower( $value );
+            $value = strtolower($value);
         }
         if ($this->strTo === 'TITLE') {
-            $value = strtolower( $value );
-            $value = ucwords( $value );
+            $value = strtolower($value);
+            $value = ucwords($value);
         }
         if ($this->strTo === 'PHRASE') {
             //$value = strtolower( $value );
 
-            $title = explode(" ",$value);
+            $title = explode(" ", $value);
 
-            $title[0] = ucwords( $title[0] );
+            $title[0] = ucwords($title[0]);
 
             $value = implode(" ", $title);
         }
         //if ($this->strTo==='CAPITALIZE') $value = strtocapitalize($value);
-        $onkeypress = G::replaceDataField( $this->onkeypress, $owner->values );
+        $onkeypress = G::replaceDataField($this->onkeypress, $owner->values);
         if ($this->replaceTags == 1) {
-            $value = G::replaceDataField( $value, $owner->values );
+            $value = G::replaceDataField($value, $owner->values);
         }
 
         $html = '';
@@ -1137,9 +1135,9 @@ class XmlFormFieldText extends XmlFormFieldSimpleText
             $html .= 'name="form[' . $this->name . ']" ';
             $html .= 'type="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" ';
             $html .= 'autocomplete="' . $this->autocomplete . '" ';
-            $html .= 'value="' . $this->htmlentities( $value, ENT_QUOTES, 'utf-8' ) . '" ';
-            $html .= 'style="' . $this->htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" ';
-            $html .= 'onkeypress="' . $this->htmlentities( $onkeypress, ENT_COMPAT, 'utf-8' ) . '" ';
+            $html .= 'value="' . $this->htmlentities($value, ENT_QUOTES, 'utf-8') . '" ';
+            $html .= 'style="' . $this->htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" ';
+            $html .= 'onkeypress="' . $this->htmlentities($onkeypress, ENT_COMPAT, 'utf-8') . '" ';
             $html .= $this->NSDefaultValue() . ' ';
             $html .= $this->NSRequiredValue() . ' ';
             $html .= $this->NSFieldType() . ' ';
@@ -1147,18 +1145,18 @@ class XmlFormFieldText extends XmlFormFieldSimpleText
             $html .= '/>';
         } else {
             //VIEW MODE
-            $html .= $this->htmlentities( $value, ENT_QUOTES, 'utf-8' );
+            $html .= $this->htmlentities($value, ENT_QUOTES, 'utf-8');
             $html .= '<input ';
             $html .= 'id="form[' . $this->name . ']" ';
             $html .= 'name="form[' . $this->name . ']" ';
             $html .= $this->NSFieldType() . ' ';
             $this->enableHtml = false;
-            $html .= 'type="hidden" value="' . $this->htmlentities( $value, ENT_QUOTES, 'utf-8' ) . '" />';
+            $html .= 'type="hidden" value="' . $this->htmlentities($value, ENT_QUOTES, 'utf-8') . '" />';
         }
 
         $html .= $this->renderHint();
         if (($this->readOnly == 1) && ($this->renderMode == 'edit')) {
-            $html = str_replace( "class=\"module_app_input___gray\"", "class=\"module_app_input___gray_readOnly\"", $html );
+            $html = str_replace("class=\"module_app_input___gray\"", "class=\"module_app_input___gray_readOnly\"", $html);
         }
 
         return $html;
@@ -1174,20 +1172,20 @@ class XmlFormFieldText extends XmlFormFieldSimpleText
      */
     public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
     {
-        $result = $aux = array ();
+        $result = $aux = [];
         $r = 1;
         if ($owner->mode != 'view') {
             $this->renderMode = $this->modeForGrid;
         }
 
         foreach ($values as $v) {
-            $this->executeSQL( $owner, $r );
-            $firstElement = key( $this->sqlOption );
-            if (isset( $firstElement )) {
+            $this->executeSQL($owner, $r);
+            $firstElement = key($this->sqlOption);
+            if (isset($firstElement)) {
                 $v = $firstElement;
             }
             if ($this->replaceTags == 1) {
-                $v = G::replaceDataField( $v, $owner->values );
+                $v = G::replaceDataField($v, $owner->values);
             }
             $aux[$r] = $v;
 
@@ -1199,8 +1197,8 @@ class XmlFormFieldText extends XmlFormFieldSimpleText
                 $html .= 'id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'type="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" ';
-                $html .= 'value="' . $this->htmlentities( $v, ENT_QUOTES, 'utf-8' ) . '" ';
-                $html .= 'style="' . $this->htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" ';
+                $html .= 'value="' . $this->htmlentities($v, ENT_QUOTES, 'utf-8') . '" ';
+                $html .= 'style="' . $this->htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" ';
                 $html .= $this->NSDefaultValue() . ' ';
                 $html .= $this->NSRequiredValue() . ' ';
                 $html .= $this->NSGridLabel() . ' ';
@@ -1209,17 +1207,17 @@ class XmlFormFieldText extends XmlFormFieldSimpleText
                 $html .= '/>';
             } else {
                 //VIEW MODE
-                $html .= $this->htmlentities( $v, ENT_QUOTES, 'utf-8' );
+                $html .= $this->htmlentities($v, ENT_QUOTES, 'utf-8');
                 $html .= '<input ';
                 $html .= 'id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= $this->NSDefaultValue() . ' ';
                 $html .= $this->NSGridType() . ' ';
-                $html .= 'type="hidden" value="' . $this->htmlentities( $v, ENT_QUOTES, 'utf-8' ) . '" />';
+                $html .= 'type="hidden" value="' . $this->htmlentities($v, ENT_QUOTES, 'utf-8') . '" />';
             }
 
             $result[] = $html;
-            $r ++;
+            $r++;
         }
         $this->options = $aux;
         return $result;
@@ -1227,7 +1225,7 @@ class XmlFormFieldText extends XmlFormFieldSimpleText
 
     public function renderTable($values = "", $owner = null, $paramDummy3 = null)
     {
-        $result = $this->htmlentities( $values, ENT_COMPAT, 'utf-8' );
+        $result = $this->htmlentities($values, ENT_COMPAT, 'utf-8');
         return $result;
     }
 }
@@ -1253,7 +1251,7 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
     public $readOnly = false;
     public $sqlConnection = 0;
     public $sql = '';
-    public $sqlOption = array ();
+    public $sqlOption = [];
     public $searchType = "*searchtext*";
     //Atributes only for grids
     public $gridFieldType = 'suggest';
@@ -1285,35 +1283,34 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
      * @param $owner
      * @return <String>
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
-
-        if (! $this->sqlConnection) {
+        if (!$this->sqlConnection) {
             $this->sqlConnection = 'workflow';
         }
 
         //NOTE: string functions must be in G class
         if ($this->strTo === 'UPPER') {
-            $value = strtoupper( $value );
+            $value = strtoupper($value);
         }
         if ($this->strTo === 'LOWER') {
-            $value = strtolower( $value );
+            $value = strtolower($value);
         }
 
-            //if ($this->strTo==='CAPITALIZE') $value = strtocapitalize($value);
-        $onkeypress = G::replaceDataField( $this->onkeypress, $owner->values );
+        //if ($this->strTo==='CAPITALIZE') $value = strtocapitalize($value);
+        $onkeypress = G::replaceDataField($this->onkeypress, $owner->values);
 
         if ($this->replaceTags == 1) {
-            $value = G::replaceDataField( $value, $owner->values );
+            $value = G::replaceDataField($value, $owner->values);
         }
 
-        $aProperties = Array ('value' => '""','size' => '"' . $this->size . '"');
+        $aProperties = array('value' => '""', 'size' => '"' . $this->size . '"');
 
         $storeEntry = null;
         $storeEntryData = ", storeEntryData: [0]";
 
         if ($this->store_new_entry) {
-            $storeEntry = ' title="' . G::LoadTranslation( "ID_FIELD_DYNAFORM_SUGGEST_INPUT_TITLE" ) . '"';
+            $storeEntry = ' title="' . G::LoadTranslation("ID_FIELD_DYNAFORM_SUGGEST_INPUT_TITLE") . '"';
             $storeEntryData = ", storeEntryData: [1, \"form[" . $this->name . "_label]\", \"" . $this->sqlConnection . "\", \"" . $this->table . "\", \"" . $this->primary_key . "\", \"" . $this->primary_key_type . "\", \"" . $this->field . "\"]";
         }
 
@@ -1321,9 +1318,9 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
         $formVariableKeyValue = '';
 
         $oApp = new Cases();
-        if (isset( $_SESSION['APPLICATION'] ) && ($_SESSION['APPLICATION'] != null && $oApp->loadCase( $_SESSION['APPLICATION'] ) != null)) {
-            $aFields = $oApp->loadCase( $_SESSION['APPLICATION'] );
-            if (isset( $aFields['APP_DATA'][$this->name . '_label'] )) {
+        if (isset($_SESSION['APPLICATION']) && ($_SESSION['APPLICATION'] != null && $oApp->loadCase($_SESSION['APPLICATION']) != null)) {
+            $aFields = $oApp->loadCase($_SESSION['APPLICATION']);
+            if (isset($aFields['APP_DATA'][$this->name . '_label'])) {
                 $formVariableValue = $aFields['APP_DATA'][$this->name . '_label'];
                 $formVariableKeyValue = $aFields['APP_DATA'][$this->name];
             }
@@ -1331,37 +1328,37 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
 
         if ($this->mode === 'edit') {
             if ($this->readOnly) {
-                return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' ' . $this->NSFieldType() . ' readOnly="readOnly" style="' . htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" onkeypress="' . htmlentities( $onkeypress, ENT_COMPAT, 'utf-8' ) . '"/>';
+                return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities($value, ENT_COMPAT, 'utf-8') . '\' ' . $this->NSFieldType() . ' readOnly="readOnly" style="' . htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" onkeypress="' . htmlentities($onkeypress, ENT_COMPAT, 'utf-8') . '"/>';
             } else {
                 //        $str = '<textarea '.$storeEntry.' class="module_app_input___gray" style="height:16px" rows=1 cols="'.$this->size.'" id="form[' . $this->name . ']" name="form[' . $this->name . ']" >'.$this->htmlentities($value, ENT_COMPAT, 'utf-8').'</textarea>';
-                if (strlen( trim( $formVariableValue ) ) > 0) {
+                if (strlen(trim($formVariableValue)) > 0) {
                     $value = $formVariableValue;
                 }
                 $name = "'" . $this->name . "'";
-                $str = '<input type="text" ' . $storeEntry . ' class="module_app_input___gray" size="' . $this->size . '" id="form[' . $this->name . '_label]" name="form[' . $this->name . '_label]" value="' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '" onblur="idSet(' . $name . ');" ';
-                $str .= $this->NSDependentFields( true ) . ' ';
+                $str = '<input type="text" ' . $storeEntry . ' class="module_app_input___gray" size="' . $this->size . '" id="form[' . $this->name . '_label]" name="form[' . $this->name . '_label]" value="' . $this->htmlentities($value, ENT_COMPAT, 'utf-8') . '" onblur="idSet(' . $name . ');" ';
+                $str .= $this->NSDependentFields(true) . ' ';
                 $str .= '/>';
                 $str .= '<input ';
                 $str .= 'id="form[' . $this->name . ']" ';
                 $str .= 'name="form[' . $this->name . ']" ';
                 $str .= $this->NSFieldType() . ' ';
-                $str .= 'value="' . $this->htmlentities( $formVariableKeyValue, ENT_COMPAT, 'utf-8' ) . '" ';
+                $str .= 'value="' . $this->htmlentities($formVariableKeyValue, ENT_COMPAT, 'utf-8') . '" ';
                 $str .= 'type="hidden" />';
 
                 $str .= $this->renderHint();
-                if (trim( $this->callback ) != '') {
+                if (trim($this->callback) != '') {
                     $sCallBack = 'try{' . $this->callback . '}catch(e){alert("Suggest Widget call back error: "+e)}';
                 } else {
                     $sCallBack = '';
                 }
-                
-                $sSQL = $this->sql;
-                $nCount = preg_match_all( '/\@(?:([\@\%\#\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*?)*)\))/', $sSQL, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE );
 
-                $aResult = array ();
+                $sSQL = $this->sql;
+                $nCount = preg_match_all('/\@(?:([\@\%\#\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*?)*)\))/', $sSQL, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
+
+                $aResult = [];
                 if ($nCount) {
-                    for ($i = 0; $i < $nCount; $i ++) {
-                        if (isset( $match[0][$i][0] ) && isset( $match[2][$i][0] )) {
+                    for ($i = 0; $i < $nCount; $i++) {
+                        if (isset($match[0][$i][0]) && isset($match[2][$i][0])) {
                             $aResult[$match[0][$i][0]] = $match[2][$i][0];
                         }
                     }
@@ -1369,17 +1366,16 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
 
                 $depValues = '';
                 $i = 1;
-                if (isset( $aResult ) && $aResult) {
-                    $sResult = '"' . implode( '","', $aResult ) . '"';
-                    $aResultKeys = array_keys( $aResult );
-                    $sResultKeys = str_rot13( base64_encode( implode( '|', $aResultKeys ) ) );
+                if (isset($aResult) && $aResult) {
+                    $sResult = '"' . implode('","', $aResult) . '"';
+                    $aResultKeys = array_keys($aResult);
+                    $sResultKeys = str_rot13(base64_encode(implode('|', $aResultKeys)));
 
                     foreach ($aResult as $key => $field) {
                         $depValues .= 'getField(\'' . $field . '\').value';
-                        if ($i ++ < count( $aResult )) {
+                        if ($i++ < count($aResult)) {
                             $depValues .= '+"|"+';
                         }
-
                     }
                     $depValues = '+' . $depValues . '+';
                 } else {
@@ -1388,14 +1384,14 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
                     $depValues = '+';
                 }
 
-                $aDepFields = array ();
+                $aDepFields = [];
                 $count = 0;
                 if ($this->dependentFields !== '') {
-                    $dependentFields = explode( ",", $this->dependentFields );
+                    $dependentFields = explode(",", $this->dependentFields);
                     foreach ($dependentFields as $keyDependent => $valueDependent) {
                         $sqlDepField = $owner->fields[$valueDependent]->sql;
-                        $count = preg_match_all( '/\@(?:([\@\%\#\=\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*?)*)\))/', $sqlDepField, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE );
-                        for ($cnt = 0; $cnt < $count; $cnt ++) {
+                        $count = preg_match_all('/\@(?:([\@\%\#\=\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*?)*)\))/', $sqlDepField, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
+                        for ($cnt = 0; $cnt < $count; $cnt++) {
                             $aDepFields[$cnt] = $match[2][$cnt][0];
                         }
                     }
@@ -1425,8 +1421,8 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
                 $sOptions .= ' var sField = "[]"; ';
 
                 if ($count > 0) {
-                    for ($cnt = 0; $cnt < $count; $cnt ++) {
-                        if ( $this->name == $aDepFields[$cnt] ) {
+                    for ($cnt = 0; $cnt < $count; $cnt++) {
+                        if ($this->name == $aDepFields[$cnt]) {
                             $sOptions .= '  jField[\'' . $aDepFields[$cnt] . '\'] = obj.id;';
                         } else {
                             $sOptions .= '  jField[\'' . $aDepFields[$cnt] . '\'] = getField(\'' . $aDepFields[$cnt] . '\').value; ';
@@ -1477,46 +1473,46 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
                 return $str;
             }
         } else {
-            $html  = '<span id="form[' . $this->name . ']" name="form[' . $this->name . ']" ' . $this->NSFieldType() . ' >';
+            $html = '<span id="form[' . $this->name . ']" name="form[' . $this->name . ']" ' . $this->NSFieldType() . ' >';
             $html .= $this->htmlentities($formVariableValue, ENT_COMPAT, 'utf-8');
             $html .= '</span>';
             return $html;
         }
     }
 
-   /**
+    /**
      * render Field Grid
      *
      * @param type $value
      * @param type $owner
      * @param type $rowId
-     * @param type $ownerName   Grid Name
-     * @param type $index       Index on the grid
+     * @param type $ownerName Grid Name
+     * @param type $index Index on the grid
      * @return string
      */
     public function renderFieldGrid($value = null, $owner = null, $rowId = '', $ownerName = '', $index = 0)
     {
         $rowIdField = substr($rowId, 1);
-        if (! $this->sqlConnection) {
+        if (!$this->sqlConnection) {
             $this->sqlConnection = 'workflow';
         }
 
         if ($this->strTo === 'UPPER') {
-            $value = strtoupper( $value );
+            $value = strtoupper($value);
         }
         if ($this->strTo === 'LOWER') {
-            $value = strtolower( $value );
+            $value = strtolower($value);
         }
-        $onkeypress = G::replaceDataField( $this->onkeypress, $owner->values );
+        $onkeypress = G::replaceDataField($this->onkeypress, $owner->values);
 
         if ($this->replaceTags == 1) {
-            $value = G::replaceDataField( $value, $owner->values );
+            $value = G::replaceDataField($value, $owner->values);
         }
 
         $storeEntry = null;
         $storeEntryData = ", storeEntryData: [0]";
         if ($this->store_new_entry) {
-            $storeEntry = ' title="' . G::LoadTranslation( "ID_FIELD_DYNAFORM_SUGGEST_INPUT_TITLE" ) . '"';
+            $storeEntry = ' title="' . G::LoadTranslation("ID_FIELD_DYNAFORM_SUGGEST_INPUT_TITLE") . '"';
             $storeEntryData = ", storeEntryData: [1, \"form" . $rowId . "[" . $this->name . "_label]\", \"" . $this->sqlConnection . "\", \"" . $this->table . "\", \"" . $this->primary_key . "\", \"" . $this->primary_key_type . "\", \"" . $this->field . "\"]";
         }
 
@@ -1524,10 +1520,9 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
         $formVariableKeyValue = '';
 
         $oApp = new Cases();
-        if (isset( $_SESSION['APPLICATION'] ) && ($_SESSION['APPLICATION'] != null && $oApp->loadCase( $_SESSION['APPLICATION'] ) != null)) {
-            $aFields = $oApp->loadCase( $_SESSION['APPLICATION'] );
-            if (isset( $aFields['APP_DATA'][$ownerName][$index][$this->name . '_label'] )) {
-
+        if (isset($_SESSION['APPLICATION']) && ($_SESSION['APPLICATION'] != null && $oApp->loadCase($_SESSION['APPLICATION']) != null)) {
+            $aFields = $oApp->loadCase($_SESSION['APPLICATION']);
+            if (isset($aFields['APP_DATA'][$ownerName][$index][$this->name . '_label'])) {
                 $formVariableValue = $aFields['APP_DATA'][$ownerName][$index][$this->name . '_label'];
                 $formVariableKeyValue = $aFields['APP_DATA'][$ownerName][$index][$this->name];
             }
@@ -1535,14 +1530,14 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
 
         if ($this->mode === 'edit') {
             if ($this->readOnly) {
-                return '<input class="module_app_input___gray" id="form' . $rowId . '[' . $this->name . ']" name="form' . $rowId . '[' . $this->name . ']" type ="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' ' .  $this->NSGridType() . ' readOnly="readOnly" style="' . htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" onkeypress="' . htmlentities( $onkeypress, ENT_COMPAT, 'utf-8' ) . '"/>';
+                return '<input class="module_app_input___gray" id="form' . $rowId . '[' . $this->name . ']" name="form' . $rowId . '[' . $this->name . ']" type ="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities($value, ENT_COMPAT, 'utf-8') . '\' ' . $this->NSGridType() . ' readOnly="readOnly" style="' . htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" onkeypress="' . htmlentities($onkeypress, ENT_COMPAT, 'utf-8') . '"/>';
             } else {
-                if (strlen( trim( $formVariableValue ) ) > 0) {
+                if (strlen(trim($formVariableValue)) > 0) {
                     $value = $formVariableValue;
                 }
 
                 $str = '<input type="text" ' . $storeEntry . ' class="module_app_input___gray" size="' . $this->size . '" id="form' . $rowId . '[' . $this->name . '_label]" name="form' . $rowId . '[' . $this->name . '_label]" value="' . $this->htmlentities($value, ENT_COMPAT, 'utf-8') . '" onblur="idSet(\'' . $this->name . '\');" ';
-                $str .= $this->NSDependentFields( true ) . ' ';
+                $str .= $this->NSDependentFields(true) . ' ';
                 $str .= $this->NSRequiredValue() . ' ';
                 $str .= $this->NSGridLabel() . ' ';
                 $str .= '/>';
@@ -1550,23 +1545,23 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
                 $str .= 'id="form' . $rowId . '[' . $this->name . ']" ';
                 $str .= 'name="form' . $rowId . '[' . $this->name . ']" ';
                 $str .= $this->NSGridType() . ' ';
-                $str .= 'value="' . $this->htmlentities( $formVariableKeyValue, ENT_COMPAT, 'utf-8' ) . '" ';
+                $str .= 'value="' . $this->htmlentities($formVariableKeyValue, ENT_COMPAT, 'utf-8') . '" ';
                 $str .= 'type="hidden" />';
 
                 //$str .= $this->renderHint();
-                if (trim( $this->callback ) != '') {
+                if (trim($this->callback) != '') {
                     $sCallBack = 'try{' . $this->callback . '}catch(e){alert("Suggest Widget call back error: "+e)}';
                 } else {
                     $sCallBack = '';
                 }
 
                 $sSQL = $this->sql;
-                $nCount = preg_match_all( '/\@(?:([\@\%\#\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*?)*)\))/', $sSQL, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE );
+                $nCount = preg_match_all('/\@(?:([\@\%\#\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*?)*)\))/', $sSQL, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
 
-                $aResult = array ();
+                $aResult = [];
                 if ($nCount) {
-                    for ($i = 0; $i < $nCount; $i ++) {
-                        if (isset( $match[0][$i][0] ) && isset( $match[2][$i][0] )) {
+                    for ($i = 0; $i < $nCount; $i++) {
+                        if (isset($match[0][$i][0]) && isset($match[2][$i][0])) {
                             $aResult[$match[0][$i][0]] = $match[2][$i][0];
                         }
                     }
@@ -1575,20 +1570,19 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
                 $depValues = '';
                 $depFieldsLast = '';
                 $i = 1;
-                if (isset( $aResult ) && $aResult) {
-                    $sResult = '"' . implode( '","', $aResult ) . '"';
-                    $aResultKeys = array_keys( $aResult );
-                    $sResultKeys = str_rot13( base64_encode( implode( '|', $aResultKeys ) ) );
+                if (isset($aResult) && $aResult) {
+                    $sResult = '"' . implode('","', $aResult) . '"';
+                    $aResultKeys = array_keys($aResult);
+                    $sResultKeys = str_rot13(base64_encode(implode('|', $aResultKeys)));
 
                     foreach ($aResult as $key => $field) {
-                        $depValues .= 'getField(\''. $rowIdField . '[' . $field . '\').value';
+                        $depValues .= 'getField(\'' . $rowIdField . '[' . $field . '\').value';
 
-                        if ($i ++ < count( $aResult )) {
+                        if ($i++ < count($aResult)) {
                             $depValues .= '+"|"+';
                         }
-
                     }
-                    $depFieldsLast = 'getField(\''. $rowIdField . '[' . $field . '\').value';
+                    $depFieldsLast = 'getField(\'' . $rowIdField . '[' . $field . '\').value';
                     $depValues = '+' . $depValues . '+';
                 } else {
                     $sResult = '';
@@ -1620,7 +1614,7 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
                 $sOptions .= ' var sFieldCurrent = "["+ encodeURIComponent(aFieldCurrent.toJSONString()) + "]"; ';
                 $sOptions .= $sCallBack . '; getField("' . $rowIdField . '[' . $this->name . '").value = obj.id;';
 
-                $sOwnerId = (isset($owner->owner->id))? $owner->owner->id : $owner->id;
+                $sOwnerId = (isset($owner->owner->id)) ? $owner->owner->id : $owner->id;
                 $sOptions .= 'var indexField =  "' . $rowIdField . '[' . $this->name . '";';
                 $sOptions .= 'indexField = indexField.match(/\[[0-9]+\]/g); ';
                 $sOptions .= 'indexFieldVal = indexField[0].replace(/\[|\]/g,""); ';
@@ -1659,7 +1653,7 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
                 $sOptions .= '}';
 
                 $str .= '<script type="text/javascript">';
-                $str .= 'var as_json = new bsn.AutoSuggest(\'form' .  $rowId . '[' . $this->name . '_label]\', {' . $sOptions . $storeEntryData . '}, "' . $this->searchType . '"); ';
+                $str .= 'var as_json = new bsn.AutoSuggest(\'form' . $rowId . '[' . $this->name . '_label]\', {' . $sOptions . $storeEntryData . '}, "' . $this->searchType . '"); ';
                 $str .= '</script>';
 
                 return $str;
@@ -1689,11 +1683,11 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
      */
     public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
     {
-        $aResult = array();
+        $aResult = [];
         $r = 1;
 
         foreach ($values as $v) {
-            $aResult[] = $this->renderFieldGrid( $v, $owner, '[' . $owner->name . '][' . $r . ']', $owner->name, $r );
+            $aResult[] = $this->renderFieldGrid($v, $owner, '[' . $owner->name . '][' . $r . ']', $owner->name, $r);
             $r++;
         }
         return $aResult;
@@ -1708,7 +1702,7 @@ class XmlFormFieldSuggest extends XmlFormFieldSimpleText
      */
     public function renderTable($values = "", $owner = null, $paramDummy3 = null)
     {
-        $result = $this->htmlentities( $values, ENT_COMPAT, 'utf-8' );
+        $result = $this->htmlentities($values, ENT_COMPAT, 'utf-8');
         return $result;
     }
 }
@@ -1740,16 +1734,16 @@ class XmlFormFieldPrint extends XmlFormFieldSimpleText //by neyek
      * @return string
      */
     //750, 450, 10, 32, 1
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
-        $onclick = G::replaceDataField( $this->onclick, $owner->values );
-        $link = G::replaceDataField( $this->link, $owner->values );
-        $target = G::replaceDataField( $this->target, $owner->values );
-        $value = G::replaceDataField( $this->value, $owner->values );
-        $label = G::replaceDataField( $this->label, $owner->values );
+        $onclick = G::replaceDataField($this->onclick, $owner->values);
+        $link = G::replaceDataField($this->link, $owner->values);
+        $target = G::replaceDataField($this->target, $owner->values);
+        $value = G::replaceDataField($this->value, $owner->values);
+        $label = G::replaceDataField($this->label, $owner->values);
 
-        $html = '<a href="javascript:;" onclick="dynaFormPrint(\'' . $owner->parentFormId . '\', \'' . $this->htmlentities( $link, ENT_QUOTES, 'utf-8' ) . '\', ' . $this->width . ', ' . $this->height . ', ' . $this->left . ', ' . $this->top . ', ' . $this->resizable . '); return false;">
-                  <image title="' . $this->htmlentities( $label, ENT_QUOTES, 'utf-8' ) . '" src="/images/printer.png" width="15" height="15" border="0"/>
+        $html = '<a href="javascript:;" onclick="dynaFormPrint(\'' . $owner->parentFormId . '\', \'' . $this->htmlentities($link, ENT_QUOTES, 'utf-8') . '\', ' . $this->width . ', ' . $this->height . ', ' . $this->left . ', ' . $this->top . ', ' . $this->resizable . '); return false;">
+                  <image title="' . $this->htmlentities($label, ENT_QUOTES, 'utf-8') . '" src="/images/printer.png" width="15" height="15" border="0"/>
                   </a>';
 
         return $html;
@@ -1757,6 +1751,7 @@ class XmlFormFieldPrint extends XmlFormFieldSimpleText //by neyek
 }
 
 /*DEPRECATED*/
+
 /**
  * caption field for dynaforms
  *
@@ -1764,15 +1759,14 @@ class XmlFormFieldPrint extends XmlFormFieldSimpleText //by neyek
  */
 class XmlFormFieldCaption extends XmlFormField
 {
-
     public $defaultValue = '';
     public $required = false;
     public $dependentFields = '';
     public $readonly = false;
-    public $option = array ();
+    public $option = [];
     public $sqlConnection = 0;
     public $sql = '';
-    public $sqlOption = array ();
+    public $sqlOption = [];
     public $saveLabel = 0;
     //public $hint;
 
@@ -1795,23 +1789,22 @@ class XmlFormFieldCaption extends XmlFormField
      * @param string value
      * @return string modified
      */
-    public function render ($value = null, $owner = null, $rowId = '', $onlyValue = false, $row = -1, $therow = -1)
+    public function render($value = null, $owner = null, $rowId = '', $onlyValue = false, $row = -1, $therow = -1)
     {
-
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         }
-        if ($therow == - 1) {
+        if ($therow == -1) {
             //print_r($this->executeSQL ( $owner, $row ));print"<hr>";
-            $this->executeSQL( $owner, $row );
+            $this->executeSQL($owner, $row);
         } else {
             if ($row == $therow) {
-                $this->executeSQL( $owner, $row );
+                $this->executeSQL($owner, $row);
             }
         }
         $html = '';
 
-        if (! $onlyValue) {
+        if (!$onlyValue) {
             foreach ($this->option as $optionName => $option) {
                 if ($optionName == $value) {
                     $value = $option;
@@ -1822,7 +1815,6 @@ class XmlFormFieldCaption extends XmlFormField
                     $value = $option;
                 }
             }
-
         } else {
             foreach ($this->option as $optionName => $option) {
                 if ($optionName == $value) {
@@ -1836,10 +1828,10 @@ class XmlFormFieldCaption extends XmlFormField
             }
         }
         $pID = "form[$this->name]";
-        $htm = $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+        $htm = $this->htmlentities($value, ENT_COMPAT, 'utf-8');
         $htm .= '<input type="hidden" id="' . $pID . '" name="' . $pID . '" value="' . $value . '">';
         return $htm;
-        }
+    }
 }
 
 /**
@@ -1875,18 +1867,18 @@ class XmlFormFieldPassword extends XmlFormField
 
         if ($this->mode === 'edit') {
             if ($this->readOnly) {
-                return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="password" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' ' . $this->NSFieldType() . ' readOnly="readOnly"/>';
+                return '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="password" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities($value, ENT_COMPAT, 'utf-8') . '\' ' . $this->NSFieldType() . ' readOnly="readOnly"/>';
             } else {
-                $html = '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="password" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '\' ' . $this->NSFieldType() . '/>';
+                $html = '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="password" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities($value, ENT_COMPAT, 'utf-8') . '\' ' . $this->NSFieldType() . '/>';
                 $html .= $this->renderHint();
                 return $html;
             }
         } elseif ($this->mode === 'view') {
-            $html = '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="hidden" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) .  '\' ' . $this->NSFieldType() . ' readOnly="readOnly"/>';
-            $html .= $this->htmlentities( str_repeat( '*', 10 ), ENT_COMPAT, 'utf-8' );
+            $html = '<input class="module_app_input___gray" id="form[' . $this->name . ']" name="form[' . $this->name . ']" type ="hidden" autocomplete="' . $this->autocomplete . '" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value=\'' . $this->htmlentities($value, ENT_COMPAT, 'utf-8') . '\' ' . $this->NSFieldType() . ' readOnly="readOnly"/>';
+            $html .= $this->htmlentities(str_repeat('*', 10), ENT_COMPAT, 'utf-8');
             return $html;
         } else {
-            return $this->htmlentities( str_repeat( '*', 10 ), ENT_COMPAT, 'utf-8' );
+            return $this->htmlentities(str_repeat('*', 10), ENT_COMPAT, 'utf-8');
         }
     }
 }
@@ -1915,29 +1907,28 @@ class XmlFormFieldTextarea extends XmlFormField
      * @param string value
      * @return string
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
-
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         } else {
-            $this->executeSQL( $owner );
-            if (isset( $this->sqlOption )) {
-                $firstElement = key( $this->sqlOption );
+            $this->executeSQL($owner);
+            if (isset($this->sqlOption)) {
+                $firstElement = key($this->sqlOption);
             }
-            if (isset( $firstElement )) {
+            if (isset($firstElement)) {
                 $value = $firstElement;
             }
         }
 
-        $className = isset( $this->className ) ? $this->className : 'module_app_input___gray';
+        $className = isset($this->className) ? $this->className : 'module_app_input___gray';
 
         if ($this->renderMode == '') {
             $this->renderMode = $this->mode;
         }
         $resizable = ($this->resizable == 1 || $this->resizable == '1') ? 'resize:both;' : 'resize:none;';
         $html = '';
-        $scrollStyle = $this->style . "overflow:scroll;overflow-y:scroll;overflow-x:hidden;overflow:-moz-scrollbars-vertical;".$resizable;
+        $scrollStyle = $this->style . "overflow:scroll;overflow-y:scroll;overflow-x:hidden;overflow:-moz-scrollbars-vertical;" . $resizable;
         if ($this->renderMode == 'edit') {
             //EDIT MODE
             $readOnlyText = ($this->readOnly == 1 || $this->readOnly == '1') ? 'readOnly="readOnly"' : '';
@@ -1945,12 +1936,12 @@ class XmlFormFieldTextarea extends XmlFormField
             $html .= 'id="form[' . $this->name . ']" ';
             $html .= 'name="form[' . $this->name . ']" ';
             $html .= 'wrap="soft" cols="' . $this->cols . '" rows="' . $this->rows . '" ';
-            $html .= 'style="' . $scrollStyle . '" wrap="' . $this->htmlentities( $this->wrap, ENT_QUOTES, 'UTF-8' ) . '" ';
+            $html .= 'style="' . $scrollStyle . '" wrap="' . $this->htmlentities($this->wrap, ENT_QUOTES, 'UTF-8') . '" ';
             $html .= $this->NSDefaultValue() . ' ';
             $html .= $this->NSRequiredValue() . ' ';
             $html .= $this->NSFieldType() . ' ';
             $html .= 'class="' . $className . '" >';
-            $html .= $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+            $html .= $this->htmlentities($value, ENT_COMPAT, 'utf-8');
             $html .= '</textarea>';
         } else {
             //VIEW MODE
@@ -1958,9 +1949,9 @@ class XmlFormFieldTextarea extends XmlFormField
             $html .= 'id="form[' . $this->name . ']" ';
             $html .= 'name="form[' . $this->name . ']" ';
             $html .= 'wrap="soft" cols="' . $this->cols . '" rows="' . $this->rows . '" ';
-            $html .= $this->NSFieldType(). ' style="border:0px;backgroud-color:inherit;' . $scrollStyle . '" wrap="' . $this->htmlentities( $this->wrap, ENT_QUOTES, 'UTF-8' ) . '" ';
+            $html .= $this->NSFieldType() . ' style="border:0px;backgroud-color:inherit;' . $scrollStyle . '" wrap="' . $this->htmlentities($this->wrap, ENT_QUOTES, 'UTF-8') . '" ';
             $html .= 'class="FormTextArea" >';
-            $html .= $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+            $html .= $this->htmlentities($value, ENT_COMPAT, 'utf-8');
             $html .= '</textarea>';
         }
 
@@ -1984,8 +1975,8 @@ class XmlFormFieldTextarea extends XmlFormField
             $this->renderMode = $this->modeForGrid;
         }
 
-        $result = array();
-        $arrayOptions = array();
+        $result = [];
+        $arrayOptions = [];
 
         $r = 1;
 
@@ -2002,7 +1993,7 @@ class XmlFormFieldTextarea extends XmlFormField
 
             $arrayOptions[$r] = $v;
             $resizable = ($this->resizable == 1 || $this->resizable == '1') ? 'resize:both;' : 'resize:none;';
-            $scrollStyle = $this->style . "overflow:scroll;overflow-y:scroll;overflow-x:hidden;overflow:-moz-scrollbars-vertical;".$resizable;
+            $scrollStyle = $this->style . "overflow:scroll;overflow-y:scroll;overflow-x:hidden;overflow:-moz-scrollbars-vertical;" . $resizable;
             $html = '';
             if ($this->renderMode == 'edit') {
                 //EDIT MODE
@@ -2017,7 +2008,7 @@ class XmlFormFieldTextarea extends XmlFormField
                 $html .= $this->NSGridType() . ' ';
                 $html .= $this->NSGridLabel() . ' ';
                 $html .= '>';
-                $html .= $this->htmlentities( $v, ENT_COMPAT, 'utf-8' );
+                $html .= $this->htmlentities($v, ENT_COMPAT, 'utf-8');
                 $html .= '</textarea>';
             } else {
                 //VIEW MODE
@@ -2026,13 +2017,13 @@ class XmlFormFieldTextarea extends XmlFormField
                 $html .= $this->NSGridType() . ' ';
                 $html .= 'name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'wrap="soft" cols="' . $this->cols . '" rows="' . $this->rows . '" ';
-                $html .= 'style="' . $scrollStyle . '" wrap="' . $this->htmlentities( $this->wrap, ENT_QUOTES, 'UTF-8' ) . '" ';
+                $html .= 'style="' . $scrollStyle . '" wrap="' . $this->htmlentities($this->wrap, ENT_QUOTES, 'UTF-8') . '" ';
                 $html .= 'class="FormTextArea" >';
-                $html .= $this->htmlentities( $v, ENT_COMPAT, 'utf-8' );
+                $html .= $this->htmlentities($v, ENT_COMPAT, 'utf-8');
                 $html .= '</textarea>';
             }
             $result[] = $html;
-            $r ++;
+            $r++;
         }
 
         $this->options = $arrayOptions;
@@ -2062,7 +2053,7 @@ class XmlFormFieldCurrency extends XmlFormFieldSimpleText
     public $function = '';
     public $gridFieldType = 'currency';
     public $comma_separator = '.';
-    public $sqlOption = array();
+    public $sqlOption = [];
 
     /**
      * render the field in a dynaform
@@ -2071,16 +2062,16 @@ class XmlFormFieldCurrency extends XmlFormFieldSimpleText
      * @param <String> $owner
      * @return <String>
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         } else {
-            $this->executeSQL( $owner );
-            if (isset( $this->sqlOption )) {
-                $firstElement = key( $this->sqlOption );
+            $this->executeSQL($owner);
+            if (isset($this->sqlOption)) {
+                $firstElement = key($this->sqlOption);
             }
-            if (isset( $firstElement )) {
+            if (isset($firstElement)) {
                 $value = $firstElement;
             }
         }
@@ -2088,11 +2079,11 @@ class XmlFormFieldCurrency extends XmlFormFieldSimpleText
         if ($this->renderMode == '') {
             $this->renderMode = $this->mode;
         }
-        $onkeypress = G::replaceDataField( $this->onkeypress, $owner->values );
+        $onkeypress = G::replaceDataField($this->onkeypress, $owner->values);
 
         $html = '';
-        $currency = preg_replace( '/([_;#,.])/', '', $this->mask );
-        if (! $value) {
+        $currency = preg_replace('/([_;#,.])/', '', $this->mask);
+        if (!$value) {
             $value = $currency;
         }
 
@@ -2103,9 +2094,9 @@ class XmlFormFieldCurrency extends XmlFormFieldSimpleText
             $html .= 'id="form[' . $this->name . ']" ';
             $html .= 'name="form[' . $this->name . ']" ';
             $html .= 'type="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" ';
-            $html .= 'value="' . $this->htmlentities( $value, ENT_QUOTES, 'utf-8' ) . '" ';
-            $html .= 'style="' . $this->htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" ';
-            $html .= 'onkeypress="' . $this->htmlentities( $onkeypress, ENT_COMPAT, 'utf-8' ) . '" ';
+            $html .= 'value="' . $this->htmlentities($value, ENT_QUOTES, 'utf-8') . '" ';
+            $html .= 'style="' . $this->htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" ';
+            $html .= 'onkeypress="' . $this->htmlentities($onkeypress, ENT_COMPAT, 'utf-8') . '" ';
             $html .= $this->NSDefaultValue() . ' ';
             $html .= $this->NSRequiredValue() . ' ';
             $html .= $this->NSFieldType() . ' ';
@@ -2113,20 +2104,19 @@ class XmlFormFieldCurrency extends XmlFormFieldSimpleText
             $html .= '/>';
         } else {
             //VIEW MODE
-            $html .= $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+            $html .= $this->htmlentities($value, ENT_COMPAT, 'utf-8');
             $html .= '<input ';
             $html .= 'id="form[' . $this->name . ']" ';
             $html .= 'name="form[' . $this->name . ']" ';
             $html .= $this->NSFieldType() . ' ';
-            $html .= 'type="hidden" value="' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '" />';
+            $html .= 'type="hidden" value="' . $this->htmlentities($value, ENT_COMPAT, 'utf-8') . '" />';
         }
         if (($this->readOnly == 1) && ($this->renderMode == 'edit')) {
-            $html = str_replace( "class=\"module_app_input___gray\"", "class=\"module_app_input___gray_readOnly\"", $html );
+            $html = str_replace("class=\"module_app_input___gray\"", "class=\"module_app_input___gray_readOnly\"", $html);
         }
-            $html .= $this->renderHint();
+        $html .= $this->renderHint();
 
         return $html;
-
     }
 
     /**
@@ -2140,22 +2130,22 @@ class XmlFormFieldCurrency extends XmlFormFieldSimpleText
      */
     public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
     {
-        $result = array ();
+        $result = [];
         $r = 1;
         if ($owner->mode != 'view') {
             $this->renderMode = $this->modeForGrid;
         }
 
         foreach ($values as $v) {
-            $this->executeSQL( $owner, $r );
-            $firstElement = key( $this->sqlOption );
-            if (isset( $firstElement )) {
+            $this->executeSQL($owner, $r);
+            $firstElement = key($this->sqlOption);
+            if (isset($firstElement)) {
                 $v = $firstElement;
             }
 
             $html = '';
-            $currency = preg_replace( '/([_;#,.])/', '', $this->mask );
-            if (! $v) {
+            $currency = preg_replace('/([_;#,.])/', '', $this->mask);
+            if (!$v) {
                 $v = $currency;
             }
             if ($this->renderMode === 'edit') {
@@ -2165,8 +2155,8 @@ class XmlFormFieldCurrency extends XmlFormFieldSimpleText
                 $html .= 'id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'type="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" ';
-                $html .= 'value="' . $this->htmlentities( $v, ENT_QUOTES, 'utf-8' ) . '" ';
-                $html .= 'style="' . $this->htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" ';
+                $html .= 'value="' . $this->htmlentities($v, ENT_QUOTES, 'utf-8') . '" ';
+                $html .= 'style="' . $this->htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" ';
                 $html .= $this->NSDefaultValue() . ' ';
                 $html .= $this->NSRequiredValue() . ' ';
                 $html .= $this->NSGridType() . ' ';
@@ -2174,21 +2164,22 @@ class XmlFormFieldCurrency extends XmlFormFieldSimpleText
                 $html .= '/>';
             } else {
                 //VIEW MODE
-                $html .= $this->htmlentities( $v, ENT_QUOTES, 'utf-8' );
+                $html .= $this->htmlentities($v, ENT_QUOTES, 'utf-8');
                 $html .= '<input ';
                 $html .= 'id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= $this->NSGridType() . ' ';
-                $html .= 'type="hidden" value="' . $this->htmlentities( $v, ENT_QUOTES, 'utf-8' ) . '" />';
+                $html .= 'type="hidden" value="' . $this->htmlentities($v, ENT_QUOTES, 'utf-8') . '" />';
             }
             $result[] = $html;
-            $r ++;
+            $r++;
         }
         return $result;
     }
 }
 
 /*DEPRECATED*/
+
 /**
  *
  * @package gulliver.system
@@ -2205,7 +2196,7 @@ class XmlFormFieldCaptionCurrency extends XmlFormField
      */
     public function render($value = null, $paramDummy2 = null)
     {
-        return '$ ' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+        return '$ ' . $this->htmlentities($value, ENT_COMPAT, 'utf-8');
     }
 }
 
@@ -2228,18 +2219,18 @@ class XmlFormFieldPercentage extends XmlFormFieldSimpleText
     public $function = '';
     public $gridFieldType = 'percentage';
     public $comma_separator = '.';
-    public $sqlOption = array();
+    public $sqlOption = [];
 
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         } else {
-            $this->executeSQL( $owner );
-            if (isset( $this->sqlOption )) {
-                $firstElement = key( $this->sqlOption );
+            $this->executeSQL($owner);
+            if (isset($this->sqlOption)) {
+                $firstElement = key($this->sqlOption);
             }
-            if (isset( $firstElement )) {
+            if (isset($firstElement)) {
                 $value = $firstElement;
             }
         }
@@ -2247,7 +2238,7 @@ class XmlFormFieldPercentage extends XmlFormFieldSimpleText
         if ($this->renderMode == '') {
             $this->renderMode = $this->mode;
         }
-        $onkeypress = G::replaceDataField( $this->onkeypress, $owner->values );
+        $onkeypress = G::replaceDataField($this->onkeypress, $owner->values);
 
         $html = '';
 
@@ -2258,9 +2249,9 @@ class XmlFormFieldPercentage extends XmlFormFieldSimpleText
             $html .= 'id="form[' . $this->name . ']" ';
             $html .= 'name="form[' . $this->name . ']" ';
             $html .= 'type="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" ';
-            $html .= 'value="' . $this->htmlentities( $value, ENT_QUOTES, 'utf-8' ) . '" ';
-            $html .= 'style="' . $this->htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" ';
-            $html .= 'onkeypress="' . $this->htmlentities( $onkeypress, ENT_COMPAT, 'utf-8' ) . '" ';
+            $html .= 'value="' . $this->htmlentities($value, ENT_QUOTES, 'utf-8') . '" ';
+            $html .= 'style="' . $this->htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" ';
+            $html .= 'onkeypress="' . $this->htmlentities($onkeypress, ENT_COMPAT, 'utf-8') . '" ';
             $html .= $this->NSDefaultValue() . ' ';
             $html .= $this->NSRequiredValue() . ' ';
             $html .= $this->NSFieldType() . ' ';
@@ -2268,16 +2259,16 @@ class XmlFormFieldPercentage extends XmlFormFieldSimpleText
             $html .= '/>';
         } else {
             //VIEW MODE
-            $html .= $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+            $html .= $this->htmlentities($value, ENT_COMPAT, 'utf-8');
             $html .= '<input ';
             $html .= 'id="form[' . $this->name . ']" ';
             $html .= 'name="form[' . $this->name . ']" ';
             $html .= $this->NSFieldType() . ' ';
-            $html .= 'type="hidden" value="' . $this->htmlentities( $value, ENT_COMPAT, 'utf-8' ) . '" />';
+            $html .= 'type="hidden" value="' . $this->htmlentities($value, ENT_COMPAT, 'utf-8') . '" />';
         }
 
         if (($this->readOnly == 1) && ($this->renderMode == 'edit')) {
-            $html = str_replace( "class=\"module_app_input___gray\"", "class=\"module_app_input___gray_readOnly\"", $html );
+            $html = str_replace("class=\"module_app_input___gray\"", "class=\"module_app_input___gray_readOnly\"", $html);
         }
         $html .= $this->renderHint();
         return $html;
@@ -2285,22 +2276,22 @@ class XmlFormFieldPercentage extends XmlFormFieldSimpleText
 
     public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
     {
-        $result = array ();
+        $result = [];
         $r = 1;
         if ($owner->mode != 'view') {
             $this->renderMode = $this->modeForGrid;
         }
 
         foreach ($values as $v) {
-            $this->executeSQL( $owner, $r );
-            $firstElement = key( $this->sqlOption );
-            if (isset( $firstElement )) {
+            $this->executeSQL($owner, $r);
+            $firstElement = key($this->sqlOption);
+            if (isset($firstElement)) {
                 $v = $firstElement;
             }
 
             $html = '';
-            $percentage = preg_replace( '/([_;#,.])/', '', $this->mask );
-            if (! $v) {
+            $percentage = preg_replace('/([_;#,.])/', '', $this->mask);
+            if (!$v) {
                 $v = $percentage;
             }
             if ($this->renderMode === 'edit') {
@@ -2310,8 +2301,8 @@ class XmlFormFieldPercentage extends XmlFormFieldSimpleText
                 $html .= 'id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'type="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" ';
-                $html .= 'value="' . $this->htmlentities( $v, ENT_QUOTES, 'utf-8' ) . '" ';
-                $html .= 'style="' . $this->htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" ';
+                $html .= 'value="' . $this->htmlentities($v, ENT_QUOTES, 'utf-8') . '" ';
+                $html .= 'style="' . $this->htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" ';
                 $html .= $this->NSDefaultValue() . ' ';
                 $html .= $this->NSRequiredValue() . ' ';
                 $html .= $this->NSGridType() . ' ';
@@ -2319,31 +2310,31 @@ class XmlFormFieldPercentage extends XmlFormFieldSimpleText
                 $html .= '/>';
             } else {
                 //VIEW MODE
-                $html .= $this->htmlentities( $v, ENT_QUOTES, 'utf-8' );
+                $html .= $this->htmlentities($v, ENT_QUOTES, 'utf-8');
                 $html .= '<input ';
                 $html .= 'id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= $this->NSGridType() . ' ';
-                $html .= 'type="hidden" value="' . $this->htmlentities( $v, ENT_QUOTES, 'utf-8' ) . '" />';
+                $html .= 'type="hidden" value="' . $this->htmlentities($v, ENT_QUOTES, 'utf-8') . '" />';
             }
             $result[] = $html;
-            $r ++;
+            $r++;
         }
         return $result;
     }
 }
 
 /*DEPRECATED*/
+
 /**
  *
  * @package gulliver.system
  */
 class XmlFormFieldCaptionPercentage extends XmlFormField
 {
-
     public function render($value = null, $paramDummy2 = null)
     {
-        return $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+        return $this->htmlentities($value, ENT_COMPAT, 'utf-8');
     }
 }
 
@@ -2378,13 +2369,13 @@ class XmlFormFieldDate2 extends XmlFormFieldSimpleText
      * @param $date
      * @return Boolean true/false
      */
-    public function verifyDateFormat ($date)
+    public function verifyDateFormat($date)
     {
-        $aux = explode( '-', $date );
-        if (count( $aux ) != 3) {
+        $aux = explode('-', $date);
+        if (count($aux) != 3) {
             return false;
         }
-        if (! (is_numeric( $aux[0] ) && is_numeric( $aux[1] ) && is_numeric( $aux[2] ))) {
+        if (!(is_numeric($aux[0]) && is_numeric($aux[1]) && is_numeric($aux[2]))) {
             return false;
         }
         if ($aux[0] < 1900 || $aux[0] > 2100) {
@@ -2399,14 +2390,14 @@ class XmlFormFieldDate2 extends XmlFormFieldSimpleText
      * @param $date
      * @return <Boolean>
      */
-    public function isvalidBeforeFormat ($date)
+    public function isvalidBeforeFormat($date)
     {
-        $part1 = substr( $date, 0, strlen( $date ) - 1 );
-        $part2 = substr( $date, strlen( $date ) - 1 );
+        $part1 = substr($date, 0, strlen($date) - 1);
+        $part2 = substr($date, strlen($date) - 1);
         if ($part2 != 'd' && $part2 != 'm' && $part2 != 'y') {
             return false;
         }
-        if (! is_numeric( $part1 )) {
+        if (!is_numeric($part1)) {
             return false;
         }
         return true;
@@ -2419,19 +2410,19 @@ class XmlFormFieldDate2 extends XmlFormFieldSimpleText
      * @param <type> $sign
      * @return <date> $res date based on the data insert
      */
-    public function calculateBeforeFormat ($date, $sign)
+    public function calculateBeforeFormat($date, $sign)
     {
-        $part1 = $sign * substr( $date, 0, strlen( $date ) - 1 );
-        $part2 = substr( $date, strlen( $date ) - 1 );
+        $part1 = $sign * substr($date, 0, strlen($date) - 1);
+        $part2 = substr($date, strlen($date) - 1);
         switch ($part2) {
             case 'd':
-                $res = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ) + $part1, date( 'Y' ) ) );
+                $res = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d') + $part1, date('Y')));
                 break;
             case 'm':
-                $res = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ) + $part1, date( 'd' ), date( 'Y' ) ) );
+                $res = date('Y-m-d', mktime(0, 0, 0, date('m') + $part1, date('d'), date('Y')));
                 break;
             case 'y':
-                $res = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + $part1 ) );
+                $res = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d'), date('Y') + $part1));
                 break;
 
         }
@@ -2445,78 +2436,76 @@ class XmlFormFieldDate2 extends XmlFormFieldSimpleText
      * @param $owner
      * @return <String>
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
-
-        $value = G::replaceDataField( $value, $owner->values );
-        $startDate = G::replaceDataField( $this->startDate, $owner->values );
-        $endDate = G::replaceDataField( $this->endDate, $owner->values );
-        $beforeDate = G::replaceDataField( $this->beforeDate, $owner->values );
-        $afterDate = G::replaceDataField( $this->afterDate, $owner->values );
+        $value = G::replaceDataField($value, $owner->values);
+        $startDate = G::replaceDataField($this->startDate, $owner->values);
+        $endDate = G::replaceDataField($this->endDate, $owner->values);
+        $beforeDate = G::replaceDataField($this->beforeDate, $owner->values);
+        $afterDate = G::replaceDataField($this->afterDate, $owner->values);
         //for backward compatibility size and maxlength
         if ($startDate != '') {
-            if (! $this->verifyDateFormat( $startDate )) {
+            if (!$this->verifyDateFormat($startDate)) {
                 $startDate = '';
             }
         }
-        if (isset( $beforeDate ) && $beforeDate != '') {
-            if ($this->isvalidBeforeFormat( $beforeDate )) {
-                $startDate = $this->calculateBeforeFormat( $beforeDate, - 1 );
+        if (isset($beforeDate) && $beforeDate != '') {
+            if ($this->isvalidBeforeFormat($beforeDate)) {
+                $startDate = $this->calculateBeforeFormat($beforeDate, -1);
             }
         }
 
-        if ($startDate == '' && isset( $this->size ) && is_numeric( $this->size ) && $this->size >= 1900 && $this->size <= 2100) {
+        if ($startDate == '' && isset($this->size) && is_numeric($this->size) && $this->size >= 1900 && $this->size <= 2100) {
             $startDate = $this->size . '-01-01';
         }
 
         if ($startDate == '') {
-            $startDate = date( 'Y-m-d' ); // the default is the current date
+            $startDate = date('Y-m-d'); // the default is the current date
         }
 
         //for backward compatibility maxlength
         //if ( $this->endDate == '')   $this->finalYear = date('Y') + 8;
         //for backward compatibility size and maxlength
         if ($endDate != '') {
-            if (! $this->verifyDateFormat( $endDate )) {
+            if (!$this->verifyDateFormat($endDate)) {
                 $endDate = '';
             }
         }
 
-        if (isset( $afterDate ) && $afterDate != '') {
-            if ($this->isvalidBeforeFormat( $afterDate )) {
-                $endDate = $this->calculateBeforeFormat( $afterDate, + 1 );
+        if (isset($afterDate) && $afterDate != '') {
+            if ($this->isvalidBeforeFormat($afterDate)) {
+                $endDate = $this->calculateBeforeFormat($afterDate, +1);
             }
             if ($endDate) {
                 $sign = '1';
                 $date = $afterDate;
-                $part1 = $sign * substr( $date, 0, strlen( $date ) - 1 );
-                $part2 = substr( $date, strlen( $date ) - 1 );
+                $part1 = $sign * substr($date, 0, strlen($date) - 1);
+                $part2 = substr($date, strlen($date) - 1);
                 switch ($part2) {
                     case 'd':
-                        $res = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ) + $part1, date( 'Y' ) ) );
+                        $res = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d') + $part1, date('Y')));
                         break;
                     case 'm':
-                        $res = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ) + $part1, date( 'd' ) - 1, date( 'Y' ) ) );
+                        $res = date('Y-m-d', mktime(0, 0, 0, date('m') + $part1, date('d') - 1, date('Y')));
                         break;
                     case 'y':
-                        $res = (intVal( date( 'Y' ) ) + $part1) . '-' . date( 'm' ) . '-' . date( 'd' );
+                        $res = (intVal(date('Y')) + $part1) . '-' . date('m') . '-' . date('d');
                         break;
                 }
 
                 $endDate = $res;
-
             }
         }
 
-        if (isset( $this->maxlength ) && is_numeric( $this->maxlength ) && $this->maxlength >= 1900 && $this->maxlength <= 2100) {
+        if (isset($this->maxlength) && is_numeric($this->maxlength) && $this->maxlength >= 1900 && $this->maxlength <= 2100) {
             $endDate = $this->maxlength . '-01-01';
         }
         if ($endDate == '') {
             //$this->endDate = mktime ( 0,0,0,date('m'),date('d'),date('y') );  // the default is the current date + 2 years
-            $endDate = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 2 ) ); // the default is the current date + 2 years
+            $endDate = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d'), date('Y') + 2)); // the default is the current date + 2 years
         }
         if ($value == '') {
-            $value = date( 'Y-m-d' );
+            $value = date('Y-m-d');
         }
         $html = "<input type='hidden' id='form[" . $this->name . "]' name='form[" . $this->name . "]' value='" . $value . "'>";
         $html .= "<span id='span[" . $owner->id . "][" . $this->name . "]' name='span[" . $owner->id . "][" . $this->name . "]' style='border:1;border-color:#000;width:100px;'>" . $value . " </span> ";
@@ -2536,90 +2525,90 @@ class XmlFormFieldDate2 extends XmlFormFieldSimpleText
      */
     public function renderGrid($values = null, $owner = null, $onlyValue = false, $paramDummy4 = null)
     {
-        $result = array ();
+        $result = [];
         $r = 1;
         foreach ($values as $v) {
-            $v = G::replaceDataField( $v, $owner->values );
-            $startDate = G::replaceDataField( $this->startDate, $owner->values );
-            $endDate = G::replaceDataField( $this->endDate, $owner->values );
-            $beforeDate = G::replaceDataField( $this->beforeDate, $owner->values );
-            $afterDate = G::replaceDataField( $this->afterDate, $owner->values );
+            $v = G::replaceDataField($v, $owner->values);
+            $startDate = G::replaceDataField($this->startDate, $owner->values);
+            $endDate = G::replaceDataField($this->endDate, $owner->values);
+            $beforeDate = G::replaceDataField($this->beforeDate, $owner->values);
+            $afterDate = G::replaceDataField($this->afterDate, $owner->values);
             //for backward compatibility size and maxlength
             if ($startDate != '') {
-                if (! $this->verifyDateFormat( $startDate )) {
+                if (!$this->verifyDateFormat($startDate)) {
                     $startDate = '';
                 }
             }
-            if ($startDate == '' && isset( $beforeDate ) && $beforeDate != '') {
-                if ($this->isvalidBeforeFormat( $beforeDate )) {
-                    $startDate = $this->calculateBeforeFormat( $beforeDate, - 1 );
+            if ($startDate == '' && isset($beforeDate) && $beforeDate != '') {
+                if ($this->isvalidBeforeFormat($beforeDate)) {
+                    $startDate = $this->calculateBeforeFormat($beforeDate, -1);
                 }
             }
 
-            if ($startDate == '' && isset( $this->size ) && is_numeric( $this->size ) && $this->size >= 1900 && $this->size <= 2100) {
+            if ($startDate == '' && isset($this->size) && is_numeric($this->size) && $this->size >= 1900 && $this->size <= 2100) {
                 $startDate = $this->size . '-01-01';
             }
 
             if ($startDate == '') {
-                $startDate = date( 'Y-m-d' ); // the default is the current date
+                $startDate = date('Y-m-d'); // the default is the current date
             }
 
             //for backward compatibility maxlength
             //if ( $this->endDate == '')   $this->finalYear = date('Y') + 8;
             //for backward compatibility size and maxlength
             if ($endDate != '') {
-                if (! $this->verifyDateFormat( $endDate )) {
+                if (!$this->verifyDateFormat($endDate)) {
                     $endDate = '';
                 }
             }
 
-            if ($endDate == '' && isset( $afterDate ) && $afterDate != '') {
-                if ($this->isvalidBeforeFormat( $afterDate )) {
-                    $endDate = $this->calculateBeforeFormat( $afterDate, + 1 );
+            if ($endDate == '' && isset($afterDate) && $afterDate != '') {
+                if ($this->isvalidBeforeFormat($afterDate)) {
+                    $endDate = $this->calculateBeforeFormat($afterDate, +1);
                 }
             }
 
-            if ($endDate == '' && isset( $this->maxlength ) && is_numeric( $this->maxlength ) && $this->maxlength >= 1900 && $this->maxlength <= 2100) {
+            if ($endDate == '' && isset($this->maxlength) && is_numeric($this->maxlength) && $this->maxlength >= 1900 && $this->maxlength <= 2100) {
                 $endDate = $this->maxlength . '-01-01';
             }
             if ($endDate == '') {
                 //$this->endDate = mktime ( 0,0,0,date('m'),date('d'),date('y') );  // the default is the current date + 2 years
-                $endDate = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 2 ) ); // the default is the current date + 2 years
+                $endDate = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d'), date('Y') + 2)); // the default is the current date + 2 years
             }
             if ($v == '') {
-                $v = date( 'Y-m-d' );
+                $v = date('Y-m-d');
             }
-            if (! $onlyValue) {
+            if (!$onlyValue) {
                 $html = "<input type='hidden' id='form[" . $owner->name . '][' . $r . '][' . $this->name . "]' name='form[" . $owner->name . '][' . $r . '][' . $this->name . "]' value='" . $v . "'>";
-                if (isset( $owner->owner->id )) {
+                if (isset($owner->owner->id)) {
                     $html .= "<span id='span[" . $owner->owner->id . "][" . $owner->name . '][' . $r . '][' . $this->name . "]' name='span[" . $owner->owner->id . "][" . $owner->name . '][' . $r . '][' . $this->name . "]' style='border:1;border-color:#000;width:100px;'>" . $v . " </span> ";
                 } else {
                     $html .= "<span id='span[" . $owner->id . "][" . $owner->name . '][' . $r . '][' . $this->name . "]' name='span[" . $owner->id . "][" . $owner->name . '][' . $r . '][' . $this->name . "]' style='border:1;border-color:#000;width:100px;'>" . $v . " </span> ";
                 }
                 if ($this->mode == 'edit') {
-                    $html .= "<a href='#' onclick=\"showDatePicker(event,'" . (isset( $owner->owner ) ? $owner->owner->id : $owner->id) . "', '" . $owner->name . '][' . $r . '][' . $this->name . "', '" . $v . "', '" . $startDate . "', '" . $endDate . "'); return false;\" ><img src='/controls/cal.gif' border='0'></a>";
+                    $html .= "<a href='#' onclick=\"showDatePicker(event,'" . (isset($owner->owner) ? $owner->owner->id : $owner->id) . "', '" . $owner->name . '][' . $r . '][' . $this->name . "', '" . $v . "', '" . $startDate . "', '" . $endDate . "'); return false;\" ><img src='/controls/cal.gif' border='0'></a>";
                 }
             } else {
                 $html = $v;
             }
             $result[] = $html;
-            $r ++;
+            $r++;
         }
         return $result;
     }
 }
 
 /*DEPRECATED*/
+
 /**
  *
  * @package gulliver.system
  */
 class XmlFormFieldDateView extends XmlFormField
 {
-
     public function render($value = null, $paramDummy2 = null)
     {
-        return $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+        return $this->htmlentities($value, ENT_COMPAT, 'utf-8');
     }
 }
 
@@ -2642,10 +2631,10 @@ class XmlFormFieldYesNo extends XmlFormField
      * @param string value
      * @return string
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         }
         if ($value == '') {
             $value = '0';
@@ -2666,8 +2655,8 @@ class XmlFormFieldYesNo extends XmlFormField
             $html .= $this->NSDefaultValue() . ' ';
             $html .= $this->NSRequiredValue() . ' ';
             $html .= '>';
-            $html .= '<option value="0"' . (($value === '0') ? ' selected' : '') . '>' . G::LoadTranslation( 'ID_NO_VALUE' ) . '</option>';
-            $html .= '<option value="1"' . (($value === '1') ? ' selected' : '') . '>' . G::LoadTranslation( 'ID_YES_VALUE' ) . '</option>';
+            $html .= '<option value="0"' . (($value === '0') ? ' selected' : '') . '>' . G::LoadTranslation('ID_NO_VALUE') . '</option>';
+            $html .= '<option value="1"' . (($value === '1') ? ' selected' : '') . '>' . G::LoadTranslation('ID_YES_VALUE') . '</option>';
             $html .= '</select>';
             if ($readOnlyText != '') {
                 $html .= '<input ';
@@ -2679,7 +2668,7 @@ class XmlFormFieldYesNo extends XmlFormField
         } else {
             //VIEW MODE
             $html .= '<span id="' . $this->name . '">';
-            $html .= ($value === '0') ? G::LoadTranslation( 'ID_NO_VALUE' ) : G::LoadTranslation( 'ID_YES_VALUE' );
+            $html .= ($value === '0') ? G::LoadTranslation('ID_NO_VALUE') : G::LoadTranslation('ID_YES_VALUE');
             $html .= '<input ';
             $html .= 'id="form[' . $this->name . ']" ';
             $html .= 'name="form[' . $this->name . ']" ';
@@ -2701,7 +2690,7 @@ class XmlFormFieldYesNo extends XmlFormField
     public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
     {
         $this->gridFieldType = 'yesno';
-        $result = array ();
+        $result = [];
         $r = 1;
         if ($owner->mode != 'view') {
             $this->renderMode = $this->modeForGrid;
@@ -2724,8 +2713,8 @@ class XmlFormFieldYesNo extends XmlFormField
                 $html .= $this->NSRequiredValue() . ' ';
                 $html .= $this->NSGridLabel() . ' ';
                 $html .= '>';
-                $html .= '<option value="0"' . (($v === '0') ? ' selected="selected"' : '') . '>' . G::LoadTranslation( 'ID_NO_VALUE' ) . '</option>';
-                $html .= '<option value="1"' . (($v === '1') ? ' selected="selected"' : '') . '>' . G::LoadTranslation( 'ID_YES_VALUE' ) . '</option>';
+                $html .= '<option value="0"' . (($v === '0') ? ' selected="selected"' : '') . '>' . G::LoadTranslation('ID_NO_VALUE') . '</option>';
+                $html .= '<option value="1"' . (($v === '1') ? ' selected="selected"' : '') . '>' . G::LoadTranslation('ID_YES_VALUE') . '</option>';
                 $html .= '</select>';
                 if ($readOnlyText != '') {
                     $html .= '<input ';
@@ -2736,7 +2725,7 @@ class XmlFormFieldYesNo extends XmlFormField
                 }
             } else {
                 //VIEW MODE
-                $html .= ($v === '0') ? G::LoadTranslation( 'ID_NO_VALUE' ) : G::LoadTranslation( 'ID_YES_VALUE' );
+                $html .= ($v === '0') ? G::LoadTranslation('ID_NO_VALUE') : G::LoadTranslation('ID_YES_VALUE');
                 $html .= '<input ';
                 $html .= 'id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
                 $html .= 'name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" ';
@@ -2744,7 +2733,7 @@ class XmlFormFieldYesNo extends XmlFormField
                 $html .= 'type="hidden" value="' . (($v === '0') ? '0' : '1') . '" />';
             }
             $result[] = $html;
-            $r ++;
+            $r++;
         }
         return $result;
     }
@@ -2781,7 +2770,7 @@ class XmlFormFieldLink extends XmlFormField
         switch ($owner->type) {
             case "grid":
                 $id = $owner->name . "][" . $row . "][" . $this->name;
-                $v = (isset($owner->values[$owner->name][$row]))? $owner->values[$owner->name][$row] : array();
+                $v = (isset($owner->values[$owner->name][$row])) ? $owner->values[$owner->name][$row] : [];
                 //g::pr($this->NSGridType().'gyygygy');die;
                 $pmtype = $this->NSGridType();
                 break;
@@ -2798,19 +2787,19 @@ class XmlFormFieldLink extends XmlFormField
         } else {
             $link = !empty($value) ? $value : "";
         }
-        $labelAux1 = (!empty($label))? $label : G::replaceDataField($this->label, $v);
-        $labelAux2 = (!empty($label))? $label : G::replaceDataField($this->value, $v);
+        $labelAux1 = (!empty($label)) ? $label : G::replaceDataField($this->label, $v);
+        $labelAux2 = (!empty($label)) ? $label : G::replaceDataField($this->value, $v);
         $onclick = G::replaceDataField($this->onclick, $v);
         $target = G::replaceDataField($this->target, $v);
 
-        $html = "<a ". $pmtype . " class=\"tableOption\" href=\"" . $this->htmlentities($link, ENT_QUOTES, "utf-8") . "\"";
+        $html = "<a " . $pmtype . " class=\"tableOption\" href=\"" . $this->htmlentities($link, ENT_QUOTES, "utf-8") . "\"";
         $html = $html . " id=\"form[$id]\" name=\"form[$id]\" pm:field=\"pm:field\" ";
         if ((strrpos($_SERVER['HTTP_USER_AGENT'], "Chrome") === false ? false : true) && trim($this->htmlentities($link, ENT_QUOTES, "utf-8")) === "#") {
             $html = $html . (($this->onclick) ? " onclick=\"" . htmlentities($onclick, ENT_QUOTES, "utf-8") . " return false;\"" : " onclick=\" return false;\"");
         } else {
             $html = $html . (($this->onclick) ? " onclick=\"" . htmlentities($onclick, ENT_QUOTES, "utf-8") . "\"" : null);
         }
-        $html = $html . (($this->target)? " target=\"" . htmlentities($target, ENT_QUOTES, "utf-8") . "\"" : null);
+        $html = $html . (($this->target) ? " target=\"" . htmlentities($target, ENT_QUOTES, "utf-8") . "\"" : null);
 
         switch ($owner->type) {
             case "grid":
@@ -2823,7 +2812,7 @@ class XmlFormFieldLink extends XmlFormField
                 break;
         }
 
-        $html = $html . ">" . $this->htmlentities(($this->value == "")? $labelAux1 : $labelAux2, ENT_QUOTES, "utf-8") . "</a>";
+        $html = $html . ">" . $this->htmlentities(($this->value == "") ? $labelAux1 : $labelAux2, ENT_QUOTES, "utf-8") . "</a>";
 
         switch ($owner->type) {
             case "grid":
@@ -2845,13 +2834,13 @@ class XmlFormFieldLink extends XmlFormField
      */
     public function renderGrid($value = array(), $label = array(), $owner = null, $paramDummy4 = null)
     {
-        $arrayResult = array();
+        $arrayResult = [];
         $row = 1;
 
         foreach ($value as $index => $v) {
             $arrayResult[] = $this->render(
-                (isset($value[$index]))? $value[$index] : null,
-                (isset($label[$index]))? $label[$index] : null,
+                (isset($value[$index])) ? $value[$index] : null,
+                (isset($label[$index])) ? $label[$index] : null,
                 $owner,
                 $row
             );
@@ -2871,14 +2860,14 @@ class XmlFormFieldLink extends XmlFormField
      */
     public function renderTable($value = null, $owner = null, $paramDummy3 = null)
     {
-        $onclick = $this->htmlentities( G::replaceDataField( $this->onclick, $owner->values ), ENT_QUOTES, 'utf-8' );
-        $link = $this->htmlentities( G::replaceDataField( $this->link, $owner->values ), ENT_QUOTES, 'utf-8' );
-        $target = G::replaceDataField( $this->target, $owner->values );
-        $value = G::replaceDataField( $this->value, $owner->values );
-        $label = G::replaceDataField( $this->label, $owner->values );
-        $aLabel = $this->htmlentities( $this->value === '' ? $label : $value, ENT_QUOTES, 'utf-8' );
-        if (isset( $aLabel ) && strlen( $aLabel ) > 0) {
-            return '<a class="tableOption" href=\'' . $link . '\'' . (($this->onclick) ? ' onclick="' . $onclick . '"' : '') . (($this->target) ? ' target="' . htmlentities( $target, ENT_QUOTES, 'utf-8' ) . '"' : '') . '>' . $aLabel . '</a>';
+        $onclick = $this->htmlentities(G::replaceDataField($this->onclick, $owner->values), ENT_QUOTES, 'utf-8');
+        $link = $this->htmlentities(G::replaceDataField($this->link, $owner->values), ENT_QUOTES, 'utf-8');
+        $target = G::replaceDataField($this->target, $owner->values);
+        $value = G::replaceDataField($this->value, $owner->values);
+        $label = G::replaceDataField($this->label, $owner->values);
+        $aLabel = $this->htmlentities($this->value === '' ? $label : $value, ENT_QUOTES, 'utf-8');
+        if (isset($aLabel) && strlen($aLabel) > 0) {
+            return '<a class="tableOption" href=\'' . $link . '\'' . (($this->onclick) ? ' onclick="' . $onclick . '"' : '') . (($this->target) ? ' target="' . htmlentities($target, ENT_QUOTES, 'utf-8') . '"' : '') . '>' . $aLabel . '</a>';
         } else {
             return '';
         }
@@ -2904,7 +2893,7 @@ class XmlFormFieldFile extends XmlFormField
      * @param string value
      * @return string
      */
-    public function render ($value = null, $owner = null, $rowId = null, $row = -1, $therow = -1)
+    public function render($value = null, $owner = null, $rowId = null, $row = -1, $therow = -1)
     {
         $permission = false;
         $url = null;
@@ -2918,28 +2907,28 @@ class XmlFormFieldFile extends XmlFormField
                 break;
         }
 
-        if (isset( $_SESSION["APPLICATION"] ) && isset( $_SESSION["USER_LOGGED"] ) && isset( $_SESSION["TASK"] ) && isset( $this->input ) && $this->input != null && $this->mode == "view") {
-            require_once ("classes/model/AppDocument.php");
+        if (isset($_SESSION["APPLICATION"]) && isset($_SESSION["USER_LOGGED"]) && isset($_SESSION["TASK"]) && isset($this->input) && $this->input != null && $this->mode == "view") {
+            require_once("classes/model/AppDocument.php");
 
 
             $case = new Cases();
-            $arrayField = $case->loadCase( $_SESSION["APPLICATION"] );
-            $arrayPermission = $case->getAllObjects( $arrayField["PRO_UID"], $_SESSION["APPLICATION"], $_SESSION["TASK"], $_SESSION["USER_LOGGED"] );
+            $arrayField = $case->loadCase($_SESSION["APPLICATION"]);
+            $arrayPermission = $case->getAllObjects($arrayField["PRO_UID"], $_SESSION["APPLICATION"], $_SESSION["TASK"], $_SESSION["USER_LOGGED"]);
 
             $criteria = new Criteria();
-            $criteria->add( AppDocumentPeer::APP_DOC_UID, $arrayPermission["INPUT_DOCUMENTS"], Criteria::IN );
+            $criteria->add(AppDocumentPeer::APP_DOC_UID, $arrayPermission["INPUT_DOCUMENTS"], Criteria::IN);
 
             switch ($owner->type) {
                 case "xmlform":
                     break;
                 case "grid":
-                    $criteria->add( AppDocumentPeer::APP_DOC_FIELDNAME, $owner->name . "_" . $row . "_" . $this->name );
+                    $criteria->add(AppDocumentPeer::APP_DOC_FIELDNAME, $owner->name . "_" . $row . "_" . $this->name);
                     break;
             }
 
-            $criteria->addDescendingOrderByColumn( AppDocumentPeer::APP_DOC_CREATE_DATE );
-            $rsCriteria = AppDocumentPeer::doSelectRS( $criteria );
-            $rsCriteria->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $criteria->addDescendingOrderByColumn(AppDocumentPeer::APP_DOC_CREATE_DATE);
+            $rsCriteria = AppDocumentPeer::doSelectRS($criteria);
+            $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $sw = 0;
 
             while (($rsCriteria->next()) && $sw == 0) {
@@ -2947,7 +2936,7 @@ class XmlFormFieldFile extends XmlFormField
 
                 if ($row["DOC_UID"] == $this->input) {
                     $permission = true;
-                    $url = ((G::is_https()) ? "https://" : "http://") . $_SERVER["HTTP_HOST"] . dirname( $_SERVER["REQUEST_URI"] ) . "/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"];
+                    $url = ((G::is_https()) ? "https://" : "http://") . $_SERVER["HTTP_HOST"] . dirname($_SERVER["REQUEST_URI"]) . "/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"];
                     $sw = 1;
                 }
             }
@@ -2968,12 +2957,10 @@ class XmlFormFieldFile extends XmlFormField
             $styleDisplay = "display: none;";
         }
 
-        $arrayInputDocumentData = array();
+        $arrayInputDocumentData = [];
         $inpDocMaxFilesize = "";
 
         if (isset($this->input) && $this->input != null) {
-
-
             try {
                 $inputDocument = new InputDocument();
                 $arrayInputDocumentData = $inputDocument->load($this->input);
@@ -2983,7 +2970,7 @@ class XmlFormFieldFile extends XmlFormField
         }
 
         if (count($arrayInputDocumentData) > 0) {
-            $inpDocMaxFilesize = $arrayInputDocumentData["INP_DOC_MAX_FILESIZE"] * (($arrayInputDocumentData["INP_DOC_MAX_FILESIZE_UNIT"] == "MB")? 1024 *1024 : 1024); //Bytes
+            $inpDocMaxFilesize = $arrayInputDocumentData["INP_DOC_MAX_FILESIZE"] * (($arrayInputDocumentData["INP_DOC_MAX_FILESIZE_UNIT"] == "MB") ? 1024 * 1024 : 1024); //Bytes
         }
 
         $pmInputDocument = "pmindocmaxfilesize=\"" . $inpDocMaxFilesize . "\""; //Bytes
@@ -2992,9 +2979,9 @@ class XmlFormFieldFile extends XmlFormField
 
         if (isset($this->input) && $this->input != null) {
             if (count($arrayInputDocumentData) > 0) {
-                $maxUploadFilesizeLabel = ($arrayInputDocumentData["INP_DOC_MAX_FILESIZE"] . "" != "0" && $arrayInputDocumentData["INP_DOC_MAX_FILESIZE"] != "")? G::LoadTranslation("ID_MAX_FILE_SIZE") . " [" . $arrayInputDocumentData["INP_DOC_MAX_FILESIZE"] . " " . $arrayInputDocumentData["INP_DOC_MAX_FILESIZE_UNIT"] . "]" : "";
+                $maxUploadFilesizeLabel = ($arrayInputDocumentData["INP_DOC_MAX_FILESIZE"] . "" != "0" && $arrayInputDocumentData["INP_DOC_MAX_FILESIZE"] != "") ? G::LoadTranslation("ID_MAX_FILE_SIZE") . " [" . $arrayInputDocumentData["INP_DOC_MAX_FILESIZE"] . " " . $arrayInputDocumentData["INP_DOC_MAX_FILESIZE_UNIT"] . "]" : "";
 
-                $arrayInputDocumentData["INP_DOC_TITLE"] = (isset($arrayInputDocumentData["INP_DOC_TITLE"]))? $arrayInputDocumentData["INP_DOC_TITLE"] : null;
+                $arrayInputDocumentData["INP_DOC_TITLE"] = (isset($arrayInputDocumentData["INP_DOC_TITLE"])) ? $arrayInputDocumentData["INP_DOC_TITLE"] : null;
                 $html = $html . "<br /><label><img src=\"/images/inputdocument.gif\" width=\"22px\" width=\"22px\" alt=\"\" /><font size=\"1\">(" . trim($arrayInputDocumentData["INP_DOC_TITLE"]) . ") " . $maxUploadFilesizeLabel . "</font></label>";
             } else {
                 $html = $html . "&nbsp;<font color=\"red\"><img src=\"/images/alert_icon.gif\" width=\"16px\" width=\"16px\" alt=\"\" /><font size=\"1\">(" . G::loadTranslation("ID_INPUT_DOC_DOESNT_EXIST") . ")</font></font>";
@@ -3008,11 +2995,11 @@ class XmlFormFieldFile extends XmlFormField
 
     public function renderGrid($value = array(), $owner = null, $therow = -1, $paramDummy4 = null)
     {
-        $arrayResult = array ();
+        $arrayResult = [];
         $r = 1;
 
         foreach ($value as $v) {
-            $arrayResult[] = $this->render( $v, $owner, "[" . $owner->name . "][" . $r . "]", $r, $therow );
+            $arrayResult[] = $this->render($v, $owner, "[" . $owner->name . "][" . $r . "]", $r, $therow);
             $r = $r + 1;
         }
 
@@ -3031,12 +3018,12 @@ class XmlFormFieldDropdownpt extends XmlFormField
 {
     public $value;
 
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
         $this->value = $value;
 
         $id = $this->value->id;
-        $value = isset( $this->value->value ) ? $this->value->value : '';
+        $value = isset($this->value->value) ? $this->value->value : '';
         $items = $this->value->items;
 
         $res = '<select id="form[' . $id . ']" name="form[' . $this->name . ']" class="module_app_input___gray"><option value="0"></option>';
@@ -3049,7 +3036,7 @@ class XmlFormFieldDropdownpt extends XmlFormField
 
     /* Used in Form::validatePost
     */
-    public function maskValue ($value, &$owner)
+    public function maskValue($value, &$owner)
     {
         return ($value === $this->value) ? $value : $this->falseValue;
     }
@@ -3076,12 +3063,12 @@ class XmlFormFieldCheckboxpt extends XmlFormField
      * @param $owner
      * @return <>
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         }
-        $checked = (isset( $value ) && ($value == $this->value)) ? 'checked' : '';
+        $checked = (isset($value) && ($value == $this->value)) ? 'checked' : '';
         $res = "<input id='form[" . $this->name . "][{$this->value}]' value='{$this->value}' name='form[" . $this->name . "][{$this->value}]' type='checkbox' />";
         return $res;
     }
@@ -3095,14 +3082,14 @@ class XmlFormFieldCheckboxpt extends XmlFormField
      */
     public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
     {
-        $result = array ();
+        $result = [];
         $r = 1;
         foreach ($values as $v) {
             $checked = (($v == $this->value) ? 'checked="checked"' : '');
             $disabled = (($this->value == 'view') ? 'disabled="disabled"' : '');
             $html = $res = "<input id='form[" . $owner->name . "][" . $r . "][" . $this->name . "]' value='{$this->value}' name='form[" . $owner->name . "][" . $r . "][" . $this->name . "]' type='checkbox' $checked $disabled />";
             $result[] = $html;
-            $r ++;
+            $r++;
         }
         return $result;
     }
@@ -3114,7 +3101,7 @@ class XmlFormFieldCheckboxpt extends XmlFormField
      * @param &$owner
      * @return either the value or falseValue attributes
      */
-    public function maskValue ($value, &$owner)
+    public function maskValue($value, &$owner)
     {
         return ($value === $this->value) ? $value : $this->falseValue;
     }
@@ -3141,10 +3128,10 @@ class XmlFormFieldCheckbox extends XmlFormField
      * @param string value
      * @return string
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         }
 
         $disabled = '';
@@ -3154,7 +3141,7 @@ class XmlFormFieldCheckbox extends XmlFormField
             $readOnly = '';
         }
 
-        $checked = (isset( $value ) && ($value == $this->value)) ? 'checked' : '';
+        $checked = (isset($value) && ($value == $this->value)) ? 'checked' : '';
 
         if ($this->mode === 'edit') {
             //$readOnly = isset ( $this->readOnly ) && $this->readOnly ? 'disabled' : '';
@@ -3168,7 +3155,7 @@ class XmlFormFieldCheckbox extends XmlFormField
             //      $res = "<input id='form[" . $this->name . "]' value='" . $this->name . "' name='form[" .$this->name . "]' type='checkbox' $checked $readOnly >" . $this->label ;
             return $res;
         } elseif ($this->mode === 'view') {
-            $checked = (isset( $value ) && ($value == $this->value)) ? 'checked' : '';
+            $checked = (isset($value) && ($value == $this->value)) ? 'checked' : '';
             if ($this->labelOnRight) {
                 $html = "<input id='form[" . $this->name . "]' value='{$this->value}' type='checkbox' $checked $readOnly disabled />
                  <span class='FormCheck'>" . $this->label . '</span></input>';
@@ -3190,7 +3177,7 @@ class XmlFormFieldCheckbox extends XmlFormField
     public function renderGrid($values = array(), $owner = null, $paramDummy3 = null, $paramDummy4 = null)
     {
         $this->gridFieldType = 'checkbox';
-        $result = array ();
+        $result = [];
         $r = 1;
         foreach ($values as $v) {
             $checked = (($v == $this->value) ? 'checked="checked"' : '');
@@ -3202,12 +3189,12 @@ class XmlFormFieldCheckbox extends XmlFormField
             if ($this->mode === 'edit') {
                 $html = $res = "<input id='form[" . $owner->name . "][" . $r . "][" . $this->name . "]' value='{$this->value}' falseValue= " . $this->falseValue . "  name='form[" . $owner->name . "][" . $r . "][" . $this->name . "]' type='checkbox' $checked $disabled readonly = '{$this->readOnly}' " . $this->NSDefaultValue() . " " . $this->NSGridType() . "/>";
                 $result[] = $html;
-                $r ++;
+                $r++;
             } else {
                 //$disabled = (($this->value == 'view') ? 'disabled="disabled"' : '');
                 $html = $res = "<input id='form[" . $owner->name . "][" . $r . "][" . $this->name . "]' value='{$this->value}' falseValue= " . $this->falseValue . " name='form[" . $owner->name . "][" . $r . "][" . $this->name . "]' type='checkbox' $checked disabled readonly = '{$this->readOnly}' " . $this->NSDefaultValue() . " " . $this->NSGridType() . "/>";
                 $result[] = $html;
-                $r ++;
+                $r++;
             }
         }
         return $result;
@@ -3220,13 +3207,14 @@ class XmlFormFieldCheckbox extends XmlFormField
      * @param $owner
      * @return either the value or falseValue
      */
-    public function maskValue ($value, &$owner)
+    public function maskValue($value, &$owner)
     {
         return ($value === $this->value) ? $value : $this->falseValue;
     }
 }
 
 /*DEPRECATED*/
+
 /**
  *
  * @package gulliver.system
@@ -3260,17 +3248,17 @@ class XmlFormFieldButton extends XmlFormField
      * @param string value
      * @return string
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
-        $onclick = G::replaceDataField( $this->onclick, $owner->values );
-        $label = G::replaceDataField( $this->label, $owner->values );
+        $onclick = G::replaceDataField($this->onclick, $owner->values);
+        $label = G::replaceDataField($this->label, $owner->values);
         if ($this->mode === 'edit') {
-            $re = "<input style=\"{$this->style}\" class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . " name=\"form[{$this->name}]\" type='button' value=\"{$label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
+            $re = "<input style=\"{$this->style}\" class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . " name=\"form[{$this->name}]\" type='button' value=\"{$label}\" " . (($this->onclick) ? 'onclick="' . htmlentities($onclick, ENT_COMPAT, 'utf-8') . '"' : '') . " />";
             return $re;
         } elseif ($this->mode === 'view') {
-            return "<input style=\"{$this->style};display:none\" disabled='disabled' class='module_app_button___gray module_app_buttonDisabled___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . " name=\"form[{$this->name}]\" type='button' value=\"{$label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
+            return "<input style=\"{$this->style};display:none\" disabled='disabled' class='module_app_button___gray module_app_buttonDisabled___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . " name=\"form[{$this->name}]\" type='button' value=\"{$label}\" " . (($this->onclick) ? 'onclick="' . htmlentities($onclick, ENT_COMPAT, 'utf-8') . '"' : '') . " />";
         } else {
-            return $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+            return $this->htmlentities($value, ENT_COMPAT, 'utf-8');
         }
     }
 }
@@ -3291,20 +3279,19 @@ class XmlFormFieldReset extends XmlFormField
      * @param string value
      * @return string
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
-        $onclick = G::replaceDataField( $this->onclick, $owner->values );
+        $onclick = G::replaceDataField($this->onclick, $owner->values);
         $mode = ($this->mode == 'view') ? ' disabled="disabled"' : '';
         //return '<input name="'.$this->name.'" type ="reset" value="'.$this->label.'"/>';
         //    return "<input style=\"{$this->style}\" $mode class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" name=\"form[{$this->name}]\" type='reset' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities ( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
         if ($this->mode === 'edit') {
-            return "<input style=\"{$this->style}\" $mode class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . " name=\"form[{$this->name}]\" type='reset' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
+            return "<input style=\"{$this->style}\" $mode class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . " name=\"form[{$this->name}]\" type='reset' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities($onclick, ENT_COMPAT, 'utf-8') . '"' : '') . " />";
         } elseif ($this->mode === 'view') {
-            return "<input style=\"{$this->style};display:none\" $mode class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . " name=\"form[{$this->name}]\" type='reset' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
+            return "<input style=\"{$this->style};display:none\" $mode class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . " name=\"form[{$this->name}]\" type='reset' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities($onclick, ENT_COMPAT, 'utf-8') . '"' : '') . " />";
         } else {
-            return $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+            return $this->htmlentities($value, ENT_COMPAT, 'utf-8');
         }
-
     }
 }
 
@@ -3325,25 +3312,25 @@ class XmlFormFieldSubmit extends XmlFormField
      * @param string value
      * @return string
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
-        $onclick = G::replaceDataField( $this->onclick, $owner->values );
+        $onclick = G::replaceDataField($this->onclick, $owner->values);
 
         if ($this->mode === 'edit') {
             //      if ($this->readOnly)
             //        return '<input id="form['.$this->name.']" name="form['.$this->name.']" type=\'submit\' value=\''. $this->label .'\' disabled/>';
-            return "<input style=\"{$this->style}\" class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . " name=\"form[{$this->name}]\" type='submit' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
-         } elseif ($this->mode === 'view') {
+            return "<input style=\"{$this->style}\" class='module_app_button___gray {$this->className}' id=\"form[{$this->name}]\" " . $this->NSFieldType() . " name=\"form[{$this->name}]\" type='submit' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities($onclick, ENT_COMPAT, 'utf-8') . '"' : '') . " />";
+        } elseif ($this->mode === 'view') {
             //return "<input style=\"{$this->style};display:none\" disabled='disabled' class='module_app_button___gray module_app_buttonDisabled___gray {$this->className}' id=\"form[{$this->name}]\" name=\"form[{$this->name}]\" type='submit' value=\"{$this->label}\" " . (($this->onclick) ? 'onclick="' . htmlentities ( $onclick, ENT_COMPAT, 'utf-8' ) . '"' : '') . " />";
             //$sLinkNextStep = 'window.open("' . $owner->fields['__DYNAFORM_OPTIONS']->xmlMenu->values['NEXT_STEP'] . '", "_self");';
             $html = '';
-            if (isset( $_SESSION['CURRENT_DYN_UID'] )) {
+            if (isset($_SESSION['CURRENT_DYN_UID'])) {
                 $sLinkNextStep = 'window.location=("casesSaveDataView?UID=' . $_SESSION['CURRENT_DYN_UID'] . '");';
-                $html = '<input style="' . $this->style . '" class="module_app_button___gray ' . $this->className . '" id="form[' . $this->name . ']" ' . $this->NSFieldType() . ' name="form[' . $this->name . ']" type="button" value="' . G::LoadTranslation( 'ID_CONTINUE' ) . '"  onclick="' . htmlentities( $sLinkNextStep, ENT_COMPAT, 'utf-8' ) . '" />';
+                $html = '<input style="' . $this->style . '" class="module_app_button___gray ' . $this->className . '" id="form[' . $this->name . ']" ' . $this->NSFieldType() . ' name="form[' . $this->name . ']" type="button" value="' . G::LoadTranslation('ID_CONTINUE') . '"  onclick="' . htmlentities($sLinkNextStep, ENT_COMPAT, 'utf-8') . '" />';
             }
             return $html;
         } else {
-            return $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+            return $this->htmlentities($value, ENT_COMPAT, 'utf-8');
         }
     }
 }
@@ -3358,9 +3345,10 @@ class XmlFormFieldHidden extends XmlFormField
 {
     public $sqlConnection = 0;
     public $sql = '';
-    public $sqlOption = array ();
+    public $sqlOption = [];
     public $dependentFields = '';
     public $gridFieldType = 'hidden';
+
     /**
      * Function render
      *
@@ -3369,29 +3357,29 @@ class XmlFormFieldHidden extends XmlFormField
      * @param string owner
      * @return string
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         } else {
-            $this->executeSQL( $owner );
+            $this->executeSQL($owner);
 
-            if (isset( $this->sqlOption )) {
-                reset( $this->sqlOption );
-                $firstElement = key( $this->sqlOption );
-                if (isset( $firstElement )) {
+            if (isset($this->sqlOption)) {
+                reset($this->sqlOption);
+                $firstElement = key($this->sqlOption);
+                if (isset($firstElement)) {
                     $value = $firstElement;
                 }
             }
         }
         //$html .= 'value="' . $this->htmlentities( $value, ENT_QUOTES, 'utf-8' ) . '" ';
         if ($this->mode === 'edit') {
-            return '<input id="form[' . $this->name . ']" ' . $this->NSFieldType() . ' name="form[' . $this->name . ']" type=\'hidden\' value=\'' . $this->htmlentities( $value, ENT_QUOTES, 'utf-8' ) . '\'/>';
+            return '<input id="form[' . $this->name . ']" ' . $this->NSFieldType() . ' name="form[' . $this->name . ']" type=\'hidden\' value=\'' . $this->htmlentities($value, ENT_QUOTES, 'utf-8') . '\'/>';
         } elseif ($this->mode === 'view') {
             //a button? who wants a hidden field be showed like a button?? very strange.
-            return '<input id="form[' . $this->name . ']" ' . $this->NSFieldType() . ' name="form[' . $this->name . ']" type=\'text\' value=\'' . $this->htmlentities( $value, ENT_QUOTES, 'utf-8' ) . '\' style="display:none"/>';
+            return '<input id="form[' . $this->name . ']" ' . $this->NSFieldType() . ' name="form[' . $this->name . ']" type=\'text\' value=\'' . $this->htmlentities($value, ENT_QUOTES, 'utf-8') . '\' style="display:none"/>';
         } else {
-            return $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+            return $this->htmlentities($value, ENT_COMPAT, 'utf-8');
         }
     }
 
@@ -3404,11 +3392,11 @@ class XmlFormFieldHidden extends XmlFormField
      */
     public function renderGrid($values = null, $owner = null, $paramDummy3 = null, $paramDummy4 = null)
     {
-        $result = array ();
+        $result = [];
         $r = 1;
         foreach ($values as $v) {
-            $result[] = '<input type="hidden" ' . $this->NSGridType() . ' value="' . $this->htmlentities( $v, ENT_COMPAT, 'utf-8' ) . '" id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" />';
-            $r ++;
+            $result[] = '<input type="hidden" ' . $this->NSGridType() . ' value="' . $this->htmlentities($v, ENT_COMPAT, 'utf-8') . '" id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" />';
+            $r++;
         }
 
         return $result;
@@ -3440,10 +3428,10 @@ class XmlFormFieldDropdown extends XmlFormField
     public $dependentFields = '';
     public $readonly = false;
     public $optgroup = 0;
-    public $option = array();
+    public $option = [];
     public $sqlConnection = 0;
     public $sql = '';
-    public $sqlOption = array();
+    public $sqlOption = [];
     public $saveLabel = 0;
     public $modeGridDrop = '';
     public $renderMode = '';
@@ -3462,21 +3450,21 @@ class XmlFormFieldDropdown extends XmlFormField
      * @param string owner
      * @return string
      */
-    public function render ($value = null, $owner = null, $rowId = '', $onlyValue = false, $row = -1, $therow = -1)
+    public function render($value = null, $owner = null, $rowId = '', $onlyValue = false, $row = -1, $therow = -1)
     {
         $displayStyle = '';
 
         //Returns value from a PMTable when it is exists.
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         }
         //Recalculate SQL options if $therow is not defined or the row id equal
-        if ($therow == - 1) {
+        if ($therow == -1) {
             //echo 'Entro:'.$this->dependentFields;
-            $this->executeSQL( $owner, $row );
+            $this->executeSQL($owner, $row);
         } else {
             if ($row == $therow) {
-                $this->executeSQL( $owner, $row );
+                $this->executeSQL($owner, $row);
             }
         }
 
@@ -3487,7 +3475,7 @@ class XmlFormFieldDropdown extends XmlFormField
             $this->renderMode = $this->mode;
         }
 
-        if (! $onlyValue) {
+        if (!$onlyValue) {
             //Render Field if not defined onlyValue
             if ($this->renderMode != 'edit') {
                 //EDIT MODE
@@ -3507,8 +3495,8 @@ class XmlFormFieldDropdown extends XmlFormField
             $html .= $this->NSDefaultValue() . ' ';
             $html .= $this->NSGridLabel() . ' ';
             $html .= $rowId == '' ? $this->NSFieldType() : $this->NSGridType() . ' ';
-            $html .= $this->NSDependentFields( true ) . ' ';
-            $html = $html . (($this->optgroup == 1)? "pm:optgroup=\"1\" " : null);
+            $html .= $this->NSDependentFields(true) . ' ';
+            $html = $html . (($this->optgroup == 1) ? "pm:optgroup=\"1\" " : null);
             $html = $html . ">";
 
             $findValue = '';
@@ -3532,7 +3520,7 @@ class XmlFormFieldDropdown extends XmlFormField
                     $swOptGroupPrev = 1;
                     $swAppend = 0;
                 } else {
-                    $html = $html . $htmlOptGroup . "<option value=\"$optValue\"" . (($optValue == $value)? " selected=\"selected\"" : null) . ">$optName</option>";
+                    $html = $html . $htmlOptGroup . "<option value=\"$optValue\"" . (($optValue == $value) ? " selected=\"selected\"" : null) . ">$optName</option>";
                     $htmlOptGroup = null;
                     $swAppend = 1;
 
@@ -3562,7 +3550,7 @@ class XmlFormFieldDropdown extends XmlFormField
                     $swOptGroupPrev = 1;
                     $swAppend = 0;
                 } else {
-                    $html = $html . $htmlOptGroup . "<option value=\"$optValue\"" . (($optValue == $value)? " selected=\"selected\"" : null) . ">$optName</option>";
+                    $html = $html . $htmlOptGroup . "<option value=\"$optValue\"" . (($optValue == $value) ? " selected=\"selected\"" : null) . ">$optName</option>";
                     $htmlOptGroup = null;
                     $swAppend = 1;
 
@@ -3599,7 +3587,7 @@ class XmlFormFieldDropdown extends XmlFormField
                 $html .= 'value="' . (($findValue != '') ? $findValue : $firstValue) . '" />';
             }
 
-            $this->selectedValue = ($findValue != "")? $findValue : ($count == 0)? $firstValue : "";
+            $this->selectedValue = ($findValue != "") ? $findValue : ($count == 0) ? $firstValue : "";
         } else {
             //Render Field showing only value;
             foreach ($this->option as $optValue => $optName) {
@@ -3634,18 +3622,18 @@ class XmlFormFieldDropdown extends XmlFormField
      * @param string values
      * @return string
      */
-    public function renderGrid ($values = array(), $owner = null, $onlyValue = false, $therow = -1)
+    public function renderGrid($values = array(), $owner = null, $onlyValue = false, $therow = -1)
     {
         $this->gridFieldType = 'dropdown';
-        $result = array ();
+        $result = [];
         $r = 1;
         if ($owner->mode != 'view') {
             $this->renderMode = $this->modeForGrid;
         }
 
         foreach ($values as $v) {
-            $result[] = $this->render( $v, $owner, '[' . $owner->name . '][' . $r . ']', $onlyValue, $r, $therow );
-            $r ++;
+            $result[] = $this->render($v, $owner, '[' . $owner->name . '][' . $r . ']', $onlyValue, $r, $therow);
+            $r++;
         }
         return $result;
     }
@@ -3661,12 +3649,12 @@ class XmlFormFieldListbox extends XmlFormField
 {
     public $defaultValue = '';
     public $required = false;
-    public $option = array ();
+    public $option = [];
     public $sqlConnection = 0;
     public $size = 4;
     public $width = '';
     public $sql = '';
-    public $sqlOption = array ();
+    public $sqlOption = [];
 
     /**
      * Function render
@@ -3676,17 +3664,17 @@ class XmlFormFieldListbox extends XmlFormField
      * @param string owner
      * @return string
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         }
-        $this->executeSQL( $owner );
-        if (! is_array( $value )) {
-            $value = explode( '|', $value );
+        $this->executeSQL($owner);
+        if (!is_array($value)) {
+            $value = explode('|', $value);
         }
 
-        $arrayAux = array();
+        $arrayAux = [];
 
         foreach ($value as $index2 => $value2) {
             if (!is_array($value2)) {
@@ -3705,10 +3693,10 @@ class XmlFormFieldListbox extends XmlFormField
             }
             $html = '<select multiple="multiple" id="form[' . $this->name . ']" ' . $this->NSFieldType() . ' name="form[' . $this->name . '][]" size="' . $this->size . '" ' . $itemWidth . '  ' . $this->NSFieldType() . '>';
             foreach ($this->option as $optionName => $option) {
-                $html .= "<option value=\"" . $optionName . "\" " . ((in_array( $optionName . "", $value )) ? "selected=\"selected\"" : "") . ">" . $option . "</option>";
+                $html .= "<option value=\"" . $optionName . "\" " . ((in_array($optionName . "", $value)) ? "selected=\"selected\"" : "") . ">" . $option . "</option>";
             }
             foreach ($this->sqlOption as $optionName => $option) {
-                $html .= "<option value=\"" . $optionName . "\" " . ((in_array( $optionName . "", $value )) ? "selected=\"selected\"" : "") . ">" . $option . "</option>";
+                $html .= "<option value=\"" . $optionName . "\" " . ((in_array($optionName . "", $value)) ? "selected=\"selected\"" : "") . ">" . $option . "</option>";
             }
             $html .= '</select>';
 
@@ -3718,16 +3706,16 @@ class XmlFormFieldListbox extends XmlFormField
             $valuesFound = array('__NULL__');
             $html = '<select id="form[' . $this->name . ']" ' . $this->NSFieldType() . ' multiple="multiple" size="' . $this->size . '" style="background: none;" disabled="disabled">';
             foreach ($this->option as $optionName => $option) {
-                if (in_array( $optionName . "", $value )) {
+                if (in_array($optionName . "", $value)) {
                     $valuesFound[] = $optionName . "";
                 }
-                $html .= "<option value=\"" . $optionName . "\" " . ((in_array( $optionName . "", $value )) ? "class=\"module_ListBoxView\" selected=\"selected\"" : "") . ">" . $option . "</option>";
+                $html .= "<option value=\"" . $optionName . "\" " . ((in_array($optionName . "", $value)) ? "class=\"module_ListBoxView\" selected=\"selected\"" : "") . ">" . $option . "</option>";
             }
             foreach ($this->sqlOption as $optionName => $option) {
-                if (in_array( $optionName . "", $value )) {
+                if (in_array($optionName . "", $value)) {
                     $valuesFound[] = $optionName . "";
                 }
-                $html .= "<option value=\"" . $optionName . "\" " . ((in_array( $optionName . "", $value )) ? "class=\"module_ListBoxView\" selected=\"selected\"" : "") . ">" . $option . "</option>";
+                $html .= "<option value=\"" . $optionName . "\" " . ((in_array($optionName . "", $value)) ? "class=\"module_ListBoxView\" selected=\"selected\"" : "") . ">" . $option . "</option>";
             }
             if (count($valuesFound) - 1 < count($value)) {
                 $valuesNotFound = array_diff($value, $valuesFound);
@@ -3737,10 +3725,10 @@ class XmlFormFieldListbox extends XmlFormField
             }
             $html .= '</select>';
             foreach ($this->option as $optionName => $option) {
-                $html .= "<input type=\"hidden\" id=\"form[" . $this->name . "][" . $optionName . "]\" name=\"form[" . $this->name . "][]\" " . $this->NSFieldType() . " value=\"" . ((in_array( $optionName . "", $value )) ? $optionName : "__NULL__") . "\">";
+                $html .= "<input type=\"hidden\" id=\"form[" . $this->name . "][" . $optionName . "]\" name=\"form[" . $this->name . "][]\" " . $this->NSFieldType() . " value=\"" . ((in_array($optionName . "", $value)) ? $optionName : "__NULL__") . "\">";
             }
             foreach ($this->sqlOption as $optionName => $option) {
-                $html .= "<input type=\"hidden\" id=\"form[" . $this->name . "][" . $optionName . "]\" name=\"form[" . $this->name . "][]\" " . $this->NSFieldType() . " value=\"" . ((in_array( $optionName . "", $value )) ? $optionName : "__NULL__") . "\">";
+                $html .= "<input type=\"hidden\" id=\"form[" . $this->name . "][" . $optionName . "]\" name=\"form[" . $this->name . "][]\" " . $this->NSFieldType() . " value=\"" . ((in_array($optionName . "", $value)) ? $optionName : "__NULL__") . "\">";
             }
             if (count($valuesFound) - 1 < count($value)) {
                 $valuesNotFound = array_diff($value, $valuesFound);
@@ -3750,7 +3738,7 @@ class XmlFormFieldListbox extends XmlFormField
             }
             return $html;
         } else {
-            return $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+            return $this->htmlentities($value, ENT_COMPAT, 'utf-8');
         }
     }
 
@@ -3763,7 +3751,7 @@ class XmlFormFieldListbox extends XmlFormField
      */
     public function renderGrid($value = null, $owner = null, $paramDummy3 = null, $paramDummy4 = null)
     {
-        return $this->render( $value, $owner );
+        return $this->render($value, $owner);
     }
 }
 
@@ -3777,10 +3765,10 @@ class XmlFormFieldRadioGroup extends XmlFormField
 {
     public $defaultValue = '';
     public $required = false;
-    public $option = array ();
+    public $option = [];
     public $sqlConnection = 0;
     public $sql = '';
-    public $sqlOption = array ();
+    public $sqlOption = [];
     public $viewAlign = 'vertical';
     public $linkType;
 
@@ -3792,22 +3780,22 @@ class XmlFormFieldRadioGroup extends XmlFormField
      * @param string owner
      * @return string
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         }
-        $this->executeSQL( $owner );
+        $this->executeSQL($owner);
         if ($this->mode === 'edit') {
             $html = '';
             $i = 0;
             foreach ($this->options as $optionName => $option) {
-                if (isset( $this->linkType ) && ($this->linkType == 1 || $this->linkType == "1")) {
+                if (isset($this->linkType) && ($this->linkType == 1 || $this->linkType == "1")) {
                     $html .= '<input id="form[' . $this->name . '][' . $optionName . ']" ' . $this->NSFieldType() . ' name="form[' . $this->name . ']" type="radio" value="' . $optionName . '" ' . (($optionName == $value) ? ' checked' : '') . '><a href="#" onclick="executeEvent(\'form[' . $this->name . '][' . $optionName . ']\', \'click\'); return false;">' . $option . '</a></input>';
                 } else {
                     $html .= '<input id="form[' . $this->name . '][' . $optionName . ']" ' . $this->NSFieldType() . ' name="form[' . $this->name . ']" type="radio" value="' . $optionName . '" ' . (($optionName == $value) ? ' checked' : '') . '><label for="form[' . $this->name . '][' . $optionName . ']">' . $option . '</label></input>';
                 }
-                if (++ $i == count( $this->options )) {
+                if (++$i == count($this->options)) {
                     $html .= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' . $this->renderHint();
                 }
 
@@ -3834,12 +3822,13 @@ class XmlFormFieldRadioGroup extends XmlFormField
             }
             return $html;
         } else {
-            return $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+            return $this->htmlentities($value, ENT_COMPAT, 'utf-8');
         }
     }
 }
 
 /*DEPRECATED*/
+
 /**
  *
  * @package gulliver.system
@@ -3849,10 +3838,10 @@ class XmlFormFieldRadioGroupView extends XmlFormField
 {
     public $defaultValue = '';
     public $required = false;
-    public $option = array ();
+    public $option = [];
     public $sqlConnection = 0;
     public $sql = '';
-    public $sqlOption = array ();
+    public $sqlOption = [];
 
     /**
      * Function render
@@ -3862,9 +3851,9 @@ class XmlFormFieldRadioGroupView extends XmlFormField
      * @param string owner
      * @return string
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
-        $this->executeSQL( $owner );
+        $this->executeSQL($owner);
         $html = '';
         foreach ($this->option as $optionName => $option) {
             $html .= '<input type=\'radio\'`disabled/><span class="FormCheck">' . $option . '</span><br>';
@@ -3882,34 +3871,34 @@ class XmlFormFieldRadioGroupView extends XmlFormField
 class XmlFormFieldCheckGroup extends XmlFormField
 {
     public $required = false;
-    public $option = array ();
+    public $option = [];
     public $sqlConnection = 0;
     public $sql = '';
-    public $sqlOption = array ();
+    public $sqlOption = [];
     /*function validateValue( $value , $owner )
     {
     	$this->executeSQL( $owner );
     	return isset($value) && ( array_key_exists( $value , $this->options ) );
     }*/
     /**
-    * Function render
-    *
-    * @access public
-    * @param string value
-    * @param string owner
-    * @return string
-    */
-    public function render ($value = null, $owner = null)
+     * Function render
+     *
+     * @access public
+     * @param string value
+     * @param string owner
+     * @return string
+     */
+    public function render($value = null, $owner = null)
     {
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         }
-        $this->executeSQL( $owner );
-        if (! is_array( $value )) {
-            $value = explode( '|', $value );
+        $this->executeSQL($owner);
+        if (!is_array($value)) {
+            $value = explode('|', $value);
         }
 
-        $arrayAux = array();
+        $arrayAux = [];
 
         foreach ($value as $index2 => $value2) {
             $arrayAux[] = $value2 . "";
@@ -3921,9 +3910,9 @@ class XmlFormFieldCheckGroup extends XmlFormField
             $i = 0;
             $html = '';
             foreach ($this->options as $optionName => $option) {
-                $html .= "<input type=\"checkbox\" id=\"form[" . $this->name . "][" . $optionName . "]\" " . $this->NSFieldType() . " name=\"form[" . $this->name . "][]\"  value=\"" . $optionName . "\"" . (in_array( $optionName . "", $value ) ? "checked = \"checked\" " : "") . "><span class=\"FormCheck\"><label for=\"form[" . $this->name . "][" . $optionName . "]\">" . $option . "</label></span></input>";
+                $html .= "<input type=\"checkbox\" id=\"form[" . $this->name . "][" . $optionName . "]\" " . $this->NSFieldType() . " name=\"form[" . $this->name . "][]\"  value=\"" . $optionName . "\"" . (in_array($optionName . "", $value) ? "checked = \"checked\" " : "") . "><span class=\"FormCheck\"><label for=\"form[" . $this->name . "][" . $optionName . "]\">" . $option . "</label></span></input>";
 
-                if (++ $i == count( $this->options )) {
+                if (++$i == count($this->options)) {
                     $html .= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;' . $this->renderHint();
                 }
                 $html .= '<br>';
@@ -3933,11 +3922,11 @@ class XmlFormFieldCheckGroup extends XmlFormField
             $valuesFound = array('__NULL__');
             $html = '';
             foreach ($this->options as $optionName => $option) {
-                if (in_array( $optionName . "", $value )) {
+                if (in_array($optionName . "", $value)) {
                     $valuesFound[] = $optionName . "";
                 }
-                $html .= "<input " . $this->NSFieldType() . "class=\"FormCheck\" type=\"checkbox\" id=\"form[" . $this->name . "][" . $optionName . "]\" value=\"" . $optionName . "\"" . (in_array( $optionName . "", $value ) ? " checked=\"checked\" " : "") . " disabled=\"disabled\"><span class=\"FormCheck\"><label for=\"form[" . $this->name . "][" . $optionName . "]\">" . $option . "</label></span></input><br />";
-                $html .= "<input type=\"hidden\" name=\"form[" . $this->name . "][]\"  value=\"" . ((in_array( $optionName . "", $value )) ? $optionName : "__NULL__") . "\">";
+                $html .= "<input " . $this->NSFieldType() . "class=\"FormCheck\" type=\"checkbox\" id=\"form[" . $this->name . "][" . $optionName . "]\" value=\"" . $optionName . "\"" . (in_array($optionName . "", $value) ? " checked=\"checked\" " : "") . " disabled=\"disabled\"><span class=\"FormCheck\"><label for=\"form[" . $this->name . "][" . $optionName . "]\">" . $option . "</label></span></input><br />";
+                $html .= "<input type=\"hidden\" name=\"form[" . $this->name . "][]\"  value=\"" . ((in_array($optionName . "", $value)) ? $optionName : "__NULL__") . "\">";
             }
             if (count($valuesFound) - 1 < count($value)) {
                 $valuesNotFound = array_diff($value, $valuesFound);
@@ -3948,37 +3937,37 @@ class XmlFormFieldCheckGroup extends XmlFormField
             }
             return $html;
         } else {
-            return $this->htmlentities( $value, ENT_COMPAT, 'utf-8' );
+            return $this->htmlentities($value, ENT_COMPAT, 'utf-8');
         }
-
     }
 
     /**
      * Renderring the checkgroup inner grid for Staff Eval Plugin
-     * @see class.form.php#validateArray();
+     * @see class.form.php#validate[];
      * @author Edauto
      * @since  2012-07-20
      */
-    public function renderGrid($values = NULL, $owner = NULL) {
-        $this->executeSQL ( $owner );
+    public function renderGrid($values = null, $owner = null, $onlyValue = false, $therow = -1)
+    {
+        $this->executeSQL($owner);
         $disable = ($owner->mode === 'view') ? 'disabled="disabled" ' : ' ';
         $r = 1;
-        $result = array();
-        foreach ( $values as $v ) { // foreach the grid row with selection
-            $i=1;
+        $result = [];
+        foreach ($values as $v) { // foreach the grid row with selection
+            $i = 1;
             $html = '';
-            if (! is_array ( $v )) {
-                $aV = explode ( '|', str_replace(" ","",$v));
+            if (!is_array($v)) {
+                $aV = explode('|', str_replace(" ", "", $v));
             } else {
                 $aV = $v;
             }
-            foreach ( $this->options as $optionName => $option ) { // foreach the options of checkbox group
-                $bChecked =  in_array ( $i , $aV, true ) || in_array($optionName, $aV, true);
-                $html .= '<input id="form[' . $owner->name . ']['. $r .']['. $this->name .'][' . $optionName . ']" ';
-                $html .= 'name="form[' . $owner->name . ']['. $r .']['. $this->name .'][]" ';
-                $html .= 'type="checkbox" value="' . $optionName . '" ' . ($bChecked ? 'checked ' : ' ') ;
+            foreach ($this->options as $optionName => $option) { // foreach the options of checkbox group
+                $bChecked = in_array($i, $aV, true) || in_array($optionName, $aV, true);
+                $html .= '<input id="form[' . $owner->name . '][' . $r . '][' . $this->name . '][' . $optionName . ']" ';
+                $html .= 'name="form[' . $owner->name . '][' . $r . '][' . $this->name . '][]" ';
+                $html .= 'type="checkbox" value="' . $optionName . '" ' . ($bChecked ? 'checked ' : ' ');
                 $html .= $disable . '><span class="FormCheck">' . $option . '</span></input>';
-                if(++$i==count($this->options)){
+                if (++$i == count($this->options)) {
                     $html .= ' ' . $this->renderHint();
                 }
                 $html .= '<br />';
@@ -3991,6 +3980,7 @@ class XmlFormFieldCheckGroup extends XmlFormField
 }
 
 /* TODO: DEPRECATED */
+
 /**
  *
  * @package gulliver.system
@@ -3998,10 +3988,10 @@ class XmlFormFieldCheckGroup extends XmlFormField
  */
 class XmlFormFieldCheckGroupView extends XmlFormField
 {
-    public $option = array ();
+    public $option = [];
     public $sqlConnection = 0;
     public $sql = '';
-    public $sqlOption = array ();
+    public $sqlOption = [];
 
     /**
      * Function render
@@ -4037,7 +4027,7 @@ class XmlFormFieldGrid extends XmlFormField
     public $sql = '';
     //TODO: 0=doesn't excecute the query, 1=Only the first time, 2=Allways
     public $fillType = 0;
-    public $fields = array ();
+    public $fields = [];
     public $scriptURL;
     public $id = '';
 
@@ -4050,10 +4040,10 @@ class XmlFormFieldGrid extends XmlFormField
      * @param string home
      * @return string
      */
-    public function __construct ($xmlnode, $language, $home)
+    public function __construct($xmlnode, $language, $home)
     {
-        parent::__construct( $xmlnode, $language );
-        $this->parseFile( $home, $language );
+        parent::__construct($xmlnode, $language);
+        $this->parseFile($home, $language);
     }
 
     /**
@@ -4064,17 +4054,17 @@ class XmlFormFieldGrid extends XmlFormField
      * @param string language
      * @return string
      */
-    public function parseFile ($home, $language)
+    public function parseFile($home, $language)
     {
-        if (file_exists( $home . $this->xmlGrid . '.xml' )) {
+        if (file_exists($home . $this->xmlGrid . '.xml')) {
             $this->xmlform = new XmlForm();
             $this->xmlform->home = $home;
-            $this->xmlform->parseFile( $this->xmlGrid . '.xml', $language, false );
+            $this->xmlform->parseFile($this->xmlGrid . '.xml', $language, false);
             $this->fields = $this->xmlform->fields;
             $this->scriptURL = $this->xmlform->scriptURL;
             $this->id = $this->xmlform->id;
             $this->modeGrid = $this->xmlform->mode;
-            unset( $this->xmlform );
+            unset($this->xmlform);
         }
     }
 
@@ -4088,9 +4078,8 @@ class XmlFormFieldGrid extends XmlFormField
 
     public function render($values = null, $owner = null)
     {
-        $emptyRow = $this->setScrollStyle( $owner );
-        return $this->renderGrid( $emptyRow, $owner );
-
+        $emptyRow = $this->setScrollStyle($owner);
+        return $this->renderGrid($emptyRow, $owner);
     }
 
     /**
@@ -4105,7 +4094,7 @@ class XmlFormFieldGrid extends XmlFormField
         $this->id = $this->owner->id . $this->name;
         $using_template = 'grid';
 
-        if (isset( $this->mode )) {
+        if (isset($this->mode)) {
             $ownerMode = $this->mode;
         } else {
             $ownerMode = '';
@@ -4127,23 +4116,23 @@ class XmlFormFieldGrid extends XmlFormField
 
         $tpl = new xmlformTemplate($this, PATH_CORE . "templates" . PATH_SEP . "$using_template.html");
 
-        if (! isset( $values ) || ! is_array( $values ) || sizeof( $values ) == 0) {
-            $values = array_keys( $this->fields );
+        if (!isset($values) || !is_array($values) || sizeof($values) == 0) {
+            $values = array_keys($this->fields);
         }
 
-        if ($therow != - 1) {
+        if ($therow != -1) {
             //Check if values arrary is complete to can flip.
-            $xValues = array ();
-            if (isset( $values[$therow] )) {
+            $xValues = [];
+            if (isset($values[$therow])) {
                 $aRow = $values[$therow];
             } else {
-                $aRow = array ();
+                $aRow = [];
             }
-            for ($c = 1; $c <= $therow; $c ++) {
+            for ($c = 1; $c <= $therow; $c++) {
                 if ($c == $therow) {
                     $xValues[$therow] = $aRow;
                 } else {
-                    if (is_array( $aRow )) {
+                    if (is_array($aRow)) {
                         foreach ($aRow as $key => $value) {
                             $xValues[$c][$key] = "";
                         }
@@ -4155,18 +4144,18 @@ class XmlFormFieldGrid extends XmlFormField
             $values = $xValues;
         }
 
-        $aValuekeys = array_keys( $values );
+        $aValuekeys = array_keys($values);
 
-        if (count( $aValuekeys ) > 0 && (int) $aValuekeys[0] == 1) {
-            $values = $this->flipValues( $values );
+        if (count($aValuekeys) > 0 && (int)$aValuekeys[0] == 1) {
+            $values = $this->flipValues($values);
         }
 
         //if ($therow == 1)g::pr($values);
-        $this->rows = count( reset( $values ) );
+        $this->rows = count(reset($values));
 
         //Fields required in grid (view in sql attribute)
-        $arrayField = array();
-        $arrayFieldRequired = array();
+        $arrayField = [];
+        $arrayFieldRequired = [];
 
         foreach ($this->fields as $index1 => $value1) {
             $field = $value1;
@@ -4188,7 +4177,7 @@ class XmlFormFieldGrid extends XmlFormField
         if (isset($owner->values) && count($arrayFieldRequired) > 0) {
             foreach ($owner->values as $key => $value) {
                 if (in_array($key, $arrayFieldRequired) && !isset($values[$key])) {
-                    $values[$key] = array();
+                    $values[$key] = [];
                     //for($r=0; $r < $this->rows ; $r++ ) {
                     $values[$key] = $value;
                     //}
@@ -4197,7 +4186,7 @@ class XmlFormFieldGrid extends XmlFormField
         }
 
         foreach ($this->fields as $k => $v) {
-            if (isset( $values['SYS_GRID_AGGREGATE_' . $this->name . '_' . $k] )) {
+            if (isset($values['SYS_GRID_AGGREGATE_' . $this->name . '_' . $k])) {
                 $this->fields[$k]->aggregate = $values['SYS_GRID_AGGREGATE_' . $this->name . '_' . $k];
             } else {
                 $this->fields[$k]->aggregate = '0';
@@ -4206,15 +4195,15 @@ class XmlFormFieldGrid extends XmlFormField
 
         $this->values = $values;
 
-        $this->NewLabel = G::LoadTranslation( 'ID_NEW' );
-        $this->DeleteLabel = G::LoadTranslation( 'ID_DELETE' );
+        $this->NewLabel = G::LoadTranslation('ID_NEW');
+        $this->DeleteLabel = G::LoadTranslation('ID_DELETE');
 
-        $tpl->template = $tpl->printTemplate( $this );
+        $tpl->template = $tpl->printTemplate($this);
         //In the header
-        $oHeadPublisher = & headPublisher::getSingleton();
-        $oHeadPublisher->addScriptFile( $this->scriptURL );
-        $oHeadPublisher->addScriptCode( $tpl->printJavaScript( $this ) );
-        return $tpl->printObject( $this, $therow );
+        $oHeadPublisher = headPublisher::getSingleton();
+        $oHeadPublisher->addScriptFile($this->scriptURL);
+        $oHeadPublisher->addScriptCode($tpl->printJavaScript($this));
+        return $tpl->printObject($this, $therow);
     }
 
     /**
@@ -4223,15 +4212,15 @@ class XmlFormFieldGrid extends XmlFormField
      * @param <array> $arrayData
      * @return <array>
      */
-    public function flipValues ($arrayData)
+    public function flipValues($arrayData)
     {
-        $flipped = array ();
+        $flipped = [];
 
         foreach ($arrayData as $rowIndex => $rowValue) {
-            if (is_array( $rowValue )) {
+            if (is_array($rowValue)) {
                 foreach ($rowValue as $colIndex => $colValue) {
-                    if (! isset( $flipped[$colIndex] ) || ! is_array( $flipped[$colIndex] )) {
-                        $flipped[$colIndex] = array ();
+                    if (!isset($flipped[$colIndex]) || !is_array($flipped[$colIndex])) {
+                        $flipped[$colIndex] = [];
                     }
 
                     $flipped[$colIndex][$rowIndex] = $colValue;
@@ -4242,42 +4231,43 @@ class XmlFormFieldGrid extends XmlFormField
         return $flipped;
     }
 
-    public function setScrollStyle($owner) {
-        $arrayKeys = array_keys( $this->fields );
-        $emptyRow = array ();
+    public function setScrollStyle($owner)
+    {
+        $arrayKeys = array_keys($this->fields);
+        $emptyRow = [];
         $fieldsSize = 0;
         foreach ($arrayKeys as $key) {
-            if (isset( $this->fields[$key]->defaultValue )) {
+            if (isset($this->fields[$key]->defaultValue)) {
                 $emptyValue = $this->fields[$key]->defaultValue;
             } else {
                 $emptyValue = '';
             }
-            if (isset( $this->fields[$key]->size )) {
+            if (isset($this->fields[$key]->size)) {
                 $size = $this->fields[$key]->size;
             }
-            if (! isset( $size )) {
+            if (!isset($size)) {
                 $size = 15;
             }
             $fieldsSize += $size;
-            $emptyRow[$key] = array ($emptyValue);
+            $emptyRow[$key] = array($emptyValue);
         }
 
-        if (isset( $owner->adjustgridswidth ) && $owner->adjustgridswidth == '1') {
+        if (isset($owner->adjustgridswidth) && $owner->adjustgridswidth == '1') {
             // 400w -> 34s to Firefox
             // 400w -> 43s to Chrome
             $baseWidth = 400;
             $minusWidth = 30;
-            if (eregi( 'chrome', $_SERVER['HTTP_USER_AGENT'] )) {
+            if (preg_match('/chrome/i', $_SERVER['HTTP_USER_AGENT'])) {
                 $baseSize = 43;
             } else {
-                if (strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false) {
+                if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) {
                     $minusWidth = 20;
                 }
                 $baseSize = 34;
             }
 
             $baseWidth = 400;
-            $formWidth = (int) $owner->width;
+            $formWidth = (int)$owner->width;
             $maxSize = (($formWidth * $baseSize) / $baseWidth);
 
             if ($fieldsSize > $maxSize) {
@@ -4302,31 +4292,31 @@ class XmlFormFieldJavaScript extends XmlFormField
     public $replaceTags = true;
 
     /**
-    * Function XmlFormFieldJavaScript
-    *
-    * @access public
-    * @param string xmlNode
-    * @param string lang
-    * @param string home
-    * @return string
-    */
-    public function __construct ($xmlNode, $lang = 'en', $home = '')
+     * Function XmlFormFieldJavaScript
+     *
+     * @access public
+     * @param string xmlNode
+     * @param string lang
+     * @param string home
+     * @return string
+     */
+    public function __construct($xmlNode, $lang = 'en', $home = '')
     {
         //Loads any attribute that were defined in the xmlNode
         //except name and label.
-        $myAttributes = get_class_vars( get_class( $this ) );
+        $myAttributes = get_class_vars(get_class($this));
         foreach ($myAttributes as $k => $v) {
-            $myAttributes[$k] = strtoupper( $k );
+            $myAttributes[$k] = strtoupper($k);
         }
         foreach ($xmlNode->attributes as $k => $v) {
-            $key = array_search( strtoupper( $k ), $myAttributes );
+            $key = array_search(strtoupper($k), $myAttributes);
             if ($key) {
-                eval( '$this->' . $key . '=$v;' );
+                eval('$this->' . $key . '=$v;');
             }
         }
         //Loads the main attributes
         $this->name = $xmlNode->name;
-        $this->type = strtolower( $xmlNode->attributes['type'] );
+        $this->type = strtolower($xmlNode->attributes['type']);
         //$data: Includes labels and options.
         $this->code = $xmlNode->value;
     }
@@ -4338,9 +4328,9 @@ class XmlFormFieldJavaScript extends XmlFormField
      * @param string value
      * @return string
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
-        $code = ($this->replaceTags) ? G::replaceDataField( $this->code, $owner->values ) : $this->code;
+        $code = ($this->replaceTags) ? G::replaceDataField($this->code, $owner->values) : $this->code;
         return $code;
     }
 
@@ -4354,7 +4344,7 @@ class XmlFormFieldJavaScript extends XmlFormField
      */
     public function renderGrid($values = null, $owner = null, $paramDummy3 = null, $paramDummy4 = null)
     {
-        return array ('');
+        return array('');
     }
 
     /**
@@ -4363,7 +4353,7 @@ class XmlFormFieldJavaScript extends XmlFormField
      * @param $value
      * @return false
      */
-    public function validateValue ($value)
+    public function validateValue($value)
     {
         return false;
     }
@@ -4382,11 +4372,11 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
     public $startDate = '';
     public $endDate = '';
     /**
-    * for dinamically dates,   beforeDate << currentDate << afterDate
-    * beforeDate='1y' means one year before,  beforeDate='3m' means 3 months before
-    * afterDate='5y' means five year after,  afterDate='15d' means 15 days after
-    * startDate and endDate have priority over beforeDate and AfterDate
-    **/
+     * for dinamically dates,   beforeDate << currentDate << afterDate
+     * beforeDate='1y' means one year before,  beforeDate='3m' means 3 months before
+     * afterDate='5y' means five year after,  afterDate='15d' means 15 days after
+     * startDate and endDate have priority over beforeDate and AfterDate
+     **/
     public $afterDate = '';
     public $beforeDate = '';
     public $defaultValue = null;
@@ -4404,14 +4394,14 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
     * @param <Date> $date
     * @return <Boolean> true/false
     */
-    public function verifyDateFormat ($date)
+    public function verifyDateFormat($date)
     {
-        $dateTime = explode( " ", $date ); //To accept the Hour part
-        $aux = explode( '-', $dateTime[0] );
-        if (count( $aux ) != 3) {
+        $dateTime = explode(" ", $date); //To accept the Hour part
+        $aux = explode('-', $dateTime[0]);
+        if (count($aux) != 3) {
             return false;
         }
-        if (! (is_numeric( $aux[0] ) && is_numeric( $aux[1] ) && is_numeric( $aux[2] ))) {
+        if (!(is_numeric($aux[0]) && is_numeric($aux[1]) && is_numeric($aux[2]))) {
             return false;
         }
         if ($aux[0] < 1900 || $aux[0] > 2100) {
@@ -4426,14 +4416,14 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
      * @param <Date> $date
      * @return <Boolean> true/false
      */
-    public function isvalidBeforeFormat ($date)
+    public function isvalidBeforeFormat($date)
     {
-        $part1 = substr( $date, 0, strlen( $date ) - 1 );
-        $part2 = substr( $date, strlen( $date ) - 1 );
+        $part1 = substr($date, 0, strlen($date) - 1);
+        $part2 = substr($date, strlen($date) - 1);
         if ($part2 != 'd' && $part2 != 'm' && $part2 != 'y') {
             return false;
         }
-        if (! is_numeric( $part1 )) {
+        if (!is_numeric($part1)) {
             return false;
         }
         return true;
@@ -4446,14 +4436,14 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
      * @param $sign
      * @return <Date>
      */
-    public function calculateBeforeFormat ($date, $sign)
+    public function calculateBeforeFormat($date, $sign)
     {
-        $part1 = $sign * substr( $date, 0, strlen( $date ) - 1 );
-        $part2 = substr( $date, strlen( $date ) - 1 );
+        $part1 = $sign * substr($date, 0, strlen($date) - 1);
+        $part2 = substr($date, strlen($date) - 1);
 
-        $year  = (int)(date("Y"));
+        $year = (int)(date("Y"));
         $month = (int)(date("m"));
-        $day   = (int)(date("d"));
+        $day = (int)(date("d"));
 
         $osIsLinux = strtoupper(substr(PHP_OS, 0, 3)) != "WIN";
         $checkYear = false;
@@ -4504,18 +4494,18 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
      * @param $owner
      * @return renderized widget
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
         $this->renderMode = $this->mode;
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         } else {
-            $value = G::replaceDataField( $value, $owner->values );
+            $value = G::replaceDataField($value, $owner->values);
         }
         //$this->defaultValue = G::replaceDataField( $this->defaultValue, $owner->values);
         $id = "form[$this->name]";
 
-        return $this->__draw_widget( $id, $value, $owner );
+        return $this->__draw_widget($id, $value, $owner);
     }
 
     /**
@@ -4529,7 +4519,7 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
     public function renderGrid($values = null, $owner = null, $onlyValue = false, $paramDummy4 = null)
     {
         $this->gridFieldType = 'date';
-        $result = array ();
+        $result = [];
         $r = 1;
         /*    if( ! isset($owner->modeGrid)) $owner->modeGrid = '';
         $this->mode = $this->modeForGrid;*/
@@ -4537,28 +4527,28 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
             $this->renderMode = $this->modeForGrid;
         }
         foreach ($values as $v) {
-            $v = G::replaceDataField( $v, $owner->values );
-            if (! $onlyValue) {
-                if ($this->mode === 'view' || (isset( $owner->modeGrid ) && $owner->modeGrid === 'view')) {
+            $v = G::replaceDataField($v, $owner->values);
+            if (!$onlyValue) {
+                if ($this->mode === 'view' || (isset($owner->modeGrid) && $owner->modeGrid === 'view')) {
                     if ($this->required) {
                         $isRequired = '1';
                     } else {
                         $isRequired = '0';
                     }
-                    $mask = str_replace( "%", "", $this->mask );
+                    $mask = str_replace("%", "", $this->mask);
                     if (trim($v) !== "") {
-                        $v = date( masktophp($mask, $v) );
+                        $v = date(masktophp($mask, $v));
                     }
-                    $html = '<input ' . $this->NSRequiredValue() .' class="module_app_input___gray" '. $this->NSGridType() .' id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" type ="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value="' . $this->htmlentities( $v, ENT_COMPAT, 'utf-8' ) . '" pm:required="' . $isRequired . '" style="display:none;' . htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" />' . htmlentities( $v, ENT_COMPAT, 'utf-8' );
+                    $html = '<input ' . $this->NSRequiredValue() . ' class="module_app_input___gray" ' . $this->NSGridType() . ' id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" type ="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value="' . $this->htmlentities($v, ENT_COMPAT, 'utf-8') . '" pm:required="' . $isRequired . '" style="display:none;' . htmlentities($this->style, ENT_COMPAT, 'utf-8') . '" />' . htmlentities($v, ENT_COMPAT, 'utf-8');
                 } else {
                     $id = 'form[' . $owner->name . '][' . $r . '][' . $this->name . ']';
-                    $html = $this->__draw_widget( $id, $v, $owner, true );
+                    $html = $this->__draw_widget($id, $v, $owner, true);
                 }
             } else {
                 $html = $v;
             }
             $result[] = $html;
-            $r ++;
+            $r++;
         }
         return $result;
     }
@@ -4571,52 +4561,52 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
      * @param $owner
      * @return <String>
      */
-    public function __draw_widget ($pID, $value, $owner = '', $inGrid = false)
+    public function __draw_widget($pID, $value, $owner = '', $inGrid = false)
     {
-        $startDate = G::replaceDataField( $this->startDate, $owner->values );
-        $endDate = G::replaceDataField( $this->endDate, $owner->values );
-        $beforeDate = G::replaceDataField( $this->beforeDate, $owner->values );
-        $afterDate = G::replaceDataField( $this->afterDate, $owner->values );
+        $startDate = G::replaceDataField($this->startDate, $owner->values);
+        $endDate = G::replaceDataField($this->endDate, $owner->values);
+        $beforeDate = G::replaceDataField($this->beforeDate, $owner->values);
+        $afterDate = G::replaceDataField($this->afterDate, $owner->values);
         $defaultValue = $this->defaultValue;
         if ($startDate != '') {
-            if (! $this->verifyDateFormat( $startDate )) {
+            if (!$this->verifyDateFormat($startDate)) {
                 $startDate = '';
             }
         }
 
-        if (isset( $beforeDate ) && $beforeDate != '') {
-            if ($this->isvalidBeforeFormat( $beforeDate )) {
-                $startDate = $this->calculateBeforeFormat( $beforeDate, 1 );
+        if (isset($beforeDate) && $beforeDate != '') {
+            if ($this->isvalidBeforeFormat($beforeDate)) {
+                $startDate = $this->calculateBeforeFormat($beforeDate, 1);
             }
         }
 
-        if ($startDate == '' && isset( $this->size ) && is_numeric( $this->size ) && $this->size >= 1900 && $this->size <= 2100) {
+        if ($startDate == '' && isset($this->size) && is_numeric($this->size) && $this->size >= 1900 && $this->size <= 2100) {
             $startDate = $this->size . '-01-01';
         }
 
         if ($endDate != '') {
-            if (! $this->verifyDateFormat( $endDate )) {
+            if (!$this->verifyDateFormat($endDate)) {
                 $endDate = '';
             }
         }
 
-        if (isset( $afterDate ) && $afterDate != '') {
-            if ($this->isvalidBeforeFormat( $afterDate )) {
-                $endDate = $this->calculateBeforeFormat( $afterDate, + 1 );
+        if (isset($afterDate) && $afterDate != '') {
+            if ($this->isvalidBeforeFormat($afterDate)) {
+                $endDate = $this->calculateBeforeFormat($afterDate, +1);
             }
         }
 
-        if (isset( $this->maxlength ) && is_numeric( $this->maxlength ) && $this->maxlength >= 1900 && $this->maxlength <= 2100) {
+        if (isset($this->maxlength) && is_numeric($this->maxlength) && $this->maxlength >= 1900 && $this->maxlength <= 2100) {
             $endDate = $this->maxlength . '-01-01';
         }
 
         if ($endDate == '') {
             // the default is the current date + 2 years
-            $endDate = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 2 ) );
+            $endDate = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d'), date('Y') + 2));
         }
 
         //validating the mask, if it is not set,
-        if (isset( $this->mask ) && $this->mask != '') {
+        if (isset($this->mask) && $this->mask != '') {
             $mask = $this->mask;
         } else {
             $mask = '%Y-%m-%d'; //set default
@@ -4625,21 +4615,21 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
         $valueDemo = masktophp($mask, "today");
 
         if ($this->defaultValue != "") {
-            $defaultValue = masktophp( $mask, $defaultValue);
+            $defaultValue = masktophp($mask, $defaultValue);
         }
 
-        if (strpos( $mask, '%' ) === false) {
-            if (strpos( $mask, '-' ) !== false) {
+        if (strpos($mask, '%') === false) {
+            if (strpos($mask, '-') !== false) {
                 $separator = '-';
             }
-            if (strpos( $mask, '/' ) !== false) {
+            if (strpos($mask, '/') !== false) {
                 $separator = '/';
             }
-            if (strpos( $mask, '.' ) !== false) {
+            if (strpos($mask, '.') !== false) {
                 $separator = '.';
             }
 
-            $maskparts = explode( $separator, $mask );
+            $maskparts = explode($separator, $mask);
             $mask = '';
             foreach ($maskparts as $part) {
                 if ($mask != '') {
@@ -4661,17 +4651,17 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
             }
         }
 
-        $tmp = str_replace( "%", "", $mask );
-        if (trim( $value ) == '' or $value == null) {
+        $tmp = str_replace("%", "", $mask);
+        if (trim($value) == '' or $value == null) {
             $value = ''; //date ($tmp);
         } else {
             if ($value != "") {
-                $value = masktophp( $mask, $value);
+                $value = masktophp($mask, $value);
             }
         }
 
         //onchange
-        if (isset( $this->onchange ) && $this->onchange != '') {
+        if (isset($this->onchange) && $this->onchange != '') {
             $onchange = 'onchange="' . $this->onchange . '"';
         } else {
             $onchange = '';
@@ -4684,13 +4674,13 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
         }
 
         if ($this->renderMode == 'edit') {
-            $maskleng = strlen( $mask );
+            $maskleng = strlen($mask);
             $hour = '%H';
             $min = '%M';
             $sec = '%S';
-            $sizehour = strpos( $mask, $hour );
-            $sizemin = strpos( $mask, $min );
-            $sizesec = strpos( $mask, $sec );
+            $sizehour = strpos($mask, $hour);
+            $sizemin = strpos($mask, $min);
+            $sizesec = strpos($mask, $sec);
             $Time = 'false';
 
             if (($sizehour !== false) && ($sizemin !== false) && ($sizesec !== false)) {
@@ -4738,25 +4728,25 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
         return $html;
     }
 
-    public function maskDateValue ($value, $field)
+    public function maskDateValue($value, $field)
     {
         $value = trim($value);
         $mask = $field->mask;
         if ($value == '' || $mask == '') {
             return $value;
         }
-        if (strpos( $mask, '%' ) === false) {
-            if (strpos( $mask, '-' ) !== false) {
+        if (strpos($mask, '%') === false) {
+            if (strpos($mask, '-') !== false) {
                 $separator = '-';
             }
-            if (strpos( $mask, '/' ) !== false) {
+            if (strpos($mask, '/') !== false) {
                 $separator = '/';
             }
-            if (strpos( $mask, '.' ) !== false) {
+            if (strpos($mask, '.') !== false) {
                 $separator = '.';
             }
 
-            $maskparts = explode( $separator, $mask );
+            $maskparts = explode($separator, $mask);
             $mask = '';
             foreach ($maskparts as $part) {
                 if ($mask != '') {
@@ -4780,7 +4770,7 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
 
         $withHours = (strpos($mask, '%H') !== false || strpos($mask, '%I') !== false || strpos($mask, '%k') !== false || strpos($mask, '%l') !== false || strpos($mask, '%M') !== false || strpos($mask, '%S') !== false);
 
-        $tmp = str_replace( "%", "", $mask );
+        $tmp = str_replace("%", "", $mask);
         return $this->date_create_from_format($tmp, $value, $withHours);
     }
 
@@ -4805,10 +4795,10 @@ class XmlFormFieldDate extends XmlFormFieldSimpleText
       //Sec
       %S seconds, range 00 to 59
     */
-    function date_create_from_format( $dformat, $dvalue, $withHours = false )
+    public function date_create_from_format($dformat, $dvalue, $withHours = false)
     {
         $schedule = $dvalue;
-        $schedule_format = str_replace(array('Y','y','m','B','b','d','e','H','I','k','l','M','S'),array('%Y','%y','%m','%B','%b','%d','%e','%H','%I','%k','%l','%M','%S') ,$dformat);
+        $schedule_format = str_replace(array('Y', 'y', 'm', 'B', 'b', 'd', 'e', 'H', 'I', 'k', 'l', 'M', 'S'), array('%Y', '%y', '%m', '%B', '%b', '%d', '%e', '%H', '%I', '%k', '%l', '%M', '%S'), $dformat);
         $ugly = strptime($schedule, $schedule_format);
         $ymd = sprintf(
             '%04d-%02d-%02d %02d:%02d:%02d',
@@ -4868,27 +4858,27 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
      * @param <Date> $date
      * @return <Boolean> true/false
      */
-    public function verifyDateFormat ($date, $mask = '')
+    public function verifyDateFormat($date, $mask = '')
     {
-        $dateTime = explode( " ", $date ); //To accept the Hour part
-        $aDate = explode( '-', str_replace( "/", "-", $dateTime[0] ) );
+        $dateTime = explode(" ", $date); //To accept the Hour part
+        $aDate = explode('-', str_replace("/", "-", $dateTime[0]));
         $bResult = true;
 
         foreach ($aDate as $sDate) {
-            if (! is_numeric( $sDate )) {
+            if (!is_numeric($sDate)) {
                 $bResult = false;
                 break;
             }
         }
 
         if ($mask != '') {
-            $aDate = $this->getSplitDate( $dateTime[0], $mask );
-            $aDate[0] = ($aDate[0] == '') ? date( 'Y' ) : $aDate[0];
-            $aDate[1] = ($aDate[1] == '') ? date( 'm' ) : $aDate[1];
-            $aDate[2] = ($aDate[2] == '') ? date( 'd' ) : $aDate[2];
+            $aDate = $this->getSplitDate($dateTime[0], $mask);
+            $aDate[0] = ($aDate[0] == '') ? date('Y') : $aDate[0];
+            $aDate[1] = ($aDate[1] == '') ? date('m') : $aDate[1];
+            $aDate[2] = ($aDate[2] == '') ? date('d') : $aDate[2];
 
             return true;
-            if (checkdate( $aDate[1], $aDate[2], $aDate[0] )) {
+            if (checkdate($aDate[1], $aDate[2], $aDate[0])) {
             } else {
                 return false;
             }
@@ -4902,23 +4892,23 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
      * @param <Date> $date
      * @return <Boolean> true/false
      */
-    public function isvalidBeforeFormat ($date)
+    public function isvalidBeforeFormat($date)
     {
-        $part1 = substr( $date, 0, strlen( $date ) - 1 );
-        $part2 = substr( $date, strlen( $date ) - 1 );
+        $part1 = substr($date, 0, strlen($date) - 1);
+        $part2 = substr($date, strlen($date) - 1);
         if ($part2 != 'd' && $part2 != 'm' && $part2 != 'y') {
             return false;
         }
-        if (! is_numeric( $part1 )) {
+        if (!is_numeric($part1)) {
             return false;
         }
         return true;
     }
 
-    public function calculateBeforeFormat ($date, $sign)
+    public function calculateBeforeFormat($date, $sign)
     {
-        $part1 = $sign * substr( $date, 0, strlen( $date ) - 1 );
-        $part2 = substr( $date, strlen( $date ) - 1 );
+        $part1 = $sign * substr($date, 0, strlen($date) - 1);
+        $part2 = substr($date, strlen($date) - 1);
 
         #TODO
         # neyek
@@ -4932,15 +4922,15 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
 
         switch ($part2) {
             case 'd':
-                $res = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ) + $part1, date( 'Y' ) ) );
+                $res = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d') + $part1, date('Y')));
                 break;
             case 'm':
-                $res = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ) + $part1, date( 'd' ) - 1, date( 'Y' ) ) );
+                $res = date('Y-m-d', mktime(0, 0, 0, date('m') + $part1, date('d') - 1, date('Y')));
                 break;
             case 'y':
                 //$res = date ( 'Y-m-d', mktime ( 0, 0, 0, date ( 'm' ), date ( 'd' ), date ( 'Y' ) + $part1) );
                 //hook
-                $res = (intVal( date( 'Y' ) ) + $part1) . '-' . date( 'm' ) . '-' . date( 'd' );
+                $res = (intVal(date('Y')) + $part1) . '-' . date('m') . '-' . date('d');
                 break;
         }
 
@@ -4954,16 +4944,16 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
      * @param $owner
      * @return renderized widget
      */
-    public function render ($value = null, $owner = null)
+    public function render($value = null, $owner = null)
     {
         if (($this->pmconnection != '') && ($this->pmfield != '') && $value == null) {
-            $value = $this->getPMTableValue( $owner );
+            $value = $this->getPMTableValue($owner);
         } else {
-            $value = G::replaceDataField( $value, $owner->values );
+            $value = G::replaceDataField($value, $owner->values);
         }
         //$this->defaultValue = G::replaceDataField( $this->defaultValue, $owner->values);
         $id = "form[$this->name]";
-        return $this->__draw_widget( $id, $value, $owner );
+        return $this->__draw_widget($id, $value, $owner);
     }
 
     /**
@@ -4976,18 +4966,18 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
      */
     public function renderGrid($values = null, $owner = null, $onlyValue = false, $paramDummy4 = null)
     {
-        $result = array ();
+        $result = [];
         $r = 1;
         foreach ($values as $v) {
-            $v = ($v != '') ? G::replaceDataField( $v, $owner->values ) : $this->defaultValue;
-            if (! $onlyValue) {
+            $v = ($v != '') ? G::replaceDataField($v, $owner->values) : $this->defaultValue;
+            if (!$onlyValue) {
                 $id = 'form[' . $owner->name . '][' . $r . '][' . $this->name . ']';
-                $html = $this->__draw_widget( $id, $v, $owner );
+                $html = $this->__draw_widget($id, $v, $owner);
             } else {
                 $html = $v;
             }
             $result[] = $html;
-            $r ++;
+            $r++;
         }
         return $result;
     }
@@ -5000,21 +4990,21 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
      * @param $owner
      * @return <String>
      */
-    public function __draw_widget ($pID, $value, $owner = '')
+    public function __draw_widget($pID, $value, $owner = '')
     {
 
         /*for deprecated mask definitions...*/
 
         #first deprecated simple (yyyy-mm-dd) and personalizes combinations
-        $this->mask = str_replace( 'yyyy', 'Y', $this->mask );
-        $this->mask = str_replace( 'yy', 'y', $this->mask );
-        $this->mask = str_replace( 'mm', 'm', $this->mask );
-        $this->mask = str_replace( 'dd', 'd', $this->mask );
+        $this->mask = str_replace('yyyy', 'Y', $this->mask);
+        $this->mask = str_replace('yy', 'y', $this->mask);
+        $this->mask = str_replace('mm', 'm', $this->mask);
+        $this->mask = str_replace('dd', 'd', $this->mask);
 
         #second deprecated (%Y-%m-%d) and other combinations
-        $this->mask = str_replace( '%', '', $this->mask );
+        $this->mask = str_replace('%', '', $this->mask);
 
-        if (isset( $this->mask ) && $this->mask != '') {
+        if (isset($this->mask) && $this->mask != '') {
             $mask = $this->mask;
         } else {
             #Default mask
@@ -5030,24 +5020,24 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
             $isRequired = '0';
         }
 
-        $startDate = G::replaceDataField( $this->startDate, $owner->values );
-        $endDate = G::replaceDataField( $this->endDate, $owner->values );
+        $startDate = G::replaceDataField($this->startDate, $owner->values);
+        $endDate = G::replaceDataField($this->endDate, $owner->values);
 
-        $beforeDate = G::replaceDataField( $this->beforeDate, $owner->values );
-        $afterDate = G::replaceDataField( $this->afterDate, $owner->values );
+        $beforeDate = G::replaceDataField($this->beforeDate, $owner->values);
+        $afterDate = G::replaceDataField($this->afterDate, $owner->values);
 
         if ($startDate != '') {
-            if (! $this->verifyDateFormat( $startDate )) {
+            if (!$this->verifyDateFormat($startDate)) {
                 $startDate = '';
             }
         }
-        if (isset( $beforeDate ) && $beforeDate != '') {
-            if ($this->isvalidBeforeFormat( $beforeDate )) {
-                $startDate = $this->calculateBeforeFormat( $beforeDate, 1 );
+        if (isset($beforeDate) && $beforeDate != '') {
+            if ($this->isvalidBeforeFormat($beforeDate)) {
+                $startDate = $this->calculateBeforeFormat($beforeDate, 1);
             }
         }
 
-        if ($startDate == '' && isset( $this->size ) && is_numeric( $this->size ) && $this->size >= 1900 && $this->size <= 2100) {
+        if ($startDate == '' && isset($this->size) && is_numeric($this->size) && $this->size >= 1900 && $this->size <= 2100) {
             $startDate = $this->size . '-01-01';
         }
 
@@ -5056,35 +5046,35 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
         }
 
         if ($endDate != '') {
-            if (! $this->verifyDateFormat( $endDate )) {
+            if (!$this->verifyDateFormat($endDate)) {
                 $endDate = '';
             }
         }
 
-        if (isset( $afterDate ) && $afterDate != '') {
-            if ($this->isvalidBeforeFormat( $afterDate )) {
-                $endDate = $this->calculateBeforeFormat( $afterDate, + 1 );
+        if (isset($afterDate) && $afterDate != '') {
+            if ($this->isvalidBeforeFormat($afterDate)) {
+                $endDate = $this->calculateBeforeFormat($afterDate, +1);
             }
         }
 
-        if (isset( $this->maxlength ) && is_numeric( $this->maxlength ) && $this->maxlength >= 1900 && $this->maxlength <= 2100) {
+        if (isset($this->maxlength) && is_numeric($this->maxlength) && $this->maxlength >= 1900 && $this->maxlength <= 2100) {
             $endDate = $this->maxlength . '-01-01';
         }
         if ($endDate == '') {
             //$this->endDate = mktime ( 0,0,0,date('m'),date('d'),date('y') );  // the default is the current date + 2 years
-            $endDate = date( 'Y-m-d', mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 2 ) ); // the default is the current date + 2 years
+            $endDate = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d'), date('Y') + 2)); // the default is the current date + 2 years
         }
 
-        $tmp = str_replace( "%", "", $mask );
-        if (trim( $value ) == '' or $value == null) {
+        $tmp = str_replace("%", "", $mask);
+        if (trim($value) == '' or $value == null) {
             $value = ''; //date ($tmp);
         } else {
-            switch (strtolower( $value )) {
+            switch (strtolower($value)) {
                 case 'today':
-                    $value = date( $tmp );
+                    $value = date($tmp);
                     break;
                 default:
-                    if (! $this->verifyDateFormat( $value, $mask )) {
+                    if (!$this->verifyDateFormat($value, $mask)) {
                         $value = '';
                     }
                     break;
@@ -5092,29 +5082,29 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
         }
 
         if ($value == '') {
-            $valueDate = Array (date( 'Y' ),date( 'm' ),date( 'd' )
+            $valueDate = array(date('Y'), date('m'), date('d')
             );
         } else {
-            $valueDate = $this->getSplitDate( $value, $mask );
+            $valueDate = $this->getSplitDate($value, $mask);
         }
 
-        $startDate = $this->getSplitDate( $startDate, 'Y-m-d' );
+        $startDate = $this->getSplitDate($startDate, 'Y-m-d');
         //adatation for new js calendar widget
         $startDate[2] = $startDate[2] - 1;
 
-        $endDate = $this->getSplitDate( $endDate, 'Y-m-d' );
+        $endDate = $this->getSplitDate($endDate, 'Y-m-d');
         //adatation for new js calendar widget
         $endDate[2] = $endDate[2] + 1;
 
-        $extra = (defined( 'SYS_LANG_DIRECTION' ) && SYS_LANG_DIRECTION == 'R') ? 'direction:rtl; float:right' : 'direction:ltr';
+        $extra = (defined('SYS_LANG_DIRECTION') && SYS_LANG_DIRECTION == 'R') ? 'direction:rtl; float:right' : 'direction:ltr';
 
-        if (isset( $this->showtime ) && $this->showtime) {
+        if (isset($this->showtime) && $this->showtime) {
             $mask .= ' h:i';
-            $img = (defined( 'SYS_LANG_DIRECTION' ) && SYS_LANG_DIRECTION == 'R') ? 'pmdatetimeiw.png' : 'pmdatetime.png';
+            $img = (defined('SYS_LANG_DIRECTION') && SYS_LANG_DIRECTION == 'R') ? 'pmdatetimeiw.png' : 'pmdatetime.png';
             $style = 'background-image:url(/images/' . $img . ');float:left; width:131px; height:22px;padding:2px 1px 1px 3px;cursor:pointer;color:#000; ' . $extra . ';';
             $showTime = 'true';
         } else {
-            $img = (defined( 'SYS_LANG_DIRECTION' ) && SYS_LANG_DIRECTION == 'R') ? 'pmdateiw.png' : 'pmdate.png';
+            $img = (defined('SYS_LANG_DIRECTION') && SYS_LANG_DIRECTION == 'R') ? 'pmdateiw.png' : 'pmdate.png';
             $style = 'background-image:url(/images/' . $img . ');float:left; width:100px; height:22px;padding:2px 1px 1px 3px;cursor:pointer;color:#000; direction:' . $extra . ';';
             $showTime = 'false';
         }
@@ -5152,7 +5142,6 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
             event
           ); return false;"><img src="/images/pmdateicon.png" width="16px" height="18px" border="0"></a>';
             }
-
         } else {
             $html = '<input type="hidden" id="' . $pID . '" name="' . $pID . '" value="' . $value . '" onchange="' . $this->onchange . '"/>';
             $html .= "<span style='border:1;border-color:#000;width:100px;' name='" . $pID . "'>$value</span>";
@@ -5174,22 +5163,22 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
      * @param $mask
      * @return <type>
      */
-    public function getSplitDate ($date, $mask)
+    public function getSplitDate($date, $mask)
     {
         $sw1 = false;
-        for ($i = 0; $i < 3; $i ++) {
-            $item = substr( $mask, $i * 2, 1 );
+        for ($i = 0; $i < 3; $i++) {
+            $item = substr($mask, $i * 2, 1);
             switch ($item) {
                 case 'Y':
                     switch ($i) {
                         case 0:
-                            $d1 = substr( $date, 0, 4 );
+                            $d1 = substr($date, 0, 4);
                             break;
                         case 1:
-                            $d1 = substr( $date, 3, 4 );
+                            $d1 = substr($date, 3, 4);
                             break;
                         case 2:
-                            $d1 = substr( $date, 6, 4 );
+                            $d1 = substr($date, 6, 4);
                             break;
                     }
                     $sw1 = true;
@@ -5197,45 +5186,45 @@ class XmlFormFieldDate5 extends XmlFormFieldSimpleText
                 case 'y':
                     switch ($i) {
                         case 0:
-                            $d1 = substr( $date, 0, 2 );
+                            $d1 = substr($date, 0, 2);
                             break;
                         case 1:
-                            $d1 = substr( $date, 3, 2 );
+                            $d1 = substr($date, 3, 2);
                             break;
                         case 2:
-                            $d1 = substr( $date, 6, 2 );
+                            $d1 = substr($date, 6, 2);
                             break;
                     }
                     break;
                 case 'm':
                     switch ($i) {
                         case 0:
-                            $d2 = substr( $date, 0, 2 );
+                            $d2 = substr($date, 0, 2);
                             break;
                         case 1:
-                            $d2 = ($sw1) ? substr( $date, 5, 2 ) : substr( $date, 3, 2 );
+                            $d2 = ($sw1) ? substr($date, 5, 2) : substr($date, 3, 2);
                             break;
                         case 2:
-                            $d2 = ($sw1) ? substr( $date, 8, 2 ) : substr( $date, 5, 2 );
+                            $d2 = ($sw1) ? substr($date, 8, 2) : substr($date, 5, 2);
                             break;
                     }
                     break;
                 case 'd':
                     switch ($i) {
                         case 0:
-                            $d3 = substr( $date, 0, 2 );
+                            $d3 = substr($date, 0, 2);
                             break;
                         case 1:
-                            $d3 = ($sw1) ? substr( $date, 5, 2 ) : substr( $date, 3, 2 );
+                            $d3 = ($sw1) ? substr($date, 5, 2) : substr($date, 3, 2);
                             break;
                         case 2:
-                            $d3 = ($sw1) ? substr( $date, 8, 2 ) : substr( $date, 5, 2 );
+                            $d3 = ($sw1) ? substr($date, 8, 2) : substr($date, 5, 2);
                             break;
                     }
                     break;
             }
         }
-        return Array (isset( $d1 ) ? $d1 : '',isset( $d2 ) ? $d2 : '',isset( $d3 ) ? $d3 : ''
+        return array(isset($d1) ? $d1 : '', isset($d2) ? $d2 : '', isset($d3) ? $d3 : ''
         );
     }
 }
@@ -5255,7 +5244,7 @@ class XmlFormFieldXmlform extends XmlFormField
     public $sql = '';
     //TODO: 0=doesn't excecute the query, 1=Only the first time, 2=Allways
     public $fillType = 0;
-    public $fields = array ();
+    public $fields = [];
     public $scriptURL;
     public $id = '';
 
@@ -5268,10 +5257,10 @@ class XmlFormFieldXmlform extends XmlFormField
      * @param string home
      * @return string
      */
-    public function __construct ($xmlnode, $language, $home)
+    public function __construct($xmlnode, $language, $home)
     {
-        parent::__construct( $xmlnode, $language );
-        $this->parseFile( $home, $language );
+        parent::__construct($xmlnode, $language);
+        $this->parseFile($home, $language);
     }
 
     /**
@@ -5282,15 +5271,15 @@ class XmlFormFieldXmlform extends XmlFormField
      * @param string language
      * @return string
      */
-    public function parseFile ($home, $language)
+    public function parseFile($home, $language)
     {
         $this->xmlform = new XmlForm();
         $this->xmlform->home = $home;
-        $this->xmlform->parseFile( $this->xmlfile . '.xml', $language, false );
+        $this->xmlform->parseFile($this->xmlfile . '.xml', $language, false);
         $this->fields = $this->xmlform->fields;
         $this->scriptURL = $this->xmlform->scriptURL;
         $this->id = $this->xmlform->id;
-        unset( $this->xmlform );
+        unset($this->xmlform);
     }
 
     /**
@@ -5304,18 +5293,18 @@ class XmlFormFieldXmlform extends XmlFormField
     {
         $html = '';
         foreach ($this->fields as $f => $v) {
-            $html .= $v->render( '' );
+            $html .= $v->render('');
         }
         $this->id = $this->owner->id . $this->name;
-        $tpl = new xmlformTemplate( $this, PATH_CORE . 'templates/xmlform.html' );
+        $tpl = new xmlformTemplate($this, PATH_CORE . 'templates/xmlform.html');
         $this->values = $values;
         //$this->rows=count(reset($values));
-        $tpl->template = $tpl->printTemplate( $this );
+        $tpl->template = $tpl->printTemplate($this);
         //In the header
-        $oHeadPublisher = & headPublisher::getSingleton();
-        $oHeadPublisher->addScriptFile( $this->scriptURL );
-        $oHeadPublisher->addScriptCode( $tpl->printJavaScript( $this ) );
-        return $tpl->printObject( $this );
+        $oHeadPublisher = headPublisher::getSingleton();
+        $oHeadPublisher->addScriptFile($this->scriptURL);
+        $oHeadPublisher->addScriptCode($tpl->printJavaScript($this));
+        return $tpl->printObject($this);
     }
 }
 
@@ -5333,9 +5322,9 @@ class XmlForm
     public $name = '';
     public $language;
     /* @attribute string version 0.xxx = Previous to pre-open source
-    */
+     */
     public $version = '0.3';
-    public $fields = array ();
+    public $fields = [];
     public $title = '';
     public $home = '';
     public $parsedFile = '';
@@ -5355,67 +5344,67 @@ class XmlForm
     // public $labelWidth        = 180;
     public $labelWidth = "40%";
     public $onsubmit = '';
-    public $requiredFields = array ();
+    public $requiredFields = [];
     public $fieldContentWidth = 450;
 
     /**
      * List of xmlform controls and its classes.
      *
-     * @var string[] 
+     * @var string[]
      */
     private static $controls = [
-        'button'            => XmlFormFieldButton::class,
-        'caption'           => XmlFormFieldCaption::class,
-        'captioncurrency'   => XmlFormFieldCaptionCurrency::class,
+        'button' => XmlFormFieldButton::class,
+        'caption' => XmlFormFieldCaption::class,
+        'captioncurrency' => XmlFormFieldCaptionCurrency::class,
         'captionpercentage' => XmlFormFieldCaptionPercentage::class,
-        'cellmark'          => XmlFormFieldCellMark::class,
-        'checkbox2'         => XmlFormFieldCheckbox2::class,
-        'checkbox'          => XmlFormFieldCheckbox::class,
-        'checkboxpt'        => XmlFormFieldCheckboxpt::class,
-        'checkboxtable'     => XmlFormFieldCheckBoxTable::class,
-        'checkgroup'        => XmlFormFieldCheckGroup::class,
-        'checkgroupview'    => XmlFormFieldCheckGroupView::class,
-        'currency'          => XmlFormFieldCurrency::class,
-        'date2'             => XmlFormFieldDate2::class,
-        'date5'             => XmlFormFieldDate5::class,
-        'date'              => XmlFormFieldDate::class,
-        'dateview'          => XmlFormFieldDateView::class,
-        'dropdown'          => XmlFormFieldDropdown::class,
-        'dropdownpt'        => XmlFormFieldDropdownpt::class,
-        'dveditor'          => XmlFormFieldDVEditor::class,
-        'fastsearch'        => XmlFormFieldFastSearch::class,
-        'file'              => XmlFormFieldFile::class,
-        'grid'              => XmlFormFieldGrid::class,
-        'hidden'            => XmlFormFieldHidden::class,
-        'hours'             => XmlFormFieldHours::class,
-        'html'              => XmlFormFieldHTML::class,
-        'image'             => XmlFormFieldImage::class,
-        'javascript'        => XmlFormFieldJavaScript::class,
-        'label'             => XmlFormFieldLabel::class,
-        'link'              => XmlFormFieldLink::class,
-        'listbox'           => XmlFormFieldListbox::class,
-        'password'          => XmlFormFieldPassword::class,
-        'percentage'        => XmlFormFieldPercentage::class,
-        'popupoption'       => XmlFormFieldPopupOption::class,
-        'print'             => XmlFormFieldPrint::class,
-        'radiogroup'        => XmlFormFieldRadioGroup::class,
-        'radiogroupview'    => XmlFormFieldRadioGroupView::class,
-        'reset'             => XmlFormFieldReset::class,
-        'simpletext'        => XmlFormFieldSimpleText::class,
-        'submit'            => XmlFormFieldSubmit::class,
-        'subtitle'          => XmlFormFieldSubtitle::class,
-        'suggest'           => XmlFormFieldSuggest::class,
-        'text'              => XmlFormFieldText::class,
-        'textarea'          => XmlFormFieldTextarea::class,
-        'textareapm'        => XmlFormFieldTextareaPm::class,
-        'textpm'            => XmlFormFieldTextPm::class,
-        'title'             => XmlFormFieldTitle::class,
-        'toolbar'           => XmlFormFieldToolBar::class,
-        'toolbutton'        => XmlFormFieldToolButton::class,
-        'wysiwyg_editor'    => XmlFormFieldWYSIWYGEditor::class,
-        'xmlform'           => XmlFormFieldXmlform::class,
-        'xmlmenu'           => XmlFormFieldXmlMenu::class,
-        'yesno'             => XmlFormFieldYesNo::class,
+        'cellmark' => XmlFormFieldCellMark::class,
+        'checkbox2' => XmlFormFieldCheckbox2::class,
+        'checkbox' => XmlFormFieldCheckbox::class,
+        'checkboxpt' => XmlFormFieldCheckboxpt::class,
+        'checkboxtable' => XmlFormFieldCheckBoxTable::class,
+        'checkgroup' => XmlFormFieldCheckGroup::class,
+        'checkgroupview' => XmlFormFieldCheckGroupView::class,
+        'currency' => XmlFormFieldCurrency::class,
+        'date2' => XmlFormFieldDate2::class,
+        'date5' => XmlFormFieldDate5::class,
+        'date' => XmlFormFieldDate::class,
+        'dateview' => XmlFormFieldDateView::class,
+        'dropdown' => XmlFormFieldDropdown::class,
+        'dropdownpt' => XmlFormFieldDropdownpt::class,
+        'dveditor' => XmlFormFieldDVEditor::class,
+        'fastsearch' => XmlFormFieldFastSearch::class,
+        'file' => XmlFormFieldFile::class,
+        'grid' => XmlFormFieldGrid::class,
+        'hidden' => XmlFormFieldHidden::class,
+        'hours' => XmlFormFieldHours::class,
+        'html' => XmlFormFieldHTML::class,
+        'image' => XmlFormFieldImage::class,
+        'javascript' => XmlFormFieldJavaScript::class,
+        'label' => XmlFormFieldLabel::class,
+        'link' => XmlFormFieldLink::class,
+        'listbox' => XmlFormFieldListbox::class,
+        'password' => XmlFormFieldPassword::class,
+        'percentage' => XmlFormFieldPercentage::class,
+        'popupoption' => XmlFormFieldPopupOption::class,
+        'print' => XmlFormFieldPrint::class,
+        'radiogroup' => XmlFormFieldRadioGroup::class,
+        'radiogroupview' => XmlFormFieldRadioGroupView::class,
+        'reset' => XmlFormFieldReset::class,
+        'simpletext' => XmlFormFieldSimpleText::class,
+        'submit' => XmlFormFieldSubmit::class,
+        'subtitle' => XmlFormFieldSubtitle::class,
+        'suggest' => XmlFormFieldSuggest::class,
+        'text' => XmlFormFieldText::class,
+        'textarea' => XmlFormFieldTextarea::class,
+        'textareapm' => XmlFormFieldTextareaPm::class,
+        'textpm' => XmlFormFieldTextPm::class,
+        'title' => XmlFormFieldTitle::class,
+        'toolbar' => XmlFormFieldToolBar::class,
+        'toolbutton' => XmlFormFieldToolButton::class,
+        'wysiwyg_editor' => XmlFormFieldWYSIWYGEditor::class,
+        'xmlform' => XmlFormFieldXmlform::class,
+        'xmlmenu' => XmlFormFieldXmlMenu::class,
+        'yesno' => XmlFormFieldYesNo::class,
     ];
 
     /**
@@ -5446,27 +5435,27 @@ class XmlForm
      * @param string templateFile
      * @return string
      */
-    public function parseFile ($filename, $language, $forceParse)
+    public function parseFile($filename, $language, $forceParse)
     {
         $this->language = $language;
         $filenameInitial = $filename;
         $filename = $this->home . $filename;
 
         //if the xmlform file doesn't exists, then try with the plugins folders
-        if (! is_file( $filename )) {
-            $aux = explode( PATH_SEP, $filenameInitial );
+        if (!is_file($filename)) {
+            $aux = explode(PATH_SEP, $filenameInitial);
             //check if G_PLUGIN_CLASS is defined, because publisher can be called without an environment
-            if (count( $aux ) > 2) {
+            if (count($aux) > 2) {
                 //Subfolders
-                $filename = array_pop( $aux );
-                $aux0 = implode( PATH_SEP, $aux );
-                $aux = array ();
+                $filename = array_pop($aux);
+                $aux0 = implode(PATH_SEP, $aux);
+                $aux = [];
                 $aux[0] = $aux0;
                 $aux[1] = $filename;
             }
-            if (count( $aux ) == 2 && defined( 'G_PLUGIN_CLASS' )) {
+            if (count($aux) == 2 && defined('G_PLUGIN_CLASS')) {
                 $oPluginRegistry = PluginRegistry::loadSingleton();
-                if ($response = $oPluginRegistry->isRegisteredFolder( $aux[0] )) {
+                if ($response = $oPluginRegistry->isRegisteredFolder($aux[0])) {
                     if ($response !== true) {
                         $sPath = PATH_PLUGINS . $response . PATH_SEP;
                     } else {
@@ -5478,109 +5467,107 @@ class XmlForm
         }
 
         $this->fileName = $filename;
-        $parsedFile = dirname( $filename ) . PATH_SEP . basename( $filename, 'xml' ) . $language;
+        $parsedFile = dirname($filename) . PATH_SEP . basename($filename, 'xml') . $language;
 
         $parsedFilePath = defined('PATH_C') ? (!empty(config("system.workspace")) ? PATH_C . 'ws' . PATH_SEP . config("system.workspace") . PATH_SEP : PATH_C) : PATH_DATA;
-        $parsedFilePath .= 'xmlform/' . substr( $parsedFile, strlen( $this->home ) );
+        $parsedFilePath .= 'xmlform/' . substr($parsedFile, strlen($this->home));
 
         // Improvement for the js cache - Start
-        $realPath = substr( realpath( $this->fileName ), strlen( realpath( $this->home ) ), - 4 );
-        if (substr( $realPath, 0, 1 ) != PATH_SEP) {
+        $realPath = substr(realpath($this->fileName), strlen(realpath($this->home)), -4);
+        if (substr($realPath, 0, 1) != PATH_SEP) {
             $realPath = PATH_SEP . $realPath;
         }
-        $filesToDelete = substr( (defined( 'PATH_C' ) ? PATH_C : PATH_DATA) . 'xmlform/', 0, - 1 ) . $realPath . '.*.js';
-        $auxPath = explode( PATH_SEP, $realPath );
-        $auxPath[count( $auxPath ) - 1] = $auxPath[count( $auxPath ) - 1] . '.' . G::encryptOld( filemtime( $this->fileName ) );
-        $realPath = implode( PATH_SEP, $auxPath );
+        $filesToDelete = substr((defined('PATH_C') ? PATH_C : PATH_DATA) . 'xmlform/', 0, -1) . $realPath . '.*.js';
+        $auxPath = explode(PATH_SEP, $realPath);
+        $auxPath[count($auxPath) - 1] = $auxPath[count($auxPath) - 1] . '.' . G::encryptOld(filemtime($this->fileName));
+        $realPath = implode(PATH_SEP, $auxPath);
         // Improvement for the js cache - End
         $this->parsedFile = $parsedFilePath;
         $this->scriptURL = '/jsform' . $realPath . '.js';
-        $this->scriptFile = substr( (defined( 'PATH_C' ) ? PATH_C : PATH_DATA) . 'xmlform/', 0, - 1 ) . substr( $this->scriptURL, 7 );
-        $this->id = G::createUID( '', substr( $this->fileName, strlen( $this->home ) ) );
-        $this->scriptURL = str_replace( '\\', '/', $this->scriptURL );
+        $this->scriptFile = substr((defined('PATH_C') ? PATH_C : PATH_DATA) . 'xmlform/', 0, -1) . substr($this->scriptURL, 7);
+        $this->id = G::createUID('', substr($this->fileName, strlen($this->home)));
+        $this->scriptURL = str_replace('\\', '/', $this->scriptURL);
 
         $newVersion = false;
-        if ($forceParse || ((! file_exists( $this->parsedFile )) || (filemtime( $filename ) > filemtime( $this->parsedFile )) || (filemtime( __FILE__ ) > filemtime( $this->parsedFile ))) || (! file_exists( $this->scriptFile )) || (filemtime( $filename ) > filemtime( $this->scriptFile ))) {
-            if (glob( $filesToDelete )) {
-                foreach (glob( $filesToDelete ) as $fileToDelete) {
-                    @unlink( $fileToDelete );
+        if ($forceParse || ((!file_exists($this->parsedFile)) || (filemtime($filename) > filemtime($this->parsedFile)) || (filemtime(__FILE__) > filemtime($this->parsedFile))) || (!file_exists($this->scriptFile)) || (filemtime($filename) > filemtime($this->scriptFile))) {
+            if (glob($filesToDelete)) {
+                foreach (glob($filesToDelete) as $fileToDelete) {
+                    @unlink($fileToDelete);
                 }
             }
             $this->tree = new Xml_Document();
-            $this->tree->parseXmlFile( $filename );
+            $this->tree->parseXmlFile($filename);
             //$this->tree->unsetParent();
-            if (! is_object( $this->tree->children[0] )) {
-                throw new Exception( 'Failure loading root node.' );
+            if (!is_object($this->tree->children[0])) {
+                throw new Exception('Failure loading root node.');
             }
-            $this->tree = &$this->tree->children[0]->toTree();
+            $this->tree = $this->tree->children[0]->toTree();
             //ERROR CODE [1] : Failed to read the xml document
-            if (! isset( $this->tree )) {
+            if (!isset($this->tree)) {
                 return 1;
             }
-            $xmlNode = & $this->tree->children;
+            $xmlNode = &$this->tree->children;
 
             //Set the form's attributes
-            $myAttributes = get_class_vars( get_class( $this ) );
+            $myAttributes = get_class_vars(get_class($this));
             foreach ($myAttributes as $k => $v) {
-                $myAttributes[$k] = strtolower( $k );
+                $myAttributes[$k] = strtolower($k);
             }
             foreach ($this->tree->attributes as $k => $v) {
-                $key = array_search( strtolower( $k ), $myAttributes );
-                if (($key !== false) && (strtolower( $k ) !== 'fields') && (strtolower( $k ) !== 'values')) {
+                $key = array_search(strtolower($k), $myAttributes);
+                if (($key !== false) && (strtolower($k) !== 'fields') && (strtolower($k) !== 'values')) {
                     $this->{$key} = $v;
                 }
             }
             //Reeplace non valid characters in xmlform name with "_"
-            $this->name = preg_replace( '/\W/', '_', $this->name );
+            $this->name = preg_replace('/\W/', '_', $this->name);
             //Create fields
 
 
             foreach ($xmlNode as $k => $v) {
-                if (($xmlNode[$k]->type !== 'cdata') && isset( $xmlNode[$k]->attributes['type'] )) {
+                if (($xmlNode[$k]->type !== 'cdata') && isset($xmlNode[$k]->attributes['type'])) {
                     $class = $this->getClassByControlType($xmlNode[$k]->attributes['type']);
-                    $field = new $class( $xmlNode[$k], $language, $this->home, $this );
+                    $field = new $class($xmlNode[$k], $language, $this->home, $this);
                     $field->language = $this->language;
                     $this->fields[$field->name] = $field;
                 }
 
-                if (isset( $xmlNode[$k]->attributes['required'] ) || isset( $xmlNode[$k]->attributes['validate'] )) {
+                if (isset($xmlNode[$k]->attributes['required']) || isset($xmlNode[$k]->attributes['validate'])) {
                     // the fields or xml nodes with a required attribute are put in an array that is passed to the view file
-                    $isEditMode = isset( $xmlNode[$k]->attributes['mode'] ) && $xmlNode[$k]->attributes['mode'] == 'view' ? false : true;
+                    $isEditMode = isset($xmlNode[$k]->attributes['mode']) && $xmlNode[$k]->attributes['mode'] == 'view' ? false : true;
 
                     if ($isEditMode && $this->mode != 'view') {
-
                         $validateValue = "";
-                        if (isset( $xmlNode[$k]->attributes['validate'] )) {
+                        if (isset($xmlNode[$k]->attributes['validate'])) {
                             $validateValue = $xmlNode[$k]->attributes['validate'];
                         }
                         $requiredValue = "0";
-                        if (isset( $xmlNode[$k]->attributes['required'] )) {
+                        if (isset($xmlNode[$k]->attributes['required'])) {
                             $requiredValue = $xmlNode[$k]->attributes['required'] == 1 ? '1' : '0';
                         }
 
-                        $this->requiredFields[] = array ('name' => $field->name,'type' => $xmlNode[$k]->attributes['type'],'label' => addslashes( trim( $field->label ) ),'validate' => $validateValue,'required' => $requiredValue
+                        $this->requiredFields[] = array('name' => $field->name, 'type' => $xmlNode[$k]->attributes['type'], 'label' => addslashes(trim($field->label)), 'validate' => $validateValue, 'required' => $requiredValue
                         );
                     }
-
                 }
             }
 
             //$oJSON = new Services_JSON();
-            $jsonRequired =  G::json_encode( $this->requiredFields );
-            $this->objectRequiredFields = str_replace( '"', "%27", str_replace( "'", "%39", $jsonRequired ) );
+            $jsonRequired = G::json_encode($this->requiredFields);
+            $this->objectRequiredFields = str_replace('"', "%27", str_replace("'", "%39", $jsonRequired));
 
             //Load the default values
             //$this->setDefaultValues();
             //Save the cache file
-            if (! is_dir( dirname( $this->parsedFile ) )) {
-                G::mk_dir( dirname( $this->parsedFile ) );
+            if (!is_dir(dirname($this->parsedFile))) {
+                G::mk_dir(dirname($this->parsedFile));
             }
-            $f = fopen( $this->parsedFile, 'w+' );
+            $f = fopen($this->parsedFile, 'w+');
             //ERROR CODE [2] : Failed to open cache file
             if ($f === false) {
                 return 2;
             }
-            fwrite( $f, "<?php\n" );
+            fwrite($f, "<?php\n");
             /*  fwrite ($f, '$this = unserialize( \'' .
                   addcslashes( serialize ( $this ), '\\\'' ) . '\' );' . "\n" );*/
             foreach ($this as $key => $value) {
@@ -5594,30 +5581,30 @@ class XmlForm
                         break;
                     default:
                         switch (true) {
-                            case is_string( $this->{$key} ):
-                                fwrite( $f, '$this->' . $key . '=\'' . addcslashes( $this->{$key}, '\\\'' ) . '\'' . ";\n" );
+                            case is_string($this->{$key}):
+                                fwrite($f, '$this->' . $key . '=\'' . addcslashes($this->{$key}, '\\\'') . '\'' . ";\n");
                                 break;
-                            case is_bool( $this->{$key} ):
-                                fwrite( $f, '$this->' . $key . '=' . (($this->{$key}) ? 'true;' : 'false') . ";\n" );
+                            case is_bool($this->{$key}):
+                                fwrite($f, '$this->' . $key . '=' . (($this->{$key}) ? 'true;' : 'false') . ";\n");
                                 break;
-                            case is_null( $this->{$key} ):
-                                fwrite( $f, '$this->' . $key . '=null' . ";\n" );
+                            case is_null($this->{$key}):
+                                fwrite($f, '$this->' . $key . '=null' . ";\n");
                                 break;
-                            case is_float( $this->{$key} ):
-                            case is_int( $this->{$key} ):
-                                fwrite( $f, '$this->' . $key . '=' . $this->{$key} . ";\n" );
+                            case is_float($this->{$key}):
+                            case is_int($this->{$key}):
+                                fwrite($f, '$this->' . $key . '=' . $this->{$key} . ";\n");
                                 break;
                             default:
-                                fwrite( $f, '$this->' . $key . ' = unserialize( \'' . addcslashes( serialize( $this->{$key} ), '\\\'' ) . '\' );' . "\n" );
+                                fwrite($f, '$this->' . $key . ' = unserialize( \'' . addcslashes(serialize($this->{$key}), '\\\'') . '\' );' . "\n");
                         }
                 }
             }
-            fwrite( $f, "?>" );
-            fclose( $f );
+            fwrite($f, "?>");
+            fclose($f);
             $newVersion = true;
         } //if $forceParse
         //Loads the parsedFile.
-        require ($this->parsedFile);
+        require($this->parsedFile);
         $this->fileName = $filename;
         $this->parsedFile = $parsedFile;
 
@@ -5628,16 +5615,16 @@ class XmlForm
             $template = PATH_CORE . 'templates/' . $this->type . '.html';
             //If the type is not the correct template name, use xmlform.html
             //if (!file_exists($template)) $template = PATH_CORE . 'templates/xmlform.html';
-            if (($template !== '') && (file_exists( $template ))) {
-                if (! is_dir( dirname( $this->scriptFile ) )) {
-                    G::mk_dir( dirname( $this->scriptFile ) );
+            if (($template !== '') && (file_exists($template))) {
+                if (!is_dir(dirname($this->scriptFile))) {
+                    G::mk_dir(dirname($this->scriptFile));
                 }
-                $f = fopen( $this->scriptFile, 'w' );
-                $o = new xmlformTemplate( $this, $template );
-                $scriptContent = $o->printJSFile( $this );
-                unset( $o );
-                fwrite( $f, $scriptContent );
-                fclose( $f );
+                $f = fopen($this->scriptFile, 'w');
+                $o = new xmlformTemplate($this, $template);
+                $scriptContent = $o->printJSFile($this);
+                unset($o);
+                fwrite($f, $scriptContent);
+                fclose($f);
             }
         }
         return 0;
@@ -5649,18 +5636,17 @@ class XmlForm
      * @param $newValues
      * @return void
      */
-    public function setValues ($newValues = array())
+    public function setValues($newValues = array())
     {
         foreach ($this->fields as $k => $v) {
-            if (array_key_exists( $k, $newValues )) {
+            if (array_key_exists($k, $newValues)) {
                 $this->values[$k] = $newValues[$k];
             }
         }
         foreach ($this->fields as $k => $v) {
-            if (is_object( $this->fields[$k] ) && get_class( $this->fields[$k] ) != '__PHP_Incomplete_Class') {
-                $this->fields[$k]->owner = & $this;
+            if (is_object($this->fields[$k]) && get_class($this->fields[$k]) != '__PHP_Incomplete_Class') {
+                $this->fields[$k]->owner = &$this;
             }
-
         }
     }
 
@@ -5671,15 +5657,15 @@ class XmlForm
      * @param &$scriptContent
      * @return string
      */
-    public function render ($template, &$scriptContent)
+    public function render($template, &$scriptContent)
     {
-        $o = new xmlformTemplate( $this, $template );
-        if (is_array( reset( $this->values ) )) {
-            $this->rows = count( reset( $this->values ) );
+        $o = new xmlformTemplate($this, $template);
+        if (is_array(reset($this->values))) {
+            $this->rows = count(reset($this->values));
         }
-        $o->template = $o->printTemplate( $this );
-        $scriptContent = $o->printJavaScript( $this );
-        return $o->printObject( $this );
+        $o->template = $o->printTemplate($this);
+        $scriptContent = $o->printJavaScript($this);
+        return $o->printObject($this);
     }
 
     /**
@@ -5687,9 +5673,9 @@ class XmlForm
      *
      * @return Object
      */
-    public function cloneObject ()
+    public function cloneObject()
     {
-        return unserialize( serialize( $this ) );
+        return unserialize(serialize($this));
     }
 }
 
@@ -5698,91 +5684,92 @@ class XmlForm
  */
 class XmlFormFieldImage extends XmlFormField
 {
-    public $file         = '';
-    public $home         = 'public_html';
+    public $file = '';
+    public $home = 'public_html';
     public $withoutLabel = false;
 
     /**
-    * Function render
-    * @access public
-    * @param string values
-    * @return string
-    */
+     * Function render
+     * @access public
+     * @param string values
+     * @return string
+     */
     public function render($value = null, $owner = null)
     {
         $url = G::replaceDataField($this->file, $owner->values);
         if ($this->home === "methods") {
-            $url = G::encryptlink( SYS_URI . $url );
+            $url = G::encryptlink(SYS_URI . $url);
         }
         if ($this->home === "public_html") {
-            $url ='/' . $url ;
+            $url = '/' . $url;
         }
-        return '<img src="'.htmlentities( $url, ENT_QUOTES, 'utf-8').'" '.
-            (($this->style)?'style="'.$this->style.'"':'')
-            .' alt ="'.htmlentities($value,ENT_QUOTES,'utf-8').'"/>';
+        return '<img src="' . htmlentities($url, ENT_QUOTES, 'utf-8') . '" ' .
+            (($this->style) ? 'style="' . $this->style . '"' : '')
+            . ' alt ="' . htmlentities($value, ENT_QUOTES, 'utf-8') . '"/>';
     }
 }
 
 //mask function to php
-function masktophp ($mask, $value)
+function masktophp($mask, $value)
 {
     $tmp = str_replace("%", "", $mask);
-    if (preg_match('/M/',$tmp)) {
+    if (preg_match('/M/', $tmp)) {
         $tmp = str_replace("M", "i", $tmp);
     }
-    if (preg_match('/b/',$tmp)) {
+    if (preg_match('/b/', $tmp)) {
         $tmp = str_replace("b", "M", $tmp);
     }
-    if (preg_match('/B/',$tmp)) {
+    if (preg_match('/B/', $tmp)) {
         $tmp = str_replace("B", "F", $tmp);
     }
-    if (preg_match('/S/',$tmp)) {
+    if (preg_match('/S/', $tmp)) {
         $tmp = str_replace("S", "s", $tmp);
     }
-    if (preg_match('/o/',$tmp)) {
+    if (preg_match('/o/', $tmp)) {
         $tmp = str_replace("o", "n", $tmp);
     }
-    if (preg_match('/a/',$tmp)) {
+    if (preg_match('/a/', $tmp)) {
         $tmp = str_replace("a", "D", $tmp);
     }
-    if (preg_match('/l/',$tmp)) {
+    if (preg_match('/l/', $tmp)) {
         $tmp = str_replace("l", "g", $tmp);
     }
-    if (preg_match('/A/',$tmp)) {
+    if (preg_match('/A/', $tmp)) {
         $tmp = str_replace("A", "l", $tmp);
     }
-    if (preg_match('/I/',$tmp)) {
+    if (preg_match('/I/', $tmp)) {
         $tmp = str_replace("I", "h", $tmp);
     }
-    if (preg_match('/j/',$tmp)) {
+    if (preg_match('/j/', $tmp)) {
         $tmp = str_replace("j", "z", $tmp);
     }
-    if (preg_match('/k/',$tmp)) {
+    if (preg_match('/k/', $tmp)) {
         $tmp = str_replace("k", "G", $tmp);
     }
-    if (preg_match('/e/',$tmp)) {
+    if (preg_match('/e/', $tmp)) {
         $tmp = str_replace("e", "j", $tmp);
     }
-    if (preg_match('/u/',$tmp)) {
+    if (preg_match('/u/', $tmp)) {
         $tmp = str_replace("u", "N", $tmp);
     }
-    if (preg_match('/p/',$tmp)) {
+    if (preg_match('/p/', $tmp)) {
         $tmp = str_replace("p", "A", $tmp);
     }
-    if (preg_match('/P/',$tmp)) {
+    if (preg_match('/P/', $tmp)) {
         $tmp = str_replace("P", "a", $tmp);
     }
 
     if ($value == 'today') {
         $value = date($tmp);
     } else {
-        $value = date($tmp, strtotime ($value));
+        $value = date($tmp, strtotime($value));
     }
     return $value;
 }
 
 if (!function_exists('strptime')) {
-    function strptime($date, $format) {
+    function strptime($date, $format)
+    {
         $masks = array(
             '%d' => '(?P<d>[0-9]{2})',
             '%m' => '(?P<m>[0-9]{2})',
@@ -5793,56 +5780,55 @@ if (!function_exists('strptime')) {
             // usw..
         );
 
-        $rexep = "#".strtr(preg_quote($format), $masks)."#";
-        if(!preg_match($rexep, $date, $out)) {
+        $rexep = "#" . strtr(preg_quote($format), $masks) . "#";
+        if (!preg_match($rexep, $date, $out)) {
             return false;
         }
 
         if (!isset($out['S'])) {
             $out['S'] = 0;
         } else {
-            $out['S'] = (int) $out['S'];
+            $out['S'] = (int)$out['S'];
         }
 
         if (!isset($out['M'])) {
             $out['M'] = 0;
         } else {
-            $out['M'] = (int) $out['M'];
+            $out['M'] = (int)$out['M'];
         }
 
         if (!isset($out['H'])) {
             $out['H'] = 0;
         } else {
-            $out['H'] = (int) $out['H'];
+            $out['H'] = (int)$out['H'];
         }
 
         if (!isset($out['d'])) {
             $out['d'] = 0;
         } else {
-            $out['d'] = (int) $out['d'];
+            $out['d'] = (int)$out['d'];
         }
 
         if (!isset($out['m'])) {
             $out['m'] = 0;
         } else {
-            $out['m'] = (int) $out['m'];
+            $out['m'] = (int)$out['m'];
         }
 
         if (!isset($out['Y'])) {
             $out['Y'] = 0;
         } else {
-            $out['Y'] = (int) $out['Y'];
+            $out['Y'] = (int)$out['Y'];
         }
 
         $ret = array(
-            "tm_sec"  => $out['S'],
-            "tm_min"  => $out['M'],
+            "tm_sec" => $out['S'],
+            "tm_min" => $out['M'],
             "tm_hour" => $out['H'],
             "tm_mday" => $out['d'],
-            "tm_mon"  => $out['m'] ? $out['m'] - 1 : 0,
+            "tm_mon" => $out['m'] ? $out['m'] - 1 : 0,
             "tm_year" => $out['Y'] > 1900 ? $out['Y'] - 1900 : 0,
         );
         return $ret;
     }
 }
-
diff --git a/phpunit.xml b/phpunit.xml
index 241fcb099..e59678301 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -33,18 +33,31 @@
     </filter>
 
     <php>
-        <var name="SYS_SYS" value="test" />
-        <var name="SYS_LANG" value="en" />
-        <var name="SYS_SKIN" value="neoclassic" />
-        <var name="DB_ADAPTER" value="mysql" />
-        <var name="DB_HOST" value="processmaker3" />
-        <var name="DB_NAME" value="wf_test" />
-        <var name="DB_USER" value="root" />
-        <var name="DB_PASS" value="" />
-        <var name="PATH_DB" value="./shared/sites/" />
-        <var name="PATH_DATA" value="./shared/" />
-        <var name="APP_HOST" value="processmaker3.local" />
-        <var name="HTTPS" value="off" />
-        <var name="SERVER_PORT" value="8080" />
+      <var name="APP_ENV" value="testing" />
+      <var name="SYS_SYS" value="test" />
+      <var name="SYS_LANG" value="en" />
+      <var name="SYS_SKIN" value="neoclassic" />
+      <var name="DB_ADAPTER" value="mysql" />
+      <var name="DB_HOST" value="processmaker3" />
+      <var name="DB_NAME" value="wf_test" />
+      <var name="DB_USER" value="root" />
+      <var name="DB_PASS" value="" />
+      <var name="PATH_DB" value="./shared/sites/" />
+      <var name="PATH_DATA" value="./shared/" />
+      <var name="APP_HOST" value="processmaker3.local" />
+      <var name="HTTPS" value="off" />
+      <var name="SERVER_PORT" value="8080" />
+
+
+      <env name="DB_DATABASE" value="test" />
+      <env name="DB_USERNAME" value="root" />
+      <env name="DB_PASSWORD" value="" />
+
+      <env name="RUN_MSSQL_TESTS" value="true" />
+      <env name="MSSQL_HOST" value="172.16.3.1" />
+      <env name="MSSQL_PORT" value="1433" />
+      <env name="MSSQL_DATABASE" value="testexternal" />
+      <env name="MSSQL_USERNAME" value="test" />
+      <env name="MSSQL_PASSWORD" value="test" />
     </php>
 </phpunit>
diff --git a/tests/Feature/DBQueryTest.php b/tests/Feature/DBQueryTest.php
new file mode 100644
index 000000000..f851feafb
--- /dev/null
+++ b/tests/Feature/DBQueryTest.php
@@ -0,0 +1,97 @@
+<?php
+namespace Tests\Feature;
+
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Queue\Console\WorkCommand;
+use Illuminate\Support\Facades\DB;
+use ProcessMaker\Model\DbSource;
+use ProcessMaker\Model\Process;
+use Tests\TestCase;
+use Propel;
+use DbConnections;
+
+class DBQueryTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /**
+     * A basic cache example.
+     *
+     * @return void
+     */
+    public function testStandardExecuteQuery()
+    {
+        $results = executeQuery("SELECT * FROM USERS WHERE USR_UID = '00000000000000000000000000000001'");
+        $this->assertCount(1, $results);
+        // Note, we check index 1 because results from executeQuery are 1 indexed, not 0 indexed.
+        $this->assertArraySubset([
+            'USR_UID' => '00000000000000000000000000000001',
+            'USR_USERNAME' => 'admin'
+        ], $results[1]);
+    }
+
+    public function testDBFacadeQuery()
+    {
+        $record = DB::table('USERS')->where([
+            'USR_UID' => '00000000000000000000000000000001'
+        ])->first();
+        $this->assertEquals('admin', $record->USR_USERNAME);
+    }
+
+    public function testStandardExecuteQueryWithExternalMySQLDatabase()
+    {
+        // Our test external database is created in our tests/bootstrap.php file
+        // We'll use our factories to create our process and database
+        $process = factory(Process::class)->create();
+        // Let's create an external DB to ourselves
+        $externalDB = factory(DbSource::class)->create([
+            'DBS_SERVER' => 'localhost',
+            'DBS_PORT' => '3306',
+            'DBS_USERNAME' => env('DB_USERNAME'),
+            // Remember, we have to do some encryption here @see DbSourceFactory.php
+            'DBS_PASSWORD' => \G::encrypt( env('DB_PASSWORD'), 'testexternal') . "_2NnV3ujj3w",
+            'DBS_DATABASE_NAME' => 'testexternal',
+            'PRO_UID' => $process->PRO_UID
+        ]);
+
+        // Now set our process ID
+        /**
+         * @todo Migrate to non session based process store
+         */
+        $_SESSION['PROCESS'] = $process->PRO_UID;
+        // Perform test
+        $results = executeQuery('SELECT * FROM test', $externalDB->DBS_UID);
+        $this->assertCount(1, $results);
+        $this->assertEquals('testvalue', $results[1]['value']);
+    }
+
+    public function testStandardExecuteQueryWithExternalMSSqlDatabase()
+    {
+        if(!env('RUN_MSSQL_TESTS')) {
+            $this->markTestSkipped('MSSQL Related Test Skipped');
+        }
+        // Our test external database is created in our tests/bootstrap.php file
+        // We'll use our factories to create our process and database
+        $process = factory(Process::class)->create();
+        // Let's create an external DB to ourselves
+        $externalDB = factory(DbSource::class)->create([
+            'DBS_SERVER' => env('MSSQL_HOST'),
+            'DBS_PORT' => env('MSSQL_PORT'),
+            'DBS_TYPE' => 'mssql',
+            'DBS_USERNAME' => env('MSSQL_USERNAME'),
+            // Remember, we have to do some encryption here @see DbSourceFactory.php
+            'DBS_PASSWORD' => \G::encrypt( env('MSSQL_PASSWORD'), 'testexternal') . "_2NnV3ujj3w",
+            'DBS_DATABASE_NAME' => 'testexternal',
+            'PRO_UID' => $process->PRO_UID
+        ]);
+        // Now set our process ID
+        /**
+         * @todo Migrate to non session based process store
+         */
+        $_SESSION['PROCESS'] = $process->PRO_UID;
+        // Perform test
+        $results = executeQuery('SELECT * FROM test', $externalDB->DBS_UID);
+        $this->assertCount(1, $results);
+        $this->assertEquals('testvalue', $results[1]['value']);
+    }
+}
\ No newline at end of file
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 0e61740a2..41f485da0 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,9 +1,12 @@
 <?php
-namespace tests;
+namespace Tests;
 
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use Illuminate\Support\Facades\DB;
+use Propel;
 
 abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication;
+
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 000000000..70cb1973e
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Test harness bootstrap that sets up initial defines and builds up the initial database schema
+ */
+// Bring in our standard bootstrap
+include_once(__DIR__ . '/../bootstrap/autoload.php');
+
+use Illuminate\Contracts\Console\Kernel;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+// Setup our required defines
+/**
+ * @todo Migrate to configuration parameters
+ */
+define('PATH_CORE', 'workflow/engine/');
+define('PATH_CONFIG', PATH_CORE . 'config/');
+define('PATH_RBAC_CORE', 'rbac/engine/');
+define('PATH_DB', 'shared/sites/');
+define('PATH_DATA', 'shared/rbac/');
+define('PATH_SEP', '/');
+define('PATH_METHODS', 'workflow/engine/methods/');
+
+// Setup basic app services
+$app = require __DIR__ . '/../bootstrap/app.php';
+$app->make(Kernel::class)->bootstrap();
+
+// Setup our testexternal database
+config(['database.connections.testexternal' => [
+    'driver' => 'mysql',
+    'host' => env('DB_HOST', '127.0.0.1'),
+    'database' => env('DB_TESTEXTERNAL_DB', 'testexternal'),
+    'username' => env('DB_USERNAME', 'root'),
+    'password' => env('DB_PASSWORD', ''),
+    'unix_socket' => env('DB_SOCKET', ''),
+    'charset' => 'utf8mb4',
+    'collation' => 'utf8mb4_unicode_ci',
+    'prefix' => '',
+    'strict' => true,
+    'engine' => null,
+]]);
+
+// Now, drop all test tables and repopulate with schema
+Schema::connection('testexternal')->dropIfExists('test');
+
+Schema::connection('testexternal')->create('test', function($table) {
+    $table->increments('id');
+    $table->string('value');
+});
+DB::connection('testexternal')->table('test')->insert([
+    'value' => 'testvalue'
+]);
+
+// Only do if we are supporting MSSql tests
+if(env('RUN_MSSQL_TESTS')) {
+    config(['database.connections.mssql' => [
+        'driver' => 'sqlsrv',
+        'host' => env('MSSQL_HOST', '127.0.0.1'),
+        'database' => env('MSSQL_DATABASE', 'testexternal'),
+        'username' => env('MSSQL_USERNAME', 'root'),
+        'password' => env('MSSQL_PASSWORD', ''),
+    ]]);
+
+    Schema::connection('mssql')->dropIfExists('test');
+    Schema::connection('mssql')->create('test', function($table) {
+        $table->increments('id');
+        $table->string('value');
+    });
+    DB::connection('mssql')->table('test')->insert([
+        'value' => 'testvalue'
+    ]);
+}
+
+
+// THIS IS FOR STANDARD PROCESSMAKER TABLES
+
+// Now, drop all test tables and repopulate with schema
+DB::unprepared('SET FOREIGN_KEY_CHECKS = 0');
+$colname = 'Tables_in_' . env('DB_DATABASE');
+$tables = DB::select('SHOW TABLES');
+$drop = [];
+foreach($tables as $table) {
+    $drop[] = $table->$colname;
+}
+if(count($drop)) {
+    $drop = implode(',', $drop);
+    DB::statement("DROP TABLE $drop");
+    DB::unprepared('SET FOREIGN_KEY_CHECKS = 1');
+}
+
+// Repopulate with schema and standard inserts
+DB::unprepared(file_get_contents(PATH_CORE.'data/mysql/schema.sql'));
+DB::unprepared(file_get_contents(PATH_RBAC_CORE.'data/mysql/schema.sql'));
+DB::unprepared(file_get_contents(PATH_CORE.'data/mysql/insert.sql'));
+DB::unprepared(file_get_contents(PATH_RBAC_CORE.'data/mysql/insert.sql'));
+
+// Set our APP_SEQUENCE val
+DB::table('APP_SEQUENCE')->insert([
+    'ID' => 1
+]);
+
+// Setup our initial oauth client for our web designer
+DB::table('OAUTH_CLIENTS')->insert([
+    'CLIENT_ID' => 'x-pm-local-client',
+    'CLIENT_SECRET' => '179ad45c6ce2cb97cf1029e212046e81',
+    'CLIENT_NAME' => 'PM Web Designer',
+    'CLIENT_DESCRIPTION' => 'ProcessMaker Web Designer App',
+    'CLIENT_WEBSITE' => 'www.processmaker.com',
+    'REDIRECT_URI' => config('app.url') . '/sys' . config('system.workspace').'/en/neoclassic/oauth2/grant',
+    'USR_UID' => '00000000000000000000000000000001'
+]);
+DB::table('OAUTH_ACCESS_TOKENS')->insert([
+    'ACCESS_TOKEN' => '39704d17049f5aef45e884e7b769989269502f83',
+    'CLIENT_ID' => 'x-pm-local-client',
+    'USER_ID' => '00000000000000000000000000000001',
+    'EXPIRES' => '2017-06-15 17:55:19',
+    'SCOPE' => 'view_processes edit_processes *'
+]);
+
+// We need to manually initialize Propel with our test database
+Propel::initConfiguration([
+    'datasources' => [
+        'workflow' => [
+            'connection' => 'mysql://' . config('database.connections.workflow.username') . ':' . config('database.connections.workflow.password') . '@' . config('database.connections.workflow.host') . '/test?encoding=utf8',
+            'adapter' => 'mysql'
+        ],
+        'rbac' => [
+            'connection' => 'mysql://' . config('database.connections.workflow.username') . ':' . config('database.connections.workflow.password') . '@' . config('database.connections.workflow.host') . '/test?encoding=utf8',
+            'adapter' => 'mysql'
+        ],
+        'rp' => [
+            'connection' => 'mysql://' . config('database.connections.workflow.username') . ':' . config('database.connections.workflow.password') . '@' . config('database.connections.workflow.host') . '/test?encoding=utf8',
+            'adapter' => 'mysql'
+        ]
+    ]
+]);
\ No newline at end of file
diff --git a/thirdparty/creole/Statement.php b/thirdparty/creole/Statement.php
index a41f5bf10..adea1bc91 100644
--- a/thirdparty/creole/Statement.php
+++ b/thirdparty/creole/Statement.php
@@ -21,20 +21,21 @@
 
 /**
  * Class that represents a SQL statement.
- * 
+ *
  * This class is very generic and has no driver-specific implementations.  In fact,
  * it wouldn't be possible to have driver-specific classes, since PHP doesn't support
  * multiple inheritance.  I.e. you couldn't have MySQLPreparedStatement that extended
  * both the abstract PreparedStatement class and the MySQLStatement class.  In Java
  * this isn't a concern since PreparedStatement is an interface, not a class.
  *
- * 
+ *
  * @author   Hans Lellelid <hans@xmpl.org>
  * @version  $Revision: 1.17 $
  * @package  creole
  */
-interface Statement {    
-    
+interface Statement
+{
+
     /**
      * Sets the maximum number of rows to return from db.
      * This will affect the SQL if the RDBMS supports native LIMIT; if not,
@@ -43,45 +44,45 @@ interface Statement {
      * @return void
      */
     public function setLimit($v);
-    
+
     /**
      * Returns the maximum number of rows to return or 0 for all.
      * @return int
      */
     public function getLimit();
-    
+
     /**
      * Sets the start row.
      * This will affect the SQL if the RDBMS supports native OFFSET; if not,
-     * it will be emulated. Offset only applies to queries (not update) and 
+     * it will be emulated. Offset only applies to queries (not update) and
      * only is evaluated when LIMIT is set!
      * @param int $v
      * @return void
-     */ 
+     */
     public function setOffset($v);
-    
+
     /**
      * Returns the start row.
      * Offset only applies when Limit is set!
      * @return int
      */
     public function getOffset();
-    
+
     /**
      * Free resources associated with this statement.
      * Some drivers will need to implement this method to free
-     * database result resources. 
-     * 
+     * database result resources.
+     *
      * @return void
      */
     public function close();
-    
+
     /**
      * Generic execute() function has to check to see whether SQL is an update or select query.
-     * 
+     *
      * If you already know whether it's a SELECT or an update (manipulating) SQL, then use
      * the appropriate method, as this one will incurr overhead to check the SQL.
-     * 
+     *
      * @param int $fetchmode Fetchmode (only applies to queries).
      * @return boolean True if it is a result set, false if not or if no more results (this is identical to JDBC return val).
      * @throws SQLException
@@ -102,27 +103,27 @@ interface Statement {
      *
      * @return int Number of records affected, or <code>null</code> if not applicable.
      */
-    public function getUpdateCount();        
+    public function getUpdateCount();
 
     /**
      * Executes the SQL query in this PreparedStatement object and returns the resultset generated by the query.
-     * 
+     *
      * @param string $sql This method may optionally be called with the SQL statement.
      * @param int $fetchmode The mode to use when fetching the results (e.g. ResultSet::FETCHMODE_NUM, ResultSet::FETCHMODE_ASSOC).
      * @return object Creole::ResultSet
      * @throws SQLException if a database access error occurs.
      */
     public function executeQuery($sql, $fetchmode = null);
-    
+
     /**
      * Executes the SQL INSERT, UPDATE, or DELETE statement in this PreparedStatement object.
-     * 
+     *
      * @param string $sql This method may optionally be called with the SQL statement.
      * @return int Number of affected rows (or 0 for drivers that return nothing).
      * @throws SQLException if a database access error occurs.
      */
     public function executeUpdate($sql);
-    
+
     /**
      * Gets next result set (if this behavior is supported by driver).
      * Some drivers (e.g. MSSQL) support returning multiple result sets -- e.g.
@@ -133,15 +134,15 @@ interface Statement {
      * Default behavior is for this function to return false.  Driver-specific
      * implementations of this class can override this method if they actually
      * support multiple result sets.
-     * 
+     *
      * @return boolean True if there is another result set, otherwise false.
      */
     public function getMoreResults();
-     
+
     /**
      * Gets the db Connection that created this statement.
      * @return Connection
      */
     public function getConnection();
-    
+
 }
diff --git a/thirdparty/creole/contrib/DBArrayConnection.php b/thirdparty/creole/contrib/DBArrayConnection.php
index e49a3e450..a7cbcff75 100644
--- a/thirdparty/creole/contrib/DBArrayConnection.php
+++ b/thirdparty/creole/contrib/DBArrayConnection.php
@@ -7,239 +7,232 @@ require_once 'creole/common/PreparedStatementCommon.php';
 require_once 'creole/ResultSet.php';
 require_once 'creole/common/ResultSetCommon.php';
 
-class DBArrayPreparedStatement extends PreparedStatementCommon implements PreparedStatement {
+class DBArrayPreparedStatement extends PreparedStatementCommon implements PreparedStatement
+{
 
-  /**
-   * Quotes string using native mysql function (mysql_real_escape_string()).
-   * @param string $str
-   * @return string
-   */
-  protected function escape($str) {
-    return $str;
-  }
-
-  private function prepareStatement($sql) {
-    
-  return $sql;
-  }
+    /**
+     * Quotes string using native mysql function (mysqli_real_escape_string()).
+     * @param string $str
+     * @return string
+     */
+    protected function escape($str)
+    {
+        return $str;
+    }
 
+    private function prepareStatement($sql)
+    {
+        return $sql;
+    }
 }
 
-class DBArrayResultSet extends ResultSetCommon implements ResultSet {
+class DBArrayResultSet extends ResultSetCommon implements ResultSet
+{
+    public $dbArray = null;
 
-  public $dbArray = null;
-
-  public function seek($rownum) {
-    $this->cursorPos = $rownum;
-    return true;
-  }
-
-  /**
-   * @see ResultSet::next()
-   */
-  public function next() {
-    if ($this->cursorPos == 0) {
-      $this->cursorPos++;
+    public function seek($rownum)
+    {
+        $this->cursorPos = $rownum;
+        return true;
     }
 
-    if ($this->cursorPos >= count($this->dbArray)) {
-      $this->fields = NULL;
-      return false;
-    } else {
-      $this->fields = $this->dbArray[$this->cursorPos];
-      $this->cursorPos++;
-      return true;
-    }
-    /*
-     *
-      $this->fields = mysql_fetch_array($this->result, $this->fetchmode);
-
-      if (!$this->fields) {
-      $errno = mysql_errno($this->conn->getResource());
-      if (!$errno) {
-      // We've advanced beyond end of recordset.
-      $this->afterLast();
-      return false;
-      } else {
-      throw new SQLException("Error fetching result", mysql_error($this->conn->getResource()));
-      }
-      }
-
-      if ($this->fetchmode === ResultSet::FETCHMODE_ASSOC && $this->lowerAssocCase) {
-      $this->fields = array_change_key_case($this->fields, CASE_LOWER);
-      }
-
-      // Advance cursor position
+    /**
+     * @see ResultSet::next()
      */
-    return true;
-  }
+    public function next()
+    {
+        if ($this->cursorPos == 0) {
+            $this->cursorPos++;
+        }
 
-  /**
-   * @see ResultSet::getRecordCount()
-   */
-  function getRecordCount() {
-    return (int) count($this->dbArray) - 1;
-  }
-
-  /**
-   * @see ResultSet::close()
-   */
-  function close() {
-    if (is_resource($this->result)) {
-      @mysql_free_result($this->result);
+        if ($this->cursorPos >= count($this->dbArray)) {
+            $this->fields = null;
+            return false;
+        } else {
+            $this->fields = $this->dbArray[$this->cursorPos];
+            $this->cursorPos++;
+            return true;
+        }
+        return true;
     }
-    $this->fields = array();
-  }
 
-  /**
-   * Get string version of column.
-   * No rtrim() necessary for MySQL, as this happens natively.
-   * @see ResultSet::getString()
-   */
-  public function getString($column) {
-    $idx = (is_int($column) ? $column - 1 : $column);
-    if (!array_key_exists($idx, $this->fields)) {
-      throw new SQLException("Invalid resultset column: " . $column);
+    /**
+     * @see ResultSet::getRecordCount()
+     */
+    public function getRecordCount()
+    {
+        return (int)count($this->dbArray) - 1;
     }
-    if ($this->fields[$idx] === null) {
-      return null;
-    }
-    return (string) $this->fields[$idx];
-  }
 
+    /**
+     * @see ResultSet::close()
+     */
+    public function close()
+    {
+        if (is_resource($this->result)) {
+            mysqli_free_result($this->result);
+        }
+        $this->fields = array();
+    }
+
+    /**
+     * Get string version of column.
+     * No rtrim() necessary for MySQL, as this happens natively.
+     * @see ResultSet::getString()
+     */
+    public function getString($column)
+    {
+        $idx = (is_int($column) ? $column - 1 : $column);
+        if (!array_key_exists($idx, $this->fields)) {
+            throw new SQLException("Invalid resultset column: " . $column);
+        }
+        if ($this->fields[$idx] === null) {
+            return null;
+        }
+        return (string)$this->fields[$idx];
+    }
 }
 
 /**
  * DBArray implementation of Connection.
  *
  */
-class DBArrayConnection implements Connection {
+class DBArrayConnection implements Connection
+{
 
-  /** @var Connection */
-  private $childConnection = null;
-  /** @var int */
-  private $numQueriesExecuted = 0;
-  /** @var string */
-  private $lastExecutedQuery = '';
-  /**
-   * @var object Instance of PEAR Log (or other class with log() method).
-   */
-  private $logger;
-  private $_DBArray;
-  public $dataSql;
+    /** @var Connection */
+    private $childConnection = null;
+    /** @var int */
+    private $numQueriesExecuted = 0;
+    /** @var string */
+    private $lastExecutedQuery = '';
+    /**
+     * @var object Instance of PEAR Log (or other class with log() method).
+     */
+    private $logger;
+    private $_DBArray;
+    public $dataSql;
 
-  /**
-   * Sets a Logger class (e.g. PEAR Log) to use for logging.
-   * The logger class must have a log() method.  All messages are logged at default log level.
-   * @param object $logger
-   */
-  public function setLogger($logger) {
-    krumo('DBArrayConnection setLogger ');
-    die;
-    $this->logger = $logger;
-  }
-
-  /**
-   * connect()
-   */
-  public function connect($dsninfo, $flags = 0) {
-
-    if (!($driver = Creole::getDriver($dsninfo['phptype']))) {
-      throw new SQLException("No driver has been registered to handle connection type: $type");
+    /**
+     * Sets a Logger class (e.g. PEAR Log) to use for logging.
+     * The logger class must have a log() method.  All messages are logged at default log level.
+     * @param object $logger
+     */
+    public function setLogger($logger)
+    {
+        krumo('DBArrayConnection setLogger ');
+        die;
+        $this->logger = $logger;
     }
-    global $_DBArray;
-    if ((!isset($_DBArray) ) && (isset($_SESSION['_DBArray']))) {
-      //throw new SQLException("No Database Array defined for this connection but exists in session");
-      //Added by JHL to avoid errors trying to execute query of a dbarray on June 25, 2011
-      $_DBArray = $_SESSION['_DBArray'];
+
+    /**
+     * connect()
+     */
+    public function connect($dsninfo, $flags = 0)
+    {
+        if (!($driver = Creole::getDriver($dsninfo['phptype']))) {
+            throw new SQLException("No driver has been registered to handle connection type: $type");
+        }
+        global $_DBArray;
+        if ((!isset($_DBArray)) && (isset($_SESSION['_DBArray']))) {
+            //throw new SQLException("No Database Array defined for this connection but exists in session");
+            //Added by JHL to avoid errors trying to execute query of a dbarray on June 25, 2011
+            $_DBArray = $_SESSION['_DBArray'];
+        }
+        if (!isset($_DBArray)) {
+            throw new SQLException("No Database Array defined for this connection");
+        }
+        $this->_DBArray = $_DBArray;
+        return true;
     }
-    if (!isset($_DBArray)) {
-      throw new SQLException("No Database Array defined for this connection");
+
+    /**
+     * @see Connection::getDatabaseInfo()
+     */
+    public function getDatabaseInfo()
+    {
+        krumo('DBArrayConnection getDatabaseInfo ');
+        die;
+        return $this->childConnection->getDatabaseInfo();
     }
-    $this->_DBArray = $_DBArray;
-    return true;
-  }
 
-  /**
-   * @see Connection::getDatabaseInfo()
-   */
-  public function getDatabaseInfo() {
-    krumo('DBArrayConnection getDatabaseInfo ');
-    die;
-    return $this->childConnection->getDatabaseInfo();
-  }
+    /**
+     * @see Connection::getIdGenerator()
+     */
+    public function getIdGenerator()
+    {
+        krumo('DBArrayConnection getIdGenerator ');
+        die;
+        return $this->childConnection->getIdGenerator();
+    }
 
-  /**
-   * @see Connection::getIdGenerator()
-   */
-  public function getIdGenerator() {
-    krumo('DBArrayConnection getIdGenerator ');
-    die;
-    return $this->childConnection->getIdGenerator();
-  }
+    /**
+     * @see Connection::isConnected()
+     */
+    public function isConnected()
+    {
+        return true;
+        krumo('DBArrayConnection isConnected ');
+        die;
+        return $this->childConnection->isConnected();
+    }
 
-  /**
-   * @see Connection::isConnected()
-   */
-  public function isConnected() {
-    return true;
-    krumo('DBArrayConnection isConnected ');
-    die;
-    return $this->childConnection->isConnected();
-  }
+    /**
+     * @see Connection::prepareStatement()
+     */
+    public function prepareStatement($dataSql)
+    {
+        $this->dataSql = $dataSql;
+        return new DBArrayPreparedStatement($this, $this->dataSql);
+    }
 
-  /**
-   * @see Connection::prepareStatement()
-   */
-  public function prepareStatement($dataSql) {
-    $this->dataSql = $dataSql;
-    return new DBArrayPreparedStatement($this, $this->dataSql);
-  }
+    /**
+     * @see Connection::createStatement()
+     */
+    public function createStatement()
+    {
+        return new DBArrayPreparedStatement($this, null);
+        return new DBArrayPreparedStatement($this, $dataSql['sql']);
+        krumo('DBArrayConnection createStatement ');
+        die;
+        $obj = $this->childConnection->createStatement();
+        $objClass = get_class($obj);
+        return new $objClass($this);
+    }
 
-  /**
-   * @see Connection::createStatement()
-   */
-  public function createStatement() {
-    return new DBArrayPreparedStatement($this, null);
-    return new DBArrayPreparedStatement($this, $dataSql['sql']);
-    krumo('DBArrayConnection createStatement ');
-    die;
-    $obj = $this->childConnection->createStatement();
-    $objClass = get_class($obj);
-    return new $objClass($this);
-  }
+    /**
+     * @see Connection::applyLimit()
+     */
+    public function applyLimit(&$sql, $offset, $limit)
+    {
+        krumo('DBArrayConnection applyLimit ');
+        die;
+        $this->log("applyLimit(): $sql, offset: $offset, limit: $limit");
+        return $this->childConnection->applyLimit($sql, $offset, $limit);
+    }
 
-  /**
-   * @see Connection::applyLimit()
-   */
-  public function applyLimit(&$sql, $offset, $limit) {
-    krumo('DBArrayConnection applyLimit ');
-    die;
-    $this->log("applyLimit(): $sql, offset: $offset, limit: $limit");
-    return $this->childConnection->applyLimit($sql, $offset, $limit);
-  }
-
-  /**
-   * @see Connection::close()
-   */
-  public function close() {
-    krumo('DBArrayConnection connect ');
-    die;
-    $this->log("close(): Closing connection.");
-    return $this->childConnection->close();
-  }
+    /**
+     * @see Connection::close()
+     */
+    public function close()
+    {
+        krumo('DBArrayConnection connect ');
+        die;
+        $this->log("close(): Closing connection.");
+        return $this->childConnection->close();
+    }
 
 
-  /**
-   * Evaluate Clause
-   * @param type $clause
-   * @return type
-   */
-  public function evaluateClause($clause)
-  {
-    $sqlStr = $clause;
-    $sqlStr = str_replace(array('\\\'','\\"',"\r\n","\n","()"), array("''",'""'," "," "," "), $sqlStr);
-    $regex  = "/((?:)[@A-Za-z0-9_.-]+(?:\(\s*\)){0,1})"
+    /**
+     * Evaluate Clause
+     * @param type $clause
+     * @return type
+     */
+    public function evaluateClause($clause)
+    {
+        $sqlStr = $clause;
+        $sqlStr = str_replace(array('\\\'', '\\"', "\r\n", "\n", "()"), array("''", '""', " ", " ", " "), $sqlStr);
+        $regex = "/((?:)[@A-Za-z0-9_.-]+(?:\(\s*\)){0,1})"
             . "|(\+|-|\*|\/|!=|>=|<=|<>|>|<|&&|\|\||=|\^)"
             . "|(\(.*?\))"
             . "|('(?:[^']|'')*'+)"
@@ -247,394 +240,445 @@ class DBArrayConnection implements Connection {
             . "|([^ ,]+)"
             . "/ix";
 
-    $tokens = preg_split($regex, $sqlStr, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-    return $tokens;
-  }
-
-  /**
-   * Evaluate Clause Where
-   * @param type $clauseWhere
-   * @return type
-   */
-  public function evaluateClauseWhere($clauseWhere)
-  {
-    $aOperator = array("=", "!=", "<>", ">", "<", ">=", "<=", "LIKE", "AND", "OR", "NOT", "IN");
-    $evalClause = $this->evaluateClause($clauseWhere);
-    $pos = 0;
-    foreach ($evalClause as $key => $value) {
-      $value = strtoupper(trim($value));
-      $sSelect = strtoupper($this->dataSql['selectClause'][0]);
-      if( stripos($sSelect, $value)  !== false ) {
-        $evalClause[$key] = "\$row['" . $evalClause[$key] . "']";
-      }
-      if ( in_array($value, $aOperator) ) {
-        switch ( $value ) {
-          case "=" :
-            $evalClause[$key] = "==";
-            break;
-          case "<>" :
-            $evalClause[$key] = "!=";
-            break;
-          case "AND" :
-            $evalClause[$key] = "&&";
-            break;
-          case "OR" :
-            $evalClause[$key] = "||";
-            break;
-          case "NOT" :
-            $evalClause[$key] = "!";
-            break;
-          case "LIKE" :
-            $evalClause[$key] = ", ";
-            if (trim($evalClause[$key-1]) !== "" ) {
-              $evalClause[$key-1] = " stripos(" . $evalClause[$key-1];
-            }
-            else {
-              if (trim($evalClause[$key-2]) !== "" ) {
-                $evalClause[$key-2] = " stripos(" . $evalClause[$key-2];
-              }
-            }
-
-            if (trim($evalClause[$key+1]) !== "" ) {
-              $evalClause[$key+1] = str_replace("%", "", $evalClause[$key+1]);
-              $evalClause[$key+1] = $evalClause[$key+1] . ") !== false";
-            }
-            else {
-              if (trim($evalClause[$key+2]) !== "" ) {
-                $evalClause[$key+2] = str_replace("%", "", $evalClause[$key+2]);
-                $evalClause[$key+2] = $evalClause[$key+2] . ") !== false";
-              }
-            }
-            break;
-        }
-      }
-    }
-    $$sEvalClause = implode("", $evalClause);
-    return $$sEvalClause;
-  }
-
-  private function parseSqlString($query) {
-    //we need a SQL parse, for now we only search for text 'select * from'
-    /* $aux = str_ireplace ( 'select * from', '', trim($query) );
-      $sql = array();
-      $sql['fromClause'][0] = trim( $aux );
-      $sql['limit'] = 0;
-      $sql['offset'] = 0; */
-    // if (1 === preg_match('/^\s*SELECT\s+(.+?)(?:\s+FROM\s+(.+?))(?:\s+WHERE\s+(.+?))?(?:\s+GROUP\s+BY\s+(.+?))?(?:\s+ORDER\s+BY\s+(.+?))?(?:\s+BETWEEN\s+(.+?)\s+AND\s+(.+?))?\s*$/im', $query, $matches)) {
-    if (1 === preg_match('/^\s*SELECT\s+([\w\W]+?)(?:\s+FROM\s+`?([^`]+?)`?)(?:\s+WHERE\s+([\w\W]+?))?(?:\s+GROUP\s+BY\s+([\w\W]+?))?(?:\s+ORDER\s+BY\s+([\w\W]+?))?(?:\s+BETWEEN\s+([\w\W]+?)\s+AND\s+([\w\W]+?))?(?:\s+LIMIT\s+(\d+)\s*,\s*(\d+))?\s*$/im', $query, $matches)) {
-      //$sqlSelect='SELECT '.$matches[1].(($matches[2]!='')?' FROM '.$matches[2]:'');
-    } else {
-      return;
-    }
-    $sql = array();
-    $sql['selectClause'][0] = isset($matches[1]) ? $matches[1] : '';//Include selectClause. By JHL
-    $sql['fromClause'][0] = isset($matches[2]) ? $matches[2] : '';
-    //$sql['whereClause'][0] = isset($matches[3]) ? $matches[3] : '';
-    if(isset($matches[3])){
-      $sql['whereClause'][0] = $matches[3];      
-    }
-    if(isset($matches[4])){
-      $sql['groupByClause'][0] = $matches[4];      
-    }
-    if(isset($matches[5])){
-      $sql['orderByClause'][0] = $matches[5];
-    }
-    
-
-    $sql['limit'] = 0;
-    $sql['offset'] = 0;
-    return $sql;
-  }
-
-  /**
-   * @see Connection::executeQuery()
-   */
-  public function executeQuery($sql, $fetchmode = null) {
-    if (!is_array($sql) && strlen($sql) > 1) {
-      $this->dataSql=$sql = $this->parseSqlString($sql);
-    }
-    $resultSet = new DBArrayResultSet($this, $sql, $fetchmode);
-    $tableName = $sql['fromClause'][0];
-
-    //the table doesnt exists
-    if (!isset($this->_DBArray[$tableName])) {
-      $resultSet->dbArray = array();
-      return $resultSet;
+        $tokens = preg_split($regex, $sqlStr, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        return $tokens;
     }
 
-
-    foreach ($this->_DBArray[$tableName] as $key => $row) {
-      if ($key == 0)
-        continue;
-      $flag = 1;
-      if (isset($sql['whereClause'])){//If there is no where then return the row
-        foreach ($sql['whereClause'] as $keyClause => $valClause) {
-          if (isset($valClause) && $flag == 1) {
-            //$toEval =  "\$flag = ( " . ($valClause != '' ? str_replace('=', '==', $valClause): '1') . ') ?1 :0;' ;
-            //if the eval is EQUAL   add a double Equal
-            if (strpos($valClause, "\$row['*'] CUSTOM'(") !== false) {
-              $valClause = str_replace("\$row['*'] CUSTOM'(", '', $valClause);
-              $words = explode(' ', $valClause);
-              $valClause = str_replace($words[0], "\$row['" . $words[0] . "']", $valClause);
-              $valClause = str_replace(")'", "", $valClause);
-            }
-
-            if (stripos($valClause, "\$row[") !== false ){
-              if (stripos($valClause, "LIKE") !== false) {
-                $valClause = str_replace("%", "", $valClause);
-                $operands = explode('LIKE', $valClause);
-                if ($operands[1] == ' ""') {
-                  $toEval = "\$flag = 1;";
-                } else {
-                  $toEval = "\$flag = ( stripos ( " . $operands[0] . ", " . $operands[1] . "  )  !== false ? 1 : 0 ) ;";
-                  eval($toEval);
-                  eval('$val = ' . $operands[0] . ';');
-                }
-              } else {//this is for EQUAL, LESS_THAN_EQUAL, ETC,
-                $toEval = "\$flag = ( " . ($valClause != '' ? $valClause : '1') . ') ?1 :0;';
-              }
-            }
-            else {
-                $valClause = $this->evaluateClauseWhere($valClause);
-                $toEval = "\$flag = ( " . ($valClause != '' ? $valClause : '1') . ') ?1 :0;';
-            }
-            eval($toEval);
-          }
-        }}else{
-
-        }
-
-      if ($flag) {
-        $resultRow[] = $row;
-      }
-    }
-    if ($this->dataSql['selectClause'][0] == 'COUNT(*)') {
-      $rows[] = array('1' => 'integer');
-      if (isset($resultRow) && is_array($resultRow))
-        $rows[] = array('1' => count($resultRow));
-      else
-        $rows[] = array('1' => 0);
-      $resultSet->dbArray = $rows;
-      return $resultSet;
-    }
-
-    if (!isset($resultRow)) {
-      $resultSet->dbArray = array();
-      return $resultSet;
-    }
-
-    
-    if (isset($this->dataSql['orderByClause'])&&is_array($this->dataSql['orderByClause']) && count($this->dataSql['orderByClause']) > 0) {
-      foreach ($resultRow as $key => $row) {
-        foreach ($this->dataSql['orderByClause'] as $keyOrder => $valOrder) {
-          if (isset($row[$valOrder['columnName']])) {
-            $column[$valOrder['columnName']][$key] = strtoupper($row[$valOrder['columnName']]);
-          } else {
-            $column[$valOrder['columnName']][$key] = '';
-          }
-        }
-      }
-      foreach ($this->dataSql['orderByClause'] as $keyOrder => $valOrder) {
-        $direction[$keyOrder] = (trim($valOrder['direction']) != 'ASC') ? SORT_DESC : SORT_ASC;
-      }
-      $aOrderClause = $this->dataSql['orderByClause'];
-      switch (count($column)) {
-        case 1 :
-          array_multisort($column[$aOrderClause[0]['columnName']], $direction[0], $resultRow);
-          break;
-        case 2 :
-          array_multisort($column[$aOrderClause[0]['columnName']], $direction[0],
-                  $column[$aOrderClause[1]['columnName']], $direction[1],
-                  $resultRow);
-          break;
-        case 3 :
-          array_multisort($column[$aOrderClause[0]['columnName']], $direction[0],
-                  $column[$aOrderClause[1]['columnName']], $direction[1],
-                  $column[$aOrderClause[2]['columnName']], $direction[2],
-                  $resultRow);
-          break;
-        case 4 :
-          array_multisort($column[$aOrderClause[0]['columnName']], $direction[0],
-                  $column[$aOrderClause[1]['columnName']], $direction[1],
-                  $column[$aOrderClause[2]['columnName']], $direction[2],
-                  $column[$aOrderClause[3]['columnName']], $direction[3],
-                  $resultRow);
-          break;
-        case 5 :
-          array_multisort($column[$aOrderClause[0]['columnName']], $direction[0],
-                  $column[$aOrderClause[1]['columnName']], $direction[1],
-                  $column[$aOrderClause[2]['columnName']], $direction[2],
-                  $column[$aOrderClause[3]['columnName']], $direction[3],
-                  $column[$aOrderClause[4]['columnName']], $direction[4],
-                  $resultRow);
-          break;
-        case 6 :
-          array_multisort($column[$aOrderClause[0]['columnName']], $direction[0],
-                  $column[$aOrderClause[1]['columnName']], $direction[1],
-                  $column[$aOrderClause[2]['columnName']], $direction[2],
-                  $column[$aOrderClause[3]['columnName']], $direction[3],
-                  $column[$aOrderClause[4]['columnName']], $direction[4],
-                  $column[$aOrderClause[5]['columnName']], $direction[5],
-                  $resultRow);
-          break;
-        case 7 :
-          array_multisort($column[$aOrderClause[0]['columnName']], $direction[0],
-                  $column[$aOrderClause[1]['columnName']], $direction[1],
-                  $column[$aOrderClause[2]['columnName']], $direction[2],
-                  $column[$aOrderClause[3]['columnName']], $direction[3],
-                  $column[$aOrderClause[4]['columnName']], $direction[4],
-                  $column[$aOrderClause[5]['columnName']], $direction[5],
-                  $column[$aOrderClause[6]['columnName']], $direction[6],
-                  $resultRow);
-          break;
-      }
-    }
-
-    //prepend the headers in the resultRow
-    array_unshift($resultRow, $this->_DBArray[$tableName][0]);
-    //$resultRow[0] = $this->_DBArray[ $tableName ][0];
-
-    /* algorith to order a multiarray
-      // Obtain a list of columns
-      foreach ($data as $key => $row) {
-      $volume[$key]  = $row['volume'];
-      $edition[$key] = $row['edition'];
-      }
-      // Sort the data with volume descending, edition ascending
-      // Add $data as the last parameter, to sort by the common key
-      array_multisort($volume, SORT_DESC, $edition, SORT_ASC, $data); */
-
-    /*
-     * Apply Limit and Offset
+    /**
+     * Evaluate Clause Where
+     * @param type $clauseWhere
+     * @return type
      */
-    if ($sql['limit'] > 0) {
-      $header = $resultRow[0];
-      $resultRow = array_slice($resultRow, $sql['offset'] + 1, $sql['limit']);
-      array_unshift($resultRow, $header);
-    } else {
-      $header = $resultRow[0];
-      $resultRow = array_slice($resultRow, $sql['offset'] + 1);
-      array_unshift($resultRow, $header);
+    public function evaluateClauseWhere($clauseWhere)
+    {
+        $aOperator = array("=", "!=", "<>", ">", "<", ">=", "<=", "LIKE", "AND", "OR", "NOT", "IN");
+        $evalClause = $this->evaluateClause($clauseWhere);
+        $pos = 0;
+        foreach ($evalClause as $key => $value) {
+            $value = strtoupper(trim($value));
+            $sSelect = strtoupper($this->dataSql['selectClause'][0]);
+            if (stripos($sSelect, $value) !== false) {
+                $evalClause[$key] = "\$row['" . $evalClause[$key] . "']";
+            }
+            if (in_array($value, $aOperator)) {
+                switch ($value) {
+                    case "=":
+                        $evalClause[$key] = "==";
+                        break;
+                    case "<>":
+                        $evalClause[$key] = "!=";
+                        break;
+                    case "AND":
+                        $evalClause[$key] = "&&";
+                        break;
+                    case "OR":
+                        $evalClause[$key] = "||";
+                        break;
+                    case "NOT":
+                        $evalClause[$key] = "!";
+                        break;
+                    case "LIKE":
+                        $evalClause[$key] = ", ";
+                        if (trim($evalClause[$key - 1]) !== "") {
+                            $evalClause[$key - 1] = " stripos(" . $evalClause[$key - 1];
+                        } else {
+                            if (trim($evalClause[$key - 2]) !== "") {
+                                $evalClause[$key - 2] = " stripos(" . $evalClause[$key - 2];
+                            }
+                        }
+
+                        if (trim($evalClause[$key + 1]) !== "") {
+                            $evalClause[$key + 1] = str_replace("%", "", $evalClause[$key + 1]);
+                            $evalClause[$key + 1] = $evalClause[$key + 1] . ") !== false";
+                        } else {
+                            if (trim($evalClause[$key + 2]) !== "") {
+                                $evalClause[$key + 2] = str_replace("%", "", $evalClause[$key + 2]);
+                                $evalClause[$key + 2] = $evalClause[$key + 2] . ") !== false";
+                            }
+                        }
+                        break;
+                }
+            }
+        }
+        $$sEvalClause = implode("", $evalClause);
+        return $$sEvalClause;
     }
-    $resultSet->dbArray = $resultRow;
-    return $resultSet;
-  }
 
-  /**
-   * @see Connection::executeUpdate()
-   */
-  public function executeUpdate($sql) {
-    krumo('DBArrayConnection executeUpdate ');
-    die;
-    $this->log("executeUpdate(): $sql");
-    $this->lastExecutedQuery = $sql;
-    $this->numQueriesExecuted++;
-    return $this->childConnection->executeUpdate($sql);
-  }
+    private function parseSqlString($query)
+    {
+        //we need a SQL parse, for now we only search for text 'select * from'
+        /* $aux = str_ireplace ( 'select * from', '', trim($query) );
+          $sql = array();
+          $sql['fromClause'][0] = trim( $aux );
+          $sql['limit'] = 0;
+          $sql['offset'] = 0; */
+        // if (1 === preg_match('/^\s*SELECT\s+(.+?)(?:\s+FROM\s+(.+?))(?:\s+WHERE\s+(.+?))?(?:\s+GROUP\s+BY\s+(.+?))?(?:\s+ORDER\s+BY\s+(.+?))?(?:\s+BETWEEN\s+(.+?)\s+AND\s+(.+?))?\s*$/im', $query, $matches)) {
+        if (1 === preg_match('/^\s*SELECT\s+([\w\W]+?)(?:\s+FROM\s+`?([^`]+?)`?)(?:\s+WHERE\s+([\w\W]+?))?(?:\s+GROUP\s+BY\s+([\w\W]+?))?(?:\s+ORDER\s+BY\s+([\w\W]+?))?(?:\s+BETWEEN\s+([\w\W]+?)\s+AND\s+([\w\W]+?))?(?:\s+LIMIT\s+(\d+)\s*,\s*(\d+))?\s*$/im', $query, $matches)) {
+            //$sqlSelect='SELECT '.$matches[1].(($matches[2]!='')?' FROM '.$matches[2]:'');
+        } else {
+            return;
+        }
+        $sql = array();
+        $sql['selectClause'][0] = isset($matches[1]) ? $matches[1] : '';//Include selectClause. By JHL
+        $sql['fromClause'][0] = isset($matches[2]) ? $matches[2] : '';
+        //$sql['whereClause'][0] = isset($matches[3]) ? $matches[3] : '';
+        if (isset($matches[3])) {
+            $sql['whereClause'][0] = $matches[3];
+        }
+        if (isset($matches[4])) {
+            $sql['groupByClause'][0] = $matches[4];
+        }
+        if (isset($matches[5])) {
+            $sql['orderByClause'][0] = $matches[5];
+        }
 
-  /**
-   * @see Connection::getUpdateCount()
-   */
-  public function getUpdateCount() {
-    krumo('DBArrayConnection getUpdateCount ');
-    die;
-    return $this->childConnection->getUpdateCount();
-  }
 
-  /**
-   * @see Connection::prepareCall()
-   * */
-  public function prepareCall($sql) {
-    krumo('DBArrayConnection prepareCall ');
-    die;
-    $this->log("prepareCall(): $sql");
-    return $this->childConnection->prepareCall($sql);
-  }
-
-  /**
-   * @see Connection::getResource()
-   */
-  public function getResource() {
-    krumo('DBArrayConnection getResource ');
-    die;
-    return $this->childConnection->getResource();
-  }
-
-  /**
-   * @see Connection::connect()
-   */
-  public function getDSN() {
-    krumo('DBArrayConnection getDSN ');
-    die;
-    return $this->childConnection->getDSN();
-  }
-
-  /**
-   * @see Connection::getFlags()
-   */
-  public function getFlags() {
-    return;
-  }
-
-  /**
-   * @see Connection::begin()
-   */
-  public function begin() {
-    krumo('DBArrayConnection begin ');
-    die;
-    $this->log("Beginning transaction.");
-    return $this->childConnection->begin();
-  }
-
-  /**
-   * @see Connection::commit()
-   */
-  public function commit() {
-    krumo('DBArrayConnection commit ');
-    die;
-    $this->log("Committing transaction.");
-    return $this->childConnection->commit();
-  }
-
-  /**
-   * @see Connection::rollback()
-   */
-  public function rollback() {
-    krumo('DBArrayConnection rollback ');
-    die;
-    $this->log("Rolling back transaction.");
-    return $this->childConnection->rollback();
-  }
-
-  /**
-   * @see Connection::setAutoCommit()
-   */
-  public function setAutoCommit($bit) {
-    krumo('DBArrayConnection connect ');
-    die;
-    $this->log("Setting autocommit to: " . var_export($bit, true));
-    return $this->childConnection->setAutoCommit($bit);
-  }
-
-  /**
-   * @see Connection::getAutoCommit()
-   */
-  public function getAutoCommit() {
-    krumo('DBArrayConnection getAutoCommit ');
-    die;
-    return $this->childConnection->getAutoCommit();
-  }
-
-  /**
-   * Private function that logs message using specified logger (if provided).
-   * @param string $msg Message to log.
-   */
-  private function log($msg) {
-    krumo('DBArrayConnection  log ');
-    die;
-    if ($this->logger) {
-      $this->logger->log($msg);
+        $sql['limit'] = 0;
+        $sql['offset'] = 0;
+        return $sql;
     }
-  }
 
-}
\ No newline at end of file
+    /**
+     * @see Connection::executeQuery()
+     */
+    public function executeQuery($sql, $fetchmode = null)
+    {
+        if (!is_array($sql) && strlen($sql) > 1) {
+            $this->dataSql = $sql = $this->parseSqlString($sql);
+        }
+        $resultSet = new DBArrayResultSet($this, $sql, $fetchmode);
+        $tableName = $sql['fromClause'][0];
+
+        //the table doesnt exists
+        if (!isset($this->_DBArray[$tableName])) {
+            $resultSet->dbArray = array();
+            return $resultSet;
+        }
+
+
+        foreach ($this->_DBArray[$tableName] as $key => $row) {
+            if ($key == 0) {
+                continue;
+            }
+            $flag = 1;
+            if (isset($sql['whereClause'])) {//If there is no where then return the row
+                foreach ($sql['whereClause'] as $keyClause => $valClause) {
+                    if (isset($valClause) && $flag == 1) {
+                        //$toEval =  "\$flag = ( " . ($valClause != '' ? str_replace('=', '==', $valClause): '1') . ') ?1 :0;' ;
+                        //if the eval is EQUAL   add a double Equal
+                        if (strpos($valClause, "\$row['*'] CUSTOM'(") !== false) {
+                            $valClause = str_replace("\$row['*'] CUSTOM'(", '', $valClause);
+                            $words = explode(' ', $valClause);
+                            $valClause = str_replace($words[0], "\$row['" . $words[0] . "']", $valClause);
+                            $valClause = str_replace(")'", "", $valClause);
+                        }
+
+                        if (stripos($valClause, "\$row[") !== false) {
+                            if (stripos($valClause, "LIKE") !== false) {
+                                $valClause = str_replace("%", "", $valClause);
+                                $operands = explode('LIKE', $valClause);
+                                if ($operands[1] == ' ""') {
+                                    $toEval = "\$flag = 1;";
+                                } else {
+                                    $toEval = "\$flag = ( stripos ( " . $operands[0] . ", " . $operands[1] . "  )  !== false ? 1 : 0 ) ;";
+                                    eval($toEval);
+                                    eval('$val = ' . $operands[0] . ';');
+                                }
+                            } else {//this is for EQUAL, LESS_THAN_EQUAL, ETC,
+                                $toEval = "\$flag = ( " . ($valClause != '' ? $valClause : '1') . ') ?1 :0;';
+                            }
+                        } else {
+                            $valClause = $this->evaluateClauseWhere($valClause);
+                            $toEval = "\$flag = ( " . ($valClause != '' ? $valClause : '1') . ') ?1 :0;';
+                        }
+                        eval($toEval);
+                    }
+                }
+            } else {
+            }
+
+            if ($flag) {
+                $resultRow[] = $row;
+            }
+        }
+        if ($this->dataSql['selectClause'][0] == 'COUNT(*)') {
+            $rows[] = array('1' => 'integer');
+            if (isset($resultRow) && is_array($resultRow)) {
+                $rows[] = array('1' => count($resultRow));
+            } else {
+                $rows[] = array('1' => 0);
+            }
+            $resultSet->dbArray = $rows;
+            return $resultSet;
+        }
+
+        if (!isset($resultRow)) {
+            $resultSet->dbArray = array();
+            return $resultSet;
+        }
+
+
+        if (isset($this->dataSql['orderByClause']) && is_array($this->dataSql['orderByClause']) && count($this->dataSql['orderByClause']) > 0) {
+            foreach ($resultRow as $key => $row) {
+                foreach ($this->dataSql['orderByClause'] as $keyOrder => $valOrder) {
+                    if (isset($row[$valOrder['columnName']])) {
+                        $column[$valOrder['columnName']][$key] = strtoupper($row[$valOrder['columnName']]);
+                    } else {
+                        $column[$valOrder['columnName']][$key] = '';
+                    }
+                }
+            }
+            foreach ($this->dataSql['orderByClause'] as $keyOrder => $valOrder) {
+                $direction[$keyOrder] = (trim($valOrder['direction']) != 'ASC') ? SORT_DESC : SORT_ASC;
+            }
+            $aOrderClause = $this->dataSql['orderByClause'];
+            switch (count($column)) {
+                case 1:
+                    array_multisort($column[$aOrderClause[0]['columnName']], $direction[0], $resultRow);
+                    break;
+                case 2:
+                    array_multisort(
+                        $column[$aOrderClause[0]['columnName']],
+                        $direction[0],
+                        $column[$aOrderClause[1]['columnName']],
+                        $direction[1],
+                        $resultRow
+                    );
+                    break;
+                case 3:
+                    array_multisort(
+                        $column[$aOrderClause[0]['columnName']],
+                        $direction[0],
+                        $column[$aOrderClause[1]['columnName']],
+                        $direction[1],
+                        $column[$aOrderClause[2]['columnName']],
+                        $direction[2],
+                        $resultRow
+                    );
+                    break;
+                case 4:
+                    array_multisort(
+                        $column[$aOrderClause[0]['columnName']],
+                        $direction[0],
+                        $column[$aOrderClause[1]['columnName']],
+                        $direction[1],
+                        $column[$aOrderClause[2]['columnName']],
+                        $direction[2],
+                        $column[$aOrderClause[3]['columnName']],
+                        $direction[3],
+                        $resultRow
+                    );
+                    break;
+                case 5:
+                    array_multisort(
+                        $column[$aOrderClause[0]['columnName']],
+                        $direction[0],
+                        $column[$aOrderClause[1]['columnName']],
+                        $direction[1],
+                        $column[$aOrderClause[2]['columnName']],
+                        $direction[2],
+                        $column[$aOrderClause[3]['columnName']],
+                        $direction[3],
+                        $column[$aOrderClause[4]['columnName']],
+                        $direction[4],
+                        $resultRow
+                    );
+                    break;
+                case 6:
+                    array_multisort(
+                        $column[$aOrderClause[0]['columnName']],
+                        $direction[0],
+                        $column[$aOrderClause[1]['columnName']],
+                        $direction[1],
+                        $column[$aOrderClause[2]['columnName']],
+                        $direction[2],
+                        $column[$aOrderClause[3]['columnName']],
+                        $direction[3],
+                        $column[$aOrderClause[4]['columnName']],
+                        $direction[4],
+                        $column[$aOrderClause[5]['columnName']],
+                        $direction[5],
+                        $resultRow
+                    );
+                    break;
+                case 7:
+                    array_multisort(
+                        $column[$aOrderClause[0]['columnName']],
+                        $direction[0],
+                        $column[$aOrderClause[1]['columnName']],
+                        $direction[1],
+                        $column[$aOrderClause[2]['columnName']],
+                        $direction[2],
+                        $column[$aOrderClause[3]['columnName']],
+                        $direction[3],
+                        $column[$aOrderClause[4]['columnName']],
+                        $direction[4],
+                        $column[$aOrderClause[5]['columnName']],
+                        $direction[5],
+                        $column[$aOrderClause[6]['columnName']],
+                        $direction[6],
+                        $resultRow
+                    );
+                    break;
+            }
+        }
+
+        //prepend the headers in the resultRow
+        array_unshift($resultRow, $this->_DBArray[$tableName][0]);
+        //$resultRow[0] = $this->_DBArray[ $tableName ][0];
+
+        /* algorith to order a multiarray
+          // Obtain a list of columns
+          foreach ($data as $key => $row) {
+          $volume[$key]  = $row['volume'];
+          $edition[$key] = $row['edition'];
+          }
+          // Sort the data with volume descending, edition ascending
+          // Add $data as the last parameter, to sort by the common key
+          array_multisort($volume, SORT_DESC, $edition, SORT_ASC, $data); */
+
+        /*
+         * Apply Limit and Offset
+         */
+        if ($sql['limit'] > 0) {
+            $header = $resultRow[0];
+            $resultRow = array_slice($resultRow, $sql['offset'] + 1, $sql['limit']);
+            array_unshift($resultRow, $header);
+        } else {
+            $header = $resultRow[0];
+            $resultRow = array_slice($resultRow, $sql['offset'] + 1);
+            array_unshift($resultRow, $header);
+        }
+        $resultSet->dbArray = $resultRow;
+        return $resultSet;
+    }
+
+    /**
+     * @see Connection::executeUpdate()
+     */
+    public function executeUpdate($sql)
+    {
+        krumo('DBArrayConnection executeUpdate ');
+        die;
+        $this->log("executeUpdate(): $sql");
+        $this->lastExecutedQuery = $sql;
+        $this->numQueriesExecuted++;
+        return $this->childConnection->executeUpdate($sql);
+    }
+
+    /**
+     * @see Connection::getUpdateCount()
+     */
+    public function getUpdateCount()
+    {
+        krumo('DBArrayConnection getUpdateCount ');
+        die;
+        return $this->childConnection->getUpdateCount();
+    }
+
+    /**
+     * @see Connection::prepareCall()
+     * */
+    public function prepareCall($sql)
+    {
+        krumo('DBArrayConnection prepareCall ');
+        die;
+        $this->log("prepareCall(): $sql");
+        return $this->childConnection->prepareCall($sql);
+    }
+
+    /**
+     * @see Connection::getResource()
+     */
+    public function getResource()
+    {
+        krumo('DBArrayConnection getResource ');
+        die;
+        return $this->childConnection->getResource();
+    }
+
+    /**
+     * @see Connection::connect()
+     */
+    public function getDSN()
+    {
+        krumo('DBArrayConnection getDSN ');
+        die;
+        return $this->childConnection->getDSN();
+    }
+
+    /**
+     * @see Connection::getFlags()
+     */
+    public function getFlags()
+    {
+        return;
+    }
+
+    /**
+     * @see Connection::begin()
+     */
+    public function begin()
+    {
+        krumo('DBArrayConnection begin ');
+        die;
+        $this->log("Beginning transaction.");
+        return $this->childConnection->begin();
+    }
+
+    /**
+     * @see Connection::commit()
+     */
+    public function commit()
+    {
+        krumo('DBArrayConnection commit ');
+        die;
+        $this->log("Committing transaction.");
+        return $this->childConnection->commit();
+    }
+
+    /**
+     * @see Connection::rollback()
+     */
+    public function rollback()
+    {
+        krumo('DBArrayConnection rollback ');
+        die;
+        $this->log("Rolling back transaction.");
+        return $this->childConnection->rollback();
+    }
+
+    /**
+     * @see Connection::setAutoCommit()
+     */
+    public function setAutoCommit($bit)
+    {
+        krumo('DBArrayConnection connect ');
+        die;
+        $this->log("Setting autocommit to: " . var_export($bit, true));
+        return $this->childConnection->setAutoCommit($bit);
+    }
+
+    /**
+     * @see Connection::getAutoCommit()
+     */
+    public function getAutoCommit()
+    {
+        krumo('DBArrayConnection getAutoCommit ');
+        die;
+        return $this->childConnection->getAutoCommit();
+    }
+
+    /**
+     * Private function that logs message using specified logger (if provided).
+     * @param string $msg Message to log.
+     */
+    private function log($msg)
+    {
+        krumo('DBArrayConnection  log ');
+        die;
+        if ($this->logger) {
+            $this->logger->log($msg);
+        }
+    }
+}
diff --git a/thirdparty/creole/drivers/mssql/MSSQLCallableStatement.php b/thirdparty/creole/drivers/mssql/MSSQLCallableStatement.php
index 54825bb98..8a05deb3f 100644
--- a/thirdparty/creole/drivers/mssql/MSSQLCallableStatement.php
+++ b/thirdparty/creole/drivers/mssql/MSSQLCallableStatement.php
@@ -128,7 +128,7 @@ class MSSQLCallableStatement extends MSSQLPreparedStatement implements CallableS
                 $this->set($i+1, $params[$i]);
             }
         }                
-        
+
         $this->result = mssql_execute($this->stmt);
         if (!$this->result) {
             throw new SQLException('unable to execute callable statement', mssql_get_last_message());
@@ -142,9 +142,9 @@ class MSSQLCallableStatement extends MSSQLPreparedStatement implements CallableS
      */
     function getMoreResults()
     {
-        $this->rsFetchCount++; // we track this because 
+        $this->rsFetchCount++; // we track this because
         $hasMore = mssql_next_result($this->result);
-        if ($this->resultSet) $this->resultSet->close();                    
+        if ($this->resultSet) $this->resultSet->close();
         if ($hasMore) {
             $clazz = $this->resultClass;
             $this->resultSet = new $clazz($this, $this->result);
diff --git a/thirdparty/creole/drivers/mssql/MSSQLConnection.php b/thirdparty/creole/drivers/mssql/MSSQLConnection.php
index 0c3e1db2c..b9097ee4f 100644
--- a/thirdparty/creole/drivers/mssql/MSSQLConnection.php
+++ b/thirdparty/creole/drivers/mssql/MSSQLConnection.php
@@ -27,10 +27,10 @@ include_once 'creole/drivers/mssql/MSSQLResultSet.php';
 
 /**
  * MS SQL Server implementation of Connection.
- * 
+ *
  * If you have trouble with BLOB / CLOB support
  * --------------------------------------------
- * 
+ *
  * You may need to change some PHP ini settings.  In particular, the following settings
  * set the text size to maximum which should get around issues with truncated data:
  * <code>
@@ -39,14 +39,16 @@ include_once 'creole/drivers/mssql/MSSQLResultSet.php';
  * </code>
  * We do not set these by default (anymore) because they do not apply to cases where MSSQL
  * is being used w/ FreeTDS.
- * 
+ *
  * @author    Hans Lellelid <hans@xmpl.org>
- * @author    Stig Bakken <ssb@fast.no> 
+ * @author    Stig Bakken <ssb@fast.no>
  * @author    Lukas Smith
  * @version   $Revision: 1.25 $
  * @package   creole.drivers.mssql
- */ 
-class MSSQLConnection extends ConnectionCommon implements Connection {        
+ */
+class MSSQLConnection extends ConnectionCommon implements Connection
+{
+
     
     /** Current database (used in mssql_select_db()). */
     private $database;
@@ -55,9 +57,9 @@ class MSSQLConnection extends ConnectionCommon implements Connection {
      * @see Connection::connect()
      */
     function connect($dsninfo, $flags = 0)
-    {                
-        if (!extension_loaded('mssql') && !extension_loaded('sybase') && !extension_loaded('sybase_ct')) {
-            throw new SQLException('mssql extension not loaded');
+    {
+        if (!extension_loaded('mssql') && !extension_loaded('sybase') && !extension_loaded('sybase_ct') && !extension_loaded('sqlsrv')) {
+            throw new SQLException('mssql/sqlsrv extension not loaded');
         }
 
         $this->dsn = $dsninfo;
@@ -68,60 +70,61 @@ class MSSQLConnection extends ConnectionCommon implements Connection {
         $user = $dsninfo['username'];
         $pw = $dsninfo['password'];
         $dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost';
-		
+        
         /**
-         * MSSQL (http://php.net/manual/en/intro.mssql.php)
-         * These functions allow you to access MS SQL Server database. 
-         * This extension is not available anymore on Windows with PHP 5.3 or later. 
-         * SQLSRV, an alternative extension for MS SQL connectivity is available from 
-         * Microsoft: » http://msdn.microsoft.com/en-us/sqlserver/ff657782.aspx.
-         * http://blogs.msdn.com/b/brian_swan/archive/2010/03/08/mssql-vs-sqlsrv-what-s-the-difference-part-1.aspx
-         * 
-         * Alternatively to use the mssql functions in Windows, use php_dblib.dll (FreeTDS) http://www.freetds.org/
-         * e.g. php.ini setting
-         * extension=php_dblib.dll
-         * 
-         * php_dblib.dll (FreeTDS) use ':' as the delimiter in all installations.
+         * Define our sql connect
          */
-        /*
-		if (PHP_OS == "WINNT" || PHP_OS == "WIN32") {
-            $portDelimiter = ",";
+        if (extension_loaded('sqlsrv')) {
+            $portDelimiter = ", ";
+            if (!empty($dsninfo['port'])) {
+                $dbhost .= $portDelimiter.$dsninfo['port'];
+            }
+
+            $opt = [
+                'UID' => $user,
+                'PWD' => $pw,
+                'Database' => $dsninfo['database']
+            ];
+            // SQLSrv is persistent always
+            $conn = sqlsrv_connect($dbhost, $opt);
         } else {
             $portDelimiter = ":";
-        }
-        */
-        $portDelimiter = ":";
 
-          if(!empty($dsninfo['port'])) {
-                  $dbhost .= $portDelimiter.$dsninfo['port'];
-          } else {
-            if(!strpos($dbhost, "\\")){
-                  $dbhost .= $portDelimiter.'1433';
+            if (!empty($dsninfo['port'])) {
+                $dbhost .= $portDelimiter.$dsninfo['port'];
+            } else {
+                if (!strpos($dbhost, "\\")) {
+                    $dbhost .= $portDelimiter.'1433';
+                }
+            }
+            $connect_function = $persistent ? 'mssql_pconnect' : 'mssql_connect';
+            if ($dbhost && $user && $pw) {
+                $conn = @$connect_function($dbhost, $user, $pw);
+            } elseif ($dbhost && $user) {
+                $conn = @$connect_function($dbhost, $user);
+            } else {
+                $conn = @$connect_function($dbhost);
             }
-          }
-        $connect_function = $persistent ? 'mssql_pconnect' : 'mssql_connect';
-
-        if ($dbhost && $user && $pw) {
-            $conn = @$connect_function($dbhost, $user, $pw);
-        } elseif ($dbhost && $user) {
-            $conn = @$connect_function($dbhost, $user);
-        } else {
-            $conn = @$connect_function($dbhost);
         }
+
         if (!$conn) {
             throw new SQLException('connect failed', mssql_get_last_message());
         }
         
         if ($dsninfo['database']) {
-            if (!@mssql_select_db($dsninfo['database'], $conn)) {
-                throw new SQLException('No database selected');               
+            if (!extension_loaded('sqlsrv')) {
+                // Only do this if not using sqlsrv extension.  If using sqlsrv, the database is specified
+                // in the options
+                if (!@mssql_select_db($dsninfo['database'], $conn)) {
+                    throw new SQLException('No database selected');
+                }
             }
             
             $this->database = $dsninfo['database'];
         }
         
-        $this->dblink = $conn;        
-    }    
+        $this->dblink = $conn;
+    }
     
     /**
      * @see Connection::getDatabaseInfo()
@@ -144,7 +147,7 @@ class MSSQLConnection extends ConnectionCommon implements Connection {
     /**
      * @see Connection::prepareStatement()
      */
-    public function prepareStatement($sql) 
+    public function prepareStatement($sql)
     {
         require_once 'creole/drivers/mssql/MSSQLPreparedStatement.php';
         return new MSSQLPreparedStatement($this, $sql);
@@ -172,7 +175,11 @@ class MSSQLConnection extends ConnectionCommon implements Connection {
      */
     function close()
     {
-        $ret = @mssql_close($this->dblink);
+        if (extension_loaded('sqlsrv')) {
+            $ret = @sqlsrv_close($this->dblink);
+        } else {
+            $ret = @mssql_close($this->dblink);
+        }
         $this->dblink = null;
         return $ret;
     }
@@ -181,12 +188,17 @@ class MSSQLConnection extends ConnectionCommon implements Connection {
      * @see Connection::executeQuery()
      */
     function executeQuery($sql, $fetchmode = null)
-    {            
+    {
         $this->lastQuery = $sql;
-        if (!@mssql_select_db($this->database, $this->dblink)) {
-            throw new SQLException('No database selected');
-        }       
-        $result = @mssql_query($sql, $this->dblink);
+        if (extension_loaded('sqlsrv')) {
+            $result = sqlsrv_query($this->dblink, $sql);
+        } else {
+            if (!@mssql_select_db($this->database, $this->dblink)) {
+                throw new SQLException('No database selected');
+            }
+
+            $result = @mssql_query($sql, $this->dblink);
+        }
         if (!$result) {
             throw new SQLException('Could not execute query', mssql_get_last_message());
         }
@@ -197,14 +209,18 @@ class MSSQLConnection extends ConnectionCommon implements Connection {
      * @see Connection::executeUpdate()
      */
     function executeUpdate($sql)
-    {    
-        
-        $this->lastQuery = $sql;
-        if (!mssql_select_db($this->database, $this->dblink)) {
-            throw new SQLException('No database selected');
+    {
+        if (extension_loaded('sqlsrv')) {
+            $result = sqlsrv_query($this->dblink, $sql);
+        } else {
+            $this->lastQuery = $sql;
+            if (!mssql_select_db($this->database, $this->dblink)) {
+                throw new SQLException('No database selected');
+            }
+
+            $result = @mssql_query($sql, $this->dblink);
         }
-        
-        $result = @mssql_query($sql, $this->dblink);
+
         if (!$result) {
             throw new SQLException('Could not execute update', mssql_get_last_message(), $sql);
         }
@@ -220,7 +236,11 @@ class MSSQLConnection extends ConnectionCommon implements Connection {
      */
     protected function beginTrans()
     {
-        $result = @mssql_query('BEGIN TRAN', $this->dblink);
+        if (extension_loaded('sqlsrv')) {
+            $result = sqlsrv_begin_transaction($this->dblink);
+        } else {
+            $result = @mssql_query('BEGIN TRAN', $this->dblink);
+        }
         if (!$result) {
             throw new SQLException('Could not begin transaction', mssql_get_last_message());
         }
@@ -233,10 +253,14 @@ class MSSQLConnection extends ConnectionCommon implements Connection {
      */
     protected function commitTrans()
     {
-        if (!@mssql_select_db($this->database, $this->dblink)) {
-            throw new SQLException('No database selected');
+        if (extension_loaded('sqlsrv')) {
+            $result = sqlsrv_commit($this->dblink);
+        } else {
+            if (!@mssql_select_db($this->database, $this->dblink)) {
+                throw new SQLException('No database selected');
+            }
+            $result = @mssql_query('COMMIT TRAN', $this->dblink);
         }
-        $result = @mssql_query('COMMIT TRAN', $this->dblink);
         if (!$result) {
             throw new SQLException('Could not commit transaction', mssql_get_last_message());
         }
@@ -249,10 +273,14 @@ class MSSQLConnection extends ConnectionCommon implements Connection {
      */
     protected function rollbackTrans()
     {
-        if (!@mssql_select_db($this->database, $this->dblink)) {            
-            throw new SQLException('no database selected');
+        if (extension_loaded('sqlsrv')) {
+            $result = sqlsrv_rollback($this->dblink);
+        } else {
+            if (!@mssql_select_db($this->database, $this->dblink)) {
+                throw new SQLException('no database selected');
+            }
+            $result = @mssql_query('ROLLBACK TRAN', $this->dblink);
         }
-        $result = @mssql_query('ROLLBACK TRAN', $this->dblink);
         if (!$result) {
             throw new SQLException('Could not rollback transaction', mssql_get_last_message());
         }
@@ -266,37 +294,68 @@ class MSSQLConnection extends ConnectionCommon implements Connection {
      * @throws SQLException
      */
     function getUpdateCount()
-    {       
-        $res = @mssql_query('select @@rowcount', $this->dblink);
-        if (!$res) {
-            throw new SQLException('Unable to get affected row count', mssql_get_last_message());
-        }
-        $ar = @mssql_fetch_row($res);
-        if (!$ar) {
-            $result = 0;
+    {
+        if (extension_loaded('sqlsrv')) {
+            $res = sqlsrv_query($this->dblink, 'select @@rowcount');
+            $ar = @sqlsrv_fetch_array($res);
+            if (!$ar) {
+                $result = 0;
+            } else {
+                @sqlsrv_free_stmt($res);
+                $result = $ar[0];
+            }
         } else {
-            @mssql_free_result($res);
-            $result = $ar[0];
+            $res = @mssql_query('select @@rowcount', $this->dblink);
+            if (!$res) {
+                throw new SQLException('Unable to get affected row count', mssql_get_last_message());
+            }
+            $ar = @mssql_fetch_row($res);
+            if (!$ar) {
+                $result = 0;
+            } else {
+                @mssql_free_result($res);
+                $result = $ar[0];
+            }
         }
+
         
         return $result;
-    }          
+    }
     
     
     /**
      * Creates a CallableStatement object for calling database stored procedures.
-     * 
+     *
      * @param string $sql
      * @return CallableStatement
      * @throws SQLException
      */
-    function prepareCall($sql) 
-    {             
-        require_once 'creole/drivers/mssql/MSSQLCallableStatement.php';
-        $stmt = mssql_init($sql);
-        if (!$stmt) {
-            throw new SQLException('Unable to prepare statement', mssql_get_last_message(), $sql);
+    function prepareCall($sql)
+    {
+        if (extension_loaded('sqlsrv')) {
+            throw new SQLException("Callable statements not supported using the sqlsrv extension and this version of Creole.");
+        } else {
+            require_once 'creole/drivers/mssql/SQLCallableStatement.php';
+            $stmt = mssql_init($sql);
+            if (!$stmt) {
+                throw new SQLException('Unable to prepare statement', mssql_get_last_message(), $sql);
+            }
+            return new MSSQLCallableStatement($this, $stmt);
         }
-        return new MSSQLCallableStatement($this, $stmt);
     }
-}
\ No newline at end of file
+}
+
+/**
+ * Stub to support mssql_get_last_message for sqlsrv extension
+ */
+if (!function_exists('mssql_get_last_message') && extension_loaded('sqlsrv')) {
+    function mssql_get_last_message()
+    {
+        $errors = sqlsrv_errors();
+        if (count($errors)) {
+            return $errors[0]['message'];
+        }
+        return null;
+    }
+
+}
diff --git a/thirdparty/creole/drivers/mssql/MSSQLResultSet.php b/thirdparty/creole/drivers/mssql/MSSQLResultSet.php
index cb556a07b..b75c740e5 100644
--- a/thirdparty/creole/drivers/mssql/MSSQLResultSet.php
+++ b/thirdparty/creole/drivers/mssql/MSSQLResultSet.php
@@ -28,12 +28,14 @@ require_once 'creole/common/ResultSetCommon.php';
  * MS SQL does not support LIMIT or OFFSET natively so the methods
  * in here need to perform some adjustments and extra checking to make sure
  * that this behaves the same as RDBMS drivers using native OFFSET/LIMIT.
- * 
+ *
  * @author    Hans Lellelid <hans@xmpl.org>
  * @version   $Revision: 1.21 $
  * @package   creole.drivers.mssql
  */
-class MSSQLResultSet extends ResultSetCommon implements ResultSet {    
+class MSSQLResultSet extends ResultSetCommon implements ResultSet
+{
+
     
     /**
      * Offset at which to start reading rows.
@@ -45,7 +47,7 @@ class MSSQLResultSet extends ResultSetCommon implements ResultSet {
      * Maximum rows to retrieve, or 0 if all.
      * @var int
      */
-    private $limit = 0;   
+    private $limit = 0;
     
     /**
      * This MSSQL-only function exists to set offset after ResultSet is instantiated.
@@ -76,7 +78,7 @@ class MSSQLResultSet extends ResultSetCommon implements ResultSet {
     
     /**
      * @see ResultSet::seek()
-     */ 
+     */
     function seek($rownum)
     {
         // support emulated OFFSET
@@ -90,8 +92,8 @@ class MSSQLResultSet extends ResultSetCommon implements ResultSet {
                 
         // MSSQL rows start w/ 0, but this works, because we are
         // looking to move the position _before_ the next desired position
-         if (!@mssql_data_seek($this->result, $actual)) {
-                return false;
+        if (!@mssql_data_seek($this->result, $actual)) {
+               return false;
         }
 
         $this->cursorPos = $rownum;
@@ -104,37 +106,38 @@ class MSSQLResultSet extends ResultSetCommon implements ResultSet {
     function next()
     {
         // support emulated LIMIT
-        if ( $this->limit > 0 && ($this->cursorPos >= $this->limit) ) {
+        if ($this->limit > 0 && ($this->cursorPos >= $this->limit)) {
             $this->afterLast();
             return false;
         }
-        if ($this->result === true ) {
-        	return false;
+        if ($this->result === true) {
+            return false;
+        }
+
+        if (extension_loaded('sqlsrv')) {
+            // The modes for fetching are different when using sqlsrv. So we'll translate the mode
+            // as needed
+            $mode = SQLSRV_FETCH_BOTH;
+            if ($this->fetchmode == ResultSet::FETCHMODE_ASSOC) {
+                $mode = SQLSRV_FETCH_ASSOC;
+            } elseif ($this->fetchmode == ResultSet::FETCHMODE_NUM) {
+                $mode = SQLSRV_FETCH_NUMERIC;
+            }
+            $this->fields = sqlsrv_fetch_array($this->result, $mode);
+        } else {
+            $this->fields = mssql_fetch_array($this->result, $this->fetchmode);
         }
-        
-        $this->fields = mssql_fetch_array($this->result, $this->fetchmode);        
                 
         if (!$this->fields) {
             if ($errmsg = mssql_get_last_message()) {
                 throw new SQLException("Error fetching result", $errmsg);
-             } else {
+            } else {
                 // We've advanced beyond end of recordset.
                 $this->afterLast();
                 return false;
-             }          
+            }
         }
-        //else {
-        //	if (is_array($this->fields)) {
-        //		foreach ($this->fields as $sKey => $sValue) {
-        //			if (function_exists('mb_detect_encoding')) {
-        //				if (strtoupper(mb_detect_encoding($sValue)) == 'UTF-8') {
-        //					$this->fields[$sKey] = utf8_encode($sValue);
-        //				}
-        //			}
-        //		}
-        //	}
-        //}
-        
+
         if ($this->fetchmode === ResultSet::FETCHMODE_ASSOC && $this->lowerAssocCase) {
             $this->fields = array_change_key_case($this->fields, CASE_LOWER);
         }
@@ -149,7 +152,12 @@ class MSSQLResultSet extends ResultSetCommon implements ResultSet {
      */
     function getRecordCount()
     {
-        $rows = @mssql_num_rows($this->result);
+        if (extension_loaded('sqlsrv')) {
+            $rows = @sqlsrv_num_rows($this->result);
+        } else {
+            $rows = @mssql_num_rows($this->result);
+        }
+
         if ($rows === null) {
             throw new SQLException('Error getting record count', mssql_get_last_message());
         }
@@ -160,14 +168,17 @@ class MSSQLResultSet extends ResultSetCommon implements ResultSet {
 
     /**
      * @see ResultSet::close()
-     */ 
+     */
     function close()
     {
-        $ret = @mssql_free_result($this->result);
+        if (extension_loaded('sqlsrv')) {
+            $ret = @sqlsrv_free_stmt($this->result);
+        } else {
+            $ret = @mssql_free_result($this->result);
+        }
         $this->result = false;
         $this->fields = array();
         $this->limit = 0;
-        $this->offset = 0;        
-    }   
-
+        $this->offset = 0;
+    }
 }
diff --git a/thirdparty/creole/drivers/mssql/metadata/MSSQLDatabaseInfo.php b/thirdparty/creole/drivers/mssql/metadata/MSSQLDatabaseInfo.php
index cf90f3a32..959c1e321 100644
--- a/thirdparty/creole/drivers/mssql/metadata/MSSQLDatabaseInfo.php
+++ b/thirdparty/creole/drivers/mssql/metadata/MSSQLDatabaseInfo.php
@@ -27,8 +27,9 @@ require_once 'creole/metadata/DatabaseInfo.php';
  * @author    Hans Lellelid
  * @version   $Revision: 1.11 $
  * @package   creole.drivers.mssql.metadata
- */ 
-class MSSQLDatabaseInfo extends DatabaseInfo {
+ */
+class MSSQLDatabaseInfo extends DatabaseInfo
+{
     
     /**
      * @throws SQLException
@@ -40,30 +41,35 @@ class MSSQLDatabaseInfo extends DatabaseInfo {
         
         $dsn = $this->conn->getDSN();
         
-        
-        if (!@mssql_select_db($this->dbname, $this->conn->getResource())) {
-            throw new SQLException('No database selected');
+
+        if (extension_loaded('sqlsrv')) {
+            $result = sqlsrv_query(
+                "SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_NAME <> 'dtproperties'",
+                $this->conn->getResource()
+            );
+        } else {
+            if (!@mssql_select_db($this->dbname, $this->conn->getResource())) {
+                throw new SQLException('No database selected');
+            }
+            $result = mssql_query("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_NAME <> 'dtproperties'", $this->conn->getResource());
         }
-             
-        $result = mssql_query("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_NAME <> 'dtproperties'", $this->conn->getResource());
-    
+
         if (!$result) {
-            throw new SQLException("Could not list tables", mssql_get_last_message());            
+            throw new SQLException("Could not list tables", mssql_get_last_message());
         }
         
         while ($row = mssql_fetch_row($result)) {
-            $this->tables[strtoupper($row[0])] = new MSSQLTableInfo($this, $row[0]);            
+            $this->tables[strtoupper($row[0])] = new MSSQLTableInfo($this, $row[0]);
         }
-    }            
+    }
     
     /**
-     * 
-     * @return void 
+     *
+     * @return void
      * @throws SQLException
      */
     protected function initSequences()
     {
         // there are no sequences -- afaik -- in MSSQL.
     }
-        
 }
diff --git a/thirdparty/pear/DB.php b/thirdparty/pear/DB.php
index d866c4d25..1b93f0009 100644
--- a/thirdparty/pear/DB.php
+++ b/thirdparty/pear/DB.php
@@ -356,6 +356,7 @@ class DB
     function &connect($dsn, $options = array())
     {
         $dsninfo = DB::parseDSN($dsn);
+        $dsninfo['phptype'] = $dsninfo['phptype'] === 'mysql' ? 'mysqli' : $dsninfo['phptype'];
         $type = $dsninfo['phptype'];
 
         if (!is_array($options)) {
diff --git a/thirdparty/pear/DB/common.php b/thirdparty/pear/DB/common.php
index 13bb1df8c..2f9cfb5a2 100644
--- a/thirdparty/pear/DB/common.php
+++ b/thirdparty/pear/DB/common.php
@@ -955,7 +955,7 @@ class DB_common extends PEAR
         if (DB::isError($result) || $result === DB_OK) {
             return $result;
         } else {
-            $tmp =& new DB_result($this, $result);
+            $tmp = new DB_result($this, $result);
             return $tmp;
         }
     }
@@ -1147,7 +1147,7 @@ class DB_common extends PEAR
             if (DB::isError($result) || $result === DB_OK) {
                 return $result;
             } else {
-                $tmp =& new DB_result($this, $result);
+                $tmp = new DB_result($this, $result);
                 return $tmp;
             }
         }
diff --git a/thirdparty/pear/PEAR.php b/thirdparty/pear/PEAR.php
deleted file mode 100644
index 0cda6864d..000000000
--- a/thirdparty/pear/PEAR.php
+++ /dev/null
@@ -1,1056 +0,0 @@
-<?php
-//
-// +--------------------------------------------------------------------+
-// | PEAR, the PHP Extension and Application Repository                 |
-// +--------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                              |
-// +--------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,     |
-// | that is bundled with this package in the file LICENSE, and is      |
-// | available through the world-wide-web at the following url:         |
-// | http://www.php.net/license/3_0.txt.                                |
-// | If you did not receive a copy of the PHP license and are unable to |
-// | obtain it through the world-wide-web, please send a note to        |
-// | license@php.net so we can mail you a copy immediately.             |
-// +--------------------------------------------------------------------+
-// | Authors: Sterling Hughes <sterling@php.net>                        |
-// |          Stig Bakken <ssb@php.net>                                 |
-// |          Tomas V.V.Cox <cox@idecnet.com>                           |
-// +--------------------------------------------------------------------+
-//
-// $Id: PEAR.php 3355 2005-06-11 22:14:40Z nbm $
-//
-
-define('PEAR_ERROR_RETURN',     1);
-define('PEAR_ERROR_PRINT',      2);
-define('PEAR_ERROR_TRIGGER',    4);
-define('PEAR_ERROR_DIE',        8);
-define('PEAR_ERROR_CALLBACK',  16);
-/**
- * WARNING: obsolete
- * @deprecated
- */
-define('PEAR_ERROR_EXCEPTION', 32);
-define('PEAR_ZE2', (function_exists('version_compare') &&
-                    version_compare(zend_version(), "2-dev", "ge")));
-
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    define('OS_WINDOWS', true);
-    define('OS_UNIX',    false);
-    define('PEAR_OS',    'Windows');
-} else {
-    define('OS_WINDOWS', false);
-    define('OS_UNIX',    true);
-    define('PEAR_OS',    'Unix'); // blatant assumption
-}
-
-// instant backwards compatibility
-if (!defined('PATH_SEPARATOR')) {
-    if (OS_WINDOWS) {
-        define('PATH_SEPARATOR', ';');
-    } else {
-        define('PATH_SEPARATOR', ':');
-    }
-}
-
-$GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
-$GLOBALS['_PEAR_default_error_options']  = E_USER_NOTICE;
-$GLOBALS['_PEAR_destructor_object_list'] = array();
-$GLOBALS['_PEAR_shutdown_funcs']         = array();
-$GLOBALS['_PEAR_error_handler_stack']    = array();
-
-ini_set('track_errors', true);
-
-/**
- * Base class for other PEAR classes.  Provides rudimentary
- * emulation of destructors.
- *
- * If you want a destructor in your class, inherit PEAR and make a
- * destructor method called _yourclassname (same name as the
- * constructor, but with a "_" prefix).  Also, in your constructor you
- * have to call the PEAR constructor: $this->PEAR();.
- * The destructor method will be called without parameters.  Note that
- * at in some SAPI implementations (such as Apache), any output during
- * the request shutdown (in which destructors are called) seems to be
- * discarded.  If you need to get any debug information from your
- * destructor, use error_log(), syslog() or something similar.
- *
- * IMPORTANT! To use the emulated destructors you need to create the
- * objects by reference: $obj =& new PEAR_child;
- *
- * @since PHP 4.0.2
- * @author Stig Bakken <ssb@php.net>
- * @see http://pear.php.net/manual/
- */
-class PEAR
-{
-    // {{{ properties
-
-    /**
-     * Whether to enable internal debug messages.
-     *
-     * @var     bool
-     * @access  private
-     */
-    var $_debug = false;
-
-    /**
-     * Default error mode for this object.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_mode = null;
-
-    /**
-     * Default error options used for this object when error mode
-     * is PEAR_ERROR_TRIGGER.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_options = null;
-
-    /**
-     * Default error handler (callback) for this object, if error mode is
-     * PEAR_ERROR_CALLBACK.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_default_error_handler = '';
-
-    /**
-     * Which class to use for error objects.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_error_class = 'PEAR_Error';
-
-    /**
-     * An array of expected errors.
-     *
-     * @var     array
-     * @access  private
-     */
-    var $_expected_errors = array();
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * Constructor.  Registers this object in
-     * $_PEAR_destructor_object_list for destructor emulation if a
-     * destructor object exists.
-     *
-     * @param string $error_class  (optional) which class to use for
-     *        error objects, defaults to PEAR_Error.
-     * @access public
-     * @return void
-     */
-    function PEAR($error_class = null)
-    {
-        $classname = strtolower(get_class($this));
-        if ($this->_debug) {
-            print "PEAR constructor called, class=$classname\n";
-        }
-        if ($error_class !== null) {
-            $this->_error_class = $error_class;
-        }
-        while ($classname && strcasecmp($classname, "pear")) {
-            $destructor = "_$classname";
-            if (method_exists($this, $destructor)) {
-                global $_PEAR_destructor_object_list;
-                $_PEAR_destructor_object_list[] = &$this;
-                static $registered = false;
-                if (!$registered) {
-                    register_shutdown_function("_PEAR_call_destructors");
-                    $registered = true;
-                }
-                break;
-            } else {
-                $classname = get_parent_class($classname);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ destructor
-
-    /**
-     * Destructor (the emulated type of...).  Does nothing right now,
-     * but is included for forward compatibility, so subclass
-     * destructors should always call it.
-     *
-     * See the note in the class desciption about output from
-     * destructors.
-     *
-     * @access public
-     * @return void
-     */
-    function _PEAR() {
-        if ($this->_debug) {
-            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
-        }
-    }
-
-    // }}}
-    // {{{ getStaticProperty()
-
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        return $properties[$class][$var];
-    }
-
-    // }}}
-    // {{{ registerShutdownFunc()
-
-    /**
-    * Use this function to register a shutdown method for static
-    * classes.
-    *
-    * @access public
-    * @param  mixed $func  The function name (or array of class/method) to call
-    * @param  mixed $args  The arguments to pass to the function
-    * @return void
-    */
-    function registerShutdownFunc($func, $args = array())
-    {
-        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
-    }
-
-    // }}}
-    // {{{ isError()
-
-    /**
-     * Tell whether a value is a PEAR error.
-     *
-     * @param   mixed $data   the value to test
-     * @param   int   $code   if $data is an error object, return true
-     *                        only if $code is a string and
-     *                        $obj->getMessage() == $code or
-     *                        $code is an integer and $obj->getCode() == $code
-     * @access  public
-     * @return  bool    true if parameter is an error
-     */
-    function isError($data, $code = null)
-    {
-        if (is_a($data, 'PEAR_Error')) {
-            if (is_null($code)) {
-                return true;
-            } elseif (is_string($code)) {
-                return $data->getMessage() == $code;
-            } else {
-                return $data->getCode() == $code;
-            }
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ setErrorHandling()
-
-    /**
-     * Sets how errors generated by this object should be handled.
-     * Can be invoked both in objects and statically.  If called
-     * statically, setErrorHandling sets the default behaviour for all
-     * PEAR objects.  If called in an object, setErrorHandling sets
-     * the default behaviour for that object.
-     *
-     * @param int $mode
-     *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options
-     *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
-     *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *
-     *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
-     *        to be the callback function or method.  A callback
-     *        function is a string with the name of the function, a
-     *        callback method is an array of two elements: the element
-     *        at index 0 is the object, and the element at index 1 is
-     *        the name of the method to call in the object.
-     *
-     *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
-     *        a printf format string used when printing the error
-     *        message.
-     *
-     * @access public
-     * @return void
-     * @see PEAR_ERROR_RETURN
-     * @see PEAR_ERROR_PRINT
-     * @see PEAR_ERROR_TRIGGER
-     * @see PEAR_ERROR_DIE
-     * @see PEAR_ERROR_CALLBACK
-     * @see PEAR_ERROR_EXCEPTION
-     *
-     * @since PHP 4.0.5
-     */
-
-    function setErrorHandling($mode = null, $options = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $setmode     = &$this->_default_error_mode;
-            $setoptions  = &$this->_default_error_options;
-        } else {
-            $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-            $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        }
-
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-    }
-
-    // }}}
-    // {{{ expectError()
-
-    /**
-     * This method is used to tell which errors you expect to get.
-     * Expected errors are always returned with error mode
-     * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
-     * and this method pushes a new element onto it.  The list of
-     * expected errors are in effect until they are popped off the
-     * stack with the popExpect() method.
-     *
-     * Note that this method can not be called statically
-     *
-     * @param mixed $code a single error code or an array of error codes to expect
-     *
-     * @return int     the new depth of the "expected errors" stack
-     * @access public
-     */
-    function expectError($code = '*')
-    {
-        if (is_array($code)) {
-            array_push($this->_expected_errors, $code);
-        } else {
-            array_push($this->_expected_errors, array($code));
-        }
-        return sizeof($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ popExpect()
-
-    /**
-     * This method pops one element off the expected error codes
-     * stack.
-     *
-     * @return array   the list of error codes that were popped
-     */
-    function popExpect()
-    {
-        return array_pop($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ _checkDelExpect()
-
-    /**
-     * This method checks unsets an error code if available
-     *
-     * @param mixed error code
-     * @return bool true if the error code was unset, false otherwise
-     * @access private
-     * @since PHP 4.3.0
-     */
-    function _checkDelExpect($error_code)
-    {
-        $deleted = false;
-
-        foreach ($this->_expected_errors AS $key => $error_array) {
-            if (in_array($error_code, $error_array)) {
-                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
-                $deleted = true;
-            }
-
-            // clean up empty arrays
-            if (0 == count($this->_expected_errors[$key])) {
-                unset($this->_expected_errors[$key]);
-            }
-        }
-        return $deleted;
-    }
-
-    // }}}
-    // {{{ delExpect()
-
-    /**
-     * This method deletes all occurences of the specified element from
-     * the expected error codes stack.
-     *
-     * @param  mixed $error_code error code that should be deleted
-     * @return mixed list of error codes that were deleted or error
-     * @access public
-     * @since PHP 4.3.0
-     */
-    function delExpect($error_code)
-    {
-        $deleted = false;
-
-        if ((is_array($error_code) && (0 != count($error_code)))) {
-            // $error_code is a non-empty array here;
-            // we walk through it trying to unset all
-            // values
-            foreach($error_code as $key => $error) {
-                if ($this->_checkDelExpect($error)) {
-                    $deleted =  true;
-                } else {
-                    $deleted = false;
-                }
-            }
-            return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-        } elseif (!empty($error_code)) {
-            // $error_code comes alone, trying to unset it
-            if ($this->_checkDelExpect($error_code)) {
-                return true;
-            } else {
-                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-            }
-        } else {
-            // $error_code is empty
-            return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
-        }
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    /**
-     * This method is a wrapper that returns an instance of the
-     * configured error class with this object's default error
-     * handling applied.  If the $mode and $options parameters are not
-     * specified, the object's defaults are used.
-     *
-     * @param mixed $message a text error message or a PEAR error object
-     *
-     * @param int $code      a numeric error code (it is up to your class
-     *                  to define these if you want to use codes)
-     *
-     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
-     *                  specifies the PHP-internal error level (one of
-     *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *                  If $mode is PEAR_ERROR_CALLBACK, this
-     *                  parameter specifies the callback function or
-     *                  method.  In other error modes this parameter
-     *                  is ignored.
-     *
-     * @param string $userinfo If you need to pass along for example debug
-     *                  information, this parameter is meant for that.
-     *
-     * @param string $error_class The returned error object will be
-     *                  instantiated from this class, if specified.
-     *
-     * @param bool $skipmsg If true, raiseError will only pass error codes,
-     *                  the error message parameter will be dropped.
-     *
-     * @access public
-     * @return object   a PEAR error object
-     * @see PEAR::setErrorHandling
-     * @since PHP 4.0.5
-     */
-    function raiseError($message = null,
-                         $code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $error_class = null,
-                         $skipmsg = false)
-    {
-        // The error is yet a PEAR error object
-        if (is_object($message)) {
-            $code        = $message->getCode();
-            $userinfo    = $message->getUserInfo();
-            $error_class = $message->getType();
-            $message->error_message_prefix = '';
-            $message     = $message->getMessage();
-        }
-
-        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
-            if ($exp[0] == "*" ||
-                (is_int(reset($exp)) && in_array($code, $exp)) ||
-                (is_string(reset($exp)) && in_array($message, $exp))) {
-                $mode = PEAR_ERROR_RETURN;
-            }
-        }
-        // No mode given, try global ones
-        if ($mode === null) {
-            // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            // Global error handler
-            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
-                $mode    = $GLOBALS['_PEAR_default_error_mode'];
-                $options = $GLOBALS['_PEAR_default_error_options'];
-            }
-        }
-
-        if ($error_class !== null) {
-            $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
-            $ec = $this->_error_class;
-        } else {
-            $ec = 'PEAR_Error';
-        }
-        if ($skipmsg) {
-            return new $ec($code, $mode, $options, $userinfo);
-        } else {
-            return new $ec($message, $code, $mode, $options, $userinfo);
-        }
-    }
-
-    // }}}
-    // {{{ throwError()
-
-    /**
-     * Simpler form of raiseError with fewer options.  In most cases
-     * message, code and userinfo are enough.
-     *
-     * @param string $message
-     *
-     */
-    function throwError($message = null,
-                         $code = null,
-                         $userinfo = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            return $this->raiseError($message, $code, null, null, $userinfo);
-        } else {
-            return PEAR::raiseError($message, $code, null, null, $userinfo);
-        }
-    }
-
-    // }}}
-    function staticPushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-        $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        $stack[] = array($def_mode, $def_options);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $def_mode = $mode;
-                $def_options = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $def_mode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $def_options = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    function staticPopErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        return true;
-    }
-
-    // {{{ pushErrorHandling()
-
-    /**
-     * Push a new error handler on top of the error handler options stack. With this
-     * you can easily override the actual error handler for some code and restore
-     * it later with popErrorHandling.
-     *
-     * @param mixed $mode (same as setErrorHandling)
-     * @param mixed $options (same as setErrorHandling)
-     *
-     * @return bool Always true
-     *
-     * @see PEAR::setErrorHandling
-     */
-    function pushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $def_mode    = &$this->_default_error_mode;
-            $def_options = &$this->_default_error_options;
-        } else {
-            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-            $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        }
-        $stack[] = array($def_mode, $def_options);
-
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    // }}}
-    // {{{ popErrorHandling()
-
-    /**
-    * Pop the last error handler used
-    *
-    * @return bool Always true
-    *
-    * @see PEAR::pushErrorHandling
-    */
-    function popErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ loadExtension()
-
-    /**
-    * OS independant PHP extension load. Remember to take care
-    * on the correct extension name for case sensitive OSes.
-    *
-    * @param string $ext The extension name
-    * @return bool Success or not on the dl() call
-    */
-    function loadExtension($ext)
-    {
-        if (!extension_loaded($ext)) {
-            // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
-                return false;
-            }
-            if (OS_WINDOWS) {
-                $suffix = '.dll';
-            } elseif (PHP_OS == 'HP-UX') {
-                $suffix = '.sl';
-            } elseif (PHP_OS == 'AIX') {
-                $suffix = '.a';
-            } elseif (PHP_OS == 'OSX') {
-                $suffix = '.bundle';
-            } else {
-                $suffix = '.so';
-            }
-            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
-        }
-        return true;
-    }
-
-    // }}}
-}
-
-// {{{ _PEAR_call_destructors()
-
-function _PEAR_call_destructors()
-{
-    global $_PEAR_destructor_object_list;
-    if (is_array($_PEAR_destructor_object_list) &&
-        sizeof($_PEAR_destructor_object_list))
-    {
-        reset($_PEAR_destructor_object_list);
-        if (@PEAR::getStaticProperty('PEAR', 'destructlifo')) {
-            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
-        }
-        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
-            $classname = get_class($objref);
-            while ($classname) {
-                $destructor = "_$classname";
-                if (method_exists($objref, $destructor)) {
-                    $objref->$destructor();
-                    break;
-                } else {
-                    $classname = get_parent_class($classname);
-                }
-            }
-        }
-        // Empty the object list to ensure that destructors are
-        // not called more than once.
-        $_PEAR_destructor_object_list = array();
-    }
-
-    // Now call the shutdown functions
-    if (is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
-        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
-            call_user_func_array($value[0], $value[1]);
-        }
-    }
-}
-
-// }}}
-
-class PEAR_Error
-{
-    // {{{ properties
-
-    var $error_message_prefix = '';
-    var $mode                 = PEAR_ERROR_RETURN;
-    var $level                = E_USER_NOTICE;
-    var $code                 = -1;
-    var $message              = '';
-    var $userinfo             = '';
-    var $backtrace            = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Error constructor
-     *
-     * @param string $message  message
-     *
-     * @param int $code     (optional) error code
-     *
-     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
-     * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
-     * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
-     *
-     * @param mixed $options   (optional) error level, _OR_ in the case of
-     * PEAR_ERROR_CALLBACK, the callback function or object/method
-     * tuple.
-     *
-     * @param string $userinfo (optional) additional user/debug info
-     *
-     * @access public
-     *
-     */
-    function PEAR_Error($message = 'unknown error', $code = null,
-                        $mode = null, $options = null, $userinfo = null)
-    {
-        if ($mode === null) {
-            $mode = PEAR_ERROR_RETURN;
-        }
-        $this->message   = $message;
-        $this->code      = $code;
-        $this->mode      = $mode;
-        $this->userinfo  = $userinfo;
-        if (function_exists("debug_backtrace")) {
-            if (@!PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {
-                $this->backtrace = debug_backtrace();
-            }
-        }
-        if ($mode & PEAR_ERROR_CALLBACK) {
-            $this->level = E_USER_NOTICE;
-            $this->callback = $options;
-        } else {
-            if ($options === null) {
-                $options = E_USER_NOTICE;
-            }
-            $this->level = $options;
-            $this->callback = null;
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-            } else {
-                $format = $options;
-            }
-            printf($format, $this->getMessage());
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            trigger_error($this->getMessage(), $this->level);
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $msg = $this->getMessage();
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-                if (substr($msg, -1) != "\n") {
-                    $msg .= "\n";
-                }
-            } else {
-                $format = $options;
-            }
-            die(sprintf($format, $msg));
-        }
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_callable($this->callback)) {
-                call_user_func($this->callback, $this);
-            }
-        }
-        if ($this->mode & PEAR_ERROR_EXCEPTION) {
-            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_ErrorStack for exceptions", E_USER_WARNING);
-            eval('$e = new Exception($this->message, $this->code);$e->PEAR_Error = $this;throw($e);');
-        }
-    }
-
-    // }}}
-    // {{{ getMode()
-
-    /**
-     * Get the error mode from an error object.
-     *
-     * @return int error mode
-     * @access public
-     */
-    function getMode() {
-        return $this->mode;
-    }
-
-    // }}}
-    // {{{ getCallback()
-
-    /**
-     * Get the callback function/method from an error object.
-     *
-     * @return mixed callback function or object/method array
-     * @access public
-     */
-    function getCallback() {
-        return $this->callback;
-    }
-
-    // }}}
-    // {{{ getMessage()
-
-
-    /**
-     * Get the error message from an error object.
-     *
-     * @return  string  full error message
-     * @access public
-     */
-    function getMessage()
-    {
-        return ($this->error_message_prefix . $this->message);
-    }
-
-
-    // }}}
-    // {{{ getCode()
-
-    /**
-     * Get error code from an error object
-     *
-     * @return int error code
-     * @access public
-     */
-     function getCode()
-     {
-        return $this->code;
-     }
-
-    // }}}
-    // {{{ getType()
-
-    /**
-     * Get the name of this error/exception.
-     *
-     * @return string error/exception name (type)
-     * @access public
-     */
-    function getType()
-    {
-        return get_class($this);
-    }
-
-    // }}}
-    // {{{ getUserInfo()
-
-    /**
-     * Get additional user-supplied information.
-     *
-     * @return string user-supplied information
-     * @access public
-     */
-    function getUserInfo()
-    {
-        return $this->userinfo;
-    }
-
-    // }}}
-    // {{{ getDebugInfo()
-
-    /**
-     * Get additional debug information supplied by the application.
-     *
-     * @return string debug information
-     * @access public
-     */
-    function getDebugInfo()
-    {
-        return $this->getUserInfo();
-    }
-
-    // }}}
-    // {{{ getBacktrace()
-
-    /**
-     * Get the call backtrace from where the error was generated.
-     * Supported with PHP 4.3.0 or newer.
-     *
-     * @param int $frame (optional) what frame to fetch
-     * @return array Backtrace, or NULL if not available.
-     * @access public
-     */
-    function getBacktrace($frame = null)
-    {
-        if ($frame === null) {
-            return $this->backtrace;
-        }
-        return $this->backtrace[$frame];
-    }
-
-    // }}}
-    // {{{ addUserInfo()
-
-    function addUserInfo($info)
-    {
-        if (empty($this->userinfo)) {
-            $this->userinfo = $info;
-        } else {
-            $this->userinfo .= " ** $info";
-        }
-    }
-
-    // }}}
-    // {{{ toString()
-
-    /**
-     * Make a string representation of this object.
-     *
-     * @return string a string with an object summary
-     * @access public
-     */
-    function toString() {
-        $modes = array();
-        $levels = array(E_USER_NOTICE  => 'notice',
-                        E_USER_WARNING => 'warning',
-                        E_USER_ERROR   => 'error');
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_array($this->callback)) {
-                $callback = (is_object($this->callback[0]) ?
-                    strtolower(get_class($this->callback[0])) :
-                    $this->callback[0]) . '::' .
-                    $this->callback[1];
-            } else {
-                $callback = $this->callback;
-            }
-            return sprintf('[%s: message="%s" code=%d mode=callback '.
-                           'callback=%s prefix="%s" info="%s"]',
-                           strtolower(get_class($this)), $this->message, $this->code,
-                           $callback, $this->error_message_prefix,
-                           $this->userinfo);
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            $modes[] = 'print';
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            $modes[] = 'trigger';
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $modes[] = 'die';
-        }
-        if ($this->mode & PEAR_ERROR_RETURN) {
-            $modes[] = 'return';
-        }
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
-                       'prefix="%s" info="%s"]',
-                       strtolower(get_class($this)), $this->message, $this->code,
-                       implode("|", $modes), $levels[$this->level],
-                       $this->error_message_prefix,
-                       $this->userinfo);
-    }
-
-    // }}}
-}
-
-/*
- * Local Variables:
- * mode: php
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-?>
diff --git a/thirdparty/propel/Propel.php b/thirdparty/propel/Propel.php
index 3ebef7a3e..22122f369 100644
--- a/thirdparty/propel/Propel.php
+++ b/thirdparty/propel/Propel.php
@@ -40,566 +40,567 @@ include_once 'adapter/DBAdapter.php';
  * @version    $Revision: 601 $
  * @package    propel
  */
-class Propel {
-
-	/**
-	 * A constant for <code>default</code>.
-	 */
-	const DEFAULT_NAME = "default";
-
-	/**
-	 * A constant defining 'System is unusuable' logging level
-	 */
-	const LOG_EMERG = 0;
-
-	/**
-	 * A constant defining 'Immediate action required' logging level
-	 */
-	const LOG_ALERT = 1;
-
-	/**
-	 * A constant defining 'Critical conditions' logging level
-	 */
-	const LOG_CRIT = 2;
-
-	/**
-	 * A constant defining 'Error conditions' logging level
-	 */
-	const LOG_ERR = 3;
-
-	/**
-	 * A constant defining 'Warning conditions' logging level
-	 */
-	const LOG_WARNING = 4;
-
-	/**
-	 * A constant defining 'Normal but significant' logging level
-	 */
-	const LOG_NOTICE = 5;
-
-	/**
-	 * A constant defining 'Informational' logging level
-	 */
-	const LOG_INFO = 6;
-
-	/**
-	 * A constant defining 'Debug-level messages' logging level
-	 */
-	const LOG_DEBUG = 7;
-
-	/**
-	 * The Propel version.
-	 */
-	const VERSION = '1.2.1';
-
-	/**
-	 * The db name that is specified as the default in the property file
-	 */
-	private static $defaultDBName;
-
-	/**
-	 * The global cache of database maps
-	 */
-	private static $dbMaps = array();
-
-	/**
-	 * The cache of DB adapter keys
-	 */
-	private static $adapterMap;
-
-	/**
-	 * The logging category.
-	 */
-	private static $category;
-
-	/**
-	 * Propel-specific configuration.
-	 */
-	private static $configuration;
-
-	/**
-	 * flag to set to true once this class has been initialized
-	 */
-	private static $isInit = false;
-
-	/**
-	 * @var        Log
-	 */
-	private static $logger = null;
-
-	/**
-	 * Store mapbuilder classnames for peers that have been referenced prior
-	 * to Propel being initialized.  This can happen if the OM Peer classes are
-	 * included before the Propel::init() method has been called.
-	 */
-	private static $mapBuilders = array();
-
-	/**
-	 * Cache of established connections (to eliminate overhead).
-	 * @var        array
-	 */
-	private static $connectionMap = array();
-
-	/**
-	 * initialize Propel
-	 * @return     void
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function initialize() {
-
-		if (self::$configuration === null) {
-			throw new PropelException("Propel cannot be initialized without "
-					. "a valid configuration. Please check the log files "
-					. "for further details.");
-		}
-
-		self::configureLogging();
-		// Now that we have dealt with processing the log properties
-		// that may be contained in the configuration we will make the
-		// configuration consist only of the remaining propel-specific
-		// properties that are contained in the configuration. First
-		// look for properties that are in the "propel" namespace.
-
-
-		$originalConf = self::$configuration;
-		self::$configuration = isset(self::$configuration['propel']) ? self::$configuration['propel'] : null;
-
-		if (empty(self::$configuration)) {
-				// Assume the original configuration already had any
-				// prefixes stripped.
-				self::$configuration = $originalConf;
-		}
-
-
-		// reset the connection map (this should enable runtime changes of connection params)
-		self::$connectionMap = array();
-		self::initAdapters(self::$configuration);
-
-		self::$isInit = true;
-
-		// map builders may be registered w/ Propel before Propel has
-		// been initialized; in this case they are stored in a static
-		// var of this class & now can be propertly initialized.
-		foreach(self::$mapBuilders as $mbClass) {
-			BasePeer::getMapBuilder($mbClass);
-		}
-
-		// now that the pre-loaded map builders have been propertly initialized
-		// empty the array.
-		// any further mapBuilders will be build by the generated MapBuilder classes.
-		self::$mapBuilders = array();
-	}
-
-	/**
-	 * Setup the adapters needed.  An adapter must be defined for each database connection.
-	 * Generally the adapter will be the same as the PEAR phpname; e.g. for MySQL, use the
-	 * 'mysql' adapter.
-	 * @param      array $configuration the Configuration representing the properties file
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	private static function initAdapters($configuration) {
-
-		self::$adapterMap = array();
-
-		$c = isset($configuration['datasources']) ? $configuration['datasources'] : null;
-		if (!empty($c)) {
-			try {
-				foreach($c as $handle => $properties) {
-					if (is_array($properties) && isset($properties['adapter'])) {
-						$db = DBAdapter::factory($properties['adapter']);
-						// register the adapter for this name
-						self::$adapterMap[$handle] = $db;
-					}
-				}
-			} catch (Exception $e) {
-				throw new PropelException("Unable to initialize adapters.", $e);
-			}
-		} else {
-			self::log("There were no adapters in the configuration.", self::LOG_WARNING);
-		}
-	}
-
-	/**
-	 * configure propel
-	 *
-	 * @param      string $config Path (absolute or relative to include_path) to config file.
-	 * @return     void
-	 * @throws     PropelException If configuration file cannot be opened. (E_WARNING probably will also be raised in PHP)
-	 */
-	 	public static function krumo()
-	{
-	krumo ( self::$configuration);
-	}
-
-
-	public static function configure($configFile)
-	{
-		self::$configuration = include($configFile);
-		if (self::$configuration === false) {
-			throw new PropelException("Unable to open configuration file: " . var_export($configFile, true));
-		}
-		//include($configFile );
-	}
-
-	/**
-	 * Initialization of Propel with a properties file.
-	 *
-	 * @param      string $c The Propel configuration file path.
-	 * @return     void
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function init($c)
-	{
-		self::configure($c);
-		self::initialize();
-	}
-
-  public static function initConfiguration($configuration)
-  {
-    self::$configuration = $configuration;
-    self::initialize();
-  }
-
-	/**
-	 * Determine whether Propel has already been initialized.
-	 *
-	 * @return     boolean True if Propel is already initialized.
-	 */
-	public static function isInit()
-	{
-		return self::$isInit;
-	}
-
-	/**
-	 * Sets the configuration for Propel and all dependencies.
-	 *
-	 * @param      array $c the Configuration
-	 * @return     void
-	 */
-	public static function setConfiguration($c)
-	{
-		self::$configuration = $c;
-	}
-
-	/**
-	 * Get the configuration for this component.
-	 *
-	 * @return     the Configuration
-	 */
-	public static function getConfiguration()
-	{
-		return self::$configuration;
-	}
-
-	/**
-	 * Configure the logging for this subsystem.
-	 * The logging system is only configured if there is a 'log'
-	 * section in the passed-in runtime configuration.
-	 * @return     void
-	 */
-	protected static function configureLogging() {
-		if (self::$logger === null) {
-			if (isset(self::$configuration['log']) && is_array(self::$configuration['log']) && count(self::$configuration['log'])) {
-				include_once 'Log.php'; // PEAR Log class
-				$c = self::$configuration['log'];
-				// array casting handles bug in PHP5b2 where the isset() checks
-				// below may return true if $c is not an array (e.g. is a string)
-
-				$type = isset($c['type']) ? $c['type'] : 'file';
-				$name = isset($c['name']) ? $c['name'] : './propel.log';
-				$ident = isset($c['ident']) ? $c['ident'] : 'propel';
-				$conf = isset($c['conf']) ? $c['conf'] : array();
-				$level = isset($c['level']) ? $c['level'] : PEAR_LOG_DEBUG;
-
-				self::$logger = Log::singleton($type, $name, $ident, $conf, $level);
-			} // if isset()
-		}
-	}
-
-	/**
-	 * Override the configured logger.
-	 *
-	 * This is primarily for things like unit tests / debugging where
-	 * you want to change the logger without altering the configuration file.
-	 *
-	 * You can use any logger class that implements the propel.logger.BasicLogger
-	 * interface.  This interface is based on PEAR::Log, so you can also simply pass
-	 * a PEAR::Log object to this method.
-	 *
-	 * @param      object $logger The new logger to use. ([PEAR] Log or BasicLogger)
-	 * @return     void
-	 */
-	public static function setLogger($logger)
-	{
-		self::$logger = $logger;
-	}
-
-	/**
-	 * Returns true if a logger, for example PEAR::Log, has been configured,
-	 * otherwise false.
-	 *
-	 * @return     boolean True if Propel uses logging
-	 */
-	public static function hasLogger()
-	{
-		return self::$logger !== null;
-	}
-
-	/**
-	 * Get the configured logger.
-	 * @return     object Configured log class ([PEAR] Log or BasicLogger).
-	 */
-	public static function logger()
-	{
-		return self::$logger;
-	}
-
-	/**
-	 * Logs a message
-	 * If a logger has been configured, the logger will be used, otherwrise the
-	 * logging message will be discarded without any further action
-	 *
-	 * @param      string $message The message that will be logged.
-	 * @param      string $level The logging level.
-	 * @return     boolean True if the message was logged successfully or no logger was used.
-	 */
-	public static function log($message, $level = self::LOG_DEBUG)
-	{
-		if(self::hasLogger())
-		{
-			$logger = self::logger();
-			switch($level)
-			{
-				case self::LOG_EMERG:
-					return $logger->log($message, $level);
-				case self::LOG_ALERT:
-					return $logger->alert($message);
-				case self::LOG_CRIT:
-					return $logger->crit($message);
-				case self::LOG_ERR:
-					return $logger->err($message);
-				case self::LOG_WARNING:
-					return $logger->warning($message);
-				case self::LOG_NOTICE:
-					return $logger->notice($message);
-				case self::LOG_INFO:
-					return $logger->info($message);
-				default:
-					return $logger->debug($message);
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Returns the database map information. Name relates to the name
-	 * of the connection pool to associate with the map.
-	 *
-	 * The database maps are "registered" by the generated map builder classes.
-	 *
-	 * @param      string $name The name of the database corresponding to the DatabaseMapto retrieve.
-	 * @return     DatabaseMap The named <code>DatabaseMap</code>.
-	 * @throws     PropelException - if database map is null or propel was not initialized properly.
-	 */
-	public static function getDatabaseMap($name = null) {
-
-		if ($name === null) {
-			$name = self::getDefaultDB();
-			if ($name === null) {
-				throw new PropelException("DatabaseMap name was null!");
-			}
-		}
-
-		// CACHEHOOK - this would be a good place
-		// to add shared memory caching options (database
-		// maps should be a pretty safe candidate for shared mem caching)
-
-		if (isset(self::$dbMaps[$name])) {
-			$map = self::$dbMaps[$name];
-		} else {
-			$map = self::initDatabaseMap($name);
-		}
-
-		return $map;
-	}
-
-	/**
-	 * Creates and initializes the mape for the named database.
-	 *
-	 * The database maps are "registered" by the generated map builder classes
-	 * by calling this method and then adding the tables, etc. to teh DatabaseMap
-	 * object returned from this method.
-	 *
-	 * @param      string $name The name of the database to map.
-	 * @return     DatabaseMap The desired map.
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	private static function initDatabaseMap($name)
-	{
-		$map = new DatabaseMap($name);
-		self::$dbMaps[$name] = $map;
-		return $map;
-	}
-
-	/**
-	 * Register a MapBuilder
-	 *
-	 * @param      string $className the MapBuilder
-	 */
-	public static function registerMapBuilder($className)
-	{
-		self::$mapBuilders[] = $className;
-	}
-
-	/**
-	 * Returns the specified property of the given database, or the empty
-	 * string if no value is set for the property.
-	 *
-	 * @param      string $db   The name of the database whose property to get.
-	 * @param      string $prop The name of the property to get.
-	 * @return     mixed The property's value.
-	 */
-	private static function getDatabaseProperty($db, $prop)
-	{
-		return isset(self::$configuration['datasources'][$db][$prop]) ? self::$configuration['datasources'][$db][$prop] : null;
-	}
-
-	/**
-	 *
-	 * @param      string $name The database name.
-	 * @return     Connection A database connection
-	 * @throws     PropelException - if no conneciton params, or SQLException caught when trying to connect.
-	 */
-	public static function getConnection($name = null) {
-		if ($name === null) {
-			$name = self::getDefaultDB();
-		}
-		$con = isset(self::$connectionMap[$name]) ? self::$connectionMap[$name] : null;
-		if ($con === null || $name === 'dbarray') {
-
-			$dsn = isset(self::$configuration['datasources'][$name]['connection']) ? self::$configuration['datasources'][$name]['connection'] : null;
-			if ($dsn === null) {
-				if(isset($_SESSION['PROCESS'])) {
-					/** Added By Erik Amaru <erik@colosa.com *******************************
-					* @date: 27-05-08 11:48                                                *
-					* @Description: this was added for the additional database connections *
-					***********************************************************************/
-					$oDbConnections = new DbConnections($_SESSION['PROCESS']);
-    				$oDbConnections->loadAdditionalConnections();
-    				$dsn = isset(self::$configuration['datasources'][$name]['connection']) ? self::$configuration['datasources'][$name]['connection'] : null;
-				} else {
-    				throw new PropelException("No connection params set for " . $name);
-    			}
-			}
-			// if specified, use custom driver
-			if (isset(self::$configuration['datasources'][$name]['driver'])) {
-				Creole::registerDriver($dsn['phptype'], self::$configuration['datasources'][$name]['driver']);
-			}
-
-			try {
-				$con = Creole::getConnection($dsn);
-			} catch (SQLException $e) {
-				throw new PropelException($e);
-			}
-			self::$connectionMap[$name] = $con;
-		}
-		return $con;
-	}
-
-	/**
-	 * Returns database adapter for a specific connection pool.
-	 *
-	 * @param      string $name A database name.
-	 * @return     DBAdapter The corresponding database adapter.
-	 * @throws     PropelException - if unable to find DBdapter for specified db.
-	 */
-	public static function getDB($name = null)
-	{
-		if ($name === null) {
-			$name = self::getDefaultDB();
-		}
-		if (!isset(self::$adapterMap[$name])) {
-			//throw new PropelException("Unable to load DBAdapter for database '" . var_export($name, true) . "' (check your runtime properties file!)");
-			throw new PropelException("Unable to load DBAdapter for database '' (check your runtime properties file!)");
-		}
-		return self::$adapterMap[$name];
-	}
-
-	/**
-	 * Returns the name of the default database.
-	 *
-	 * @return     string Name of the default DB
-	 */
-	public static function getDefaultDB()
-	{
-		if (self::$configuration === null) {
-			return self::DEFAULT_NAME;
-		} elseif (self::$defaultDBName === null) {
-			// Determine default database name.
-			self::$defaultDBName = isset(self::$configuration['datasources']['default']) ? self::$configuration['datasources']['default'] : self::DEFAULT_NAME;
-		}
-		return self::$defaultDBName;
-	}
-
-	/**
-	 * Include once a file specified in DOT notation and reutrn unqualified clasname.
-	 *
-	 * Package notation is expected to be relative to a location
-	 * on the PHP include_path.  The dot-path classes are used as a way
-	 * to represent both classname and filesystem location; there is
-	 * an inherent assumption about filenaming.  To get around these
-	 * naming requirements you can include the class yourself
-	 * and then just use the classname instead of dot-path.
-	 *
-	 * @param      string $class dot-path to clas (e.g. path.to.my.ClassName).
-	 * @return     string unqualified classname
-	 */
-	public static function import($path) {
-
-		// extract classname
-		if (($pos = strrpos($path, '.')) === false) {
-			$class = $path;
-		} else {
-			$class = substr($path, $pos + 1);
-		}
-
-		// check if class exists
-		if (class_exists($class, false)) {
-			return $class;
-		}
-
-		// turn to filesystem path
-		$path = strtr($path, '.', DIRECTORY_SEPARATOR) . '.php';
-
-		// include class
-		$ret = include_once($path);
-		if ($ret === false) {
-			throw new PropelException("Unable to import class: " . $class . " from " . $path);
-		}
-
-		// return qualified name
-		return $class;
-	}
-
-	/**
-	 * Closes any associated resource handles.
-	 *
-	 * This method frees any database connection handles that have been
-	 * opened by the getConnection() method.
-	 *
-	 * @return     void
-	 */
+class Propel
+{
+
+    /**
+     * A constant for <code>default</code>.
+     */
+    const DEFAULT_NAME = "default";
+
+    /**
+     * A constant defining 'System is unusuable' logging level
+     */
+    const LOG_EMERG = 0;
+
+    /**
+     * A constant defining 'Immediate action required' logging level
+     */
+    const LOG_ALERT = 1;
+
+    /**
+     * A constant defining 'Critical conditions' logging level
+     */
+    const LOG_CRIT = 2;
+
+    /**
+     * A constant defining 'Error conditions' logging level
+     */
+    const LOG_ERR = 3;
+
+    /**
+     * A constant defining 'Warning conditions' logging level
+     */
+    const LOG_WARNING = 4;
+
+    /**
+     * A constant defining 'Normal but significant' logging level
+     */
+    const LOG_NOTICE = 5;
+
+    /**
+     * A constant defining 'Informational' logging level
+     */
+    const LOG_INFO = 6;
+
+    /**
+     * A constant defining 'Debug-level messages' logging level
+     */
+    const LOG_DEBUG = 7;
+
+    /**
+     * The Propel version.
+     */
+    const VERSION = '1.2.1';
+
+    /**
+     * The db name that is specified as the default in the property file
+     */
+    private static $defaultDBName;
+
+    /**
+     * The global cache of database maps
+     */
+    private static $dbMaps = array();
+
+    /**
+     * The cache of DB adapter keys
+     */
+    private static $adapterMap;
+
+    /**
+     * The logging category.
+     */
+    private static $category;
+
+    /**
+     * Propel-specific configuration.
+     */
+    private static $configuration;
+
+    /**
+     * flag to set to true once this class has been initialized
+     */
+    private static $isInit = false;
+
+    /**
+     * @var        Log
+     */
+    private static $logger = null;
+
+    /**
+     * Store mapbuilder classnames for peers that have been referenced prior
+     * to Propel being initialized.  This can happen if the OM Peer classes are
+     * included before the Propel::init() method has been called.
+     */
+    private static $mapBuilders = array();
+
+    /**
+     * Cache of established connections (to eliminate overhead).
+     * @var        array
+     */
+    private static $connectionMap = array();
+
+    /**
+     * initialize Propel
+     * @return     void
+     * @throws     PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function initialize()
+    {
+        if (self::$configuration === null) {
+            throw new PropelException("Propel cannot be initialized without "
+                . "a valid configuration. Please check the log files "
+                . "for further details.");
+        }
+
+        self::configureLogging();
+        // Now that we have dealt with processing the log properties
+        // that may be contained in the configuration we will make the
+        // configuration consist only of the remaining propel-specific
+        // properties that are contained in the configuration. First
+        // look for properties that are in the "propel" namespace.
+
+
+        $originalConf = self::$configuration;
+        self::$configuration = isset(self::$configuration['propel']) ? self::$configuration['propel'] : null;
+
+        if (empty(self::$configuration)) {
+            // Assume the original configuration already had any
+            // prefixes stripped.
+            self::$configuration = $originalConf;
+        }
+
+        // reset the connection map (this should enable runtime changes of connection params)
+        self::$connectionMap = array();
+        self::initAdapters(self::$configuration);
+
+        self::$isInit = true;
+
+        // map builders may be registered w/ Propel before Propel has
+        // been initialized; in this case they are stored in a static
+        // var of this class & now can be propertly initialized.
+        foreach (self::$mapBuilders as $mbClass) {
+            BasePeer::getMapBuilder($mbClass);
+        }
+
+        // now that the pre-loaded map builders have been propertly initialized
+        // empty the array.
+        // any further mapBuilders will be build by the generated MapBuilder classes.
+        self::$mapBuilders = array();
+    }
+
+    /**
+     * Setup the adapters needed.  An adapter must be defined for each database connection.
+     * Generally the adapter will be the same as the PEAR phpname; e.g. for MySQL, use the
+     * 'mysql' adapter.
+     * @param      array $configuration the Configuration representing the properties file
+     * @throws     PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    private static function initAdapters($configuration)
+    {
+        self::$adapterMap = array();
+
+        $c = isset($configuration['datasources']) ? $configuration['datasources'] : null;
+        if (!empty($c)) {
+            try {
+                foreach ($c as $handle => $properties) {
+                    if (is_array($properties) && isset($properties['adapter'])) {
+                        $db = DBAdapter::factory($properties['adapter']);
+                        // register the adapter for this name
+                        self::$adapterMap[$handle] = $db;
+                    }
+                }
+            } catch (Exception $e) {
+                throw new PropelException("Unable to initialize adapters.", $e);
+            }
+        } else {
+            self::log("There were no adapters in the configuration.", self::LOG_WARNING);
+        }
+    }
+
+    /**
+     * configure propel
+     *
+     * @param      string $config Path (absolute or relative to include_path) to config file.
+     * @return     void
+     * @throws     PropelException If configuration file cannot be opened. (E_WARNING probably will also be raised in PHP)
+     */
+    public static function krumo()
+    {
+        krumo(self::$configuration);
+    }
+
+
+    public static function configure($configFile)
+    {
+        self::$configuration = include($configFile);
+        if (self::$configuration === false) {
+            throw new PropelException("Unable to open configuration file: " . var_export($configFile, true));
+        }
+        //include($configFile );
+    }
+
+    /**
+     * Initialization of Propel with a properties file.
+     *
+     * @param      string $c The Propel configuration file path.
+     * @return     void
+     * @throws     PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    public static function init($c)
+    {
+        self::configure($c);
+        self::initialize();
+    }
+
+    public static function initConfiguration($configuration)
+    {
+        self::$configuration = $configuration;
+        self::initialize();
+    }
+
+    /**
+     * Determine whether Propel has already been initialized.
+     *
+     * @return     boolean True if Propel is already initialized.
+     */
+    public static function isInit()
+    {
+        return self::$isInit;
+    }
+
+    /**
+     * Sets the configuration for Propel and all dependencies.
+     *
+     * @param      array $c the Configuration
+     * @return     void
+     */
+    public static function setConfiguration($c)
+    {
+        self::$configuration = $c;
+    }
+
+    /**
+     * Get the configuration for this component.
+     *
+     * @return     the Configuration
+     */
+    public static function getConfiguration()
+    {
+        return self::$configuration;
+    }
+
+    /**
+     * Configure the logging for this subsystem.
+     * The logging system is only configured if there is a 'log'
+     * section in the passed-in runtime configuration.
+     * @return     void
+     */
+    protected static function configureLogging()
+    {
+        if (self::$logger === null) {
+            if (isset(self::$configuration['log']) && is_array(self::$configuration['log']) && count(self::$configuration['log'])) {
+                include_once 'Log.php'; // PEAR Log class
+                $c = self::$configuration['log'];
+                // array casting handles bug in PHP5b2 where the isset() checks
+                // below may return true if $c is not an array (e.g. is a string)
+
+                $type = isset($c['type']) ? $c['type'] : 'file';
+                $name = isset($c['name']) ? $c['name'] : './propel.log';
+                $ident = isset($c['ident']) ? $c['ident'] : 'propel';
+                $conf = isset($c['conf']) ? $c['conf'] : array();
+                $level = isset($c['level']) ? $c['level'] : PEAR_LOG_DEBUG;
+
+                self::$logger = Log::singleton($type, $name, $ident, $conf, $level);
+            } // if isset()
+        }
+    }
+
+    /**
+     * Override the configured logger.
+     *
+     * This is primarily for things like unit tests / debugging where
+     * you want to change the logger without altering the configuration file.
+     *
+     * You can use any logger class that implements the propel.logger.BasicLogger
+     * interface.  This interface is based on PEAR::Log, so you can also simply pass
+     * a PEAR::Log object to this method.
+     *
+     * @param      object $logger The new logger to use. ([PEAR] Log or BasicLogger)
+     * @return     void
+     */
+    public static function setLogger($logger)
+    {
+        self::$logger = $logger;
+    }
+
+    /**
+     * Returns true if a logger, for example PEAR::Log, has been configured,
+     * otherwise false.
+     *
+     * @return     boolean True if Propel uses logging
+     */
+    public static function hasLogger()
+    {
+        return self::$logger !== null;
+    }
+
+    /**
+     * Get the configured logger.
+     * @return     object Configured log class ([PEAR] Log or BasicLogger).
+     */
+    public static function logger()
+    {
+        return self::$logger;
+    }
+
+    /**
+     * Logs a message
+     * If a logger has been configured, the logger will be used, otherwrise the
+     * logging message will be discarded without any further action
+     *
+     * @param      string $message The message that will be logged.
+     * @param      string $level The logging level.
+     * @return     boolean True if the message was logged successfully or no logger was used.
+     */
+    public static function log($message, $level = self::LOG_DEBUG)
+    {
+        if (self::hasLogger()) {
+            $logger = self::logger();
+            switch ($level) {
+                case self::LOG_EMERG:
+                    return $logger->log($message, $level);
+                case self::LOG_ALERT:
+                    return $logger->alert($message);
+                case self::LOG_CRIT:
+                    return $logger->crit($message);
+                case self::LOG_ERR:
+                    return $logger->err($message);
+                case self::LOG_WARNING:
+                    return $logger->warning($message);
+                case self::LOG_NOTICE:
+                    return $logger->notice($message);
+                case self::LOG_INFO:
+                    return $logger->info($message);
+                default:
+                    return $logger->debug($message);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Returns the database map information. Name relates to the name
+     * of the connection pool to associate with the map.
+     *
+     * The database maps are "registered" by the generated map builder classes.
+     *
+     * @param      string $name The name of the database corresponding to the DatabaseMapto retrieve.
+     * @return     DatabaseMap The named <code>DatabaseMap</code>.
+     * @throws     PropelException - if database map is null or propel was not initialized properly.
+     */
+    public static function getDatabaseMap($name = null)
+    {
+        if ($name === null) {
+            $name = self::getDefaultDB();
+            if ($name === null) {
+                throw new PropelException("DatabaseMap name was null!");
+            }
+        }
+
+        // CACHEHOOK - this would be a good place
+        // to add shared memory caching options (database
+        // maps should be a pretty safe candidate for shared mem caching)
+
+        if (isset(self::$dbMaps[$name])) {
+            $map = self::$dbMaps[$name];
+        } else {
+            $map = self::initDatabaseMap($name);
+        }
+
+        return $map;
+    }
+
+    /**
+     * Creates and initializes the mape for the named database.
+     *
+     * The database maps are "registered" by the generated map builder classes
+     * by calling this method and then adding the tables, etc. to teh DatabaseMap
+     * object returned from this method.
+     *
+     * @param      string $name The name of the database to map.
+     * @return     DatabaseMap The desired map.
+     * @throws     PropelException Any exceptions caught during processing will be
+     *         rethrown wrapped into a PropelException.
+     */
+    private static function initDatabaseMap($name)
+    {
+        $map = new DatabaseMap($name);
+        self::$dbMaps[$name] = $map;
+        return $map;
+    }
+
+    /**
+     * Register a MapBuilder
+     *
+     * @param      string $className the MapBuilder
+     */
+    public static function registerMapBuilder($className)
+    {
+        self::$mapBuilders[] = $className;
+    }
+
+    /**
+     * Returns the specified property of the given database, or the empty
+     * string if no value is set for the property.
+     *
+     * @param      string $db The name of the database whose property to get.
+     * @param      string $prop The name of the property to get.
+     * @return     mixed The property's value.
+     */
+    private static function getDatabaseProperty($db, $prop)
+    {
+        return isset(self::$configuration['datasources'][$db][$prop]) ? self::$configuration['datasources'][$db][$prop] : null;
+    }
+
+    /**
+     *
+     * @param      string $name The database name.
+     * @return     Connection A database connection
+     * @throws     PropelException - if no conneciton params, or SQLException caught when trying to connect.
+     */
+    public static function getConnection($name = null)
+    {
+        if ($name === null) {
+            $name = self::getDefaultDB();
+        }
+        $con = isset(self::$connectionMap[$name]) ? self::$connectionMap[$name] : null;
+        if ($con === null || $name === 'dbarray') {
+            $dsn = isset(self::$configuration['datasources'][$name]['connection']) ? self::$configuration['datasources'][$name]['connection'] : null;
+            if ($dsn === null) {
+                if (isset($_SESSION['PROCESS'])) {
+                    /***********************************************************************
+                     * @date: 27-05-08 11:48                                                *
+                     * @Description: this was added for the additional database connections *
+                     ***********************************************************************/
+                    DbConnections::loadAdditionalConnections();
+                    $dsn = isset(self::$configuration['datasources'][$name]['connection']) ? self::$configuration['datasources'][$name]['connection'] : null;
+                } else {
+                    throw new PropelException("No connection params set for " . $name);
+                }
+            }
+            // if specified, use custom driver
+            if (isset(self::$configuration['datasources'][$name]['driver'])) {
+                Creole::registerDriver($dsn['phptype'], self::$configuration['datasources'][$name]['driver']);
+            }
+
+            try {
+                // set Connection Creole default mysqli
+                $dsn = str_replace('mysql:', 'mysqli:', $dsn);
+                $con = Creole::getConnection($dsn);
+            } catch (SQLException $e) {
+                throw new PropelException($e);
+            }
+            self::$connectionMap[$name] = $con;
+        }
+        return $con;
+    }
+
+    /**
+     * Returns database adapter for a specific connection pool.
+     *
+     * @param      string $name A database name.
+     * @return     DBAdapter The corresponding database adapter.
+     * @throws     PropelException - if unable to find DBdapter for specified db.
+     */
+    public static function getDB($name = null)
+    {
+        if ($name === null) {
+            $name = self::getDefaultDB();
+        }
+        if (!isset(self::$adapterMap[$name])) {
+            //throw new PropelException("Unable to load DBAdapter for database '" . var_export($name, true) . "' (check your runtime properties file!)");
+            throw new PropelException("Unable to load DBAdapter for database '' (check your runtime properties file!)");
+        }
+        return self::$adapterMap[$name];
+    }
+
+    /**
+     * Returns the name of the default database.
+     *
+     * @return     string Name of the default DB
+     */
+    public static function getDefaultDB()
+    {
+        if (self::$configuration === null) {
+            return self::DEFAULT_NAME;
+        } elseif (self::$defaultDBName === null) {
+            // Determine default database name.
+            self::$defaultDBName = isset(self::$configuration['datasources']['default']) ? self::$configuration['datasources']['default'] : self::DEFAULT_NAME;
+        }
+        return self::$defaultDBName;
+    }
+
+    /**
+     * Include once a file specified in DOT notation and reutrn unqualified clasname.
+     *
+     * Package notation is expected to be relative to a location
+     * on the PHP include_path.  The dot-path classes are used as a way
+     * to represent both classname and filesystem location; there is
+     * an inherent assumption about filenaming.  To get around these
+     * naming requirements you can include the class yourself
+     * and then just use the classname instead of dot-path.
+     *
+     * @param      string $class dot-path to clas (e.g. path.to.my.ClassName).
+     * @return     string unqualified classname
+     */
+    public static function import($path)
+    {
+
+        // extract classname
+        if (($pos = strrpos($path, '.')) === false) {
+            $class = $path;
+        } else {
+            $class = substr($path, $pos + 1);
+        }
+
+        // check if class exists
+        if (class_exists($class, false)) {
+            return $class;
+        }
+
+        // turn to filesystem path
+        $path = strtr($path, '.', DIRECTORY_SEPARATOR) . '.php';
+
+        // include class
+        $ret = include_once($path);
+        if ($ret === false) {
+            throw new PropelException("Unable to import class: " . $class . " from " . $path);
+        }
+
+        // return qualified name
+        return $class;
+    }
+
+    /**
+     * Closes any associated resource handles.
+     *
+     * This method frees any database connection handles that have been
+     * opened by the getConnection() method.
+     *
+     * @return     void
+     */
     public static function close()
     {
         $lastQuery = "";
 
         foreach (self::$connectionMap as $cnn) {
             if (get_class($cnn) != "DBArrayConnection") {
-                if(isset($cnn->lastQuery)){
+                if (isset($cnn->lastQuery)) {
                     if (gettype($cnn->getResource()) == "resource" && $cnn->isConnected() && $cnn->lastQuery != $lastQuery) {
                         $cnn->close();
                     }
@@ -617,14 +618,14 @@ class Propel {
     public static function getDbConnection($name)
     {
         /*----------------------------------********---------------------------------*/
-         if (!PMLicensedFeatures::getSingleton()->verifyfeature('02YeEFKNnVoOWFKMzN4ZmpXT0V3MU9SVklnOXNCcE9zcXJKa0tpemNmQkJ5OTUvOWlLdFhibGp0MHVHUlV0VmNpNw==')) {
-        /*----------------------------------********---------------------------------*/
-             return null;
-        /*----------------------------------********---------------------------------*/
-         }
+        if (!PMLicensedFeatures::getSingleton()->verifyfeature('02YeEFKNnVoOWFKMzN4ZmpXT0V3MU9SVklnOXNCcE9zcXJKa0tpemNmQkJ5OTUvOWlLdFhibGp0MHVHUlV0VmNpNw==')) {
+            /*----------------------------------********---------------------------------*/
+            return null;
+            /*----------------------------------********---------------------------------*/
+        }
         /*----------------------------------********---------------------------------*/
 
-        if (! empty(self::$configuration['datasources'][$name]['connection'])) {
+        if (!empty(self::$configuration['datasources'][$name]['connection'])) {
             return self::getConnection($name);
         }
 
@@ -634,10 +635,10 @@ class Propel {
 
         $defaultDbName = substr($name, 0, strrpos($name, '_'));
 
-        if (! empty(self::$configuration['datasources'][$defaultDbName]['connection'])) {
+        if (!empty(self::$configuration['datasources'][$defaultDbName]['connection'])) {
             return self::getConnection($defaultDbName);
         }
 
-        throw new PropelException('Error, database connection named "'.$name.'" is not defined for Propel.');
+        throw new PropelException('Error, database connection named "' . $name . '" is not defined for Propel.');
     }
 }
diff --git a/thirdparty/smarty/BUGS b/thirdparty/smarty/BUGS
deleted file mode 100644
index 9f1a80f31..000000000
--- a/thirdparty/smarty/BUGS
+++ /dev/null
@@ -1,7 +0,0 @@
-Smarty is supported only in PHP 4.0.6 or later.
-
-Smarty versions previous to 2.0 require the PEAR libraries. Be sure to include
-the path to the PEAR libraries in your php include_path. Config_file.class.php
-uses the PEAR library for its error handling routines. PEAR comes with the PHP
-distribution. Unix users check /usr/local/lib/php, windows users check
-C:/php/pear.
diff --git a/thirdparty/smarty/COPYING.lib b/thirdparty/smarty/COPYING.lib
deleted file mode 100644
index 3b204400c..000000000
--- a/thirdparty/smarty/COPYING.lib
+++ /dev/null
@@ -1,458 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
diff --git a/thirdparty/smarty/ChangeLog b/thirdparty/smarty/ChangeLog
deleted file mode 100644
index 802891ac8..000000000
--- a/thirdparty/smarty/ChangeLog
+++ /dev/null
@@ -1,8667 +0,0 @@
-2007-03-06  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS
-      libs/plugins/function.html_select_date.php:
-      fix html_select_date separator when parts are missing (thanks to kayk for
-      the patch)
-
-2007-03-06  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      bumped version number
-
-    * NEWS:
-      added release headline
-
-    * libs/internals/core.write_compiled_include.php:
-      fixed detection of non-cached block when writing compiled includes
-
-2007-03-01  Danilo Buerger  <danilo@blizzz.org>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      Applied boots clean up patch and removed commented out code.
-      Updated NEWS file
-
-2007-02-27  Danilo Buerger  <danilo@blizzz.org>
-
-    * NEWS
-      docs/en/designers/language-modifiers/language-modifier-date-format.xml
-      libs/internals/core.write_file.php
-      libs/plugins/modifier.date_format.php:
-      Updated smarty_core_write_file() and smarty_modifier_date_format() to speed
-      up Windows detection.
-      Emulated more parameters for Windows in smarty_modifier_date_format() and
-      fixed some old ones.
-      Updated the docs to tell what parameters are emulated on Windows.
-      Updated NEWS file.
-
-    * NEWS:
-      Updated NEWS file to reflect changes commited in the last revision
-
-2007-02-27  Monte Ohrt  <monte@ohrt.com>
-
-    * docs/en/appendixes/troubleshooting.xml:
-      fix typo
-
-2007-02-27  Danilo Buerger  <danilo@blizzz.org>
-
-    * libs/Smarty_Compiler.class.php:
-      Modified _(push|pop)_cacheable_state() to embedd alternate syntax. See this
-      bug report: http://www.phpinsider.com/smarty-forum/viewtopic.php?t=10502
-
-2007-02-26  Peter 'Mash' Morgan  <pm@daffodil.uk.com>
-
-    * docs/en/designers/language-custom-functions/language-function-html-options.xml:
-      Fix incorrect var name
-
-2007-02-23  Monte Ohrt  <monte@ohrt.com>
-
-    * libs/Smarty_Compiler.class.php:
-      escape creating of language=php from interleaving
-
-    * libs/Smarty_Compiler.class.php:
-      add removed line back in
-
-    * libs/Smarty_Compiler.class.php:
-      fix up last patch, remove unnecessary lines
-
-    * libs/Smarty_Compiler.class.php:
-      fix situation when no compiled tags are present
-
-    * libs/Smarty_Compiler.class.php:
-      fix problem with php open tags generated from tag interleaving
-
-2007-02-06  boots  <jayboots@yahoo.com>
-
-    * docs/en/programmers/advanced-features/template-resources.xml:
-      Correct default template handler function example.
-
-2007-01-17  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/modifier.truncate.php:
-      fixed handling of $etc in the truncate modifier when $etc is longer
-      than $length.
-      
-      thanks to Sylvinus!
-
-2007-01-10  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/plugins/modifier.date_format.php
-      libs/plugins/modifier.date_format.php:
-      fix handling of %I with mysql timestamps
-      
-      Thanks to Danilo Buerger
-
-    * NEWS
-      libs/internals/core.write_file.php:
-      Better recognize Windows filesystems to reduce warnings
-
-    * NEWS
-      libs/plugins/modifier.date_format.php:
-      Emulate %R in the date_format modifier on Windows
-      
-      Thanks to Danilo Buerger
-
-2006-12-10  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/getting-started.xml:
-      fix build
-
-    * docs/fr/language-snippets.ent
-      docs/fr/designers/language-builtin-functions/language-function-include-php.xml
-      docs/fr/designers/language-modifiers/language-modifier-truncate.xml
-      docs/fr/designers/language-variables/language-variables-smarty.xml:
-      sync with EN
-
-2006-12-02  Peter 'Mash' Morgan  <pm@daffodil.uk.com>
-
-    * docs/en/designers/language-builtin-functions/language-function-include-php.xml:
-      Tidy example, speeling andd add links
-
-    * docs/en/getting-started.xml:
-      Add/correct entities
-
-    * docs/entities/global.ent:
-      Fix entities (strange)
-
-2006-12-01  Monte Ohrt  <monte@ohrt.com>
-
-    * libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      update dev version numbers
-
-2006-12-01  boots  <jayboots@yahoo.com>
-
-    * (Smarty_2_6_16)
-      NEWS:
-      Fixed replacement bug introduced in trimwhitespaces output filter that
-      was introduced in the last release.
-      
-      Thanks to Spuerhund from the forums.
-
-    * (Smarty_2_6_16)
-      libs/plugins/outputfilter.trimwhitespace.php:
-      Fixed replacement bug introduced by last changes.
-      
-      Thanks to Spuerhund from the forums.
-
-2006-11-30  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS
-      docs/en/designers/language-modifiers/language-modifier-truncate.xml
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      update dev version numbers, fix manual typo
-
-2006-11-22  George Miroshnikov  <support@infinity.com.ua>
-
-    * docs/ru/getting-started.xml
-      docs/ru/language-snippets.ent:
-      sync with EN
-
-    * docs/en/getting-started.xml:
-      replaced hardcoded path separator with PATH_SEPARATOR constant
-
-2006-11-20  boots  <jayboots@yahoo.com>
-
-    * libs/plugins/modifier.debug_print_var.php:
-      fix depth formatting of arrays and objects in modifier debug_print_var
-
-2006-11-10  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/en/designers/language-variables/language-variables-smarty.xml:
-      fixed typo. thanks jonez.
-
-2006-11-08  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/internals/core.write_file.php:
-      change file writing semantics in smarty_core_write_file()
-      
-      This avoids unlink() unless rename() fails or a Windows system is detected
-      
-      see: http://www.phpinsider.com/smarty-forum/viewtopic.php?t=6956
-      
-      Thanks to c960657 from the forums.
-
-2006-11-07  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/debug.tpl:
-      update debug.tpl to xhtml 1.1 compliance, fix javascript escaping in debug
-      output and apply a Smarty based color scheme
-      
-      see: http://www.phpinsider.com/smarty-forum/viewtopic.php?t=7178
-      
-      thanks to cybot from the forums!
-
-    * NEWS
-      libs/plugins/modifier.debug_print_var.php:
-      enhance reporting precision of debug_print_var modifier
-      
-      see: http://www.phpinsider.com/smarty-forum/viewtopic.php?t=9281
-      
-      thanks to cybot from the forums
-
-2006-11-01  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/plugins/function.html_select_date.php:
-      make html_select_date work consistently with 0000-00-00 00:00:00 and
-      0000-00-00 inputs
-      
-      Thanks to cybot from forums
-
-2006-10-16  George Miroshnikov  <support@infinity.com.ua>
-
-    * docs/en/language-snippets.ent:
-      minor typo fix - &$class doesn't make sense.
-
-2006-10-14  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/designers/language-basic-syntax.xml
-      docs/fr/designers/language-builtin-functions.xml
-      docs/fr/designers/language-basic-syntax/language-syntax-attributes.xml
-      docs/fr/designers/language-basic-syntax/language-syntax-comments.xml
-      docs/fr/designers/language-basic-syntax/language-syntax-quotes.xml
-      docs/fr/designers/language-builtin-functions/language-function-capture.xml
-      docs/fr/designers/language-builtin-functions/language-function-php.xml
-      docs/fr/designers/language-builtin-functions/language-function-section.xml
-      docs/fr/designers/language-custom-functions/language-function-popup-init.xml
-      docs/fr/designers/language-modifiers/language-modifier-escape.xml
-      docs/fr/programmers/api-functions/api-display.xml
-      docs/fr/programmers/plugins/plugins-inserts.xml:
-      sync with EN
-
-2006-10-14  Fernando Correa da Concei��o  <fernando_conceicao@yahoo.com.br>
-
-    * docs/pt_BR/programmers/api-variables/variable-error-reporting.xml:
-      New Translation
-
-    * docs/pt_BR/designers/language-basic-syntax/language-escaping.xml
-      docs/pt_BR/designers/language-basic-syntax/language-syntax-variables.xml:
-      New Translations
-
-    * docs/pt_BR/translation.xml:
-      Used in revcheck
-
-    * docs/pt_BR/getting-started.xml
-      docs/pt_BR/language-snippets.ent
-      docs/pt_BR/make_chm_index.html
-      docs/pt_BR/preface.xml
-      docs/pt_BR/appendixes/resources.xml
-      docs/pt_BR/appendixes/troubleshooting.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-capitalize.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-cat.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-count-characters.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-count-paragraphs.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-count-sentences.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-count-words.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-date-format.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-default.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-escape.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-indent.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-lower.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-nl2br.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-regex-replace.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-replace.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-spacify.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-string-format.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-strip-tags.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-strip.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-truncate.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-upper.xml
-      docs/pt_BR/designers/language-modifiers/language-modifier-wordwrap.xml
-      docs/pt_BR/designers/language-variables/language-assigned-variables.xml
-      docs/pt_BR/designers/language-variables/language-config-variables.xml
-      docs/pt_BR/designers/language-variables/language-variables-smarty.xml
-      docs/pt_BR/programmers/advanced-features.xml
-      docs/pt_BR/programmers/api-functions.xml
-      docs/pt_BR/programmers/api-variables.xml
-      docs/pt_BR/programmers/caching.xml
-      docs/pt_BR/programmers/plugins.xml
-      docs/pt_BR/programmers/smarty-constants.xml
-      docs/pt_BR/programmers/advanced-features/advanced-features-objects.xml
-      docs/pt_BR/programmers/advanced-features/advanced-features-outputfilters.xml
-      docs/pt_BR/programmers/advanced-features/advanced-features-postfilters.xml
-      docs/pt_BR/programmers/advanced-features/advanced-features-prefilters.xml
-      docs/pt_BR/programmers/advanced-features/section-template-cache-handler-func.xml
-      docs/pt_BR/programmers/advanced-features/template-resources.xml
-      docs/pt_BR/programmers/api-functions/api-append-by-ref.xml
-      docs/pt_BR/programmers/api-functions/api-append.xml
-      docs/pt_BR/programmers/api-functions/api-assign-by-ref.xml
-      docs/pt_BR/programmers/api-functions/api-assign.xml
-      docs/pt_BR/programmers/api-functions/api-clear-all-assign.xml
-      docs/pt_BR/programmers/api-functions/api-clear-all-cache.xml
-      docs/pt_BR/programmers/api-functions/api-clear-assign.xml
-      docs/pt_BR/programmers/api-functions/api-clear-cache.xml
-      docs/pt_BR/programmers/api-functions/api-clear-compiled-tpl.xml
-      docs/pt_BR/programmers/api-functions/api-clear-config.xml
-      docs/pt_BR/programmers/api-functions/api-config-load.xml
-      docs/pt_BR/programmers/api-functions/api-display.xml
-      docs/pt_BR/programmers/api-functions/api-fetch.xml
-      docs/pt_BR/programmers/api-functions/api-get-config-vars.xml
-      docs/pt_BR/programmers/api-functions/api-get-registered-object.xml
-      docs/pt_BR/programmers/api-functions/api-get-template-vars.xml
-      docs/pt_BR/programmers/api-functions/api-is-cached.xml
-      docs/pt_BR/programmers/api-functions/api-load-filter.xml
-      docs/pt_BR/programmers/api-functions/api-register-block.xml
-      docs/pt_BR/programmers/api-functions/api-register-compiler-function.xml
-      docs/pt_BR/programmers/api-functions/api-register-function.xml
-      docs/pt_BR/programmers/api-functions/api-register-modifier.xml
-      docs/pt_BR/programmers/api-functions/api-register-object.xml
-      docs/pt_BR/programmers/api-functions/api-register-outputfilter.xml
-      docs/pt_BR/programmers/api-functions/api-register-postfilter.xml
-      docs/pt_BR/programmers/api-functions/api-register-prefilter.xml
-      docs/pt_BR/programmers/api-functions/api-register-resource.xml
-      docs/pt_BR/programmers/api-functions/api-template-exists.xml
-      docs/pt_BR/programmers/api-functions/api-trigger-error.xml
-      docs/pt_BR/programmers/api-functions/api-unregister-block.xml
-      docs/pt_BR/programmers/api-functions/api-unregister-compiler-function.xml
-      docs/pt_BR/programmers/api-functions/api-unregister-function.xml
-      docs/pt_BR/programmers/api-functions/api-unregister-modifier.xml
-      docs/pt_BR/programmers/api-functions/api-unregister-object.xml
-      docs/pt_BR/programmers/api-functions/api-unregister-outputfilter.xml
-      docs/pt_BR/programmers/api-functions/api-unregister-postfilter.xml
-      docs/pt_BR/programmers/api-functions/api-unregister-prefilter.xml
-      docs/pt_BR/programmers/api-functions/api-unregister-resource.xml
-      docs/pt_BR/programmers/api-variables/variable-autoload-filters.xml
-      docs/pt_BR/programmers/api-variables/variable-cache-dir.xml
-      docs/pt_BR/programmers/api-variables/variable-cache-handler-func.xml
-      docs/pt_BR/programmers/api-variables/variable-cache-lifetime.xml
-      docs/pt_BR/programmers/api-variables/variable-cache-modified-check.xml
-      docs/pt_BR/programmers/api-variables/variable-caching.xml
-      docs/pt_BR/programmers/api-variables/variable-compile-check.xml
-      docs/pt_BR/programmers/api-variables/variable-compile-dir.xml
-      docs/pt_BR/programmers/api-variables/variable-compile-id.xml
-      docs/pt_BR/programmers/api-variables/variable-compiler-class.xml
-      docs/pt_BR/programmers/api-variables/variable-config-booleanize.xml
-      docs/pt_BR/programmers/api-variables/variable-config-dir.xml
-      docs/pt_BR/programmers/api-variables/variable-config-fix-newlines.xml
-      docs/pt_BR/programmers/api-variables/variable-config-overwrite.xml
-      docs/pt_BR/programmers/api-variables/variable-config-read-hidden.xml
-      docs/pt_BR/programmers/api-variables/variable-debug-tpl.xml
-      docs/pt_BR/programmers/api-variables/variable-debugging-ctrl.xml
-      docs/pt_BR/programmers/api-variables/variable-debugging.xml
-      docs/pt_BR/programmers/api-variables/variable-default-modifiers.xml
-      docs/pt_BR/programmers/api-variables/variable-default-resource-type.xml
-      docs/pt_BR/programmers/api-variables/variable-default-template-handler-func.xml
-      docs/pt_BR/programmers/api-variables/variable-force-compile.xml
-      docs/pt_BR/programmers/api-variables/variable-global-assign.xml
-      docs/pt_BR/programmers/api-variables/variable-left-delimiter.xml
-      docs/pt_BR/programmers/api-variables/variable-php-handling.xml
-      docs/pt_BR/programmers/api-variables/variable-plugins-dir.xml
-      docs/pt_BR/programmers/api-variables/variable-request-use-auto-globals.xml
-      docs/pt_BR/programmers/api-variables/variable-request-vars-order.xml
-      docs/pt_BR/programmers/api-variables/variable-right-delimiter.xml
-      docs/pt_BR/programmers/api-variables/variable-secure-dir.xml
-      docs/pt_BR/programmers/api-variables/variable-security-settings.xml
-      docs/pt_BR/programmers/api-variables/variable-security.xml
-      docs/pt_BR/programmers/api-variables/variable-template-dir.xml
-      docs/pt_BR/programmers/api-variables/variable-trusted-dir.xml
-      docs/pt_BR/programmers/api-variables/variable-undefined.xml
-      docs/pt_BR/programmers/api-variables/variable-use-sub-dirs.xml
-      docs/pt_BR/programmers/caching/caching-cacheable.xml
-      docs/pt_BR/programmers/caching/caching-groups.xml
-      docs/pt_BR/programmers/caching/caching-multiple-caches.xml
-      docs/pt_BR/programmers/caching/caching-setting-up.xml
-      docs/pt_BR/programmers/plugins/plugins-block-functions.xml
-      docs/pt_BR/programmers/plugins/plugins-compiler-functions.xml
-      docs/pt_BR/programmers/plugins/plugins-functions.xml
-      docs/pt_BR/programmers/plugins/plugins-howto.xml
-      docs/pt_BR/programmers/plugins/plugins-inserts.xml
-      docs/pt_BR/programmers/plugins/plugins-modifiers.xml
-      docs/pt_BR/programmers/plugins/plugins-naming-conventions.xml
-      docs/pt_BR/programmers/plugins/plugins-outputfilters.xml
-      docs/pt_BR/programmers/plugins/plugins-prefilters-postfilters.xml
-      docs/pt_BR/programmers/plugins/plugins-resources.xml
-      docs/pt_BR/programmers/plugins/plugins-writing.xml:
-      Big update. Revision tag for all files. Some updates. Now I can update it
-
-2006-10-09  Peter 'Mash' Morgan  <pm@daffodil.uk.com>
-
-    * docs/en/getting-started.xml
-      docs/en/designers/language-basic-syntax.xml
-      docs/en/designers/language-custom-functions/language-function-popup-init.xml
-      docs/en/designers/language-modifiers/language-modifier-escape.xml
-      docs/en/programmers/api-functions/api-display.xml
-      docs/en/programmers/plugins/plugins-inserts.xml:
-      Minor changes and corrections
-
-    * docs/en/designers/language-basic-syntax.xml
-      docs/en/designers/language-builtin-functions.xml
-      docs/en/designers/language-basic-syntax/language-syntax-attributes.xml
-      docs/en/designers/language-basic-syntax/language-syntax-comments.xml
-      docs/en/designers/language-basic-syntax/language-syntax-quotes.xml
-      docs/en/designers/language-modifiers/language-modifier-escape.xml:
-      Minor formatting and error correction
-
-    * docs/en/designers/language-builtin-functions/language-function-capture.xml
-      docs/en/designers/language-builtin-functions/language-function-php.xml
-      docs/en/designers/language-builtin-functions/language-function-section.xml:
-      minor formatting and changes
-
-    * docs/en/getting-started.xml:
-      Tidied up formatting so more readable, tidied up the install to the paths
-      are more clear (ta jj)
-
-2006-10-09  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/designers/language-builtin-functions/language-function-section.xml:
-      sync with EN
-
-2006-10-08  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/designers/language-builtin-functions/language-function-php.xml
-      docs/fr/designers/language-modifiers/language-modifier-escape.xml
-      docs/fr/designers/language-variables/language-variables-smarty.xml
-      docs/fr/programmers/api-variables/variable-request-use-auto-globals.xml:
-      fix build
-
-    * docs/fr/designers/language-builtin-functions/language-function-strip.xml
-      docs/fr/programmers/caching.xml
-      docs/fr/programmers/smarty-constants.xml
-      docs/fr/programmers/api-variables/variable-autoload-filters.xml
-      docs/fr/programmers/api-variables/variable-cache-dir.xml
-      docs/fr/programmers/api-variables/variable-cache-handler-func.xml
-      docs/fr/programmers/api-variables/variable-cache-lifetime.xml
-      docs/fr/programmers/api-variables/variable-cache-modified-check.xml
-      docs/fr/programmers/api-variables/variable-caching.xml
-      docs/fr/programmers/api-variables/variable-compile-check.xml
-      docs/fr/programmers/api-variables/variable-compile-dir.xml
-      docs/fr/programmers/api-variables/variable-compile-id.xml
-      docs/fr/programmers/api-variables/variable-compiler-class.xml
-      docs/fr/programmers/api-variables/variable-config-booleanize.xml
-      docs/fr/programmers/api-variables/variable-config-dir.xml
-      docs/fr/programmers/api-variables/variable-config-fix-newlines.xml
-      docs/fr/programmers/api-variables/variable-config-overwrite.xml
-      docs/fr/programmers/api-variables/variable-config-read-hidden.xml
-      docs/fr/programmers/api-variables/variable-debug-tpl.xml
-      docs/fr/programmers/api-variables/variable-debugging-ctrl.xml
-      docs/fr/programmers/api-variables/variable-debugging.xml
-      docs/fr/programmers/api-variables/variable-default-modifiers.xml
-      docs/fr/programmers/api-variables/variable-default-resource-type.xml
-      docs/fr/programmers/api-variables/variable-default-template-handler-func.xml
-      docs/fr/programmers/api-variables/variable-error-reporting.xml
-      docs/fr/programmers/api-variables/variable-force-compile.xml
-      docs/fr/programmers/api-variables/variable-left-delimiter.xml
-      docs/fr/programmers/api-variables/variable-php-handling.xml
-      docs/fr/programmers/api-variables/variable-plugins-dir.xml
-      docs/fr/programmers/api-variables/variable-request-use-auto-globals.xml
-      docs/fr/programmers/api-variables/variable-request-vars-order.xml
-      docs/fr/programmers/api-variables/variable-right-delimiter.xml
-      docs/fr/programmers/api-variables/variable-secure-dir.xml
-      docs/fr/programmers/api-variables/variable-security-settings.xml
-      docs/fr/programmers/api-variables/variable-security.xml
-      docs/fr/programmers/api-variables/variable-template-dir.xml
-      docs/fr/programmers/api-variables/variable-trusted-dir.xml
-      docs/fr/programmers/api-variables/variable-use-sub-dirs.xml
-      docs/fr/programmers/caching/caching-cacheable.xml
-      docs/fr/programmers/caching/caching-groups.xml
-      docs/fr/programmers/caching/caching-multiple-caches.xml
-      docs/fr/programmers/caching/caching-setting-up.xml
-      docs/fr/programmers/plugins/plugins-block-functions.xml
-      docs/fr/programmers/plugins/plugins-compiler-functions.xml
-      docs/fr/programmers/plugins/plugins-functions.xml
-      docs/fr/programmers/plugins/plugins-inserts.xml
-      docs/fr/programmers/plugins/plugins-modifiers.xml
-      docs/fr/programmers/plugins/plugins-naming-conventions.xml
-      docs/fr/programmers/plugins/plugins-outputfilters.xml
-      docs/fr/programmers/plugins/plugins-prefilters-postfilters.xml
-      docs/fr/programmers/plugins/plugins-resources.xml
-      docs/fr/programmers/plugins/plugins-writing.xml:
-      sync with EN
-
-2006-10-07  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/programmers/advanced-features/advanced-features-objects.xml
-      docs/fr/programmers/advanced-features/advanced-features-outputfilters.xml
-      docs/fr/programmers/advanced-features/advanced-features-postfilters.xml
-      docs/fr/programmers/advanced-features/advanced-features-prefilters.xml
-      docs/fr/programmers/advanced-features/section-template-cache-handler-func.xml
-      docs/fr/programmers/advanced-features/template-resources.xml
-      docs/fr/programmers/api-functions/api-append-by-ref.xml
-      docs/fr/programmers/api-functions/api-append.xml
-      docs/fr/programmers/api-functions/api-assign-by-ref.xml
-      docs/fr/programmers/api-functions/api-assign.xml
-      docs/fr/programmers/api-functions/api-clear-all-assign.xml
-      docs/fr/programmers/api-functions/api-clear-all-cache.xml
-      docs/fr/programmers/api-functions/api-clear-assign.xml
-      docs/fr/programmers/api-functions/api-clear-cache.xml
-      docs/fr/programmers/api-functions/api-clear-compiled-tpl.xml
-      docs/fr/programmers/api-functions/api-clear-config.xml
-      docs/fr/programmers/api-functions/api-config-load.xml
-      docs/fr/programmers/api-functions/api-display.xml
-      docs/fr/programmers/api-functions/api-fetch.xml
-      docs/fr/programmers/api-functions/api-get-config-vars.xml
-      docs/fr/programmers/api-functions/api-get-registered-object.xml
-      docs/fr/programmers/api-functions/api-get-template-vars.xml
-      docs/fr/programmers/api-functions/api-is-cached.xml
-      docs/fr/programmers/api-functions/api-load-filter.xml
-      docs/fr/programmers/api-functions/api-register-block.xml
-      docs/fr/programmers/api-functions/api-register-compiler-function.xml
-      docs/fr/programmers/api-functions/api-register-function.xml
-      docs/fr/programmers/api-functions/api-register-modifier.xml
-      docs/fr/programmers/api-functions/api-register-object.xml
-      docs/fr/programmers/api-functions/api-register-outputfilter.xml
-      docs/fr/programmers/api-functions/api-register-postfilter.xml
-      docs/fr/programmers/api-functions/api-register-prefilter.xml
-      docs/fr/programmers/api-functions/api-register-resource.xml
-      docs/fr/programmers/api-functions/api-template-exists.xml
-      docs/fr/programmers/api-functions/api-trigger-error.xml
-      docs/fr/programmers/api-functions/api-unregister-block.xml
-      docs/fr/programmers/api-functions/api-unregister-compiler-function.xml
-      docs/fr/programmers/api-functions/api-unregister-function.xml
-      docs/fr/programmers/api-functions/api-unregister-modifier.xml
-      docs/fr/programmers/api-functions/api-unregister-object.xml
-      docs/fr/programmers/api-functions/api-unregister-outputfilter.xml
-      docs/fr/programmers/api-functions/api-unregister-postfilter.xml
-      docs/fr/programmers/api-functions/api-unregister-prefilter.xml
-      docs/fr/programmers/api-functions/api-unregister-resource.xml:
-      sync with EN
-
-2006-10-03  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/designers/language-custom-functions/language-function-html-select-time.xml
-      docs/fr/designers/language-custom-functions/language-function-html-table.xml
-      docs/fr/designers/language-custom-functions/language-function-mailto.xml
-      docs/fr/designers/language-custom-functions/language-function-math.xml
-      docs/fr/designers/language-custom-functions/language-function-popup-init.xml
-      docs/fr/designers/language-custom-functions/language-function-popup.xml
-      docs/fr/designers/language-custom-functions/language-function-textformat.xml
-      docs/fr/designers/language-modifiers/language-modifier-capitalize.xml
-      docs/fr/designers/language-modifiers/language-modifier-cat.xml
-      docs/fr/designers/language-modifiers/language-modifier-count-characters.xml
-      docs/fr/designers/language-modifiers/language-modifier-count-paragraphs.xml
-      docs/fr/designers/language-modifiers/language-modifier-count-sentences.xml
-      docs/fr/designers/language-modifiers/language-modifier-count-words.xml
-      docs/fr/designers/language-modifiers/language-modifier-date-format.xml
-      docs/fr/designers/language-modifiers/language-modifier-default.xml
-      docs/fr/designers/language-modifiers/language-modifier-escape.xml
-      docs/fr/designers/language-modifiers/language-modifier-indent.xml
-      docs/fr/designers/language-modifiers/language-modifier-lower.xml
-      docs/fr/designers/language-modifiers/language-modifier-nl2br.xml
-      docs/fr/designers/language-modifiers/language-modifier-regex-replace.xml
-      docs/fr/designers/language-modifiers/language-modifier-replace.xml
-      docs/fr/designers/language-modifiers/language-modifier-spacify.xml
-      docs/fr/designers/language-modifiers/language-modifier-string-format.xml
-      docs/fr/designers/language-modifiers/language-modifier-strip-tags.xml
-      docs/fr/designers/language-modifiers/language-modifier-strip.xml
-      docs/fr/designers/language-modifiers/language-modifier-truncate.xml
-      docs/fr/designers/language-modifiers/language-modifier-upper.xml
-      docs/fr/designers/language-modifiers/language-modifier-wordwrap.xml
-      docs/fr/designers/language-variables/language-assigned-variables.xml
-      docs/fr/designers/language-variables/language-config-variables.xml
-      docs/fr/designers/language-variables/language-variables-smarty.xml:
-      sync with EN
-
-2006-10-01  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/designers/language-builtin-functions/language-function-include-php.xml
-      docs/fr/designers/language-builtin-functions/language-function-include.xml
-      docs/fr/designers/language-builtin-functions/language-function-insert.xml
-      docs/fr/designers/language-builtin-functions/language-function-ldelim.xml
-      docs/fr/designers/language-builtin-functions/language-function-literal.xml
-      docs/fr/designers/language-builtin-functions/language-function-php.xml
-      docs/fr/designers/language-custom-functions/language-function-assign.xml
-      docs/fr/designers/language-custom-functions/language-function-counter.xml
-      docs/fr/designers/language-custom-functions/language-function-cycle.xml
-      docs/fr/designers/language-custom-functions/language-function-debug.xml
-      docs/fr/designers/language-custom-functions/language-function-eval.xml
-      docs/fr/designers/language-custom-functions/language-function-fetch.xml
-      docs/fr/designers/language-custom-functions/language-function-html-checkboxes.xml
-      docs/fr/designers/language-custom-functions/language-function-html-image.xml
-      docs/fr/designers/language-custom-functions/language-function-html-options.xml
-      docs/fr/designers/language-custom-functions/language-function-html-radios.xml
-      docs/fr/designers/language-custom-functions/language-function-html-select-date.xml:
-      sync with EN
-
-2006-09-30  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/getting-started.xml:
-      fix build
-
-    * docs/fr/designers/chapter-debugging-console.xml
-      docs/fr/designers/config-files.xml
-      docs/fr/designers/language-builtin-functions.xml
-      docs/fr/designers/language-modifiers.xml
-      docs/fr/designers/language-variables.xml
-      docs/fr/designers/language-basic-syntax/language-escaping.xml
-      docs/fr/designers/language-basic-syntax/language-math.xml
-      docs/fr/designers/language-basic-syntax/language-syntax-comments.xml
-      docs/fr/designers/language-basic-syntax/language-syntax-functions.xml
-      docs/fr/designers/language-basic-syntax/language-syntax-quotes.xml
-      docs/fr/designers/language-basic-syntax/language-syntax-variables.xml
-      docs/fr/designers/language-builtin-functions/language-function-capture.xml
-      docs/fr/designers/language-builtin-functions/language-function-config-load.xml
-      docs/fr/designers/language-builtin-functions/language-function-foreach.xml
-      docs/fr/designers/language-builtin-functions/language-function-if.xml:
-      sync with EN
-
-    * docs/fr/getting-started.xml
-      docs/fr/language-snippets.ent
-      docs/fr/appendixes/resources.xml
-      docs/fr/appendixes/tips.xml
-      docs/fr/appendixes/troubleshooting.xml:
-      sync with EN
-
-2006-09-27  Peter 'Mash' Morgan  <pm@daffodil.uk.com>
-
-    * docs/en/designers/language-builtin-functions/language-function-section.xml:
-      Minor tweaks and corrections
-
-    * docs/en/getting-started.xml
-      docs/en/designers/chapter-debugging-console.xml
-      docs/en/designers/language-basic-syntax/language-syntax-comments.xml
-      docs/en/designers/language-custom-functions/language-function-html-image.xml
-      docs/en/designers/language-custom-functions/language-function-html-options.xml
-      docs/en/designers/language-custom-functions/language-function-html-radios.xml
-      docs/en/designers/language-custom-functions/language-function-html-select-date.xml
-      docs/en/designers/language-custom-functions/language-function-html-select-time.xml
-      docs/en/designers/language-custom-functions/language-function-html-table.xml
-      docs/en/designers/language-custom-functions/language-function-mailto.xml
-      docs/en/designers/language-custom-functions/language-function-popup-init.xml
-      docs/en/designers/language-custom-functions/language-function-textformat.xml
-      docs/en/designers/language-variables/language-config-variables.xml
-      docs/en/designers/language-variables/language-variables-smarty.xml:
-      Add literal tags to html, general formatting
-
-    * docs/en/getting-started.xml
-      docs/en/appendixes/resources.xml
-      docs/en/appendixes/tips.xml
-      docs/en/appendixes/troubleshooting.xml
-      docs/en/designers/config-files.xml
-      docs/en/programmers/caching.xml
-      docs/en/programmers/smarty-constants.xml
-      docs/en/programmers/advanced-features/advanced-features-objects.xml
-      docs/en/programmers/advanced-features/advanced-features-outputfilters.xml
-      docs/en/programmers/advanced-features/advanced-features-postfilters.xml
-      docs/en/programmers/advanced-features/advanced-features-prefilters.xml
-      docs/en/programmers/advanced-features/section-template-cache-handler-func.xml
-      docs/en/programmers/advanced-features/template-resources.xml
-      docs/en/programmers/api-variables/variable-autoload-filters.xml
-      docs/en/programmers/api-variables/variable-cache-dir.xml
-      docs/en/programmers/api-variables/variable-cache-handler-func.xml
-      docs/en/programmers/api-variables/variable-cache-lifetime.xml
-      docs/en/programmers/api-variables/variable-cache-modified-check.xml
-      docs/en/programmers/api-variables/variable-caching.xml
-      docs/en/programmers/api-variables/variable-compile-check.xml
-      docs/en/programmers/api-variables/variable-compile-dir.xml
-      docs/en/programmers/api-variables/variable-compile-id.xml
-      docs/en/programmers/api-variables/variable-config-booleanize.xml
-      docs/en/programmers/api-variables/variable-config-dir.xml
-      docs/en/programmers/api-variables/variable-config-fix-newlines.xml
-      docs/en/programmers/api-variables/variable-config-overwrite.xml
-      docs/en/programmers/api-variables/variable-config-read-hidden.xml
-      docs/en/programmers/api-variables/variable-debug-tpl.xml
-      docs/en/programmers/api-variables/variable-debugging-ctrl.xml
-      docs/en/programmers/api-variables/variable-debugging.xml
-      docs/en/programmers/api-variables/variable-default-modifiers.xml
-      docs/en/programmers/api-variables/variable-default-resource-type.xml
-      docs/en/programmers/api-variables/variable-error-reporting.xml
-      docs/en/programmers/api-variables/variable-force-compile.xml
-      docs/en/programmers/api-variables/variable-left-delimiter.xml
-      docs/en/programmers/api-variables/variable-php-handling.xml
-      docs/en/programmers/api-variables/variable-plugins-dir.xml
-      docs/en/programmers/api-variables/variable-request-use-auto-globals.xml
-      docs/en/programmers/api-variables/variable-request-vars-order.xml
-      docs/en/programmers/api-variables/variable-right-delimiter.xml
-      docs/en/programmers/api-variables/variable-secure-dir.xml
-      docs/en/programmers/api-variables/variable-security-settings.xml
-      docs/en/programmers/api-variables/variable-security.xml
-      docs/en/programmers/api-variables/variable-template-dir.xml
-      docs/en/programmers/api-variables/variable-trusted-dir.xml
-      docs/en/programmers/api-variables/variable-use-sub-dirs.xml
-      docs/en/programmers/caching/caching-cacheable.xml
-      docs/en/programmers/caching/caching-groups.xml
-      docs/en/programmers/caching/caching-multiple-caches.xml
-      docs/en/programmers/caching/caching-setting-up.xml:
-      Tidy up of formatting
-
-    * docs/entities/global.ent:
-      Adding some more resources
-
-    * docs/en/programmers/plugins/plugins-block-functions.xml
-      docs/en/programmers/plugins/plugins-compiler-functions.xml
-      docs/en/programmers/plugins/plugins-functions.xml
-      docs/en/programmers/plugins/plugins-inserts.xml
-      docs/en/programmers/plugins/plugins-modifiers.xml
-      docs/en/programmers/plugins/plugins-naming-conventions.xml
-      docs/en/programmers/plugins/plugins-outputfilters.xml
-      docs/en/programmers/plugins/plugins-prefilters-postfilters.xml
-      docs/en/programmers/plugins/plugins-resources.xml
-      docs/en/programmers/plugins/plugins-writing.xml:
-      Tidy up some formatting
-
-2006-09-26  Peter 'Mash' Morgan  <pm@daffodil.uk.com>
-
-    * docs/en/programmers/api-functions/api-append-by-ref.xml
-      docs/en/programmers/api-functions/api-append.xml
-      docs/en/programmers/api-functions/api-assign-by-ref.xml
-      docs/en/programmers/api-functions/api-assign.xml
-      docs/en/programmers/api-functions/api-clear-all-assign.xml
-      docs/en/programmers/api-functions/api-clear-all-cache.xml
-      docs/en/programmers/api-functions/api-clear-assign.xml
-      docs/en/programmers/api-functions/api-clear-cache.xml
-      docs/en/programmers/api-functions/api-clear-compiled-tpl.xml
-      docs/en/programmers/api-functions/api-clear-config.xml
-      docs/en/programmers/api-functions/api-config-load.xml
-      docs/en/programmers/api-functions/api-display.xml
-      docs/en/programmers/api-functions/api-fetch.xml
-      docs/en/programmers/api-functions/api-get-config-vars.xml
-      docs/en/programmers/api-functions/api-get-registered-object.xml
-      docs/en/programmers/api-functions/api-get-template-vars.xml
-      docs/en/programmers/api-functions/api-is-cached.xml
-      docs/en/programmers/api-functions/api-load-filter.xml
-      docs/en/programmers/api-functions/api-register-block.xml
-      docs/en/programmers/api-functions/api-register-compiler-function.xml
-      docs/en/programmers/api-functions/api-register-function.xml
-      docs/en/programmers/api-functions/api-register-modifier.xml
-      docs/en/programmers/api-functions/api-register-object.xml
-      docs/en/programmers/api-functions/api-register-outputfilter.xml
-      docs/en/programmers/api-functions/api-register-postfilter.xml
-      docs/en/programmers/api-functions/api-register-prefilter.xml
-      docs/en/programmers/api-functions/api-register-resource.xml
-      docs/en/programmers/api-functions/api-template-exists.xml
-      docs/en/programmers/api-functions/api-trigger-error.xml
-      docs/en/programmers/api-functions/api-unregister-block.xml
-      docs/en/programmers/api-functions/api-unregister-compiler-function.xml
-      docs/en/programmers/api-functions/api-unregister-function.xml
-      docs/en/programmers/api-functions/api-unregister-modifier.xml
-      docs/en/programmers/api-functions/api-unregister-object.xml
-      docs/en/programmers/api-functions/api-unregister-outputfilter.xml
-      docs/en/programmers/api-functions/api-unregister-postfilter.xml
-      docs/en/programmers/api-functions/api-unregister-prefilter.xml
-      docs/en/programmers/api-functions/api-unregister-resource.xml:
-      Tidy up formatting and examples
-
-    * docs/en/language-snippets.ent:
-      Moved recurring para for register_*
-
-    * docs/en/designers/language-modifiers.xml:
-      Spelling on modifiers
-
-    * docs/en/designers/language-builtin-functions.xml
-      docs/en/designers/language-modifiers.xml
-      docs/en/designers/language-custom-functions/language-function-html-options.xml
-      docs/en/designers/language-modifiers/language-modifier-capitalize.xml
-      docs/en/designers/language-modifiers/language-modifier-cat.xml
-      docs/en/designers/language-modifiers/language-modifier-count-characters.xml
-      docs/en/designers/language-modifiers/language-modifier-count-paragraphs.xml
-      docs/en/designers/language-modifiers/language-modifier-count-sentences.xml
-      docs/en/designers/language-modifiers/language-modifier-count-words.xml
-      docs/en/designers/language-modifiers/language-modifier-date-format.xml
-      docs/en/designers/language-modifiers/language-modifier-default.xml
-      docs/en/designers/language-modifiers/language-modifier-escape.xml
-      docs/en/designers/language-modifiers/language-modifier-indent.xml
-      docs/en/designers/language-modifiers/language-modifier-lower.xml
-      docs/en/designers/language-modifiers/language-modifier-nl2br.xml
-      docs/en/designers/language-modifiers/language-modifier-regex-replace.xml
-      docs/en/designers/language-modifiers/language-modifier-replace.xml
-      docs/en/designers/language-modifiers/language-modifier-spacify.xml
-      docs/en/designers/language-modifiers/language-modifier-string-format.xml
-      docs/en/designers/language-modifiers/language-modifier-strip-tags.xml
-      docs/en/designers/language-modifiers/language-modifier-strip.xml
-      docs/en/designers/language-modifiers/language-modifier-truncate.xml
-      docs/en/designers/language-modifiers/language-modifier-upper.xml
-      docs/en/designers/language-modifiers/language-modifier-wordwrap.xml:
-      Tidying up some markup
-
-    * docs/en/designers/language-variables.xml:
-      typo
-
-    * docs/en/designers/language-variables.xml
-      docs/en/designers/language-variables/language-assigned-variables.xml
-      docs/en/designers/language-variables/language-config-variables.xml
-      docs/en/designers/language-variables/language-variables-smarty.xml:
-      Tidy up formatting on variables
-
-    * docs/en/designers/language-basic-syntax/language-escaping.xml
-      docs/en/designers/language-basic-syntax/language-math.xml
-      docs/en/designers/language-basic-syntax/language-syntax-comments.xml
-      docs/en/designers/language-basic-syntax/language-syntax-functions.xml
-      docs/en/designers/language-basic-syntax/language-syntax-quotes.xml
-      docs/en/designers/language-basic-syntax/language-syntax-variables.xml:
-      Formatting of the basic-syntax dir
-
-    * docs/en/designers/language-custom-functions/language-function-assign.xml
-      docs/en/designers/language-custom-functions/language-function-counter.xml
-      docs/en/designers/language-custom-functions/language-function-cycle.xml
-      docs/en/designers/language-custom-functions/language-function-debug.xml
-      docs/en/designers/language-custom-functions/language-function-eval.xml
-      docs/en/designers/language-custom-functions/language-function-fetch.xml
-      docs/en/designers/language-custom-functions/language-function-html-checkboxes.xml
-      docs/en/designers/language-custom-functions/language-function-html-image.xml
-      docs/en/designers/language-custom-functions/language-function-html-options.xml
-      docs/en/designers/language-custom-functions/language-function-html-radios.xml
-      docs/en/designers/language-custom-functions/language-function-html-select-date.xml
-      docs/en/designers/language-custom-functions/language-function-html-select-time.xml
-      docs/en/designers/language-custom-functions/language-function-html-table.xml
-      docs/en/designers/language-custom-functions/language-function-mailto.xml
-      docs/en/designers/language-custom-functions/language-function-math.xml
-      docs/en/designers/language-custom-functions/language-function-popup-init.xml
-      docs/en/designers/language-custom-functions/language-function-popup.xml
-      docs/en/designers/language-custom-functions/language-function-textformat.xml:
-      More formatting and cleaning up examples
-
-2006-09-25  Peter 'Mash' Morgan  <pm@daffodil.uk.com>
-
-    * docs/en/designers/language-builtin-functions/language-function-foreach.xml
-      docs/en/designers/language-builtin-functions/language-function-section.xml:
-      Doh! removing tabs
-
-    * docs/en/designers/language-builtin-functions/language-function-capture.xml
-      docs/en/designers/language-builtin-functions/language-function-config-load.xml
-      docs/en/designers/language-builtin-functions/language-function-foreach.xml
-      docs/en/designers/language-builtin-functions/language-function-if.xml
-      docs/en/designers/language-builtin-functions/language-function-include-php.xml
-      docs/en/designers/language-builtin-functions/language-function-include.xml
-      docs/en/designers/language-builtin-functions/language-function-insert.xml
-      docs/en/designers/language-builtin-functions/language-function-ldelim.xml
-      docs/en/designers/language-builtin-functions/language-function-literal.xml
-      docs/en/designers/language-builtin-functions/language-function-php.xml
-      docs/en/designers/language-builtin-functions/language-function-section.xml
-      docs/en/designers/language-builtin-functions/language-function-strip.xml:
-      A lot of formatting, tagging and tidy up. Some consistency at last
-
-    * docs/en/designers/language-builtin-functions/language-function-section.xml:
-      Major tidy up
-
-    * docs/en/designers/language-builtin-functions/language-function-foreach.xml:
-      Major tidy up, added index property and some examples
-
-2006-09-03  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/designers/language-custom-functions/language-function-popup-init.xml
-      docs/fr/programmers/advanced-features/advanced-features-outputfilters.xml
-      docs/fr/programmers/advanced-features/advanced-features-postfilters.xml
-      docs/fr/programmers/advanced-features/advanced-features-prefilters.xml:
-      sync with EN
-
-2006-09-01  George Miroshnikov  <support@infinity.com.ua>
-
-    * docs/ru/programmers/api-functions/api-append-by-ref.xml
-      docs/ru/programmers/api-functions/api-append.xml
-      docs/ru/programmers/api-functions/api-assign-by-ref.xml
-      docs/ru/programmers/api-functions/api-assign.xml
-      docs/ru/programmers/api-functions/api-clear-all-assign.xml
-      docs/ru/programmers/api-functions/api-clear-all-cache.xml
-      docs/ru/programmers/api-functions/api-clear-assign.xml
-      docs/ru/programmers/api-functions/api-clear-cache.xml
-      docs/ru/programmers/api-functions/api-clear-compiled-tpl.xml
-      docs/ru/programmers/api-functions/api-clear-config.xml
-      docs/ru/programmers/api-functions/api-config-load.xml
-      docs/ru/programmers/api-functions/api-display.xml:
-      sync with EN
-
-2006-08-25  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fixed wrong handling of name attribute in {insert}
-      thanks to Ivan Kravets for reporting this
-
-    * libs/Smarty_Compiler.class.php:
-      fixed typo
-
-2006-08-21  George Miroshnikov  <support@infinity.com.ua>
-
-    * docs/ru/designers/language-custom-functions/language-function-popup-init.xml
-      docs/ru/programmers/advanced-features/advanced-features-objects.xml
-      docs/ru/programmers/advanced-features/advanced-features-outputfilters.xml
-      docs/ru/programmers/advanced-features/advanced-features-postfilters.xml
-      docs/ru/programmers/advanced-features/advanced-features-prefilters.xml
-      docs/ru/programmers/advanced-features/section-template-cache-handler-func.xml
-      docs/ru/programmers/advanced-features/template-resources.xml:
-      sync with EN
-
-    * docs/en/programmers/advanced-features/advanced-features-prefilters.xml:
-      another missing dot
-
-    * docs/en/programmers/advanced-features/advanced-features-postfilters.xml:
-      missing dot
-
-    * docs/en/programmers/advanced-features/advanced-features-outputfilters.xml:
-      missing comma
-
-2006-08-19  Peter 'Mash' Morgan  <pmm@daffodil.uk.com>
-
-    * docs/en/designers/language-custom-functions/language-function-popup-init.xml:
-      avoid dupes and added remote paths
-
-2006-08-06  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/designers/language-custom-functions/language-function-html-table.xml
-      docs/fr/designers/language-custom-functions/language-function-mailto.xml:
-      sync with EN
-
-2006-08-03  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fix false replacement of "$t" inside double quotes
-      thanks to checat for reporting this
-
-2006-07-20  George Miroshnikov  <support@infinity.com.ua>
-
-    * docs/ru/designers/language-custom-functions/language-function-html-table.xml
-      docs/ru/designers/language-custom-functions/language-function-mailto.xml:
-      incrementing EN-Revision
-
-    * docs/ru/designers/language-custom-functions/language-function-assign.xml
-      docs/ru/designers/language-custom-functions/language-function-eval.xml
-      docs/ru/designers/language-custom-functions/language-function-fetch.xml
-      docs/ru/designers/language-custom-functions/language-function-html-checkboxes.xml
-      docs/ru/designers/language-custom-functions/language-function-html-image.xml
-      docs/ru/designers/language-custom-functions/language-function-html-options.xml
-      docs/ru/designers/language-custom-functions/language-function-html-radios.xml
-      docs/ru/designers/language-custom-functions/language-function-html-table.xml
-      docs/ru/designers/language-custom-functions/language-function-mailto.xml
-      docs/ru/designers/language-custom-functions/language-function-popup-init.xml
-      docs/ru/designers/language-custom-functions/language-function-popup.xml
-      docs/ru/designers/language-modifiers/language-modifier-date-format.xml
-      docs/ru/designers/language-modifiers/language-modifier-default.xml
-      docs/ru/designers/language-modifiers/language-modifier-escape.xml
-      docs/ru/designers/language-modifiers/language-modifier-indent.xml
-      docs/ru/designers/language-modifiers/language-modifier-lower.xml
-      docs/ru/designers/language-modifiers/language-modifier-nl2br.xml
-      docs/ru/designers/language-modifiers/language-modifier-strip.xml
-      docs/ru/designers/language-modifiers/language-modifier-truncate.xml
-      docs/ru/designers/language-modifiers/language-modifier-upper.xml
-      docs/ru/designers/language-modifiers/language-modifier-wordwrap.xml
-      docs/ru/designers/language-variables/language-variables-smarty.xml:
-      sync with EN
-
-    * docs/en/designers/language-custom-functions/language-function-mailto.xml:
-      typo
-
-2006-07-10  boots  <jayboots@yahoo.com>
-
-    * libs/plugins/function.html_table.php:
-      fixed email address in comments
-
-    * NEWS
-      libs/plugins/function.html_table.php:
-      html_table: fixed th/tr output, added hdir support for column
-      headings,update docs to reflect new features
-
-2006-07-08  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.html_table.php:
-      fix occasional notices on undefined variables
-
-2006-07-08  boots  <jayboots@yahoo.com>
-
-    * libs/plugins/function.html_table.php:
-      Added ability to specify column headings in {html_table}
-      
-      Added th_attrs attribute which works similary to td_attr and tr_attr but
-      for TH elements. Changes the cols attribute to allow mixed values; a
-      numeric still specifies the number of columns to render but now an array
-      of values can be used to specify TH column values. The number of columns
-      is determine from the size of the array. Further, a comma-separated
-      string of column names can be used which is internally coverted to an
-      array and used as if it was specified as a normal array.
-      
-      Thanks for lynlyn for the feature request.
-
-2006-06-23  boots  <jayboots@yahoo.com>
-
-    * libs/plugins/outputfilter.trimwhitespace.php:
-      fix comments in outputfilter.trimwhitespace
-
-    * NEWS
-      libs/plugins/outputfilter.trimwhitespace.php:
-      fixed ordering of replacements in trimwhitespace output filter
-      
-      Thanks to Getty from IRC for reporting this.
-
-2006-06-20  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/plugins/function.mailto.php:
-      update mailto function plugin to work around a firefox/thunderbird escaping
-      bug
-      
-      Thanks to elijahlofgren from the forums for reporting this and providing
-      the necessary patch
-
-    * NEWS
-      libs/plugins/modifier.date_format.php:
-      emulate %l in the date_format modifier on windows
-      
-      thanks to Gibberish from the forums for reporting this
-
-2006-06-14  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/plugins/modifier.capitalize.php:
-      Fix handling of apostrophes in the capitalize modifier.
-      
-      Thanks to asmecher from the forums for reporting this and providing a
-      partial solution.
-
-2006-05-28  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      update version numbers
-
-2006-05-25  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      un-hide hidden xml open tags
-
-2006-05-09  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      separate handling of comment blocks from "special blocks"
-
-    * NEWS
-      libs/plugins/function.popup_init.php:
-      reverted {popup_init} as proposed change to insertion behviour was not BC
-
-2006-05-04  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/plugins/function.popup_init.php:
-      changed {popup_init} to only emit code once during a request
-      
-      Thanks to TGKnIght from forums
-
-2006-04-22  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fix handling of block-methods of registered objects
-      thanks to El Hombre Gris
-
-2006-04-04  Monte Ohrt  <monte@ohrt.com>
-
-    * libs/plugins/function.html_select_date.php:
-      fix typo
-
-2006-03-09  Monte Ohrt  <monte@ohrt.com>
-
-    * (Smarty_2_6_13)
-      NEWS:
-      update for release
-
-2006-03-08  Monte Ohrt  <monte@ohrt.com>
-
-    * libs/plugins/modifier.regex_replace.php:
-      remove delim quote
-
-    * libs/plugins/modifier.regex_replace.php:
-      fix delimiter issue
-
-2006-03-03  Monte Ohrt  <monte@ohrt.com>
-
-    * libs/plugins/modifier.regex_replace.php:
-      use preg_replace to cover any space chars
-
-    * libs/plugins/modifier.regex_replace.php:
-      fix problem with allowing "e" modifier
-
-2006-01-29  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      removed possiblity for E_NOTICE on an undefined variable in
-      Smarty_Compiler::_compile_if_tag() - thanks to sbeh
-
-2006-01-18  Monte Ohrt  <monte@ohrt.com>
-
-    * libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      update version numbers
-
-    * (Smarty_2_6_12)
-      NEWS:
-      commit 2.6.12 release
-
-2006-01-15  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fixed use of references $cache_attrs and $repeat in Smarty_Compiler.
-      
-      php does not allow to pass an assigned by reference to a function. since
-      php-5.1.2
-      the reference to the lval gets lost when passing an assignment.
-
-2005-12-31  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      fixed incompatible use of fread() in Smarty::_read_file()
-      it choke on php-5.1.1 and later.
-      thanks to andig for pointing this out.
-
-2005-12-21  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      Fix improper tokenization of certain inline math expressions.
-      
-      Thanks to gerard at forums for reporting this.
-
-2005-12-19  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.math.php:
-      fixed problem with math in certain LC_NUMERIC locales.
-      thanks to wiebren for providing problem+solution.
-
-2005-12-14  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS:
-      fixed iso-latin1 special chars
-
-2005-12-14  Monte Ohrt  <monte@ohrt.com>
-
-    * libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      update version numbers
-
-    * (Smarty_2_6_11)
-      NEWS:
-      commit NEWS file for 2.6.11
-
-2005-12-08  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/de/getting-started.xml:
-      sync with en
-
-2005-11-29  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fixed code generation of non-cacheable blocks to play well with php's
-      "Alternative syntax" used for example in compiled {if}..{else}..{/if}
-      blocks.
-      
-      (see: http://php.net/manual/en/control-structures.alternative-syntax.php
-      on "Alternative syntax")
-      
-      thanks to kihara from the forum.
-
-2005-11-26  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS:
-      fixed handling of multiple identical calls to {insert}.
-      
-      the function was called multiple times, but all inserts where replaced
-      by the results of the first call to the insert function.
-
-    * libs/plugins/compiler.assign.php
-      libs/plugins/function.config_load.php:
-      added credits
-
-    * libs/plugins/function.popup.php:
-      added "closeclick" from
-      http://www.bosrup.com/web/overlib/?Command_Reference
-
-2005-11-23  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/plugins/modifier.escape.php:
-      replace {} string access with equivalent substr() to avoid E_STRICT
-      warnings in PHP 5.1
-
-2005-11-09  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/Smarty.class.php:
-      return valid reference in get_config_vars() when given var is non-existant
-
-2005-10-11  Monte Ohrt  <monte@ohrt.com>
-
-    * libs/plugins/block.textformat.php
-      libs/plugins/compiler.assign.php
-      libs/plugins/function.assign_debug_info.php
-      libs/plugins/function.config_load.php
-      libs/plugins/function.counter.php
-      libs/plugins/function.eval.php
-      libs/plugins/function.fetch.php
-      libs/plugins/function.html_options.php
-      libs/plugins/function.html_select_date.php
-      libs/plugins/function.html_select_time.php
-      libs/plugins/function.math.php
-      libs/plugins/function.popup.php
-      libs/plugins/function.popup_init.php
-      libs/plugins/modifier.capitalize.php
-      libs/plugins/modifier.count_characters.php
-      libs/plugins/modifier.count_paragraphs.php
-      libs/plugins/modifier.count_sentences.php
-      libs/plugins/modifier.count_words.php
-      libs/plugins/modifier.date_format.php
-      libs/plugins/modifier.debug_print_var.php
-      libs/plugins/modifier.default.php
-      libs/plugins/modifier.escape.php
-      libs/plugins/modifier.indent.php
-      libs/plugins/modifier.lower.php
-      libs/plugins/modifier.regex_replace.php
-      libs/plugins/modifier.replace.php
-      libs/plugins/modifier.spacify.php
-      libs/plugins/modifier.string_format.php
-      libs/plugins/modifier.strip_tags.php
-      libs/plugins/modifier.truncate.php
-      libs/plugins/modifier.upper.php
-      libs/plugins/modifier.wordwrap.php
-      libs/plugins/shared.escape_special_chars.php
-      libs/plugins/shared.make_timestamp.php:
-      Added author title to plugins where they don't exist. I put my name where I
-      was the original or co-author. If there needs to be more credit given
-      somewhere, speak up!
-
-2005-10-10  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS
-      libs/plugins/function.html_image.php:
-      add path_prefix to html_image, fix incorrect secure_dir error when image
-      file is missing
-
-2005-10-04  Monte Ohrt  <monte@ohrt.com>
-
-    * demo/templates/index.tpl:
-      remove popup example, update section var syntax
-
-2005-09-16  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/de/getting-started.xml:
-      more fixes
-
-    * docs/de/getting-started.xml:
-      fix php bug #34520: broken example display (de only)
-
-2005-08-30  Monte Ohrt  <monte@ohrt.com>
-
-    * libs/plugins/modifier.escape.php:
-      change default charset from utf8 to iso-8859-1
-
-    * NEWS
-      libs/plugins/modifier.escape.php:
-      add char_set param
-
-2005-08-17  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS:
-      fix notice in debug security check
-
-    * libs/Smarty.class.php:
-      fix typo
-
-    * NEWS
-      libs/Smarty.class.php:
-      return valid reference in get_template_vars() when given var is
-      non-existant
-
-2005-08-12  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS
-      libs/plugins/modifier.escape.php:
-      add "urlpathinfo" escape type to escape modifier. (apache does not like %2F
-      in the PATH_INFO)
-
-2005-08-05  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      update version numbers
-
-2005-08-04  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS:
-      update secure_dir notes
-
-    * NEWS:
-      allow debug.tpl to work from arbitrary dir
-
-2005-08-04  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fixed proper escaping for literal strings passed to
-      Smarty_Compiler::_expand_quoted_text() by
-      Smarty_Compiler::_parse_var_props()
-
-2005-07-27  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/shared.make_timestamp.php:
-      removed ambiguity for numeric values passed to smarty_make_timestamp().
-      numeric values are *always* treated as timestamps now.
-
-2005-07-18  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Config_File.class.php:
-      removed E_NOTICE from Config_File::get()
-
-    * libs/Smarty.class.php:
-      removed E_NOTICE
-
-2005-07-10  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/getting-started.xml:
-      sync with EN
-
-2005-07-08  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS:
-      correct username in NEWS file
-
-    * NEWS
-      libs/plugins/function.html_select_date.php:
-      added passthru attribute feature to html_select_date
-
-2005-07-03  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/language-snippets.ent
-      docs/fr/preface.xml:
-      sync with EN
-
-2005-06-16  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/de/preface.xml
-      docs/de/preface.xml:
-      sync with en
-
-2005-06-13  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS
-      libs/plugins/modifier.truncate.php:
-      add "middle" parameter to truncate modifier
-
-2005-06-10  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/de/livedocs.ent:
-      added german livedocs.ent
-
-    * docs/de/language-snippets.ent
-      docs/de/preface.xml:
-      sync with en
-
-2005-06-09  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/de/bookinfo.xml
-      docs/de/getting-started.xml
-      docs/de/getting-started.xml:
-      sync with en
-
-2005-05-24  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/getting-started.xml
-      docs/fr/language-snippets.ent:
-      sync with EN
-
-2005-05-20  Monte Ohrt  <monte@ohrt.com>
-
-    * libs/plugins/function.html_radios.php:
-      fix allowable label id characters
-
-2005-05-06  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS
-      libs/plugins/function.html_radios.php:
-      make form input label ids optional (monte)
-
-2005-05-02  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      add error message for empty if/elseif statements
-
-2005-04-15  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS
-      libs/plugins/function.html_radios.php:
-      cast selected value to string for comparison in html_radios
-
-2005-04-07  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.html_select_date.php:
-      added xhtml compliance to html_select_date's year_as_text-feature
-      thanks to Mark West
-
-    * NEWS
-      libs/plugins/function.html_select_date.php:
-      fixed handling of selected month html_select_date
-      thanks to Yuri Weseman for providing problem+solution
-
-2005-04-07  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/configure.in:
-      sync configure and file-entities scripts with phpdoc, for better
-      windows/cygwin support
-
-2005-03-31  Monte Ohrt  <monte@ohrt.com>
-
-    * libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      update version numbers
-
-    * (Smarty_2_6_9)
-      NEWS:
-      update NEWS file
-
-2005-03-30  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.math.php:
-      re-enabled hex-constant. i hope in a sane way this time.
-
-2005-03-30  Monte Ohrt  <monte@ohrt.com>
-
-    * libs/plugins/function.math.php:
-      fix function testing logic
-
-    * libs/Smarty_Compiler.class.php:
-      disable variable func calls completely
-
-    * libs/Smarty_Compiler.class.php:
-      disallow variable func calls when security is enabled
-
-2005-03-22  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      bumped version-number to 2.6.9-dev
-      added headline of 2.6.6 release to NEWS file
-
-2005-03-21  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * (Smarty_2_6_8)
-      NEWS:
-      maybe even better this way. thanks monte :)
-
-    * NEWS:
-      little more clear news-entry
-
-2005-03-21  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS:
-      update NEWS with e-modifier removal
-
-    * (Smarty_2_6_8)
-      libs/plugins/modifier.regex_replace.php:
-      remove e-modifier
-
-2005-03-19  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      objects don't get casted to arrays anymore in {foreach}
-
-2005-02-26  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      add "null" as a valid token for {if} when security is enabled
-
-2005-02-25  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS
-      libs/plugins/function.mailto.php:
-      add javascript_charcode option to mailto
-
-2005-02-24  Monte Ohrt  <monte@ohrt.com>
-
-    * NEWS:
-      update NEWS file
-
-    * QUICK_START
-      libs/plugins/function.html_radios.php:
-      add label ids to html_radios
-
-2005-02-10  Monte Ohrt  <monte@ohrt.com>
-
-    * QUICK_START:
-      update with directory structure
-
-2005-02-10  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/Makefile.in:
-      fix chm generation
-
-2005-02-10  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      fixed too agressive {strip} around delimiters inside strip-blocks
-
-2005-02-10  Monte Ohrt  <monte@ohrt.com>
-
-    * QUICK_START:
-      fix a couple errors
-
-2005-02-10  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/Makefile.in
-      docs/README:
-      commiting the new tools to make the CHM manual.
-
-2005-02-09  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fixed handling of strip-tags with non-default delimiters
-
-2005-02-04  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.html_radios.php:
-      fixed syntax error. shame on me.
-
-2005-02-03  Monte Ohrt  <monte@ohrt.com>
-
-    * QUICK_START:
-      fix example
-
-    * QUICK_START:
-      initial commit
-
-    * RELEASE_NOTES
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      update version numbers in cvs
-
-    * (Smarty_2_6_7)
-      NEWS
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      commit version numbers for new release
-
-2005-02-03  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * (Smarty_2_6_7)
-      libs/plugins/function.html_image.php:
-      fixed comment (thanks to CirTap)
-
-2005-02-01  Monte Ohrt  <monte@ohrt.com>
-
-    * libs/plugins/function.html_image.php:
-      remove border tag
-
-2005-02-01  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      fixed serialization of values containing newlines (like _cache_attrs)
-      in core_write_cache_file()
-      
-      bumped version to 2.6.6-dev-3 to indicate that the fileformat of cache
-      has changed
-
-2005-01-30  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fixed handling of hashed opening php-tags inside strip-blocks
-      (reported by titi_rafa)
-
-2005-01-30  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/fr/language-snippets.ent:
-      fix build
-
-2005-01-28  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/modifier.escape.php:
-      escape:url now uses the (RFC 1738 compliant) rawurlencode()
-
-2005-01-23  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      replaced ? true : false and removed intermediate $_cookie_var in the
-      handling of the SMARTY_DEBUG-cookie
-
-2005-01-22  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/bookinfo.xml:
-      update EN-Revision tag
-
-2005-01-21  Monte Ohrt  <monte@ohrt.com>
-
-    * README
-      RELEASE_NOTES
-      docs/de/bookinfo.xml
-      docs/fr/bookinfo.xml
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/plugins/function.cycle.php
-      libs/plugins/function.debug.php
-      libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_image.php
-      libs/plugins/function.html_radios.php
-      libs/plugins/function.html_table.php
-      libs/plugins/function.mailto.php
-      libs/plugins/modifier.cat.php
-      libs/plugins/modifier.nl2br.php
-      libs/plugins/modifier.strip.php
-      libs/plugins/outputfilter.trimwhitespace.php:
-      de-spammify e-mails
-
-    * README
-      RELEASE_NOTES
-      docs/de/bookinfo.xml
-      docs/fr/bookinfo.xml
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/plugins/function.cycle.php
-      libs/plugins/function.debug.php
-      libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_image.php
-      libs/plugins/function.html_radios.php
-      libs/plugins/function.html_table.php
-      libs/plugins/function.mailto.php
-      libs/plugins/modifier.cat.php
-      libs/plugins/modifier.nl2br.php
-      libs/plugins/modifier.strip.php
-      libs/plugins/outputfilter.trimwhitespace.php:
-      update copyright notices, e-mail addresses
-
-2005-01-06  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      reduced the code that is generated on a {foreach}-block that has a
-      name.
-      
-      instead of pre-computing all foreach-properties (like first, last,
-      show) on each iteration, they are computed on demand as soon as
-      {$smarty.foreach.*}-variables are used.
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      slight optimization in the compilation of $smarty.const.FOO .
-      
-      more complex consts like $smarty.const.$name still compile to
-      constant($this->_tpl_vars['name'])
-
-2005-01-05  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      make block functions and registered objects' block methods use a
-      local variable for block_content instead of $this->_block_content
-      
-      it's not necessary to have $smarty->_block_content accessible.
-
-2005-01-04  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/bookinfo.xml:
-      sync with EN
-
-2005-01-01  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      Happy new year from germany.
-
-2004-12-28  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty.class.php:
-      fix _read_file comments
-
-2004-12-26  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/getting-started.xml
-      docs/fr/preface.xml:
-      typo
-
-    * docs/fr/language-defs.ent
-      docs/fr/language-snippets.ent
-      docs/fr/livedocs.ent:
-      sync with EN & typo
-
-2004-12-21  Yannick Torres  <yannick.torres@keliglia.com>
-
-    * docs/fr/bookinfo.xml
-      docs/fr/getting-started.xml
-      docs/fr/translation.xml:
-      sync with EN
-
-2004-12-17  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fixed escaping of template-filenames in the generated code that loads
-      needed plugins
-
-2004-12-15  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/plugins/function.popup.php:
-      fix invalid HTML issue with popup
-
-2004-12-06  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/plugins/function.popup.php:
-      - fixed {popup} to properly handle inarray and function parameters and
-      added support for mouseoff and followmouse options
-
-2004-11-21  Mehdi Achour  <didou@keliglia.com>
-
-    * docs/fr/livedocs.ent:
-      add livedocs specific entities files
-
-2004-11-16  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_radios.php:
-      cleaned up typecasting
-
-2004-11-15  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.html_options.php:
-      fixed semantically misleading check for $options (use isset() instead
-      of is_array() because it is always an array).
-      
-      thanks to albert almeida.
-
-2004-11-08  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      removed unused code
-
-2004-10-25  Mehdi Achour  <didou@keliglia.com>
-
-    * docs/fr/bookinfo.xml
-      docs/fr/getting-started.xml:
-      sync with en
-
-2004-10-13  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS:
-      update header
-
-2004-10-02  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS:
-      fixed nocache-handling with nested includes. there was a logical error
-      in the replacement of internal nocache-tags to dynamic content that
-      lead to false results with deeply nested includes or with
-      nocache-blocks inside nocache-blocks.
-      
-      many thanks to Lars Jankowfsky for providing big help on reproducing
-      and tracking down this bug!
-
-2004-10-01  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      - better header for compiled includes (more in line with compiled
-      templates)
-      
-      - reuse cache_serials if a file is compiled more than once in one
-        process (force_compile)
-      
-      - don't print nocache-delimiters wenn already inside
-      process_cached_inserts()
-
-2004-09-29  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      switched from @count() to !empty() . this was pointed out a few times
-      by a few people with buggy error-handlers
-
-    * libs/Smarty_Compiler.class.php:
-      added some property declarations
-
-2004-09-28  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      bumped up version number to reflect incompatibility in tempfiles of
-      'core' vs. 'internals'
-
-2004-09-24  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.html_select_date.php:
-      fixed $start_year when no value for the year in $time is given.
-
-2004-09-21  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.html_table.php:
-      fixed handling of "inner"-attribute
-
-    * libs/Smarty_Compiler.class.php:
-      fixed handling of object derefence inside backticks
-
-2004-09-20  Monte Ohrt  <monte@ispi.net>
-
-    * libs/debug.tpl:
-      add <head></head> tags
-
-2004-09-18  boots  <jayboots@yahoo.com>
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/plugins/function.config_load.php
-      libs/plugins/function.debug.php
-      libs/plugins/function.fetch.php
-      libs/plugins/function.html_image.php:
-      Fixed \\r\\n line endings mistakenly introduced in last commit. d'oh.
-
-2004-09-16  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.assemble_plugin_filepath.php
-      libs/core/core.assign_smarty_interface.php
-      libs/core/core.create_dir_structure.php
-      libs/core/core.display_debug_console.php
-      libs/core/core.get_include_path.php
-      libs/core/core.get_microtime.php
-      libs/core/core.get_php_resource.php
-      libs/core/core.is_secure.php
-      libs/core/core.is_trusted.php
-      libs/core/core.load_plugins.php
-      libs/core/core.load_resource_plugin.php
-      libs/core/core.process_cached_inserts.php
-      libs/core/core.process_compiled_include.php
-      libs/core/core.read_cache_file.php
-      libs/core/core.rm_auto.php
-      libs/core/core.rmdir.php
-      libs/core/core.run_insert_handler.php
-      libs/core/core.smarty_include_php.php
-      libs/core/core.write_cache_file.php
-      libs/core/core.write_compiled_include.php
-      libs/core/core.write_compiled_resource.php
-      libs/core/core.write_file.php
-      libs/plugins/function.config_load.php
-      libs/plugins/function.debug.php
-      libs/plugins/function.fetch.php
-      libs/plugins/function.html_image.php:
-      Moved /libs/core to /libs/internals and created new constant,
-      SMARTY_CORE_DIR which defaults to SMARTY_DIR/internals. This should help
-      CVS and rsynch users butupgrades will require changes and this may affect
-      3rd party plugins that use the /core dir.
-
-2004-09-15  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      moved $this->_num_const_regexp out of $this->_var_regexp and added it
-      to the places that affect $this->_var_regexp
-      
-      this should fix some problems parsing plugin-names endings with digits
-
-2004-09-14  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      update files to 2.6.6-dev
-
-2004-09-13  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS:
-      fixed typo
-
-2004-09-13  Monte Ohrt  <monte@ispi.net>
-
-    * (Smarty_2_6_5)
-      NEWS:
-      update NEWS file with parsing correction note
-
-2004-09-11  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.debug.php:
-      removed notice from {debug}
-      thanks to Peter Billen for pointing this one out!
-
-2004-09-11  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty_Compiler.class.php:
-      fix more object calling syntax issues
-
-2004-09-10  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      added $smarty->security_settings['ALLOW_CONSTANTS']
-      including test-cases for them
-
-2004-09-09  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty_Compiler.class.php:
-      break down regex to digestable chunks, fix multiple param problem with
-      method calls,
-      add object method testing to unit_test cases
-
-    * libs/Smarty_Compiler.class.php:
-      update code comment with more examples
-
-    * libs/Smarty_Compiler.class.php:
-      allow objects in arbitrary param positions
-
-    * libs/Smarty_Compiler.class.php:
-      fix object parameter regex, allow one level of object indirection
-
-    * libs/Smarty_Compiler.class.php:
-      fix compile problem with numeric constants and math operator matching
-
-2004-09-07  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      update files to 2.6.5-dev
-
-    * (Smarty_2_6_4)
-      NEWS:
-      update NEWS file with 2.6.4 header
-
-2004-08-31  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty_Compiler.class.php:
-      fix preg_quote
-
-    * libs/Smarty_Compiler.class.php:
-      fix math in object params, clean up some regex on the way, change
-      preg_ delimiters to ~ to avoid character clashes with ! and %
-
-2004-08-30  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      add $smarty.ldelim and $smarty.rdelim to smarty special var
-
-2004-08-29  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/core/core.write_file.php:
-      tempnam() seems to be borken on many installation.
-      
-      now we try tempnam first and if that fails we generate our own
-      temp-filename with uniqid()
-
-2004-08-23  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/modifier.capitalize.php:
-      dont use constant, use static var instead
-
-    * libs/plugins/modifier.capitalize.php:
-      implement optional param to capitalize for digit behavior
-
-    * libs/plugins/modifier.capitalize.php:
-      another commit to capitalize, taking special chars into account
-
-2004-08-23  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      cleaned up attribute-handling in Smarty_Compiler::_compile_foreach_start()
-
-2004-08-23  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/plugins/function.html_select_date.php
-      libs/plugins/modifier.capitalize.php:
-      fix capitalize modifier to not rely on buggy ucwords() func
-
-2004-08-20  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/function.html_select_date.php:
-      update version
-
-    * NEWS
-      libs/plugins/function.html_select_date.php:
-      make time param work with negative timestamps, force year range to include
-      given date unless explicitly set
-
-2004-08-19  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/plugins/function.fetch.php:
-      fix bug with fetch, passing user/pass in url did not work
-
-2004-08-13  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      fixed handling of {foreachelse} and {sectionelse} that got borked with
-      the latest commit (v 1.330)
-
-2004-08-12  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fixed occasional wrong error messages on mismatched tags when
-      {else}, {elseif}, {foreachelse} or {sectionelse} is involved
-      
-      thanks to Ooypunk for pointing me on this
-
-2004-08-12  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/.cvsignore
-      docs/Makefile.in
-      docs/configure.in:
-      enable russian PDF builds
-
-2004-07-30  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/configure.in:
-      typo
-
-    * docs/Makefile.in
-      docs/README
-      docs/configure.in:
-      add make test_xml
-      this is usefull to detect XML problems
-
-2004-07-29  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/configure.in:
-      avoid warnings in head
-
-    * docs/.cvsignore
-      docs/Makefile.in
-      docs/README
-      docs/configure.in:
-      build pdf files
-      just type make pdf
-
-2004-07-27  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fixed handling of methods arguments.
-      
-      thanks to Manfred Wischin for finding this one and providing the
-      conceptual fix.
-
-2004-07-23  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_radios.php:
-      there was little flaw in smarty_function_html_radios() and
-      smarty_function_html_checkboxes():
-      
-      the newly introduced assign-attribute was still added to the
-      tag-output as an extra-attribute.
-      
-      fixed.
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.load_plugins.php
-      libs/core/core.load_resource_plugin.php
-      libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_image.php
-      libs/plugins/function.html_options.php
-      libs/plugins/function.html_radios.php
-      libs/plugins/function.html_select_date.php
-      libs/plugins/function.html_select_time.php
-      libs/plugins/modifier.date_format.php:
-      backed out renaming of _get_plugin_filepath() to get_plugin_filepath()
-      
-      we'll stick to _get_plugin_filepath() and look for a more viable
-      solution to be exposed to plugin-writers.
-
-2004-07-20  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php
-      libs/core/core.is_trusted.php
-      libs/plugins/compiler.assign.php:
-      Some fixes on PhpDocumentor comments. Thanks go to Ruben Vermeersch.
-
-2004-07-16  andreas halter  <phpcvs@andreashalter.ch>
-
-    * docs/de/bookinfo.xml
-      docs/de/getting-started.xml
-      docs/de/language-defs.ent
-      docs/de/language-snippets.ent
-      docs/de/preface.xml:
-      - updated for 2.6.3
-      - updates for new build system
-      - added missing files
-      - corrections from users
-      - revcheck comments for all files
-      - big up to didou and nuno, brilliant work
-      - make test: ok
-      - make: ok
-
-2004-07-16  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/de/getting-started.xml:
-      fix the revision tracking tag
-      the revision number might not be right. just check it, please
-
-2004-07-16  andreas halter  <phpcvs@andreashalter.ch>
-
-    * docs/de/getting-started.xml:
-      - updated version (incl revcheck comment) for revcheck testing
-
-2004-07-14  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty.class.php:
-      replace " with ' where literal strings are quoted (ever so slight speedup)
-
-2004-07-12  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/modifier.date_format.php:
-      changed call from $smarty->_get_plugin_filepath() to
-      $smarty->get_plugin_filepath()
-
-    * libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_image.php
-      libs/plugins/function.html_options.php
-      libs/plugins/function.html_radios.php
-      libs/plugins/function.html_select_date.php
-      libs/plugins/function.html_select_time.php:
-      renamed calls to $smarty->_get_plugin_filepath() to
-      $smarty->get_plugin_filepath()
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.load_plugins.php
-      libs/core/core.load_resource_plugin.php:
-      renamed Smarty::_get_plugin_filepath() to Smarty::get_plugin_filepath()
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/core/core.write_compiled_include.php
-      libs/core/core.write_compiled_resource.php
-      libs/core/core.write_file.php:
-      removed touch() call. changing the timestamp of the compiled-template
-      to the source template's may be irritating for certain
-      source-code-caches. now a newly compiled template gets the current
-      time as timestamp.
-
-2004-07-02  gerald croes  <gerald@phpside.org>
-
-    * docs/fr/getting-started.xml
-      docs/fr/preface.xml:
-      Fixed missing tags to be able to make doc again
-
-    * docs/fr/preface.xml:
-      added the "is a good thing [TM]" as in en docs
-
-    * docs/fr/getting-started.xml:
-      added ctags, updated screen => programm listing.
-      added the technical note founded on the en doc
-
-2004-07-02  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_radios.php
-      libs/plugins/function.mailto.php:
-      add assign attribute to html_checkboxes and html_radios
-
-2004-07-01  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      removed use of get_include_filepath() inside
-      get_auto_filename(). thanks go to c960657
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      enhanced error-reporting for {foreach}
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fixed handling of digits inside tagnames. this problem slipped into
-      the regexps by adding support for numeric contants next to string
-      constants as variables.
-
-2004-06-27  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fixed escaping of backslashes in Smarty_Compiler::_quote_replace()
-
-2004-06-23  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/modifier.date_format.php:
-      display date_format %e, %T and %D as expected for windows
-
-2004-06-17  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      changed version-number to 2.6.4-dev
-
-2004-06-16  Monte Ohrt  <monte@ispi.net>
-
-    * (Smarty_2_6_3)
-      NEWS:
-      update NEWS file with version number
-
-2004-06-09  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/plugins/modifier.escape.php:
-      added escapement of '</' to javascript escaping
-
-2004-06-08  gerald croes  <gerald@phpside.org>
-
-    * docs/fr/translation.xml:
-      Add other translators.
-
-2004-06-08  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      made the correct value of "use_sub_dirs" available to the compiler.
-      (not worth a NEWS-entry, i think)
-
-2004-06-01  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.fetch.php:
-      fix: proper initialistaion of $content.
-      thanks to Dmitry Koteroff for pointing this out.
-
-2004-05-29  Mehdi Achour  <didou@keliglia.com>
-
-    * docs/fr/translation.xml:
-      oups :)
-
-    * docs/fr/translation.xml:
-      added translation file
-
-2004-05-28  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/Makefile.in:
-      clean also file-entities.php
-
-2004-05-28  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.mailto.php:
-      added obfuscation of protocol-string in {mailto} when using
-      hex-encoding (thanks to bharat)
-
-2004-05-26  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      enhanced auto-generated filenames for templates_c and cache
-      
-      incremented Smarty::_version because the tempfiles' structure changed
-      a little
-
-2004-05-23  Mehdi Achour  <didou@keliglia.com>
-
-    * docs/fr/bookinfo.xml
-      docs/fr/getting-started.xml
-      docs/fr/preface.xml:
-      WS and added revcheck
-
-2004-05-21  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      fixed typo in error-messages
-
-    * docs/de/language-snippets.ent
-      docs/fr/language-snippets.ent:
-      added empty language-snippets.ent to fix "make web"
-
-2004-05-12  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/plugins/modifier.escape.php:
-      add 'nonstd' escape modifier
-
-2004-05-07  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/plugins/block.textformat.php:
-      update textformat to not output wrap chars after last para
-
-2004-05-06  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/core/core.write_file.php:
-      use tempnam() instead of unqid() to create better temporary files in
-      smarty_core_write_file().
-      
-      (thanks to xces for finding this race-condition and his work on
-      fixing it)
-
-2004-05-04  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      added check if for file_exists() to Smarty::_read_file()
-
-2004-04-30  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/plugins/modifier.escape.php:
-      add 'mail' attribute to escape modifier
-
-2004-04-20  Mehdi Achour  <didou@keliglia.com>
-
-    * docs/manual.xml.in:
-      added the language-snippets.ent file and started using entities for notes
-      under en/programmers/api-functions
-
-2004-04-18  Mehdi Achour  <didou@keliglia.com>
-
-    * docs/de/getting-started.xml
-      docs/fr/getting-started.xml:
-      new global entity for zend and php-accelerator
-
-    * docs/fr/bookinfo.xml
-      docs/fr/getting-started.xml
-      docs/fr/preface.xml:
-      added myself as translator and added vim comments and xml tags
-
-2004-04-16  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS:
-      added entry for numeric constants
-
-    * libs/Smarty_Compiler.class.php:
-      removed unused 2nd param in call to _parse_var()
-
-    * libs/Smarty_Compiler.class.php:
-      added explanation for $this->_num_const_regexp
-
-    * NEWS
-      libs/plugins/modifier.escape.php:
-      added escape type "decentity" to smarty_modifier_escape()
-
-    * libs/Smarty_Compiler.class.php:
-      enabled numerical constants be parsed as statements.
-      (like {10} or {10|@range:12} )
-
-    * libs/Smarty_Compiler.class.php:
-      removed unused $smarty_compiler->_dvar_num_var_regexp
-
-    * libs/Smarty.class.php:
-      reverted Stuff
-
-    * libs/debug.tpl
-      libs/core/core.assemble_plugin_filepath.php
-      libs/core/core.read_cache_file.php
-      libs/core/core.write_file.php
-      libs/plugins/function.eval.php
-      libs/plugins/function.popup.php
-      libs/plugins/modifier.escape.php
-      libs/plugins/shared.make_timestamp.php:
-      reverted stuff
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/debug.tpl
-      libs/core/core.assemble_plugin_filepath.php
-      libs/core/core.read_cache_file.php
-      libs/core/core.write_file.php
-      libs/plugins/function.eval.php
-      libs/plugins/function.popup.php
-      libs/plugins/modifier.escape.php
-      libs/plugins/shared.make_timestamp.php:
-      Smarty_Compiler.class.php
-
-2004-04-15  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/core/core.write_compiled_include.php:
-      made smarty_core_write_compiled_include() php5-aware
-      
-      if someone knows a better way than patching the source with the
-      tokenizer, please stand up!
-
-2004-04-14  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/Makefile.in:
-      remove file-entities.ent also
-
-    * docs/.cvsignore
-      docs/Makefile.in
-      docs/README:
-      allow make revcheck
-
-2004-04-13  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/configure.in:
-      do not need inipath
-
-2004-04-13  Mehdi Achour  <didou@keliglia.com>
-
-    * docs/TODO:
-      done
-
-    * docs/configure.in
-      docs/manual.xml.in:
-      now the files entites are generated dynamically
-
-2004-04-12  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Config_File.class.php
-      libs/Smarty.class.php:
-      removed unused functionality to load a subset of lines from a file in
-      Smarty::_read_file()
-      
-      additionally removed a warning that is emitted since php-4.3.5 when
-      fread() is called on an empty file (with filesize()==0). thanks to
-      Andreas Streichardt who pointed this out.
-
-    * NEWS
-      libs/core/core.is_secure.php:
-      smarty_core_is_secure() only checks the file for readability now, not
-      the directory where is in.
-
-    * libs/Smarty.class.php:
-      removed unused security_setting 'ALLOW_CONSTANTS'
-
-2004-04-07  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.assign_debug_info.php
-      libs/plugins/function.cycle.php
-      libs/plugins/function.mailto.php:
-      removed trailing spaces
-
-    * libs/Smarty.class.php:
-      removed unused $smarty->_error_msg
-
-2004-04-04  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/configure.in:
-      fixing my crap
-      put build_date back on-line
-
-2004-04-03  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/Makefile.in
-      docs/configure.in
-      docs/manual.xml.in:
-      trying to fix ru problems
-
-2004-03-30  Monte Ohrt  <monte@ispi.net>
-
-    * libs/core/core.display_debug_console.php:
-      fix problem with debug_tpl path and security
-
-    * NEWS
-      libs/core/core.display_debug_console.php:
-      fix problem displaying debug console when $default_resource_type is not
-      "file:"
-
-2004-03-29  Mehdi Achour  <didou@keliglia.com>
-
-    * docs/TODO:
-      and finally, add a TODO here
-
-    * docs/de/bookinfo.xml
-      docs/de/manual.sgml
-      docs/fr/bookinfo.xml
-      docs/fr/manual.xml:
-      translate bookinfo.xml and put back the translators
-
-2004-03-28  Mehdi Achour  <didou@keliglia.com>
-
-    * docs/manual.xml.in:
-      add global.ent and define some general entities
-
-    * docs/de/bookinfo.xml
-      docs/de/getting-started.xml
-      docs/de/language-defs.ent
-      docs/de/preface.xml:
-      add new de files
-
-    * docs/de/appendixes.sgml
-      docs/de/designers.sgml
-      docs/de/getting-started.sgml
-      docs/de/html-common.dsl
-      docs/de/preface.sgml
-      docs/de/programmers.sgml:
-      drop old de files
-
-    * docs/fr/bookinfo.xml
-      docs/fr/getting-started.xml
-      docs/fr/manual.xml
-      docs/fr/preface.xml:
-      add ommited files
-
-    * docs/fr/language-defs.ent:
-      split the french dir
-
-    * docs/fr/appendixes.sgml
-      docs/fr/designers.sgml
-      docs/fr/getting-started.sgml
-      docs/fr/html-common.dsl
-      docs/fr/manual.sgml
-      docs/fr/preface.sgml
-      docs/fr/programmers.sgml:
-      drop old french files
-
-    * docs/manual.xml.in:
-      let's put the new build system
-
-2004-03-26  Mehdi Achour  <didou@keliglia.com>
-
-    * docs/de/common.dsl
-      docs/de/html.dsl
-      docs/fr/common.dsl
-      docs/fr/html.dsl
-      docs/fr/php.dsl:
-      not needed anymore
-
-2004-03-24  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/Makefile.in:
-      updated stylesheets
-      highlight PHP automatically
-
-    * docs/Makefile.in
-      docs/html.dsl:
-      remove unneeded file
-
-2004-03-23  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/version.ent.in:
-      remove this also
-
-    * docs/getting-started.sgml:
-      remove this one too
-
-    * docs/appendixes.sgml
-      docs/common.dsl
-      docs/designers.sgml
-      docs/html-common.dsl
-      docs/manual.sgml
-      docs/php.dsl
-      docs/preface.sgml
-      docs/programmers.sgml:
-      removing uneeded files
-
-    * docs/.cvsignore:
-      commiting missing files for docbook
-
-    * docs/.cvsignore
-      docs/Makefile.in
-      docs/configure.in
-      docs/manual.xml.in:
-      bundling docbook 4
-      now make and make web works
-
-2004-03-23  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.config_load.php:
-      unrolled call to the is_compiled()-check to be able to supply the
-      correct resource_base_path for config_load. this avoids errors when
-      config-files are accessed where security is enabled.
-      
-      thanks to shuther for pointing out this bug.
-
-2004-03-20  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/manual.xml.in:
-      fix build date
-
-2004-03-18  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/core/core.is_secure.php:
-      removed merging of $smarty->template_dir into $smarty->secure_dir
-      
-      the resource_base_path is considerd secure instead. this change should
-      have absolutely no impact on smarty's security's behaviour
-
-2004-03-18  Nuno Lopes  <nunoplopes@sapo.pt>
-
-    * docs/configure.in:
-      correcting non-existent var
-
-    * docs/.cvsignore
-      docs/Makefile.in
-      docs/configure.in
-      docs/manual.xml.in
-      docs/version.ent.in:
-      generate build date
-
-    * docs/.cvsignore
-      docs/Makefile.in
-      docs/README
-      docs/configure.in
-      docs/manual.xml.in:
-      new build/test system
-
-2004-03-18  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      moved setting of a default resource_base_path from
-      Smarty::_parse_resource_name() to Smarty::_fetch_resource_info()
-      
-      this shouldn't affect anything, since all calls to
-      _parse_resource_name() that are not done from within
-      _fetch_resource_info() all pass their own resource_base_path
-
-2004-03-17  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      removed '.' from the list of default resource_base_paths in
-      _parse_resource_name()
-      
-      this should only affect _parse_resource_name() for templates, not for
-      php-resources and not for config_files. the latter pass two their own
-      resource_base_path.
-
-2004-03-16  Mehdi Achour  <didou@keliglia.com>
-
-    * docs/appendixes.sgml
-      docs/getting-started.sgml
-      docs/preface.sgml:
-      adding editor comments
-
-    * docs/appendixes.sgml
-      docs/getting-started.sgml:
-      cleaning words spacing, killing tabulations, using roles for
-      programlisting..
-
-2004-03-15  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      simplified Smarty::clear_all_cache();
-
-2004-03-12  boots  <jayboots@yahoo.com>
-
-    * docs/programmers.sgml:
-      Updated is_cached prototype to indicate proper return type. (thanks to
-      Geoffrey Hoffman)
-
-2004-03-11  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/core/core.assemble_plugin_filepath.php:
-      fixed little bug that prevented plugins filepaths that are found in
-      php's include_path (and not in one of the plugins_dirs) from being
-      cached in the internal plugins-filepath-cache
-
-2004-03-01  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml:
-      update include_php docs:wq
-      :q
-
-    * docs/appendixes.sgml:
-      update componentized template example to something useful
-
-2004-02-24  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      _parse_resource_name() returned true on non-existant absolute
-      paths. This caused a warning on _fetch_resource_info() when used in
-      conjunction with template_exists(). It should be fixed now without
-      negative effects.
-
-2004-02-24  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml:
-      one more typo
-
-    * docs/designers.sgml:
-      fix typo
-
-2004-02-24  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/core/core.is_secure.php:
-      smarty_resource_*_secure got &$smarty passed errornously as 3rd
-      parameter and not as 2nd. this is fixed.
-
-2004-02-23  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS:
-      fix handling of integer values like width and delay im
-      smarty_function_popup()
-
-    * libs/plugins/function.popup.php:
-      fixed handling of integer-attributes
-
-    * libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      updated version to 2.6.3-dev
-
-2004-02-22  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.html_select_date.php:
-      removed notice on html_select_date with the month_empty-attribute
-
-    * libs/plugins/function.mailto.php:
-      removed 2 notices of undefined vars (thanks Cit)
-
-2004-02-17  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS:
-      add header
-
-    * (Smarty_2_6_2)
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      change some info in headers, remove fluff
-
-2004-02-13  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.html_select_date.php:
-      correctly handle partially empty dates (like "2004--" or "-12-").
-
-    * docs/programmers.sgml:
-      learned something about <note> and sgml and applied this to the
-      use.sub.dirs-section :)
-
-    * docs/designers.sgml:
-      changed attribute-name "checked" to "selected" in the docs for
-      html_radios and html_checkboxes. "checked" is deprecated for ages
-      AFAIK and selected is recommended for consistency with {html_options}
-
-    * docs/programmers.sgml:
-      added note about use_sub_dirs and Smarty-2.6.2 .
-      fixed markup for section about clear_compiled_tpl() .
-
-2004-02-12  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Config_File.class.php:
-      YES and NO should not be booleanized inside triple-quotes in a
-      config-file. this behaviour changed by accident in 2.6.1 and is now
-      reverted to pre-2.6.1 behaviour
-
-2004-02-10  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Config_File.class.php:
-      fixed slurping of a the next line following a triple-quoted value in a
-      config-file
-
-2004-02-07  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Config_File.class.php:
-      avoid @-operator for handling empty lines in Config_File.class.php
-
-    * libs/Smarty_Compiler.class.php:
-      removed two notices from Smarty_Compiler::_parse_is_expr()
-      (thanks shuther!)
-
-    * NEWS
-      libs/Smarty.class.php:
-      changed default for use_sub_dirs to false
-
-    * libs/plugins/function.mailto.php:
-      removed notice of undefined variable. (thanks shuther!)
-
-2004-01-29  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      added file and line-number-information to error-messages regarding
-      assigned objects an an error messages regarding modifiers with
-      security.
-
-2004-01-27  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      removed use of temporary var $_params in compiled code of block-plugins
-
-    * NEWS
-      libs/plugins/function.popup.php:
-      fixed quoting of values in smarty_function_popup()
-
-2004-01-25  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/programmers.sgml:
-      documented parameters of Smarty::clear_compiled_tpl()
-
-    * libs/Smarty_Compiler.class.php:
-      Smarty_Compiler::_syntax_error() uses Smarty::_trigger_fatal_error() now
-      instead of the trigger_error()-function
-
-    * libs/Smarty.class.php:
-      Smarty::_trigger_fatal_error() uses Smarty::trigger_error() now,
-      instead of the native trigger_error()-function
-
-    * libs/Smarty_Compiler.class.php:
-      unrecognized custom-functions trigger an error at compile now, not at
-      display-time.
-
-2004-01-23  Monte Ohrt  <monte@ispi.net>
-
-    * docs/getting-started.sgml:
-      reword a paragraph
-
-2004-01-22  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.config_load.php:
-      removed emission of unnecessary notices for unavailable config-files
-      in config_load()
-
-    * NEWS
-      libs/Config_File.class.php:
-      fixed handling of hidden sections in Config_File
-
-2004-01-21  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.config_load.php:
-      added handling of resources for {config_load}
-
-2004-01-19  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.html_table.php:
-      fixed bug when using arrays with tr_attr and td_attr in {html_table}
-
-2004-01-16  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS:
-      add unit testing
-
-    * NEWS
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      update version numbers, add initial unit test directory
-
-    * (Smarty_2_6_1)
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      update version numbers for 2.6.1 release
-
-2004-01-16  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * (Smarty_2_6_1)
-      NEWS
-      docs/programmers.sgml
-      libs/Smarty.class.php:
-      renamed $smarty->tpl_rror_reporting to $smarty->error_reporting
-      "tpl_" is a bit redundant here (it's a TemPLate-engine overall :)
-
-2004-01-15  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.html_image.php:
-      forgot to remove duplicate is_secure()-check
-
-    * NEWS
-      libs/plugins/function.html_image.php:
-      fix: $smarty->security is now correctly handled
-      
-      minor optimizations:
-         core/core.is_secure.php is only included when needed
-         $dpi_default is only determined when needed
-
-2004-01-14  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/appendixes.sgml
-      docs/programmers.sgml:
-      removed suggestions to use extract() from the manual
-
-    * docs/designers.sgml:
-      fixed typo
-
-2004-01-12  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml:
-      mention SCRIPT_NAME below {$smarty} reserved variable because it got
-      lost in the docs for $smarty->global_assign
-
-    * docs/designers.sgml:
-      added docs for {$smarty.version} special variable
-
-    * docs/programmers.sgml:
-      removed docs for $global_assign
-
-    * docs/programmers.sgml:
-      added docs for tpl_error_reporting
-
-    * docs/designers.sgml:
-      added docs for year_empty-, month_empty- and day_emtpy-attributes of
-      html_select_date. maybe an example is needed to better explain empty
-      values in YYY-MM-DD.
-
-2004-01-10  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      fixed handling of {php}-tags
-
-2004-01-10  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml:
-      fix html_checkboxes examples
-
-2004-01-08  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/core/core.assemble_plugin_filepath.php:
-      added caching of requested paths to smarty_core_assemble_plugin_filepath()
-
-    * NEWS:
-      fix handling of comments inside {php}- and {literal}-blocks
-
-    * libs/Smarty_Compiler.class.php:
-      fixed handling of comments inside {php} and {literal}
-
-2004-01-06  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Config_File.class.php:
-      fixed bug handling triple-quotes in config-files
-
-    * libs/Config_File.class.php:
-      fixed bugs with triple-quotes in config-files
-      thanks BRDude for finding them testing!
-
-2004-01-02  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      removed unnecessary param in call to _fetch_resource_info()
-
-2003-12-30  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      oops! removed tabs.
-
-2003-12-27  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      made $SCRIPT_NAME available again
-      changes default for request_use_auto_global to prefer autoglobals
-
-    * libs/Smarty.class.php:
-      removed tabs and trailing spaces
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      readded default_modifiers. who removed that?
-
-2003-12-23  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS:
-      add portuguese docs
-
-2003-12-22  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml:
-      fix counter example
-
-2003-12-19  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty.class.php:
-      add debug console persistance feature
-
-2003-12-19  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/block.textformat.php
-      libs/plugins/function.html_table.php
-      libs/plugins/function.popup.php:
-      removed extract(). enhanced parameter parsing.
-
-    * libs/plugins/function.counter.php
-      libs/plugins/function.fetch.php
-      libs/plugins/function.popup_init.php
-      libs/plugins/modifier.capitalize.php
-      libs/plugins/modifier.cat.php
-      libs/plugins/modifier.date_format.php
-      libs/plugins/modifier.debug_print_var.php
-      libs/plugins/modifier.escape.php
-      libs/plugins/modifier.indent.php
-      libs/plugins/modifier.lower.php
-      libs/plugins/modifier.nl2br.php
-      libs/plugins/modifier.strip.php
-      libs/plugins/modifier.upper.php
-      libs/plugins/modifier.wordwrap.php
-      libs/plugins/outputfilter.trimwhitespace.php
-      libs/plugins/shared.escape_special_chars.php:
-      removed tabs. fixed indentiation.
-
-    * libs/plugins/modifier.truncate.php:
-      removed tabs
-
-    * libs/plugins/function.counter.php
-      libs/plugins/function.cycle.php:
-      removed extract() from parameter-parsing
-
-2003-12-17  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.html_select_date.php:
-      fix plugin-name in error message
-
-    * libs/plugins/function.html_select_time.php:
-      remove extract-call from {html_select_time}
-
-    * NEWS
-      libs/plugins/function.html_select_date.php:
-      allow single-digit days and months without smarty_make_timestamp()
-      this makes dates like "1968-11-6" work correctly since no strtotime()
-      is involved
-      
-      add warning when unknown parameter is passed
-
-2003-12-16  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      fix headers sent erroneously with cache_modified_check and fetch()
-
-2003-12-12  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/function.config_load.php:
-      move set_path() call below the conditional bracket
-
-    * NEWS
-      libs/plugins/function.config_load.php:
-      fix config_load filepath bug
-
-2003-12-12  boots  <jayboots@yahoo.com>
-
-    * docs/designers.sgml:
-      Updated language.function.if with additional annotation and to fix error
-      that broke docs build process
-
-2003-12-11  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      little optimization for "is odd" and "is even"
-
-2003-12-11  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fix 'is even by' and 'is odd by' logic
-
-2003-12-11  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml:
-      update example-output of {mailto}
-
-    * libs/plugins/function.mailto.php:
-      removed extract-call -> cleaner parameter-handling
-
-    * libs/plugins/function.mailto.php:
-      fixed indentiation
-
-    * TODO:
-      removed two done topics
-
-2003-12-11  boots  <jayboots@yahoo.com>
-
-    * docs/designers.sgml:
-      Updated language.function.if to describe qualifiers (thanks andre)
-
-2003-12-10  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.html_select_date.php:
-      added day_empty, month_empty, year_empty and all_empty attributes
-      to pass an undefined date use {html_select_date time="--" ...}
-
-    * libs/plugins/function.html_select_date.php:
-      removed extract()-call
-
-    * libs/plugins/function.html_select_date.php:
-      fixed indetiation
-
-2003-12-10  boots  <jayboots@yahoo.com>
-
-    * NEWS
-      docs/designers.sgml:
-      Added table to language.function.if to describe qualifiers
-
-2003-12-09  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_options.php:
-      strict comparason didn't work in all cases. use type-casting now.
-
-    * NEWS
-      libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_options.php:
-      fix bug when comparing array-keys to "selected" in html_options and
-      html_checkboxes
-      
-      in_array() uses "strict" comparason now.
-
-    * libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_options.php
-      libs/plugins/function.html_radios.php:
-      removed tabs, fixed indentiation
-
-2003-12-08  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      add better checks for correctly nested tags when compiling
-
-2003-12-04  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php
-      libs/plugins/function.html_image.php:
-      fix: check $smarty->request_use_auto_globals at the last occurences of
-           HTTP_*_VARS
-
-2003-12-03  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      remove $global_assign property from Smarty and $global_assign-handling
-      from the constructor. the only visible change is, that $SCRIPT_NAME is
-      not available in the tempates anymore. $smarty.server.SCRIPT_NAME has
-      to be used from now.
-
-2003-12-03  boots  <jayboots@yahoo.com>
-
-    * docs/designers.sgml:
-      Fixed example for count_characters
-
-2003-12-01  boots  <jayboots@yahoo.com>
-
-    * docs/designers.sgml:
-      Added section "Escaping Smarty Parsing" under Basic Syntax.
-
-2003-12-01  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/core/core.create_dir_structure.php:
-      thought again about my latest commit and backed it out.
-
-    * libs/core/core.create_dir_structure.php:
-      fix root-dir-handling on windows filepath
-
-2003-11-29  boots  <jayboots@yahoo.com>
-
-    * libs/plugins/function.config_load.php:
-      really make the fixes the last patch was supposed to do
-
-    * libs/plugins/function.config_load.php:
-      removed tabs and killed trailing white-space
-
-    * libs/plugins/function.config_load.php:
-      changed $smarty->_syntax_error to $smarty->trigger_error
-
-2003-11-27  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/modifier.debug_print_var.php:
-      remove warning in debug_print_var on php-resources
-
-    * README:
-      fix version number
-
-2003-11-26  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      raise max_level for $smarty.config... to 3 to allow arrays of config-vars
-
-2003-11-25  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      changed version-tag to indicate incompatibility to older compiled
-      templates
-
-2003-11-24  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/compiler.assign.php
-      libs/plugins/function.assign.php:
-      move function.assign.php to compiler.assign.php
-
-    * libs/core/core.get_include_path.php:
-      silence occasional warnings of open_basedir- and
-      safe_mode-restrictions in core.get_include_path.php
-
-2003-11-23  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/core/core.write_compiled_resource.php
-      libs/core/core.write_file.php:
-      avoid touch()-ing of recently unlinked files by touch()-ing the
-      tempfile before rename instead of touch()-ing the resulting file after
-      rename.
-
-    * NEWS
-      libs/Smarty.class.php:
-      add property $tpl_error_reporting
-
-2003-11-22  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.assign.php:
-      remove use of extract() in smarty_function_assign()
-
-    * NEWS
-      libs/Smarty.class.php:
-      remove property $undefined. "null" is used literally instead
-
-2003-11-21  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      remove two E_NOTICES
-
-2003-11-20  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      change version to 2.6.1-dev
-
-2003-11-19  Monte Ohrt  <monte@ispi.net>
-
-    * (Smarty_2_6_0)
-      NEWS:
-      update NEWS file
-
-    * (Smarty_2_6_0)
-      docs/designers.sgml
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      change version numbers to 2.6.0
-
-2003-11-19  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml
-      docs/de/designers.sgml
-      docs/fr/designers.sgml:
-      fix examples of escape-modifier (in docs, docs/de and docs/fr !)
-
-2003-11-18  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      move Smarty::quote_replace() to Smarty_Compiler::_quote_replace()
-
-    * libs/Smarty.class.php:
-      removed extract-calls from _include()- and _eval()-wrappers
-      variables passed with {include_php} have to accessed as members of $params
-      now
-
-2003-11-17  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml:
-      fixed typo
-
-2003-11-13  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Config_File.class.php:
-      fix occasional notice
-
-2003-11-13  andreas halter  <phpcvs@andreashalter.ch>
-
-    * docs/de/designers.sgml:
-      - added cat modifier, thanks messju :-)
-
-2003-11-13  Monte Ohrt  <monte@ispi.net>
-
-    * (Smarty_2_6_0-RC3)
-      NEWS
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      commit RC3 tags
-
-2003-11-13  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fix handling of $var.key inside []
-
-    * libs/Smarty.class.php:
-      fix unnecessary loading of core.load_resource_plugin.php
-
-    * (Smarty_2_6_0-RC3)
-      docs/fr/designers.sgml:
-      fixed example of html_table
-
-2003-11-11  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/core/core.process_cached_inserts.php:
-      fix handling of assign inside {insert}-tags
-
-2003-11-06  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/core/core.read_cache_file.php:
-      added $exp_time-parameter
-
-    * docs/programmers.sgml:
-      added $exp_time to cache_handler_func-example
-
-    * libs/Smarty.class.php
-      libs/core/core.write_cache_file.php:
-      added $exp_time-parameter of clear_cache() and clear_all_cache() to
-      cache_handler_func.
-
-2003-11-05  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Config_File.class.php:
-      fix handling if [...] inside triple-quotes in config-files
-
-2003-11-04  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      fixed little bug in _parse_resource_name() (jlgunter, messju)
-
-2003-11-03  andreas halter  <phpcvs@andreashalter.ch>
-
-    * docs/designers.sgml
-      docs/de/designers.sgml
-      docs/fr/designers.sgml:
-      - changed Smarty.php.class occurences to Smarty.class.php
-
-2003-10-29  boots  <jayboots@yahoo.com>
-
-    * docs/appendixes.sgml
-      docs/designers.sgml
-      docs/manual.sgml
-      docs/programmers.sgml
-      docs/de/appendixes.sgml
-      docs/de/designers.sgml
-      docs/de/programmers.sgml
-      docs/fr/appendixes.sgml
-      docs/fr/designers.sgml
-      docs/fr/getting-started.sgml
-      docs/fr/manual.sgml
-      docs/fr/preface.sgml
-      docs/fr/programmers.sgml:
-      Fixes to documentation syntax so that all content can be processed used
-      xsltproc docbook-xsl tools. In particular, fixes unescaped entities,
-      broken tags, unquoted attributes.
-
-2003-10-27  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fix handling of simple-math-operators inside modifiers
-
-2003-10-25  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      removed unused property _output_type
-      removed unused param $tag_attrs of _parse_var_props()
-      cleaned up alignment of class-properties
-
-2003-10-23  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      removed notice in php-tag handling in Smarty_Compiler::_compile_file()
-
-    * libs/Smarty_Compiler.class.php:
-      removed two occasional E_NOTICES from
-      Smarty_Compiler::_compile_include_php_tag()
-
-    * NEWS
-      libs/core/core.create_dir_structure.php:
-      fix handling of trailing-slashes in open_basedir in
-      smarty_core_create_dir_structure()
-
-2003-10-20  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      elements inside `` are bracketed now inside the compiled-tpl. this
-      fixes some issues with simple-math inside backticks.
-
-2003-10-16  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml:
-      update overlib docs, no working examples
-
-2003-10-12  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php
-      libs/core/core.is_secure.php:
-      move check for template_dir in secure_dir-array into core.is_secure.php
-      
-      this makes template_exists() work correctly with security=true even if
-      template_dir is not inside the secure_dir-array
-
-2003-10-11  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/shared.make_timestamp.php:
-      tightened check for YYYYMMDDHHMMSS-format. thanks konstantin for
-      pointing this out.
-      
-      removed a few tabs.
-
-    * libs/Smarty_Compiler.class.php:
-      fix precedence of simple-math-operators before modifiers.
-      thanks dominik!
-
-    * libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.assemble_plugin_filepath.php
-      libs/core/core.assign_smarty_interface.php
-      libs/core/core.create_dir_structure.php
-      libs/core/core.display_debug_console.php
-      libs/core/core.get_include_path.php
-      libs/core/core.get_microtime.php
-      libs/core/core.get_php_resource.php
-      libs/core/core.is_secure.php
-      libs/core/core.is_trusted.php
-      libs/core/core.load_plugins.php
-      libs/core/core.load_resource_plugin.php
-      libs/core/core.process_cached_inserts.php
-      libs/core/core.process_compiled_include.php
-      libs/core/core.read_cache_file.php
-      libs/core/core.rm_auto.php
-      libs/core/core.rmdir.php
-      libs/core/core.run_insert_handler.php
-      libs/core/core.smarty_include_php.php
-      libs/core/core.write_compiled_include.php
-      libs/core/core.write_compiled_resource.php
-      libs/core/core.write_file.php:
-      removed tabs from the main and the core/*.php files
-
-2003-10-08  Monte Ohrt  <monte@ispi.net>
-
-    * (Smarty_2_6_0-RC2)
-      NEWS
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      update version numbers to RC2
-
-2003-09-18  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml
-      docs/de/designers.sgml:
-      fixed description of cycle's advance-attribute
-
-2003-09-16  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      apply modifiers only once to section-loop and foreach-from attributes
-
-2003-09-15  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.write_cache_paths_file.php:
-      backed out _smarty_cached_paths-file-handling
-
-    * libs/Smarty.class.php
-      libs/core/core.rm_auto.php:
-      fixed clear_compiled_tpl with explicit $tpl_file given
-      fixed return value of smarty_core_rm_auto() + Smarty::_unlink()
-
-    * libs/Smarty.class.php:
-      little fix in _get_auto_filename()
-
-2003-09-14  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php
-      libs/core/core.assemble_auto_filename.php:
-      removed auto-filenames from path-cache. merged assemble_auto_filename
-      back into Smarty::_get_auto_filename()
-
-2003-09-12  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      fixed quoting of modifier parameters
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.get_php_resource.php
-      libs/core/core.load_plugins.php
-      libs/core/core.load_resource_plugin.php:
-      remove Smarty::_plugin_implementation_exists() - use php's native
-      is_callable()
-
-2003-09-11  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      silenced two notices acces HTTP_SERVER_VARS
-
-2003-09-10  andreas halter  <phpcvs@andreashalter.ch>
-
-    * docs/de/designers.sgml
-      docs/de/getting-started.sgml
-      docs/de/programmers.sgml:
-      - minor fixes (2 rep), slight wording changes
-      - jade transform problem fixed
-
-2003-09-08  andreas halter  <phpcvs@andreashalter.ch>
-
-    * docs/de/designers.sgml
-      docs/de/getting-started.sgml
-      docs/de/manual.sgml
-      docs/de/preface.sgml
-      docs/de/programmers.sgml:
-      all updated for 2.6.0 release, translated everything from 2_5_0 branch to
-      20030908
-
-2003-09-04  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      proper checking for files in  _fetch_resource_info()
-
-2003-09-02  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      ignore {strip}/{/strip) inside {strip}-blocks
-
-    * libs/plugins/function.mailto.php:
-      fixed 2 notices in smarty_function_mailto()
-
-2003-09-01  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      re-include cache_paths on multiple calls to fetch() to avoid
-      inconsistencies
-      at multiple calls to fetch() in one script
-
-    * libs/Smarty_Compiler.class.php:
-      fixed handling of \r in {strip}
-      renamed $_trailing_lf to $_additional_newline
-
-    * libs/Smarty_Compiler.class.php:
-      the weekly fix for {strip} :)
-
-    * docs/designers.sgml:
-      fixed example for simple math.
-
-2003-08-29  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/core/core.assign_smarty_interface.php
-      libs/core/core.display_debug_console.php
-      libs/plugins/function.assign.php
-      libs/plugins/function.html_options.php
-      libs/plugins/function.html_table.php:
-      fixed PHPDocumentor-comments (thanks Konstantin)
-
-    * libs/core/core.rmdir.php:
-      made rmdir a bit more optimistic. especially it now removes
-      directories correctly that where created accidently by "safe_mode=On
-      && $use_sub_dirs=true"
-
-2003-08-27  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fixed removal of leading/trailing newlines in {strip}-blocks
-
-2003-08-25  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * INSTALL:
-      added note emphasizing the introduction of "libs/" with 2.5.0
-
-    * NEWS
-      libs/plugins/modifier.escape.php:
-      fixed proper escaping of " and ' with escape:javascript
-
-2003-08-22  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/core/core.assemble_plugin_filepath.php:
-      fixed bug in traversal of $smarty->plugins_dir-array in
-      smarty_core_assemble_plugin_filepath(). the first matching plugin in
-      the path should be used, not the last one.
-
-    * libs/core/core.read_cache_file.php:
-      discard $_cache_info when the cache should be regenerated
-
-2003-08-20  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php
-      libs/plugins/block.strip.php:
-      reverted {strip} from a block-plugin back into the compiler
-
-    * docs/programmers.sgml:
-      fixed examples for register_function() and register_block()
-
-    * libs/Smarty.class.php:
-      made template_exists() quiet when the template does not exist (thanks
-      to konstatin for pointing this out)
-
-2003-08-18  Monte Ohrt  <monte@ispi.net>
-
-    * docs/getting-started.sgml:
-      fix example title
-
-    * docs/README
-      docs/getting-started.sgml:
-      change installation wording confusion
-
-2003-08-18  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php
-      libs/core/core.read_cache_file.php:
-      fixed unnecessary load of source in template_exists() and the
-      compile-check of smarty_core_read_cache_file()
-
-    * libs/Smarty_Compiler.class.php:
-      allow section-, array- and object-dereference in $smarty-references
-
-2003-08-15  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml:
-      added parameter-descriptions for count_characters (thanks Konstantin
-      A. Pelepelin)
-      
-      fixed docs for {html_checkboxes}
-
-2003-08-14  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php
-      libs/core/core.read_cache_file.php:
-      fixed timestamp-check of config-files in smarty_core_read_cache_file()
-
-    * libs/Smarty.class.php:
-      fixed typecasting for arrays in _parse_resource_name()
-
-    * NEWS
-      libs/plugins/function.config_load.php:
-      fixes in config_load:
-      - handling of section-attribute
-      - reusing the same config-file multiple times
-      - serialization of config-data for php<4.2.0 (no var_export)
-      
-      many thanks to atu for pointing this out and for testing
-
-2003-08-13  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php
-      libs/core/core.smarty_include_php.php:
-      fixed problem with vars as attributes in {include_php}
-
-2003-08-13  Monte Ohrt  <monte@ispi.net>
-
-    * docs/README:
-      commit README file for documentation compiling
-
-2003-08-13  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/debug.tpl
-      libs/plugins/modifier.debug_print_var.php:
-      removed '\r' from debug_print_vars' output
-      properly escape vars in javascript-version of debug.tpl
-
-2003-08-11  Monte Ohrt  <monte@ispi.net>
-
-    * (Smarty_2_6_0_RC1)
-      NEWS
-      docs/designers.sgml
-      docs/html.dsl
-      docs/php.dsl
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      get ready for 2.6.0-RC1 release
-
-2003-08-10  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      fixed status-header for cache_modified_check under cgi-sapi
-
-2003-08-09  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/core/core.is_secure.php
-      libs/core/core.is_trusted.php:
-      synced secure_dir-checking with trusted_dir-checking
-
-    * libs/core/core.is_secure.php:
-      tightenend path checking in smarty_core_is_secure()
-
-2003-08-08  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      fix: proper nesting of $smarty->_cache_including flag in cascaded
-      cached/not-cached/fetched/inserted/foo-templates
-
-    * libs/debug.tpl:
-      better escaping for $_debug_tpls[templates].filenames
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      removed redundant $smarty from Smarty::_smarty_include()
-
-    * libs/debug.tpl:
-      proper escaping of filenames in debug-console (thanks to prossel).
-
-2003-08-07  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/programmers.sgml:
-      added docs for block-methods of registered objects
-
-    * docs/programmers.sgml:
-      fixed typo in example for registered objects
-
-    * docs/designers.sgml:
-      fixed exampls of html_image and html_checkboxes
-
-    * libs/plugins/function.debug.php:
-      fixed {debug} and removed tabs in function.debug.php
-
-    * docs/programmers.sgml:
-      fixed example for register_object
-
-    * docs/designers.sgml
-      docs/programmers.sgml:
-      updated docs for capture, html_table, html_image and register_object
-
-2003-08-07  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml
-      docs/programmers.sgml:
-      add math and default_resource_type to docs
-
-    * docs/getting-started.sgml:
-      add core to example, add tech note
-
-2003-08-07  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/manual.sgml
-      docs/fr/manual.sgml:
-      upd copyright in the docs
-
-2003-08-07  Monte Ohrt  <monte@ispi.net>
-
-    * docs/getting-started.sgml:
-      added core directory to install instructions
-
-2003-08-07  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml
-      docs/programmers.sgml:
-      added docs for php-functions as modifiers
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      better caching of attributes for $cacheable=false-plugins
-
-    * docs/programmers.sgml:
-      added section "caching.cacheable" to the docs, explaining the usage of
-      the $cacheable-flag of the register_(block|compiler|function)-functions
-
-    * libs/Smarty_Compiler.class.php:
-      fixed output of custom-functions with cached attributes
-
-    * docs/programmers.sgml:
-      docs update on callbacks to the register_*-functions
-
-2003-08-06  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.process_compiled_include.php:
-      added optional parameter $cache_attrs to register_function() and
-      register_block(). $cache_attrs is an array containing attribute- names
-      that should be cached on calls to functions that have $cacheable set
-      to false.
-
-    * libs/Smarty.class.php:
-      fixed bug in _run_mod_handler
-
-    * libs/Smarty_Compiler.class.php:
-      fixed bug with autoload-handling of modifiers. thanks �ndre.
-
-2003-08-05  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      updated copyright notice
-
-    * libs/Smarty.class.php
-      libs/core/core.load_plugins.php:
-      fixed bug that occurred when using the same not-cacheable plugin in
-      multiple includes
-
-    * docs/programmers.sgml:
-      docs-update for plugins.writing
-
-2003-08-04  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml
-      docs/programmers.sgml:
-      updated docs for register_block_function(), block-functions,
-      $request_use_auto_globals and html_checkboxes
-
-2003-07-31  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      enabled registration of class-methods as callbacks for the
-      register_*-functions
-      
-      use: array('classname', 'method_name')) as callback
-
-2003-07-29  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      modifiers are resolved at compile-time now. _run_mod_handler() is
-      still used for modifiers with map_array=true (== no preceeding '@')
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.smarty_include.php:
-      moved _smarty_include() back into Smarty.class.php
-
-    * libs/Smarty.class.php
-      libs/core/core.load_plugins.php:
-      prevent unnecessary calls to _read_file() in _is_compiled()
-      converted method-call to internal function-call in
-      smarty_core_load_plugins()
-
-2003-07-28  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      quote smarty-header properly to prevent resource-names from escaping from
-      the comment
-
-2003-07-25  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/core/core.create_dir_structure.php:
-      weakend race-condition and removed bogus error-message caused by that
-      in smarty_core_create_dir_structure().
-
-2003-07-23  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php
-      libs/core/core.display_debug_console.php
-      libs/core/core.fetch_resource_info.php
-      libs/core/core.get_php_resource.php
-      libs/core/core.parse_resource_name.php
-      libs/core/core.process_cached_inserts.php
-      libs/core/core.read_cache_file.php
-      libs/core/core.run_insert_handler.php
-      libs/core/core.smarty_include.php
-      libs/core/core.smarty_include_php.php
-      libs/plugins/function.eval.php:
-      moved  _fetch_resource_info and _parse_resource_name back into
-      Smarty.class.php
-      renamed smarty_include and smarty_eval wrappers to _include and _eval
-
-2003-07-17  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/core/core.process_compiled_include.php
-      libs/core/core.read_cache_file.php:
-      improved checking of compiled_include against cached-template with
-      non-cached-chunks
-
-    * libs/core/core.write_compiled_include.php:
-      fixed too short open-tag
-
-    * libs/plugins/function.eval.php:
-      fixed assign parameter for eval (must have gotton lost on its way to 2.5.0)
-      cleaned up indentiation
-
-2003-07-03  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      resurrected $foo->$bar syntax
-
-    * libs/Smarty_Compiler.class.php:
-      i'm so stupid. kick me.
-
-    * libs/Smarty_Compiler.class.php:
-      fixed initialisation of $this->_plugins in compile_block_tag()
-
-2003-07-03  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Config_File.class.php:
-      add preg_quote delimiter
-
-2003-07-03  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      applied fix for {$var1->p1|modifier:$var2->p2}-syntax - thanks Dominik
-
-2003-07-02  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      fixed duplicate generation of arg-list in _compile_block_tag()
-
-    * libs/Smarty_Compiler.class.php:
-      fixed off-by-one-error in nocache-tag-handling
-
-2003-06-30  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      backed out errornously committed support for $foo->$bar
-
-    * libs/core/core.write_file.php:
-      fixed indentiation, silenced occasional warning
-
-    * libs/plugins/function.html_image.php:
-      match first character of file-attribute against "/" instead of
-      DIRECTORY_SEPARATOR since it is a url-path and not a file-path.
-
-    * libs/Smarty_Compiler.class.php
-      libs/core/core.write_file.php
-      libs/plugins/function.html_image.php:
-      libs/plugins/function.html_image.php
-
-    * libs/Smarty_Compiler.class.php:
-      re-fixed cacheable_state-handling
-
-    * libs/core/core.display_debug_console.php
-      libs/core/core.process_cached_inserts.php
-      libs/core/core.process_compiled_include.php
-      libs/core/core.run_insert_handler.php:
-      extincting $this out of smarty_core_*-functions
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      fixed handling of nocache-state
-
-2003-06-29  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php
-      libs/core/core.smarty_include.php
-      libs/core/core.smarty_include_php.php
-      libs/plugins/function.eval.php:
-      removed $this from smarty_include and smarty_include_php
-      added cleaner handling of $this to {eval}
-
-    * libs/core/core.load_resource_plugin.php:
-      fixed inlude_once-call
-
-    * docs/de/designers.sgml
-      docs/fr/designers.sgml:
-      fixed examples of html_radios and html_checkboxes in german and french docs
-
-2003-06-25  Monte Ohrt  <monte@ispi.net>
-
-    * libs/core/core.assemble_auto_filename.php
-      libs/core/core.write_cache_paths_file.php:
-      fix typo, fix write_cache_paths logic
-
-    * libs/Smarty.class.php
-      libs/core/core.assemble_auto_filename.php:
-      fix SMARTY_COMPILE_DIR_SEP problem, make local var
-
-2003-06-24  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty.class.php
-      libs/core/core.assemble_auto_filename.php
-      libs/core/core.write_cache_paths_file.php:
-      fixed cache_paths bug, simplified filename assembly logic
-
-2003-06-24  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.html_image.php:
-      added parsing of forgotton param "basedir"
-
-    * libs/Smarty_Compiler.class.php:
-      fixed $smarty.get-reference
-
-    * libs/plugins/block.textformat.php:
-      removed warning
-
-    * libs/Smarty_Compiler.class.php:
-      fixed value of _cacheable_state on compiler-startup
-
-2003-06-23  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.write_cache_paths_file.php:
-      make cache_path per resource, fix a couple directory path issues
-
-2003-06-23  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      removed warning when compiling empty template
-
-    * libs/core/core.write_compiled_include.php:
-      fixed bug in write_compiled_include
-
-    * libs/core/core.assemble_plugin_filepath.php:
-      fixed warning
-
-2003-06-22  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.eval.php:
-      fixed propagation of $this into evald code in smarty_function_eval()
-
-    * libs/core/core.write_cache_paths_file.php
-      libs/core/core.write_compiled_include.php:
-      fix in compiled-include-handling
-
-    * libs/core/core.assemble_auto_filename.php
-      libs/core/core.assemble_plugin_filepath.php
-      libs/core/core.assign_smarty_interface.php
-      libs/core/core.create_dir_structure.php
-      libs/core/core.fetch_resource_info.php
-      libs/core/core.get_include_path.php
-      libs/core/core.get_microtime.php
-      libs/core/core.get_php_resource.php
-      libs/core/core.is_secure.php
-      libs/core/core.is_trusted.php
-      libs/core/core.load_plugins.php
-      libs/core/core.load_resource_plugin.php
-      libs/core/core.parse_resource_name.php
-      libs/core/core.read_cache_file.php
-      libs/core/core.rm_auto.php
-      libs/core/core.rmdir.php
-      libs/core/core.write_cache_file.php
-      libs/core/core.write_cache_paths_file.php
-      libs/core/core.write_compiled_include.php
-      libs/core/core.write_compiled_resource.php
-      libs/core/core.write_file.php
-      libs/plugins/modifier.date_format.php:
-      started moving from $this to $smarty in core.*.php
-
-2003-06-21  Monte Ohrt  <monte@ispi.net>
-
-    * libs/core/core.create_dir_structure.php
-      libs/core/core.write_file.php
-      libs/plugins/function.config_load.php:
-      fix more dir paths
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/core/core.assemble_auto_filename.php
-      libs/core/core.assemble_plugin_filepath.php
-      libs/core/core.fetch_resource_info.php
-      libs/core/core.get_php_resource.php
-      libs/core/core.parse_resource_name.php
-      libs/core/core.process_cached_inserts.php
-      libs/core/core.read_cache_file.php
-      libs/core/core.rm_auto.php
-      libs/core/core.rmdir.php
-      libs/core/core.run_insert_handler.php
-      libs/core/core.smarty_include.php
-      libs/core/core.smarty_include_php.php
-      libs/core/core.write_cache_file.php
-      libs/core/core.write_cache_paths_file.php
-      libs/core/core.write_compiled_include.php
-      libs/core/core.write_compiled_resource.php
-      libs/core/core.write_file.php
-      libs/plugins/function.config_load.php
-      libs/plugins/function.fetch.php
-      libs/plugins/function.html_image.php:
-      fix filepaths to core files to use DIRECTORY_SEPARATOR
-
-2003-06-21  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      fixed {plugin|modifier} syntax
-
-    * libs/Smarty.class.php
-      libs/core/core.write_compiled_include.php:
-      fixed compiled include handling
-
-2003-06-21  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.assemble_auto_filename.php
-      libs/core/core.assemble_plugin_filepath.php
-      libs/core/core.write_cache_paths_file.php:
-      added filepath caching
-
-2003-06-20  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty_Compiler.class.php:
-      update more varnames
-
-    * libs/Smarty.class.php
-      libs/core/core.display_debug_console.php
-      libs/core/core.fetch_file_info.php
-      libs/core/core.fetch_resource_info.php
-      libs/core/core.get_php_resource.php
-      libs/core/core.parse_file_path.php
-      libs/core/core.parse_resource_name.php
-      libs/core/core.process_cached_inserts.php
-      libs/core/core.read_cache_file.php
-      libs/core/core.run_insert_handler.php
-      libs/core/core.smarty_include.php
-      libs/core/core.smarty_include_php.php
-      libs/core/core.write_compiled_resource.php
-      libs/core/core.write_compiled_template.php
-      libs/plugins/function.config_load.php:
-      refactored var naming to better reflect "resource" instead of "file" where
-      appropriate
-
-2003-06-19  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      updated version-number to 2.5.0-cvs
-
-    * libs/core/core.write_cache_file.php:
-      omit is-cache_dir-writable-check if a cache_handler_function is in use
-
-    * libs/core/core.smarty_include_php.php:
-      fixed comments in smarty_include_php
-
-2003-06-19  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.display_debug_console.php
-      libs/core/core.smarty_include.php
-      libs/plugins/function.eval.php:
-      split up _compile_template to _compile_file and _compile_source, fix eval
-      function
-      VS: ----------------------------------------------------------------------
-
-    * libs/plugins/function.config_load.php:
-      fix logic for _is_compiled()
-
-2003-06-19  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      added optional assign-attribute to {capture}-tag
-
-    * NEWS
-      libs/Smarty.class.php:
-      added $cacheable-parameter to register_compiler_function()
-
-2003-06-18  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.load_plugins.php
-      libs/core/core.process_compiled_include.php
-      libs/core/core.read_cache_file.php
-      libs/core/core.write_cache_file.php
-      libs/core/core.write_compiled_include.php:
-      added $cacheable-parameter to register_function() and register_block()
-
-    * libs/Smarty.class.php:
-      append '.php' to all compiled templates regardless of the settings of
-      $use_sub_dirs
-
-    * libs/Smarty.class.php
-      libs/core/core.read_cache_file.php:
-      fixed $file_path-parameters  passed to smarty_core_fetch_file_info()
-
-2003-06-17  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS:
-      fix name
-
-    * libs/Smarty_Compiler.class.php:
-      change varnames to follow coding methods
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      add math patch to core
-
-2003-06-17  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/core/core.smarty_include.php:
-      switched _process_template() to _is_compiled()-logic
-
-2003-06-17  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty.class.php:
-      fix _is_compiled logic
-
-    * NEWS:
-      update news file
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      fix _run_mod_handler routine
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.display_debug_console.php
-      libs/core/core.fetch_file_info.php
-      libs/core/core.parse_file_path.php
-      libs/core/core.write_compiled_template.php
-      libs/plugins/function.config_load.php:
-      fix path problems, rename some varibles from "template" to "file"
-
-2003-06-16  Monte Ohrt  <monte@ispi.net>
-
-    * libs/core/core.fetch_file_info.php
-      libs/core/core.fetch_template_info.php:
-      rename file, commit
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.parse_file_path.php
-      libs/core/core.read_cache_file.php
-      libs/plugins/block.strip.php
-      libs/plugins/block.textformat.php
-      libs/plugins/compiler.config_load.php
-      libs/plugins/function.config_load.php
-      libs/plugins/function.eval.php
-      libs/plugins/function.fetch.php
-      libs/plugins/function.html_image.php:
-      fix config_load, compile fetched arrays to compile_dir, switch display
-      back to runtime. clean up var names and function names,  split up compile
-      testing and compiling to separate funcs, rename some template_* functions
-      to
-      file_* functions and update logic so they can be used for file resources
-      other than templates.
-
-2003-06-16  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      fixed little bug in _compile_custom_tag()
-
-2003-06-16  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/core/core.assign_smarty_interface.php
-      libs/core/core.create_dir_structure.php
-      libs/core/core.display_debug_console.php
-      libs/core/core.fetch_template_info.php
-      libs/core/core.get_include_path.php
-      libs/core/core.get_microtime.php
-      libs/core/core.get_php_resource.php
-      libs/core/core.is_secure.php
-      libs/core/core.is_trusted.php
-      libs/core/core.load_plugins.php
-      libs/core/core.load_resource_plugin.php
-      libs/core/core.parse_file_path.php
-      libs/core/core.process_cached_inserts.php
-      libs/core/core.read_cache_file.php
-      libs/core/core.rm_auto.php
-      libs/core/core.rmdir.php
-      libs/core/core.run_insert_handler.php
-      libs/core/core.smarty_include.php
-      libs/core/core.smarty_include_php.php
-      libs/core/core.write_cache_file.php
-      libs/core/core.write_compiled_template.php
-      libs/core/core.write_file.php
-      libs/plugins/core.assign_smarty_interface.php
-      libs/plugins/core.create_dir_structure.php
-      libs/plugins/core.display_debug_console.php
-      libs/plugins/core.fetch_template_info.php
-      libs/plugins/core.get_include_path.php
-      libs/plugins/core.get_microtime.php
-      libs/plugins/core.get_php_resource.php
-      libs/plugins/core.is_secure.php
-      libs/plugins/core.is_trusted.php
-      libs/plugins/core.load_plugins.php
-      libs/plugins/core.load_resource_plugin.php
-      libs/plugins/core.parse_file_path.php
-      libs/plugins/core.process_cached_inserts.php
-      libs/plugins/core.read_cache_file.php
-      libs/plugins/core.rm_auto.php
-      libs/plugins/core.rmdir.php
-      libs/plugins/core.run_insert_handler.php
-      libs/plugins/core.smarty_include.php
-      libs/plugins/core.smarty_include_php.php
-      libs/plugins/core.write_cache_file.php
-      libs/plugins/core.write_compiled_template.php
-      libs/plugins/core.write_file.php:
-      move core files into their own directory under SMARTY_DIR,
-      remove abstraction function _execute_core_function
-
-    * libs/Smarty_Compiler.class.php:
-      fix newline handling for template for all template tags
-
-2003-06-11  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/compiler.config_load.php:
-      add compiler function to cvs repository
-
-2003-06-11  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      added config-option "request_use_auto_globals" to make auto-globals be
-      used as request vars instead of HTTP_*_VARS
-
-2003-06-11  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/plugins/function.config_load.php:
-      make config vars compile statically
-
-2003-06-11  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      backed out newlines patch
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      removed newlines in compiled templates after closing tags
-
-2003-06-10  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/de/designers.sgml:
-      fixed german note on html_image and disk-access
-
-2003-06-10  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/core.parse_file_path.php:
-      fix bug with resource_type resolving
-
-2003-06-09  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml:
-      replace example with more practical one
-
-2003-06-08  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      added block-methods for registered objects
-
-2003-06-07  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/programmers.sgml:
-      fixed bug in documentation for $smarty->default_modifiers
-
-2003-06-06  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/core.parse_file_path.php:
-      fix problem with new default_resource_type changes
-
-    * NEWS:
-      update NEWS file info
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/plugins/core.parse_file_path.php:
-      add default_resource_type, ignore 1 char resource names
-
-    * NEWS
-      libs/Config_File.class.php:
-      fix bug where config file starts with hidden section
-
-2003-06-04  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/Smarty.class.php:
-      -** empty log message ***
-
-2003-06-03  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/function.html_image.php:
-      fix example in code comments
-
-2003-06-03  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.counter.php:
-      fixed behaviour of start=... for {counter}
-
-2003-06-02  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.counter.php:
-      fixed assign for {counter}
-
-2003-05-30  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/core.write_cache_file.php
-      libs/plugins/core.write_compiled_template.php:
-      add discrete error checking pertaining to $cache_dir
-      and $compile_dir, their existance and writability
-
-2003-05-28  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.html_table.php:
-      added params vdir, hdir and inner to html_table to allow looping over
-      the data in various directions
-
-2003-05-28  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/core.compile_template.php
-      libs/plugins/core.display_debug_console.php:
-      fix problem with security and debug.tpl file
-
-2003-05-23  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS:
-      upd NEWS file
-
-    * libs/Smarty_Compiler.class.php:
-      allow spaces in literal tags
-
-2003-05-22  Monte Ohrt  <monte@ispi.net>
-
-    * docs/fr/programmers.sgml:
-      fix special chars
-
-2003-05-19  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      speed up compiled templates, hardcode plugin filepaths instead of
-      recalculate at runtime
-
-2003-05-19  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml:
-      fixed example of {html_image}
-
-    * docs/designers.sgml:
-      fixed typo
-
-2003-05-12  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php
-      libs/plugins/core.read_cache_file.php
-      libs/plugins/core.smarty_include.php
-      libs/plugins/function.config_load.php:
-      fixed multiple redundant occurrences for 'config' and 'template' in
-      $smarty->_cache_info
-
-2003-05-10  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/core.create_dir_structure.php:
-      refurbished create_dir_structure to use '/' internally
-
-    * libs/plugins/core.create_dir_structure.php:
-      fixed windows absolute-paths in smarty_core_create_dir_structure()
-
-    * libs/plugins/core.create_dir_structure.php:
-      fixed error-message
-
-2003-05-09  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      fixed warning due to missing param to _execute_core_function()
-
-    * libs/Smarty_Compiler.class.php:
-      fixed quoting in _compile_include_php
-
-    * libs/Smarty_Compiler.class.php:
-      fixed quoting of "file"-parameter in _compile_include_tag()
-
-2003-05-08  Monte Ohrt  <monte@ispi.net>
-
-    * docs/programmers.sgml:
-      fix typo
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/plugins/core.compile_template.php
-      libs/plugins/core.create_dir_structure.php
-      libs/plugins/core.fetch_template_info.php
-      libs/plugins/core.get_include_path.php
-      libs/plugins/core.get_microtime.php
-      libs/plugins/core.get_php_resource.php
-      libs/plugins/core.is_secure.php
-      libs/plugins/core.is_trusted.php
-      libs/plugins/core.load_plugins.php
-      libs/plugins/core.load_resource_plugin.php
-      libs/plugins/core.parse_file_path.php
-      libs/plugins/core.process_cached_inserts.php
-      libs/plugins/core.read_cache_file.php
-      libs/plugins/core.rm_auto.php
-      libs/plugins/core.rmdir.php
-      libs/plugins/core.run_insert_handler.php
-      libs/plugins/core.smarty_include.php
-      libs/plugins/core.smarty_include_php.php
-      libs/plugins/core.write_cache_file.php
-      libs/plugins/core.write_compiled_template.php
-      libs/plugins/core.write_file.php
-      libs/plugins/function.config_load.php
-      libs/plugins/function.fetch.php
-      libs/plugins/function.html_image.php:
-      abstract more private functions to plugin directory
-
-    * libs/Config_File.class.php:
-      only add DIRECTORY_SEPARATOR if it isn't already present
-
-    * libs/Config_File.class.php:
-      fix directory separator code, use DIRECTORY_SEPARATOR
-
-2003-05-08  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml:
-      fixed example of html_checkboxes
-
-    * NEWS
-      libs/Smarty.class.php:
-      fixed bug in _create_dir_structure() when used with
-      open_basedir-restriction and relative paths
-
-    * docs/designers.sgml:
-      fixed example for html_radios
-
-2003-05-07  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php
-      libs/plugins/core.assign_smarty_interface.php
-      libs/plugins/core.display_debug_console.php
-      libs/plugins/function.display_debug_console.php:
-      abstracted display_debug_console and assign_smarty_interface to plugin dir
-      as a test
-
-    * libs/Smarty.class.php
-      libs/plugins/function.display_debug_console.php:
-      correct misc varnames, abstract debug console display to plugin function
-
-    * libs/plugins/modifier.escape.php:
-      fix typo
-
-2003-05-05  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty_Compiler.class.php:
-      add % to math
-
-    * libs/Smarty.class.php:
-      clean up comments, formatting
-
-    * NEWS
-      libs/Smarty.class.php:
-      keep DIR_SEP for 3rd party compatability
-
-    * NEWS
-      libs/Smarty.class.php:
-      remove DIR_SEP, use DIRECTORY_SEPARATOR exclusively
-
-    * libs/Smarty_Compiler.class.php:
-      remove ++ and -- math operators on template vars
-
-2003-05-04  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty_Compiler.class.php:
-      removed unused parameter $quote from Smarty_Compiler::_parse_attrs()
-
-    * libs/plugins/function.html_image.php:
-      fixed DIR_SEP in html_image-plugin
-
-2003-05-04  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/Smarty.class.php:
-      rename DIR_SEP to SMARTY_DIR_SEP to avoid varname collisions
-
-2003-05-04  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.html_image.php:
-      changed "link" to "href" in html_image. "link" is still working but
-      deprecated
-      html_image always renders an alt-tag now (default alt="")
-      cleaned up indentiation of function.html_image.php
-
-2003-05-03  Monte Ohrt  <monte@ispi.net>
-
-    * libs/debug.tpl:
-      fix typo
-
-2003-05-02  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.counter.php:
-      fixed assign attribute for multiple counters
-
-2003-05-02  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty_Compiler.class.php:
-      allow math on negative number
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      added simple math operators to variables
-
-2003-05-02  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml:
-      fixed typos
-
-2003-04-30  Monte Ohrt  <monte@ispi.net>
-
-    * docs/fr/appendixes.sgml
-      docs/fr/common.dsl
-      docs/fr/designers.sgml
-      docs/fr/getting-started.sgml
-      docs/fr/html-common.dsl
-      docs/fr/html.dsl
-      docs/fr/manual.sgml
-      docs/fr/php.dsl
-      docs/fr/preface.sgml
-      docs/fr/programmers.sgml:
-      add frech docs to cvs repository
-
-2003-04-29  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      reverted patch for case-insensitive tag-names
-
-2003-04-28  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/programmers.sgml:
-      reverted back to humerous redundancy in the docs :). although we all
-      know we are here to generate template-based output, and not to have
-      fun ;-)
-
-    * docs/getting-started.sgml:
-      fixed default user and group for max os x installation
-
-    * libs/Smarty.class.php:
-      made $function[2] and $function[3] options for register_resource
-
-    * libs/Smarty.class.php:
-      fixed issue with object-callback when fetching a php-resource
-
-    * NEWS
-      libs/Smarty.class.php:
-      enabled array(&$obj. 'source', 'timestamp', 'secure', 'trusted') as
-      callback for register_resource()
-      
-      enabled array(&$obj, 'method') as callback for
-      $default_template_handler_func
-
-2003-04-27  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml
-      docs/programmers.sgml:
-      fixed some typos, thank to mehdi
-
-    * libs/plugins/function.counter.php:
-      prevent assign from overruling print-attribute in function.counter.php
-
-    * libs/plugins/function.counter.php:
-      fixed problem with counter and assign
-
-    * libs/Smarty.class.php:
-      fixed notice in  _load_plugins()
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      made plugin-names case-insensitive. this affects
-      compiler/block/custom-functions and modifers.
-
-2003-04-26  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      remove unnecessary close/open tags from compiled templates
-
-2003-04-26  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml:
-      added documentation for foreach.property.*
-
-2003-04-24  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * docs/designers.sgml:
-      fixed example table_attr and tr_attr in html_table-example
-
-2003-04-21  Greg Beaver  <greg@chiaraquartet.net>
-
-    * libs/Smarty.class.php:
-      fixed small bug in doc comments
-
-2003-04-21  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.html_image.php:
-      fixed errornous creation of '//' in image_path in html_image
-
-2003-04-21  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/modifier.debug_print_var.php:
-      fix htmlspecialchars() conflict
-
-    * NEWS
-      libs/plugins/modifier.debug_print_var.php:
-      fix escapement of special chars in key values of debug console
-
-    * NEWS
-      libs/plugins/function.config_load.php:
-      fixed debug timing logic for config_load
-
-    * docs/designers.sgml:
-      fix example text
-
-
-2003-04-20  Greg Beaver <cellog@users.sourceforge.net>
-    * plugins/*
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      Config_File.class.php:
-      updated all doc comments to phpDocumentor format (whew!)
-
-2003-04-06  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/plugins/function.math.php:
-      allowed "_" in the name of variable-parameters to {math}-function
-
-2003-04-04  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      docs/designers.sgml
-      libs/Smarty_Compiler.class.php:
-      change backtic syntax from $`foo` to `$foo`
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      recognize $foo[][] syntax in embedded quotes without backticks
-
-2003-04-03  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      name=123 is passed as an integer (not a string) to plugins now
-
-2003-04-01  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      added CVS $Id: ChangeLog,v 1.459 2007/03/07 01:31:23 changelog Exp $
-
-2003-03-31  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      added missing compile_id inside Smarty_Compiler
-
-    * libs/Smarty_Compiler.class.php:
-      fixed flaw when generating an error for missing postfilter
-
-2003-03-31  Monte Ohrt  <monte@ispi.net>
-
-    * docs/getting-started.sgml
-      docs/programmers.sgml:
-      fix typos
-
-2003-03-27  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/modifier.debug_print_var.php:
-      $length is now propagated to sub-values in debug_print_var
-
-2003-03-26  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS:
-      update header
-
-    * RELEASE_NOTES:
-      commit changes to release notes
-
-    * (Smarty_2_5_0_RC2)
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      committing RC2
-
-2003-03-24  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      made clear_cache() ignore compile_id when clearing cache_groups
-
-    * libs/plugins/function.popup.php:
-      made onmouseout XHTML-compatible in function.popup.php
-
-2003-03-21  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      applied new var-names to fetch()
-
-    * NEWS
-      libs/Smarty.class.php:
-      renamed $localvars to $_localvars in cache-file-handling-functions,
-      added _get_auto_id()-function
-
-2003-03-21  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/function.mailto.php
-      libs/plugins/function.popup.php:
-      update functions for XHTML compatability
-
-2003-03-21  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * libs/Smarty.class.php:
-      fixed wrong $auto_id in _read_cache_file()
-
-    * NEWS
-      libs/Smarty.class.php:
-      swapped compile_id and cache_id in read_cache_file and write_cache_file
-
-    * libs/Smarty.class.php:
-      reverted patch for ignoring compile-id back to -r1.364, due to problems
-
-    * NEWS
-      libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_radios.php:
-      html_radios and html_checkboxes accept "selected" instead of "checked"
-      optionally now
-
-    * NEWS
-      libs/Smarty.class.php:
-      swapped compile_id and cache_id for cache-file-handling again
-
-2003-03-20  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty_Compiler.class.php:
-      fix notice when no parameter is passed to default
-
-2003-03-20  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      removed notice of undefined var in _rm_auto()
-
-2003-03-19  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_radios.php
-      libs/plugins/function.html_table.php:
-      fix a few error messages, follow consistancy format plugin_name: errormsg
-
-    * libs/plugins/function.html_radios.php:
-      update error messages
-
-    * NEWS
-      libs/plugins/function.html_radios.php:
-      add a warning when an array is passed as the 'checked' value of html_radios
-
-2003-03-19  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fixed errormessage in _compile_smarty_ref()
-
-    * NEWS
-      docs/designers.sgml:
-      updated docs for html_image
-
-2003-03-18  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/Smarty.class.php:
-      cleaned up calls to readdir()
-
-    * libs/plugins/function.html_options.php:
-      fixed label for optgroup in html_options
-
-2003-03-18  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fix (newly introduced) bug with passing multiple modifiers to a parameter
-
-2003-03-18  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      docs/designers.sgml:
-      updated docs for html_checkboxes, html_options and html_radios
-
-    * libs/plugins/function.html_options.php:
-      fixed wrong default-"name" in function.html_options.php
-
-    * NEWS
-      libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_radios.php:
-      renamed "checkbox" and "radios" to "options" in {html_checkboxes} and
-      {html_radios}
-
-    * libs/plugins/outputfilter.trimwhitespace.php:
-      tried to optimize re-replacement in outputfilter.trimwhitespace.php a
-      little
-
-    * libs/plugins/outputfilter.trimwhitespace.php:
-      fixed greedy str_replace in outputfilter.trimwhitespace.php
-
-    * NEWS
-      libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_options.php
-      libs/plugins/function.html_radios.php:
-      html_options, html_checkboxes and html_radios now pass-thru all unknown
-      paramters
-
-2003-03-17  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/function.html_options.php:
-      html_options passthru all unknown paramters now
-
-2003-03-17  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/plugins/function.html_image.php:
-      Fix link bug in html_image function, also make output XHTML compatible
-
-    * libs/Smarty_Compiler.class.php:
-      fix issue of embedded var and escaped double quotes
-
-2003-03-15  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      back out "@" logic, apply only to default modifier special case
-
-    * libs/Smarty_Compiler.class.php:
-      fix @ logic, only use upon an echo
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      append "@" to template var echoes to supress possible notices
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      append "@" to _run_mod_handler to supress warnings
-
-2003-03-14  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fix problem with escaped double quotes
-
-    * NEWS
-      libs/plugins/function.html_radios.php:
-      fixed html_options to not return an array
-
-2003-03-12  Messju Mohr  <messju@lammfellpuschen.de>
-
-    * NEWS
-      libs/plugins/modifier.truncate.php:
-      fixed length in modifier.truncate.php
-
-    * NEWS
-      libs/plugins/outputfilter.trimwhitespace.php:
-      fixed handling of '$'-signs in trimwhitespace outputfilter (messju)
-
-2003-03-12  Monte Ohrt  <monte@ispi.net>
-
-    * docs/programmers.sgml:
-      update technical explanation of assign_by_ref and append_by_ref
-
-2003-03-11  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/Smarty.class.php:
-      fix config file recompiling code
-
-2003-03-07  Monte Ohrt  <monte@ispi.net>
-
-    * libs/plugins/function.html_image.php:
-      change E_USER_ERROR to E_USER_NOTICE
-
-    * libs/plugins/function.html_image.php:
-      suppress warning in html_image
-
-    * NEWS
-      libs/plugins/function.html_image.php:
-      update changes to html_image
-
-2003-03-06  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml
-      docs/de/appendixes.sgml
-      docs/de/common.dsl
-      docs/de/designers.sgml
-      docs/de/getting-started.sgml
-      docs/de/html-common.dsl
-      docs/de/html.dsl
-      docs/de/manual.sgml
-      docs/de/preface.sgml
-      docs/de/programmers.sgml:
-      add german docs to dist
-
-    * NEWS:
-      update news file
-
-    * libs/plugins/function.html_image.php:
-      fix width/height parameter index
-
-    * NEWS
-      libs/Smarty.class.php:
-      get rid of unsetting name and script attributes to insert tags
-
-2003-03-05  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      RELEASE_NOTES:
-      update NEWS file
-
-    * libs/plugins/modifier.string_format.php:
-      fix argument order, erroneously swapped a while back
-
-    * (Smarty_2_5_0_RC1)
-      NEWS
-      README
-      RELEASE_NOTES
-      libs/Config_File.class.php
-      libs/Smarty.class.php
-      libs/Smarty_Compiler.class.php:
-      commit final changes for 2.5.0-RC1
-
-2003-03-04  Monte Ohrt  <monte@ispi.net>
-
-    * docs/programmers.sgml:
-      remove $show_info_header and $show_info_include property vars from docs
-
-2003-03-03  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/plugins/function.popup.php:
-      fixed PHP notice
-
-2003-02-28  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty_Compiler.class.php:
-      simplify smarty.const.foo and smarty.const.$foo logic
-
-    * libs/Smarty_Compiler.class.php:
-      only allow $foo syntax in embedded quotes, unless escaped with backticks
-      then allow any dollar var
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      fix "once" var compiling to work with new attr compiling methods for
-      include_php
-
-    * FAQ
-      NEWS
-      README
-      docs/designers.sgml
-      docs/getting-started.sgml
-      libs/Smarty_Compiler.class.php
-      libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_image.php
-      libs/plugins/function.html_options.php
-      libs/plugins/function.html_radios.php
-      libs/plugins/function.html_select_date.php
-      libs/plugins/function.html_select_time.php
-      libs/plugins/function.html_table.php:
-      fix $smarty.const.foo compiling, clean up double quoted strings,
-      allow full dollar var syntax in quotes again
-
-2003-02-27  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml
-      docs/programmers.sgml
-      libs/Smarty_Compiler.class.php:
-      update docs, fix smarty var compiling, allow any $smarty.*.$foo syntax,
-      add $`foobar` for embedded variables
-
-    * libs/plugins/function.html_image.php:
-      update functionality
-
-2003-02-26  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      libs/plugins/modifier.nl2br.php:
-      add nl2br modifier
-
-    * libs/plugins/function.html_image.php:
-      add link parameter
-
-2003-02-24  Monte Ohrt  <monte@ispi.net>
-
-    * libs/Smarty.class.php
-      libs/plugins/function.html_image.php:
-      fix rename problem in windows, unlink first
-
-    * libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_image.php
-      libs/plugins/function.html_options.php
-      libs/plugins/function.html_radios.php
-      libs/plugins/shared.escape_special_chars.php:
-      update functions with separate escape_special_chars routine
-
-    * NEWS
-      libs/plugins/function.html_checkboxes.php
-      libs/plugins/function.html_radios.php:
-      commit checkboxes, update radios
-
-    * NEWS
-      libs/Smarty.class.php
-      libs/plugins/function.html_image.php:
-      fix bug with get_registered_object
-
-    * NEWS
-      libs/plugins/modifier.cat.php:
-      added cat modifier to distribution
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      added << >> <> support to IF statements
-
-    * libs/plugins/function.html_radios.php:
-      apply patch to initial html_radios function
-
-    * NEWS
-      libs/Smarty.class.php:
-      fix _assign_smarty_interface to not overwrite keys other than 'request'
-
-    * NEWS
-      libs/plugins/function.html_radios.php:
-      added html_radios to distribution
-
-    * NEWS
-      libs/plugins/modifier.string_format.php:
-      fixed arg order of string_format
-
-    * NEWS
-      libs/Smarty.class.php:
-      use tmp file for file writes, avoid race condition
-
-    * NEWS
-      libs/Smarty_Compiler.class.php:
-      add $smarty.config.foo var, handle embedded smarty var correctly
-
-    * NEWS
-      libs/plugins/function.fetch.php:
-      silence warnings in fetch plugin
-
-2003-02-21  Monte Ohrt  <monte@ispi.net>
-
-    * INSTALL:
-      update wording
-
-    * INSTALL:
-      update install instructions
-
-    * AUTHORS
-      BUGS
-      CREDITS
-      QUICKSTART
-      README
-      RESOURCES
-      TESTIMONIALS:
-      remove some files already in docs or elsewhere
-
-    * demo/index.php:
-      add templates_c to repository
-
-    * index.php:
-      move demo files to demo directory
-
-    * Config_File.class.php
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      debug.tpl:
-      moved lib files under libs directory
-
-2003-02-20  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php:
-      add get_config_vars() method, update get_template_vars() functionality
-
-    * NEWS
-      Smarty.class.php:
-      fix minor logic in _fetch_template_info()
-
-    * NEWS
-      Smarty.class.php:
-      support merging appended vars
-
-    * NEWS
-      Smarty.class.php:
-      fix cache groups behavior with compile_id set
-
-2003-02-19  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php:
-      back out third parameter, extend functionality of append
-
-    * NEWS
-      Smarty_Compiler.class.php:
-      update imbedded vars, allow special $smarty vars
-
-    * plugins/function.html_table.php:
-      add plugin html_table
-
-    * NEWS
-      Smarty.class.php:
-      support appending key=>val pairs
-
-    * NEWS
-      Smarty_Compiler.class.php:
-      change embedded variable logic to only recognize $foo and $foo[0][bar]
-      syntax
-
-    * NEWS
-      Smarty_Compiler.class.php:
-      allow null as function attribute value
-
-2003-02-18  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-      support foo->bar[index] syntax
-
-    * Smarty_Compiler.class.php:
-      allow $foo->bar[0] syntax
-
-2003-02-17  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/modifier.escape.php:
-      fix syntax error from previous commit
-
-    * NEWS
-      Smarty.class.php:
-      add error msgs to get_registered_object
-
-    * Smarty.class.php:
-      add function for getting reference to registered object
-
-    * Smarty_Compiler.class.php:
-      back out patches for object and objref calls on $smarty var
-
-    * NEWS
-      Smarty_Compiler.class.php:
-      treat unrecognized param attribute syntax as a string
-
-    * NEWS
-      Smarty_Compiler.class.php:
-      support $smarty.const.$foo syntax
-
-    * NEWS
-      debug.tpl
-      plugins/modifier.count_words.php
-      plugins/modifier.escape.php:
-      fix E_NOTICE messages
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-      add @ and === to if tokens, few param cleanups
-
-2003-02-16  Greg Beaver  <greg@chiaraquartet.net>
-
-    * ChangeLog
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-      many more phpdoc comment upgrades
-
-2003-02-15  Greg Beaver <cellog@sourceforge.net>
-    * Smarty.class.php
-      Smarty_Compiler.class.php
-      continue cleaning of phpdoc comments.  All that is needed is the
-      addition of @return tags and perhaps a bit more verbose comments
-      and they are finished.
-
-2003-02-14  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php:
-      enable config_load error messages
-
-    * NEWS
-      plugins/function.html_options.php:
-      fix html_options to not escape already escaped entities
-
-    * NEWS
-      Smarty.class.php:
-      send Last-Modified header on cache creation, misc tab/spacing cleanup
-
-2003-02-13  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php
-      docs/designers.sgml:
-      allow dash in plain text
-
-    * NEWS
-      Smarty_Compiler.class.php:
-      check strict syntax of function attributes
-
-2003-02-12  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty_Compiler.class.php:
-      dropped support for modifiers on object parameters,
-      added support for objects as modifier parameters
-
-    * NEWS
-      Smarty_Compiler.class.php
-      docs/designers.sgml:
-      fix bug with decimal numbers in if statements, misc doc updates
-
-2003-02-11  Monte Ohrt  <monte@ispi.net>
-
-    * (Smarty_2_4_2)
-      Config_File.class.php
-      NEWS
-      README
-      RELEASE_NOTES
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-      update version numbers
-
-2003-02-10  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty_Compiler.class.php:
-      add support for $foo->$bar syntax
-
-    * NEWS:
-      update NEWS file
-
-    * NEWS
-      Smarty_Compiler.class.php:
-      support full var syntax in quoted text, fix problem with const var access,
-      clean up some more regex code, fix object problem with no properties
-
-2003-02-06  Monte Ohrt  <monte@ispi.net>
-
-    * (Smarty_2_4_1)
-      Config_File.class.php
-      NEWS
-      README
-      RELEASE_NOTES
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-      committed 2.4.1 changes
-
-    * NEWS
-      Smarty_Compiler.class.php:
-      ignore case in IF statements
-
-2003-02-05  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty_Compiler.class.php:
-      treat undefined constants as null
-
-    * NEWS
-      Smarty.class.php:
-      fix problem with inserts and nested fetches
-
-    * Smarty_Compiler.class.php:
-      fix "if" regex for math tokens
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      docs/getting-started.sgml:
-      added support for extracting params to include_php
-
-2003-02-04  Monte Ohrt  <monte@ispi.net>
-
-    * RELEASE_NOTES:
-      reformat text
-
-2003-02-03  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS:
-      update news file
-
-2003-02-03  Greg Beaver  <greg@chiaraquartet.net>
-
-    * ChangeLog
-      Smarty.class.php:
-      begin fixing phpdoc comments in Smarty.class.php
-
-    * ChangeLog
-      Config_File.class.php:
-      fixed phpdoc comments
-
-2003-02-03  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php:
-      allow $foo->bar[$x].foo syntax
-
-    * Smarty_Compiler.class.php
-      index.php
-      configs/test.conf
-      templates/index.tpl:
-      fix accidental commit
-
-    * index.php
-      configs/test.conf
-      templates/index.tpl:
-      allow $foo->bar[$j].blah type of syntax
-
-2003-02-02  Greg Beaver  <cellog@php.net>
-
-    * Smarty.class.php
-      begin fixing of phpdoc comments
-
-    * Config_File.class.php
-      fix phpdoc comments, add phpDocumentor docblock templates
-
-2003-02-02  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      docs/html.dsl
-      docs/php.dsl:
-      fix version number
-
-    * (Smarty_2_4_0)
-      Config_File.class.php
-      NEWS
-      README
-      RELEASE_NOTES
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      docs/appendixes.sgml
-      docs/designers.sgml
-      docs/programmers.sgml:
-      update Smarty version numbers
-
-2003-01-30  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty_Compiler.class.php
-      TODO:
-      fix order of php tag comparisons
-
-    * NEWS
-      Smarty_Compiler.class.php:
-      fix known php tag handling problems
-
-2003-01-29  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php:
-      change comments to phpdoc style
-
-2003-01-28  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      docs/programmers.sgml:
-      make separate var for compiler file
-
-    * plugins/function.fetch.php:
-      fix error call
-
-2003-01-25  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php:
-      add support for restriction to registered methods
-
-    * plugins/outputfilter.trimwhitespace.php:
-      update with textarea support
-
-2003-01-24  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php:
-      fix compiling problem with {foreach} tags
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php:
-      put objects in own array, add object param format support, change
-      object syntax from foo.bar to foo->bar
-
-2003-01-23  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-      add support for object registration
-
-2003-01-22  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php:
-      add file & line number of calling error to error message
-
-2003-01-21  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php:
-      put php style object syntax back in
-
-2003-01-20  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php:
-      move security settings to fetch function for template_dir
-
-    * NEWS
-      Smarty.class.php:
-      fix debug template and security, add template_dir to secure_dir at runtime
-
-2003-01-17  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-      added new object support without new template syntax
-
-2003-01-15  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-      fix if statement syntax for negative integers, fix issue with directories
-      named '0'
-
-2003-01-08  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      plugins/function.counter.php
-      plugins/function.cycle.php
-      plugins/function.debug.php
-      plugins/function.eval.php
-      plugins/function.fetch.php
-      plugins/function.html_options.php
-      plugins/function.html_select_date.php
-      plugins/function.html_select_time.php
-      plugins/function.mailto.php
-      plugins/function.math.php
-      plugins/function.popup.php
-      plugins/function.popup_init.php:
-      update plugins to return values instead of echo, fix config file cache
-      to include global config variables in cache file
-
-    * Smarty_Compiler.class.php:
-      fix bug with >= tests in if statements, comment out full object support
-
-2003-01-06  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      docs/html.dsl
-      plugins/modifier.escape.php:
-      add javascript escape parameter to escape modifier
-
-2003-01-02  Monte Ohrt  <monte@ispi.net>
-
-    * templates/header.tpl:
-      move the title into head where it should be
-
-2002-12-24  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php:
-      added correct line numbers to smarty syntax error messages
-
-    * docs/programmers.sgml:
-      update append documentation, make more clear on its function
-
-    * Smarty_Compiler.class.php:
-      fix modifier matching regexp
-
-2002-12-23  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php:
-      support nested function calls in IF statements
-
-2002-12-20  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php:
-      few more fixes, spaces around function parameters
-
-    * Smarty_Compiler.class.php:
-      fix misc syntax issues with {if} tags
-
-2002-12-20  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php:
-      fix misc syntax issues with {if} tags
-
-2002-12-19  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php:
-      commit updates, passes all smoke tests
-
-    * NEWS:
-      update NEWS file
-
-    * Smarty_Compiler.class.php:
-      fixed literal string not in quotes as parameters
-
-    * NEWS
-      Smarty_Compiler.class.php:
-      fix misc syntax issues, add ability to pass modifiers to functions
-
-2002-12-18  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS:
-      update NEWS
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-      update compiler code, clean up regex, add new syntax features
-
-2002-12-16  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS:
-      update NEWS file
-
-    * Smarty_Compiler.class.php:
-      commit updates for objects
-
-2002-12-14  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php:
-      fix bug with compiling config files with caching on
-
-2002-12-13  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php:
-      fix problem with matching single quoted strings
-
-    * Smarty_Compiler.class.php:
-      update embedded variable logic, get rid of ."" at end of output
-
-    * NEWS
-      docs/designers.sgml
-      plugins/function.html_select_date.php:
-      add day_value_format to html_select_date
-
-2002-12-12  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/modifier.debug_print_var.php:
-      fix bug, double escaped values in display
-
-    * Smarty.class.php:
-      move debug test back into fetch()
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      plugins/outputfilter.trimwhitespace.php:
-      assigned vars are no longer in global name space, few debug cleanups
-
-2002-12-11  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/function.popup.php:
-      fix error in newline code
-
-    * plugins/function.popup.php:
-      fix popup to allow newlines in text data
-
-2002-12-10  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php:
-      fix plugin error logic
-
-    * docs/designers.sgml
-      docs/programmers.sgml:
-      edit examples, make more verbose
-
-    * NEWS
-      plugins/function.html_options.php:
-      escape html entities in the option values and output
-
-    * NEWS
-      plugins/function.html_options.php:
-      fixed bug with label of html_options
-
-2002-12-09  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php:
-      add support for var_export()
-
-    * Config_File.class.php
-      Smarty.class.php:
-      clean up code, respect force_compile and compile_check flags
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      docs/designers.sgml
-      plugins/function.mailto.php:
-      add caching feature to config loading, document update, add mailto plugin
-
-2002-12-08  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/function.fetch.php:
-      fix query part of URL
-
-2002-12-05  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml:
-      fix typos
-
-2002-11-22  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php:
-      patch for warning message
-
-2002-11-21  Monte Ohrt  <monte@ispi.net>
-
-    * RELEASE_NOTES
-      Smarty.class.php:
-      get rid of testing for a set value with assign function, just set to
-      whatever is passed into the template
-
-    * docs/programmers.sgml:
-      fix typo
-
-2002-11-19  Monte Ohrt  <monte@ispi.net>
-
-    * Config_File.class.php
-      NEWS
-      README
-      RELEASE_NOTES
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-      commit changes, ready for 2.3.1 release
-
-2002-11-01  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/function.html_options.php:
-    added label attribute to all option outputs, cover w3c spec.
-
-    * NEWS: update NEWS file
-
-    * docs/designers.sgml: update docs for optgroup output
-
-    * plugins/function.html_options.php:
-    make html_options work with optgroup, make func modular and recursive.
-
-2002-10-29  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php: set mtime on compile files so they match source files
-
-2002-10-18  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php: added proper support for open_basedir setting
-
-    * docs/designers.sgml: clear up docs on index, iteration and rownum
-
-2002-10-16  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/modifier.default.php: fix warning message in default modifier
-
-2002-09-25  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml
-      plugins/modifier.strip.php
-      NEWS: added strip variable modifier
-
-2002-09-24  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-    * Smarty_Compiler.class.php:
-    Fix to be able to use $smarty.x variables as arrays.
-
-2002-09-23  Monte Ohrt  <monte@ispi.net>
-
-    * Config_File.class.php:
-    add support for mac/dos formatted config files (fix newlines)
-
-    * docs/programmers.sgml: add optional tags to clear_cache parameters
-
-    * docs/designers.sgml:
-    fix error with include_php description, add $this to description
-
-2002-09-20  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      docs/getting-started.sgml: fixed errors with example setup docs
-
-2002-09-16  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/block.textformat.php
-      docs/designers.sgml
-      NEWS: add textformat block function
-
-2002-09-10  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml:
-    add assign attribute to cycle function documentation
-
-    * docs/designers.sgml
-      docs/programmers.sgml: fix typos
-
-2002-09-09  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/function.debug.php
-      templates/header.tpl:
-    fix header in debug template, fix typo in header.tpl example
-
-2002-08-15  mohrt  <mohrt@pb1.pair.com>
-
-    * docs/programmers.sgml: fix typos
-
-2002-08-08  mohrt  <mohrt@pb1.pair.com>
-
-    * RELEASE_NOTES
-      Smarty.class.php:
-    supress warnings from unlink() and is_dir(), let error handler deal with it
-
-2002-08-07  mohrt  <mohrt@pb1.pair.com>
-
-    * docs/appendixes.sgml
-      docs/designers.sgml
-      docs/programmers.sgml
-      Config_File.class.php
-      NEWS
-      README
-      RELEASE_NOTES
-      Smarty.class.php
-      Smarty_Compiler.class.php: update files with new version numbers
-
-2002-08-02  mohrt  <mohrt@pb1.pair.com>
-
-    * NEWS: update NEWS file with credits
-
-    * NEWS
-      Smarty.class.php: added assign_by_ref() and append_by_ref() functions
-
-2002-08-01  mohrt  <mohrt@pb1.pair.com>
-
-    * TODO
-      NEWS
-      Smarty.class.php:
-    changed default warning type for plugin errors from E_USER_WARNING to E_USER_ERROR
-
-2002-07-29  mohrt  <mohrt@pb1.pair.com>
-
-    * plugins/function.html_select_time.php
-      docs/designers.sgml
-      NEWS: added paramters to html_select_time plugin
-
-2002-07-25  Andrei Zmievski  <andrei@pb1.pair.com>
-
-    * TODO: *** empty log message ***
-
-2002-07-24  mohrt  <mohrt@pb1.pair.com>
-
-    * QUICKSTART: update QUICKSTART guide
-
-    * NEWS
-      debug.tpl
-      plugins/modifier.debug_print_var.php:
-    update debug console to show objects, fix warning in debug.tpl
-
-2002-07-23  mohrt  <mohrt@pb1.pair.com>
-
-    * docs/programmers.sgml: fix load_filter examples
-
-    * Config_File.class.php
-      NEWS: fix error when there are no sections in config file
-
-2002-07-19  mohrt  <mohrt@pb1.pair.com>
-
-    * docs/getting-started.sgml: fix error in install guide
-
-2002-07-18  mohrt  <mohrt@pb1.pair.com>
-
-    * Smarty_Compiler.class.php:
-    correct the expression match for smarty:nodefaults
-
-2002-07-17  mohrt  <mohrt@pb1.pair.com>
-
-    * Smarty_Compiler.class.php: fix default modifier to work with config vars
-
-    * Smarty_Compiler.class.php: got args to strstr backwards...
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-    change default modifiers to array instead of string
-
-    * Smarty_Compiler.class.php
-      docs/designers.sgml
-      Smarty.class.php: add default modifier logic, minor doc updates
-
-    * NEWS
-      Smarty.class.php
-      plugins/function.popup_init.php:
-    make popup_init xhtml compliant, minor variable name changes for consistancy
-
-2002-07-16  mohrt  <mohrt@pb1.pair.com>
-
-    * NEWS: update NEWS file
-
-    * plugins/function.debug.php
-      Smarty.class.php
-      debug.tpl
-      NEWS:
-    fix problem with filenames on windows, add ability to supply expire time in seconds when clearing cache or compiled files
-
-2002-07-15  mohrt  <mohrt@pb1.pair.com>
-
-    * Smarty.class.php:
-    fixed problem with insert tags when loading function from script attribute
-    and caching enabled (Monte)
-
-2002-07-14  mohrt  <mohrt@pb1.pair.com>
-
-    * NEWS
-      Smarty.class.php: fix bug with debug_tpl file path for Windows
-
-2002-07-12  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: fix append function with array/string issue
-
-2002-07-11  Monte Ohrt  <monte@ispi.net>
-
-    * RELEASE_NOTES: update release notes
-
-    * NEWS
-      README
-      RELEASE_NOTES
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      Config_File.class.php: update files to 2.2.0 tags, get ready for release
-
-2002-07-09  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php: make debug.tpl work with any delimiter
-
-    * NEWS
-      Smarty.class.php:
-    change tests in append and assign to != '' instead of empty(), which is more accurate
-
-2002-07-08  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml: minor doc update
-
-    * Smarty.class.php:
-    cast var as an array, simplify and get rid of PHP warning messages
-
-2002-07-03  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: one more N
-
-    * Smarty.class.php:
-    prepend "N" to filenames to avoid possible OS issues with dir names starting with "-"
-
-    * Smarty.class.php: only set $debug_tpl in constructor if empty
-
-    * Smarty.class.php
-      docs/designers.sgml
-      docs/getting-started.sgml
-      docs/programmers.sgml:
-    make use_sub_dirs go back to crc32 for subdir separation
-
-2002-06-29  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/function.eval.php: do nothing if $val is empty
-
-    * TODO
-      plugins/function.eval.php
-      plugins/function.popup_init.php:
-    add zindex to popup init, fix error message for eval.
-
-2002-06-27  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php:
-    only loop through relative paths for PHP include_path, remove $_relative variable
-
-    * Smarty_Compiler.class.php: added {$smarty.version} variable
-
-2002-06-26  Monte Ohrt  <monte@ispi.net>
-
-    * docs/appendixes.sgml
-      docs/designers.sgml
-      docs/getting-started.sgml
-      docs/programmers.sgml
-      Smarty.class.php:
-    update plugin loading logic, look in SMARTY_DIR, then cwd. If all fail, then retry all with include_path
-
-    * templates/header.tpl
-      Smarty.class.php: update get_include_path, get _path_array only once
-
-    * Smarty.class.php: fix get_include_path function for windows
-
-    * Smarty.class.php: update plugin search logic
-
-    * Smarty.class.php: only search include_path if relative path
-
-    * plugins/function.html_select_date.php
-      plugins/function.html_select_time.php
-      plugins/modifier.date_format.php
-      Smarty_Compiler.class.php
-      NEWS
-      Smarty.class.php: allow plugins_dir to be an array of directories
-
-2002-06-25  Monte Ohrt  <monte@ispi.net>
-
-    * docs/programmers.sgml
-      docs/getting-started.sgml: update installation docs
-
-    * debug.tpl
-      docs/getting-started.sgml
-      templates/debug.tpl
-      NEWS
-      Smarty.class.php: move debug.tpl to SMARTY_DIR, add to constructor
-
-2002-06-24  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/function.assign_debug_info.php
-      NEWS: fixed warning message in function.assign_debug_info
-
-    * Smarty.class.php: update include_path fixes
-
-    * NEWS:
-    fixed $template_dir, $compile_dir, $cache_dir, $config_dir to respect include_path
-
-2002-06-23  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/shared.make_timestamp.php:
-    update timestamp plugin to work when passed a timestamp
-
-2002-06-19  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS: update NEWS file
-
-    * plugins/modifier.date_format.php
-      docs/designers.sgml:
-    update date_format, allow optional 2nd paramater as default date if passed date is empty. update docs.
-
-    * plugins/modifier.date_format.php:
-    fix date_format modifier, return nothing if given empty string
-
-2002-06-18  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      plugins/function.cycle.php:
-    gave $reset a default value in cycle function
-
-    * plugins/function.html_select_date.php
-      plugins/shared.make_timestamp.php
-      NEWS:
-    corrected warnings in html_select_time function, made make timestamp always return a timestamp
-
-2002-06-17  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: swapped around cache_id and compile_id order
-
-2002-06-14  Monte Ohrt  <monte@ispi.net>
-
-    * docs/programmers.sgml
-      plugins/function.popup_init.php
-      Smarty.class.php:
-    change directory delimiter to "^" for cache and compile files
-
-2002-06-13  Andrei Zmievski  <andrei@php.net>
-
-    * TODO: done.
-
-    * Smarty_Compiler.class.php:
-    Optimize the calculation of section 'total' property.
-
-2002-06-11  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php:
-    added support for subdir exclusion, deletion by full or partial cache_id and compile_id, change file format to urlencoded values instead of crc32
-
-2002-06-07  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: fix bug with last_modified_check code
-
-    * NEWS
-      Smarty.class.php:
-    updated $GLOBALS refererence for HTTP_IF_MODIFIED_SINCE
-
-2002-06-06  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml
-      overlib.js:
-    remove overlib.js file from distribution, update plugin and docs
-
-2002-06-05  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml
-      NEWS
-      Smarty.class.php: fix 304 Not Modified, don't send content
-
-2002-06-03  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/function.cycle.php: update version number
-
-    * plugins/function.cycle.php
-      NEWS:
-    fixed cycle function to respect delimiter setting after initial setting
-
-    * Smarty.class.php
-      NEWS:
-    update $GLOBALS references to work properly with track_globals settings
-
-    * plugins/function.math.php: fixed bug with call $assign
-
-    * docs/appendixes.sgml
-      docs/designers.sgml
-      plugins/function.html_options.php
-      plugins/function.html_select_time.php
-      NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-    optimized for loops with count() function calls
-
-2002-06-01  Andrei Zmievski  <andrei@php.net>
-
-    * TODO: *** empty log message ***
-
-2002-05-21  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS: update NEWS file
-
-    * plugins/function.html_select_date.php
-      RESOURCES
-      docs/designers.sgml
-      Config_File.class.php:
-    update html_select_date with month_value_format attribute for controlling the format of the month values.
-
-2002-05-17  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty_Compiler.class.php:
-    Made it possible to use simple variables inside [] for indexing.
-
-2002-05-16  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml
-      docs/getting-started.sgml
-      NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      TESTIMONIALS: add "once" attribute to php_include, update docs
-
-2002-05-09  Andrei Zmievski  <andrei@ispi.net>
-
-    * NEWS
-      TODO: *** empty log message ***
-
-2002-05-07  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/function.cycle.php: remove \n from cycle function
-
-    * docs/designers.sgml
-      plugins/function.cycle.php
-      README
-      RELEASE_NOTES
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      NEWS:
-    update cycle function to handle array as input, update files to 2.1.1
-
-2002-05-06  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/function.fetch.php:
-    update fetch function with more error checking
-
-2002-05-03  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml
-      plugins/function.counter.php:
-    update counter to use name instead of id (id still works though)
-
-    * plugins/function.cycle.php
-      docs/designers.sgml: rename id to name for cycle function
-
-    * plugins/function.cycle.php:
-    update cycle function to allow blank values parameter after initialized
-
-    * plugins/function.cycle.php: fix syntax error
-
-2002-05-02  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/function.cycle.php: ugh, another typo
-
-    * plugins/function.cycle.php: update comments
-
-    * docs/designers.sgml
-      plugins/function.cycle.php
-      NEWS: added function cycle
-
-    * FAQ
-      Smarty.class.php: fix register_outputfilter function
-
-2002-05-01  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml
-      NEWS
-      Smarty.class.php: fixed bug with resource testing and include_path
-
-2002-04-30  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      README
-      RELEASE_NOTES
-      Smarty.class.php
-      Smarty_Compiler.class.php: update files for 2.1.0 release
-
-2002-04-30  Andrei Zmievski  <andrei@ispi.net>
-
-    * plugins/function.fetch.php
-      docs/programmers.sgml
-      Smarty.class.php: Fix.
-
-2002-04-29  Andrei Zmievski  <andrei@ispi.net>
-
-    * docs/programmers.sgml
-      docs/designers.sgml: A whole bunch of docs.
-
-2002-04-26  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      QUICKSTART
-      docs/programmers.sgml: update FAQ, QUICKSTART, small doc syntax fix
-
-2002-04-24  Monte Ohrt  <monte@ispi.net>
-
-    * docs/programmers.sgml
-      templates/debug.tpl
-      Smarty.class.php: changed doc structure a bit
-
-2002-04-16  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: Add register/unregister API for output filters.
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      TODO:
-    Changed the way filters are loaded, which now has to be done explicitly,
-    either through load_filter() API or by filling in $autoload_filters variable.
-    Also renamed internal variable to avoid namespace pollution.
-
-2002-04-15  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php:
-    Fixed _get_php_resource() to take include_path into account.
-
-2002-04-15  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml:
-    update docs, get modifiers and functions into index for easy access
-
-    * docs/programmers.sgml
-      NEWS
-      Smarty.class.php: update caching documentation
-
-2002-04-15  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-    * Smarty.class.php: Only turn down error notices if $debugging is false.
-
-2002-04-15  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS: update NEWS file
-
-    * plugins/function.html_select_date.php:
-    fixed logic so this works right when field_separator = "/"
-
-    * plugins/function.html_select_date.php:
-    fix regular expression for matching date
-
-2002-04-13  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml: updated html_select_date docs to reflect changes
-
-    * NEWS
-      plugins/function.html_select_date.php:
-    added YYYY-MM-DD support to html_select_date
-
-2002-04-12  Andrei Zmievski  <andrei@php.net>
-
-    * TESTIMONIALS: New entry.
-
-2002-04-12  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/modifier.strip_tags.php: back out changes to strip_tags
-
-    * docs/programmers.sgml: update docs regarding cache_lifetime
-
-    * plugins/modifier.strip_tags.php
-      Smarty.class.php:
-    update cache_lifetime logic: -1 = never expire, 0 = always expire
-
-2002-04-11  Andrei Zmievski  <andrei@php.net>
-
-    * BUGS
-      FAQ
-      INSTALL
-      NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      docs/getting-started.sgml:
-    Fixed directory separtor issue. Requiring PHP 4.0.6 now.
-
-    * NEWS
-      Smarty_Compiler.class.php:
-    Added ability to use simple variables for array indices or object properties.
-
-    * TESTIMONIALS: Another one.
-
-    * TESTIMONIALS: Adding one from Mark P.
-
-2002-04-05  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php
-      NEWS
-      Smarty.class.php: Make it possible to unregister pre/postfilter plugins.
-
-2002-04-05  Monte Ohrt  <monte@ispi.net>
-
-    * INSTALL: Remove addons file from INSTALL instructions
-
-2002-04-04  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml: update doc error
-
-    * docs/designers.sgml
-      plugins/modifier.escape.php
-      NEWS
-      Smarty.class.php: added htmlall attribute to escape modifier
-
-2002-04-03  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php: Fixed undefined offset warning in {if} tag.
-
-    * Smarty.class.php
-      NEWS: Added template_exists() API.
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php
-      NEWS:
-    - Added $smarty.template variable.
-    - Fixed {include_php} tag when dynamic values were used for 'file' attribute.
-
-    * Config_File.class.php: Separator setting fix.
-
-2002-03-28  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      README: add digest address
-
-    * FAQ
-      README
-      Smarty.class.php: update mailing list addresses
-
-2002-03-28  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-    * plugins/function.html_select_date.php
-      plugins/function.html_select_time.php
-      plugins/modifier.date_format.php:
-    Fix for when plugins directory is not the default one.
-
-2002-03-28  Andrei Zmievski  <andrei@ispi.net>
-
-    * NEWS: *** empty log message ***
-
-    * plugins/function.html_select_date.php
-      plugins/function.html_select_time.php
-      plugins/modifier.date_format.php:
-    Fix for when plugins directory is not the default one.
-
-2002-03-27  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ: update FAQ page
-
-2002-03-26  Andrei Zmievski  <andrei@ispi.net>
-
-    * CREDITS
-      NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      TODO: Block functions changes.
-
-    * Config_File.class.php: *** empty log message ***
-
-2002-03-25  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php: Initial implementation of block functions.
-
-2002-03-22  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml: fix documentation error in capture
-
-2002-03-22  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: *** empty log message ***
-
-    * Smarty.class.php: Turn off notices.
-
-2002-03-21  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php: Make _current_file available to prefilters.
-
-    * NEWS
-      Smarty.class.php:
-    Made is possible to assign variables in pre/postfilters.
-
-2002-03-20  Andrei Zmievski  <andrei@php.net>
-
-    * plugins/function.html_select_date.php: Fixed +/- functionality.
-
-    * NEWS: *** empty log message ***
-
-2002-03-20  Monte Ohrt  <monte@ispi.net>
-
-    * Config_File.class.php
-      NEWS
-      README
-      RELEASE_NOTES
-      Smarty.class.php
-      Smarty_Compiler.class.php: update version numbers
-
-    * plugins/function.html_select_date.php
-      plugins/function.html_select_time.php
-      plugins/modifier.date_format.php:
-    move .make_timestamp.php to shared.make_timestamp.php
-
-    * NEWS
-      Smarty.class.php
-      docs/designers.sgml
-      plugins/function.fetch.php
-      plugins/function.html_select_date.php:
-    update file generation, replace crc32() '-' with 'N'
-
-2002-03-20  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php: *** empty log message ***
-
-2002-03-19  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php:
-    Fix plugin behavior for inserts with script attribute.
-
-    * NEWS: *** empty log message ***
-
-    * Smarty_Compiler.class.php: Fix bug with $smarty.cookies.
-
-    * TESTIMONIALS: *** empty log message ***
-
-2002-03-15  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      docs/designers.sgml: update Changelog
-
-    * plugins/modifier.indent.php
-      plugins/modifier.wordwrap.php: add wordwrap and indent to repository
-
-2002-03-14  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php:
-    remove show_info_include and show_info_header functions
-
-2002-03-13  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/function.fetch.php: update fetch function
-
-    * plugins/function.fetch.php: update fetch function with new parameters
-
-2002-03-12  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml: update doc tables
-
-    * docs/designers.sgml: update docs columns
-
-    * docs/getting-started.sgml
-      docs/appendixes.sgml: update docs
-
-    * TESTIMONIALS
-      docs/appendixes.sgml: update syntax error in docs, add to testimonials
-
-2002-03-04  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      README: update FAQ, README with digest mode info
-
-2002-03-02  Monte Ohrt  <monte@ispi.net>
-
-    * QUICKSTART: update quickstart
-
-    * Smarty.class.php:
-    change behavior so cache_lifetime = 0 never expires (instead of always regenerate)
-
-2002-03-01  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml: update doc example
-
-2002-03-01  Andrei Zmievski  <andrei@php.net>
-
-    * CREDITS
-      RELEASE_NOTES
-      TODO
-      NEWS: *** empty log message ***
-
-2002-03-01  Monte Ohrt  <monte@ispi.net>
-
-    * docs/appendixes.sgml
-      docs/designers.sgml
-      docs/getting-started.sgml
-      docs/programmers.sgml: update document id tags
-
-    * docs.sgml: remove docs.sgml
-
-    * RESOURCES
-      Smarty.class.php: update resources
-
-2002-02-28  Andrei Zmievski  <andrei@php.net>
-
-    * TESTIMONIALS
-      docs/appendixes.sgml
-      docs/designers.sgml
-      docs/programmers.sgml: *** empty log message ***
-
-2002-02-27  Andrei Zmievski  <andrei@php.net>
-
-    * plugins/function.eval.php
-      docs/designers.sgml: *** empty log message ***
-
-2002-02-27  Monte Ohrt  <monte@ispi.net>
-
-    * plugins/function.eval.php: added eval function to plugin dir
-
-2002-02-27  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-2002-02-27  Monte Ohrt  <monte@ispi.net>
-
-    * docs/designers.sgml: fix syntax error
-
-    * docs/appendixes.sgml
-      docs/designers.sgml
-      docs/getting-started.sgml
-      docs/programmers.sgml: convert technical notes to docbook format
-
-    * NEWS
-      docs/designers.sgml: added "eval" plugin docs
-
-2002-02-26  Andrei Zmievski  <andrei@php.net>
-
-    * docs/programmers.sgml
-      docs/designers.sgml
-      docs/appendixes.sgml
-      docs/getting-started.sgml
-      docs/html-common.dsl
-      docs/.cvsignore: *** empty log message ***
-
-    * docs/appendixes.sgml
-      docs/common.dsl
-      docs/designers.sgml
-      docs/getting-started.sgml
-      docs/html-common.dsl
-      docs/html.dsl
-      docs/manual.sgml
-      docs/preface.sgml
-      docs/programmers.sgml: Split up docs.
-
-2002-02-25  Andrei Zmievski  <andrei@php.net>
-
-    * docs.sgml: *** empty log message ***
-
-2002-02-22  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml: update docs
-
-2002-02-22  Andrei Zmievski  <andrei@php.net>
-
-    * docs.sgml
-      AUTHORS
-      NEWS: *** empty log message ***
-
-2002-02-21  Monte Ohrt  <monte@ispi.net>
-
-    * Config_File.class.php
-      NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      docs.sgml: update misc changes
-
-2002-02-21  Andrei Zmievski  <andrei@php.net>
-
-    * docs.sgml: *** empty log message ***
-
-2002-02-20  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml: misc updates
-
-2002-02-20  Andrei Zmievski  <andrei@php.net>
-
-    * docs.sgml: *** empty log message ***
-
-    * Smarty.class.php
-      plugins/function.assign.php
-      plugins/function.assign_debug_info.php
-      plugins/function.counter.php
-      plugins/function.fetch.php
-      plugins/function.math.php
-      plugins/function.popup.php
-      plugins/function.popup_init.php
-      plugins/modifier.escape.php: Fixup some naming.
-
-2002-02-20  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml: update docs
-
-2002-02-20  Andrei Zmievski  <andrei@php.net>
-
-    * docs.sgml: *** empty log message ***
-
-2002-02-20  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      docs.sgml
-      plugins/modifier.escape.php:
-    removed global vars from fetch function, added attrs to escape modifier
-
-    * docs.sgml: add plugin chapter outline
-
-2002-02-19  Monte Ohrt  <monte@ispi.net>
-
-    * README
-      RELEASE_NOTES
-      RESOURCES
-      Smarty.class.php
-      docs.sgml
-      BUGS
-      FAQ
-      INSTALL
-      QUICKSTART: update docs
-
-2002-02-19  Andrei Zmievski  <andrei@php.net>
-
-    * docs.sgml: Updated resources docs.
-
-    * README: *** empty log message ***
-
-    * docs.sgml: Updated description of {$smarty} variable.
-
-    * BUGS
-      FAQ
-      INSTALL
-      QUICKSTART
-      RELEASE_NOTES
-      docs.sgml: Remove PEAR notes.
-
-2002-02-18  Andrei Zmievski  <andrei@php.net>
-
-    * Config_File.class.php
-      NEWS: Removed dependency on PEAR.
-
-2002-02-18  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      docs.sgml
-      plugins/function.popup_init.php: add src attribute to popup_init
-
-2002-02-15  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php
-      plugins/modifier.debug_print_var.php
-      NEWS
-      Smarty.class.php: Performance enhancements.
-
-2002-02-06  Andrei Zmievski  <andrei@php.net>
-
-    * plugins/function.html_options.php:
-    Fix html_options output to be XHTML compatible.
-
-2002-02-05  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php: Fix up plugin inclusion.
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php
-      TODO
-      plugins/function.html_select_date.php
-      plugins/function.html_select_time.php
-      plugins/modifier.date_format.php: Fix plugin directory access.
-
-2002-02-04  Andrei Zmievski  <andrei@php.net>
-
-    * .cvsignore
-      Smarty_Compiler.class.php: *** empty log message ***
-
-2002-01-31  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-    * Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      TODO
-      plugins/function.assign.php
-      plugins/function.assign_debug_info.php
-      plugins/function.counter.php
-      plugins/function.fetch.php
-      plugins/function.html_options.php
-      plugins/function.html_select_date.php
-      plugins/function.html_select_time.php
-      plugins/function.math.php
-      plugins/function.popup.php
-      plugins/function.popup_init.php
-      plugins/modifier.capitalize.php
-      plugins/modifier.count_characters.php
-      plugins/modifier.count_paragraphs.php
-      plugins/modifier.count_sentences.php
-      plugins/modifier.count_words.php
-      plugins/modifier.date_format.php
-      plugins/modifier.debug_print_var.php
-      plugins/modifier.default.php
-      plugins/modifier.escape.php
-      plugins/modifier.lower.php
-      plugins/modifier.regex_replace.php
-      plugins/modifier.replace.php
-      plugins/modifier.spacify.php
-      plugins/modifier.string_format.php
-      plugins/modifier.strip_tags.php
-      plugins/modifier.truncate.php
-      plugins/modifier.upper.php
-      plugins/shared.make_timestamp.php
-      templates/index.tpl
-      AUTHORS
-      CREDITS
-      Config_File.class.php
-      README: Implemented plugin architecture.
-
-    * NEWS: *** empty log message ***
-
-2002-01-30  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.addons.php
-      Smarty.class.php
-      docs.sgml: added modifiers wordwrap and indent
-
-2002-01-28  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      docs.sgml:
-    add support for is-modified-since headers, adjust a doc example
-
-2002-01-24  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: cleanup formatting
-
-    * NEWS
-      Smarty.class.php
-      docs.sgml: update ChangeLog, remove insert_tag_check parameter
-
-2002-01-24  Andrei Zmievski  <andrei@php.net>
-
-    * plugins/standard.plugin.php: *** empty log message ***
-
-2002-01-24  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: fix syntax error
-
-    * Smarty.class.php: removed unneccesary test from fetch()
-
-2002-01-23  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.addons.php: update overlib fixes
-
-    * NEWS: update changelog
-
-    * FAQ
-      NEWS
-      RESOURCES
-      Smarty.addons.php: updated overlib fixes
-
-2001-12-31  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php: Fixed compile_id problem.
-
-2001-12-28  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-    fixed problem with using assigned var with include_php filepath
-
-2001-12-21  Monte Ohrt  <monte@ispi.net>
-
-    * RESOURCES: update RESOURCES
-
-2001-12-20  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      README: update FAQ
-
-2001-12-18  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php
-      docs.sgml
-      Config_File.class.php
-      NEWS
-      README
-      RELEASE_NOTES
-      Smarty.addons.php
-      Smarty.class.php: update version numbers
-
-2001-12-18  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php: Fixed clear_cache().
-
-2001-12-14  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.addons.php:
-    fixed bug in smarty_make_timestamp introduced in PHP 4.1.0
-
-2001-12-13  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php
-      docs.sgml: update default function args, fix cached insert debug timing
-
-2001-12-12  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml: fix syntax error in documentation
-
-    * Smarty.class.php: update default template handling functionality
-
-2001-12-11  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php: update file fetching logic
-
-2001-12-11  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php: Added 'script' attribute to {insert..}.
-
-2001-12-10  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php: added default template function handler
-
-    * Config_File.class.php
-      NEWS
-      README
-      RELEASE_NOTES
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php: update version numbers in files to 1.5.1
-
-2001-12-10  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php: Removed error message from the _read_file() method.
-
-    * Smarty.class.php: Fix check for compile and cache IDs.
-
-2001-12-06  Monte Ohrt  <monte@ispi.net>
-
-    * QUICKSTART: fix spelling error in QUICKSTART
-
-    * docs.sgml: fixed spelling errors in documenation
-
-    * Smarty_Compiler.class.php
-      docs.sgml
-      Config_File.class.php
-      NEWS
-      README
-      RELEASE_NOTES
-      Smarty.addons.php
-      Smarty.class.php: commit 1.5.0 release
-
-    * RESOURCES
-      docs.sgml: added RESOURCES file
-
-2001-12-05  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php: Refactor.
-
-2001-12-05  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty_Compiler.class.php
-      docs.sgml: added assign to include and php_include
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php
-      docs.sgml: *** empty log message ***
-
-2001-12-04  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty_Compiler.class.php: Formatting.
-
-2001-12-04  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php
-      NEWS
-      Smarty.class.php: update ChangeLog
-
-2001-12-04  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php: Formatting.
-
-2001-12-04  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: removed SMARTY_DIR setting in constructor
-
-    * Smarty.class.php: fix Smarty.class.php indention error
-
-    * Smarty.class.php: update trusted logic
-
-2001-12-03  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php:
-    fix up is_secure, is_trusted, make _parse_tpl_path function
-
-    * Smarty.class.php: fix problem with testing SMARTY_DIR as empty
-
-    * NEWS
-      docs.sgml: update documentation, change log
-
-    * Smarty.class.php:
-    update constructor to check for SMARTY_DIR before assigning
-
-2001-12-03  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php: *** empty log message ***
-
-2001-12-03  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      INSTALL
-      RELEASE_NOTES: update a few files
-
-    * NEWS
-      QUICKSTART
-      Smarty.class.php
-      docs.sgml: added trusted_dir functionality, cleaned up secure_dir logic
-
-2001-12-03  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-    * NEWS
-      Smarty.class.php: - Introduced $compile_id class variable.
-    - Fixed a situation where if $cache_id and $compile_id were both null
-      they were passed to auto functions as empty string instead of null.
-
-2001-11-30  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php:
-    change variable names in fetch() fuction to smarty_* to avoid namespace conflicts
-
-    * NEWS
-      Smarty.class.php: fixed bug in _rm_auto with catenated null values
-
-2001-11-29  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty_Compiler.class.php: Added $smarty.section.* syntax.
-
-    * Smarty_Compiler.class.php: Made 'name' attribute optional for {foreach}.
-
-2001-11-29  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      index.php: remove assign "now" in index.tpl
-
-2001-11-29  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.addons.php
-      Smarty.class.php: Fix formatting.
-
-2001-11-28  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.class.php
-      docs.sgml:
-    removed return statements from _read_cache_file (how did they get in there?)
-
-2001-11-27  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml
-      NEWS
-      Smarty.addons.php
-      Smarty.class.php:
-    fixed bugs and added assign attribute to several functions
-
-2001-11-27  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: Some rewording.
-
-    * Smarty_Compiler.class.php: Fix $smarty.capture access.
-
-    * TODO: *** empty log message ***
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-    Made {config_load ..} merge globals from each config file only once per scope.
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php: - Added {foreach ...}.
-    - Made certain $smarty.* references handled at compilation time.
-
-2001-11-26  Monte Ohrt  <monte@ispi.net>
-
-    * Config_File.class.php
-      NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      docs.sgml: commit cache handler functionality
-
-2001-11-20  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.addons.php
-      Smarty_Compiler.class.php: Various fixes and additions.
-
-    * NEWS
-      index.php: *** empty log message ***
-
-2001-11-05  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: changed _read_file parameter from $end to $lines
-
-    * NEWS
-      Smarty.class.php: fixed is_cache, make cache reading more efficient
-
-2001-11-02  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      NEWS: update FAQ with mailing list Reply-To header FAQ
-
-    * NEWS
-      Smarty.class.php
-      index.php: supress fopen errors, return false if cache file won't load
-
-2001-11-01  Monte Ohrt  <monte@ispi.net>
-
-    * QUICKSTART
-      docs.sgml
-      index.php: update QUICKSTART guide with index key example
-
-    * Config_File.class.php
-      NEWS
-      README
-      RELEASE_NOTES
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      docs.sgml: commit all updates for 1.4.6
-
-2001-11-01  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-2001-10-30  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.addons.php: fix assign function problem with empty value passed
-
-    * NEWS
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      templates/debug.tpl:
-    fixed bug in assign function when passing an empty value
-
-2001-10-26  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.addons.php
-      Smarty.class.php
-      index.php: fix minor typo in debug code
-
-2001-10-26  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: Typo.
-
-2001-10-26  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.addons.php:
-    update debug console output, handle html encoding correctly
-
-2001-10-26  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.addons.php
-      templates/debug.tpl: Debug formatting.
-
-    * Smarty.class.php: Disable rmdir warning.
-
-2001-10-26  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.addons.php
-      Smarty.class.php
-      templates/debug.tpl: update debugging to expand array variables
-
-    * Smarty.class.php
-      docs.sgml:
-    update docs for fetching only timestamp with custom template source functions
-
-    * Smarty.addons.php: fix debug console error
-
-2001-10-26  Andrei Zmievski  <andrei@php.net>
-
-    * docs.sgml: Typos.
-
-    * Smarty.addons.php: Cleanup whitespace.
-
-    * Smarty_Compiler.class.php: Clean up whitespace.
-
-    * Smarty.class.php: Cleaning up code, formatting mostly.
-
-    * NEWS: *** empty log message ***
-
-2001-10-25  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      docs.sgml: update documentation to current version
-
-    * NEWS
-      Smarty.addons.php:
-    updated fetch to give proper warning when fetching unreadable or nonexistant files
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-    fixed problem with newline at the end of compiled templates
-
-    * NEWS
-      Smarty.class.php: recompile cache if config file gets modified too.
-
-    * NEWS
-      Smarty.class.php:
-    added feature to regenerate cache if compile_check is enabled and an
-    involved template is modified
-
-2001-10-23  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: fix indent for insert tags in debug console
-
-    * templates/debug.tpl: update debug.tpl file format
-
-    * NEWS
-      Smarty.addons.php
-      Smarty.class.php
-      templates/debug.tpl:
-    update execution time debugging, move into include list
-
-2001-10-10  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-    fixed up execution time output in debug console
-
-2001-10-09  Andrei Zmievski  <andrei@php.net>
-
-    * Config_File.class.php
-      NEWS
-      Smarty.class.php
-      TODO: Added support for hidden config vars.
-
-2001-10-04  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.addons.php
-      Smarty.class.php
-      templates/debug.tpl: added execution times to debug console
-
-2001-10-02  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php: Add space.
-
-2001-10-01  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: Fix reference to compile_id.
-
-2001-09-28  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php: Added postfilter functions.
-
-2001-09-26  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php
-      docs.sgml: Rename to clear_compiled_tpl().
-
-2001-09-25  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty_Compiler.class.php:
-    Fixed line number reporting when removing comments.
-
-2001-09-20  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      RELEASE_NOTES
-      Smarty.addons.php: made html_options output xhtml compatible
-
-2001-09-19  Monte Ohrt  <monte@ispi.net>
-
-    * Config_File.class.php
-      NEWS
-      README
-      RELEASE_NOTES
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      templates/debug.tpl: updated version numbers
-
-2001-09-16  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      NEWS
-      docs.sgml: fix doc error with insert function
-
-2001-09-06  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-2001-08-31  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS: update ChangeLog
-
-    * overlib.js
-      Smarty.addons.php
-      Smarty.class.php
-      docs.sgml:
-    update overlib to 3.50, adjust addon code so that the overlib.js file isn't modified
-
-2001-08-31  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: - compile_id changes
-
-    * NEWS
-      Smarty.addons.php: - compile_id support
-    - new options for html_select_date
-
-2001-08-23  Andrei Zmievski  <andrei@php.net>
-
-    * TODO: *** empty log message ***
-
-2001-08-10  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-    Modified to pass Smarty object as second parameter to insert functions.
-    Also moved _smarty_mod_handler() and _smarty_insert_handler() into the class.
-
-    * NEWS
-      Smarty_Compiler.class.php:
-    Passing Smarty as second parameter to prefilter functions.
-
-2001-08-09  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-2001-08-09  Monte Ohrt  <monte@ispi.net>
-
-    * templates/index.tpl
-      Smarty.class.php: add smarty.now variable to template
-
-2001-08-06  Monte Ohrt  <monte@ispi.net>
-
-    * templates/index.tpl: change config_load section back to setup
-
-2001-08-06  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.addons.php: Optimize a bit.
-
-2001-08-04  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml: update capture documentation
-
-2001-08-03  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      NEWS
-      Smarty.class.php:
-    fix bug with URL controlled debugging, works now (Monte)
-
-2001-08-01  Andrei Zmievski  <andrei@php.net>
-
-    * Config_File.class.php: *** empty log message ***
-
-    * Smarty_Compiler.class.php
-      Smarty.class.php: - Fixed some E_NOTICE stuff in compiler.
-    - Generalized assign_smarty_interface() a bit.
-
-2001-07-24  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty_Compiler.class.php
-      TODO: See ChangeLog for details.
-
-2001-07-20  Andrei Zmievski  <andrei@php.net>
-
-    * Config_File.class.php: Booleanize case-insensitively.
-
-2001-07-17  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS: update ChangeLog
-
-    * Smarty.class.php
-      docs.sgml: put SMARTY_DIR on Config_File require
-
-2001-07-11  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml
-      FAQ
-      NEWS
-      Smarty.class.php:
-    updated security to not include insecure docs, only warning
-
-2001-07-10  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: Adding 'sizeof' as an allowed {if} function.
-
-2001-07-06  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-2001-07-06  Monte Ohrt  <monte@ispi.net>
-
-    * Config_File.class.php
-      NEWS
-      README
-      RELEASE_NOTES
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php: update version number to 1.4.4
-
-    * NEWS
-      Smarty.addons.php
-      Smarty_Compiler.class.php
-      docs.sgml
-      templates/header.tpl
-      templates/index.tpl: update documenatation, template examples
-
-2001-07-03  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php: Implemented access to request vars via $smarty var.
-
-    * NEWS
-      Smarty_Compiler.class.php:
-    Fixed a bug with parsing function arguments in {if} tags.
-
-2001-06-30  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS: update ChangeLog
-
-2001-06-29  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.addons.php
-      Smarty.class.php
-      docs.sgml
-      overlib.js:
-    moved overlib to separate file, added SMARTY_DIR, documented. added much documentation
-
-2001-06-29  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      RELEASE_NOTES
-      TODO: *** empty log message ***
-
-2001-06-29  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      README
-      RELEASE_NOTES
-      Smarty.addons.php
-      Smarty.class.php
-      docs.sgml
-      index.php
-      templates/debug.tpl
-      templates/header.tpl
-      templates/index.tpl: update release notes
-
-2001-06-27  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php: *** empty log message ***
-
-    * NEWS
-      Smarty_Compiler.class.php: Implemented 'step' section attribute.
-
-    * Smarty_Compiler.class.php: Negative values of 'max' will mean no max.
-
-    * AUTHORS
-      NEWS: *** empty log message ***
-
-2001-06-26  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      index.php: Added 'max' and 'start' section attributes.
-    Added 'total' and 'iteration' section properties.
-
-2001-06-25  Andrei Zmievski  <andrei@php.net>
-
-    * Config_File.class.php
-      RELEASE_NOTES
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php: Update version numbers.
-
-2001-06-23  Andrei Zmievski  <andrei@php.net>
-
-    * TODO: *** empty log message ***
-
-2001-06-21  Andrei Zmievski  <andrei@php.net>
-
-    * Config_File.class.php
-      NEWS: Fixed booleanization bug.
-
-2001-06-20  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml:
-    update documents to reflect changes to cached content & debugging
-
-2001-06-20  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.addons.php
-      Smarty.class.php: Remove debug output for cached and fetched cases.
-
-2001-06-20  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: update include_info to false
-
-    * Smarty.class.php
-      docs.sgml
-      index.php
-      templates/footer.tpl:
-    moved debug logic into Smarty completely, created flags for it
-
-2001-06-19  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.addons.php
-      Smarty.class.php
-      templates/debug.tpl: *** empty log message ***
-
-    * NEWS
-      Smarty.class.php: Remove unneeded debug functions.
-
-2001-06-19  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.addons.php
-      Smarty.class.php
-      docs.sgml
-      templates/debug.tpl
-      templates/footer.tpl: commit updates, add debug template
-
-2001-06-19  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php
-      TODO:
-    Moved config loading code inside main class, the compiled template now
-    simply calls that method.
-
-2001-06-15  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      templates/index.tpl: * moved config array into class itself
-    * added 'scope' attribute for config_load
-
-    * Smarty_Compiler.class.php
-      Smarty.addons.php
-      Smarty.class.php: Finishing up secure mode.
-
-2001-06-15  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS: update ChangeLog
-
-    * Smarty_Compiler.class.php: cleaned up logic of if statement security
-
-    * Smarty_Compiler.class.php: update if logic to cover more situations
-
-    * Smarty_Compiler.class.php
-      docs.sgml: update if statement security feature
-
-2001-06-14  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.addons.php
-      Smarty.class.php: *** empty log message ***
-
-    * NEWS
-      Smarty_Compiler.class.php:
-    Fixed a bug with quoted strings inside if statements.
-
-2001-06-13  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.addons.php
-      Smarty.class.php: added secure_dir array for multiple secure directories
-
-    * Smarty.addons.php: update fetch funtion to respect security setting
-
-    * NEWS
-      Smarty.addons.php
-      Smarty.class.php
-      docs.sgml: update documentation, changelog
-
-    * Smarty.addons.php
-      Smarty.class.php: moved _extract setting to assign functions
-
-    * Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-    added assign/unassign custom functions, ability to re-extract tpl_vars
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php
-      docs.sgml
-      index.php: commit security features
-
-2001-06-11  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: Version variable typo.
-
-2001-06-05  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php:
-    Create config object in fetch() or just set the config path if it already
-    exists.
-
-2001-06-04  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: *** empty log message ***
-
-    * NEWS
-      Smarty_Compiler.class.php:
-    Fixed a problem with $<number> inside strip tags.
-
-2001-05-31  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-    * Config_File.class.php: Allow empty config_path.
-
-2001-05-29  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php
-      docs.sgml
-      NEWS
-      README
-      RELEASE_NOTES
-      Smarty.addons.php
-      Smarty.class.php: update version numbers
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      docs.sgml: moved version variable to internal variable
-
-2001-05-22  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php:
-    Moved $_smarty_sections and $_smarty_conf_obj into Smarty class.
-
-2001-05-18  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS: update ChangeLog
-
-    * FAQ
-      QUICKSTART: update FAQ, QUICKSTART for windows include_path setup
-
-    * configs/test.conf: added configs directory to cvs
-
-2001-05-18  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: Use compiler_class for including the file.
-
-2001-05-18  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml: fix typo
-
-2001-05-16  Monte Ohrt  <monte@ispi.net>
-
-    * README
-      RELEASE_NOTES
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php: update files to version 1.4.1
-
-    * NEWS: update ChangeLog
-
-2001-05-15  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-    * index.php: forget that!
-
-    * NEWS
-      Smarty_Compiler.class.php
-      index.php: Fixed a few E_NOTICE warnings.
-
-2001-05-09  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      RELEASE_NOTES
-      Smarty.addons.php
-      Smarty.class.php
-      docs.sgml: update dates versions
-
-2001-05-09  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-    * Smarty.class.php:
-    Use absolute paths when requiring/including Smart components.
-
-    * NEWS: *** empty log message ***
-
-    * Smarty.class.php: Use write mode instead of append.
-
-2001-05-02  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty_Compiler.class.php: Fix indexing by section properties.
-
-2001-05-02  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS: update changelog
-
-    * Smarty.class.php: remove period from syntax error
-
-2001-05-02  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php: Double-quote the attribute values by default.
-
-2001-04-30  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php
-      NEWS: added simple {capture} logic
-
-2001-04-30  Andrei Zmievski  <andrei@php.net>
-
-    * TODO: *** empty log message ***
-
-    * Smarty_Compiler.class.php
-      Smarty.class.php: Fix passing config vars to included files.
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php: Fix inclusion again.
-
-2001-04-30  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      RELEASE_NOTES
-      Smarty.class.php
-      misc/fix_vars.php
-      NEWS: update paths for windows (c:)
-
-2001-04-28  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php: Fix passing variables to included files.
-
-    * templates/index.tpl: *** empty log message ***
-
-2001-04-27  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php: Fix includes.
-
-2001-04-26  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php
-      docs.sgml
-      Smarty.class.php: Formatting mostly.
-
-    * Smarty_Compiler.class.php
-      Config_File.class.php: *** empty log message ***
-
-2001-04-26  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php
-      docs.sgml
-      FAQ
-      NEWS
-      QUICKSTART
-      RELEASE_NOTES
-      Smarty.class.php: update docs with new changes
-
-2001-04-26  Andrei Zmievski  <andrei@php.net>
-
-    * RELEASE_NOTES: *** empty log message ***
-
-    * docs.sgml
-      templates/index.tpl
-      NEWS
-      Smarty_Compiler.class.php: Added ability to reference object properties.
-
-2001-04-25  Andrei Zmievski  <andrei@php.net>
-
-    * README
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      docs.sgml
-      AUTHORS
-      Config_File.class.php
-      CREDITS
-      RELEASE_NOTES
-      NEWS: *** empty log message ***
-
-    * docs.sgml: Docs on new parameter to custom functions.
-
-    * NEWS: *** empty log message ***
-
-    * Smarty_Compiler.class.php:
-    Changing the way tpl vars are referenced and passing smarty object
-    to custom functions.
-
-    * RELEASE_NOTES
-      docs.sgml: Fixing docs a bit.
-
-2001-04-24  Andrei Zmievski  <andrei@php.net>
-
-    * docs.sgml: Docs for $compiler_class and compiler functions.
-
-    * templates/index.tpl: *** empty log message ***
-
-    * Smarty_Compiler.class.php: Remove debugging.
-
-2001-04-24  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml: update compiler function docs
-
-2001-04-24  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      templates/index.tpl: Added compiler function support.
-
-2001-04-24  Monte Ohrt  <monte@ispi.net>
-
-    * RELEASE_NOTES
-      Smarty.class.php:
-    update notes, change show_info_header to false by default
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php
-      docs.sgml
-      CREDITS
-      FAQ
-      NEWS
-      README
-      RELEASE_NOTES: update documenation, bug fixes
-
-2001-04-24  Andrei Zmievski  <andrei@php.net>
-
-    * misc/fix_vars.php: Hopefully fix for sure.
-
-2001-04-23  Monte Ohrt  <monte@ispi.net>
-
-    * misc/fix_vars.php: uncomment copy/unlink
-
-2001-04-23  Andrei Zmievski  <andrei@php.net>
-
-    * misc/fix_vars.php: Do it more thoroughly.
-
-    * misc/fix_vars.php: check for }
-
-2001-04-22  Andrei Zmievski  <andrei@php.net>
-
-    * misc/fix_vars.php: Fix variable parsing.
-
-2001-04-20  Monte Ohrt  <monte@ispi.net>
-
-    * misc/fix_vars.php: fix problem with 4.0.5-dev and preg_replace_callback
-
-2001-04-19  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php
-      docs.sgml
-      misc/fix_vars.php
-      NEWS
-      RELEASE_NOTES
-      Smarty.class.php: update notes/documentation
-
-    * NEWS
-      README
-      RELEASE_NOTES
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      docs.sgml: update files for 1.4.0 release
-
-2001-04-16  Andrei Zmievski  <andrei@php.net>
-
-    * misc/fix_vars.php: Added fix_vars.php script.
-
-2001-04-16  Monte Ohrt  <monte@ispi.net>
-
-    * QUICKSTART
-      RELEASE_NOTES
-      docs.sgml
-      templates/index.tpl:
-    update RELEASE_NOTES & scripts with new section var syntax
-
-2001-04-13  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php: * Implement new variable format parser.
-    * Optimizing config load a bit.
-
-2001-04-13  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      NEWS
-      RELEASE_NOTES
-      Smarty.class.php:
-    added $check_cached_insert_tags to speed up cached pages if
-          {insert ...} is not used (Monte)
-
-2001-04-12  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php
-      RELEASE_NOTES: *** empty log message ***
-
-    * Smarty_Compiler.class.php: Remove redundant functions.
-
-    * Smarty.class.php: Formatting.
-
-2001-04-12  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: update file: parsing
-
-    * Smarty.class.php
-      docs.sgml: update documentation
-
-2001-04-12  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php
-      TODO: *** empty log message ***
-
-2001-04-11  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      QUICKSTART
-      RELEASE_NOTES: added RELEASE_NOTES file to cvs
-
-    * NEWS
-      docs.sgml: update ChangeLog, update documentation
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php
-      templates/index.tpl:
-    update Smarty to compile at run-time. added ability to get files from
-    absolute paths, added work around for LOCK_EX and windows, changed a few
-    file permissions to be more secure.
-
-2001-03-29  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.addons.php:
-    allow arbitrary date strings instead of just timestamps
-
-2001-03-28  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php
-      docs.sgml
-      FAQ
-      NEWS
-      README
-      Smarty.addons.php:
-    update version in class, update docs for count_ and new vars
-
-    * templates/index.tpl
-      docs.sgml: update docs, example template
-
-2001-03-28  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php: Some variable renaming.
-
-2001-03-23  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php
-      NEWS: Fixed nested include infinite repeat bug.
-
-2001-03-23  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: fix version number
-
-    * Smarty.class.php
-      NEWS: added optional HTML header to output
-
-2001-03-22  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php: Fixed inclusion of dynamic files.
-
-2001-03-16  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty_Compiler.class.php: Fixing the config_load scoping.
-
-    * Smarty_Compiler.class.php: making config variables global for now.
-
-2001-03-15  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-    * Smarty_Compiler.class.php:
-    * Includes are now always done via generated function call to protect
-      namespace.
-    * config_load now always uses global config object to improve
-      performance.
-
-2001-03-13  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml: update math documentation with format attribute
-
-2001-03-11  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml
-      NEWS
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php: update math function with format attribute
-
-2001-03-10  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.addons.php: *** empty log message ***
-
-    * NEWS
-      Smarty.addons.php
-      Smarty.class.php: Added html_select_time custom function.
-
-2001-03-08  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php
-      NEWS
-      README
-      Smarty.addons.php: rename 1.3.1b to 1.3.1pl1
-
-    * NEWS
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php: update version numbers, changelog
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php:
-    moved _syntax_error to Smarty_Compiler.class.php
-
-    * Smarty.class.php
-      docs.sgml:
-    missing _syntax_error function recovered. fixed minor syntax in docs
-
-2001-03-07  Monte Ohrt  <monte@ispi.net>
-
-    * QUICKSTART
-      README
-      Smarty.addons.php
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      BUGS
-      INSTALL
-      NEWS: update everything to 1.3.1
-
-2001-03-03  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty_Compiler.class.php
-      Smarty.class.php: fixed bug with cached insert tags
-
-2001-03-02  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      Smarty_Compiler.class.php:
-    fix cache fuctions with separated compiled class
-
-    * FAQ
-      NEWS
-      docs.sgml: update changelog
-
-2001-03-02  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty_Compiler.class.php: Added 'first' and 'last' section properties.
-
-2001-03-02  Monte Ohrt  <monte@ispi.net>
-
-    * TODO: remove compiling separation TODO
-
-    * Smarty_Compiler.class.php
-      Smarty.addons.php
-      Smarty.class.php: update function headers
-
-    * templates/index.tpl
-      NEWS
-      Smarty.class.php
-      Smarty_Compiler.class.php
-      index.php: split out compiling code for faster execution
-
-    * Smarty.class.php: fixed a few warning messages
-
-    * Smarty.addons.php
-      Smarty.class.php
-      docs.sgml
-      NEWS: added fetch, unregister mod/fun, updated docs
-
-2001-03-01  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.addons.php: added "int" to available list
-
-    * docs.sgml
-      FAQ
-      Smarty.class.php: update FAQ, add math functions & update documetation
-
-    * index.php
-      Smarty.addons.php
-      Smarty.class.php
-      docs.sgml: fixed literal tags and other optional delimiters
-
-2001-02-26  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php:
-    Added index_prev, index_next section properties and ability to
-    index by them.
-
-    * NEWS
-      Smarty.addons.php
-      Smarty.class.php: Reverting the plugins patch - needs more thought.
-
-    * Smarty.class.php: Fixing plugin loading.
-
-2001-02-23  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.addons.php
-      Smarty.class.php
-      plugins/standard.plugin.php
-      NEWS: Added plugin functionality.
-
-2001-02-22  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml
-      templates/index.tpl
-      NEWS
-      README
-      Smarty.class.php: fixed issue with php tags executed in literal blocks
-
-2001-02-21  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS: update changelog for LGPL change
-
-    * Smarty.class.php
-      docs.sgml
-      README
-      Smarty.addons.php: updated version numbers to 1.3.0
-
-    * NEWS
-      templates/index.tpl: update changelog, rearrange index.tpl file
-
-2001-02-21  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php: *** empty log message ***
-
-2001-02-21  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml: update parameters for is_cached and fetch
-
-2001-02-21  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php: *** empty log message ***
-
-2001-02-21  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS
-      Smarty.addons.php
-      docs.sgml: update docs, remove header function from addons
-
-2001-02-20  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      NEWS: update changelog
-
-    * TODO: update todo
-
-    * TODO: update todo list
-
-    * Smarty.class.php: update php tag handling logic
-
-2001-02-19  Monte Ohrt  <monte@ispi.net>
-
-    * index.php
-      Config_File.class.php
-      FAQ
-      Smarty.class.php
-      docs.sgml: fixed <?php tag at beginning of files, updated docs
-
-2001-02-19  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.addons.php: *** empty log message ***
-
-2001-02-13  Andrei Zmievski  <andrei@php.net>
-
-    * TODO: *** empty log message ***
-
-2001-02-12  Andrei Zmievski  <andrei@php.net>
-
-    * templates/index.tpl
-      Smarty.class.php: *** empty log message ***
-
-2001-02-10  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: remove  unneeded preg_match
-
-    * Smarty.class.php: remove comment
-
-    * Smarty.class.php: updated php escape to handle <script language="php">
-
-    * NEWS
-      Smarty.class.php: fix php tag escapement logic
-
-    * NEWS: commit changelog
-
-    * docs.sgml: update header docs
-
-    * docs.sgml
-      Smarty.addons.php
-      Smarty.class.php: added header custom function
-
-2001-02-09  Monte Ohrt  <monte@ispi.net>
-
-    * index.php
-      templates/header.tpl
-      templates/index.tpl
-      INSTALL
-      QUICKSTART
-      docs.sgml: update documentation, add examples to test script.
-
-2001-02-08  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: *** empty log message ***
-
-2001-02-08  Monte Ohrt  <monte@ispi.net>
-
-    * COPYING.lib: added COPYING.lib
-
-    * COPYING
-      Config_File.class.php
-      Smarty.addons.php
-      Smarty.class.php
-      docs.sgml: changed license to LGPL for commercial use
-
-    * docs.sgml
-      Smarty.class.php: fix clear_assign syntax error
-
-2001-02-07  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: added ability to pass array to clear_assign
-
-    * index.php
-      templates/index.tpl
-      docs.sgml:
-    update documentation, remove tests from index file and template
-
-2001-02-07  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php: Adding file locking.
-
-    * templates/index.tpl
-      Smarty.addons.php
-      Smarty.class.php
-      index.php: More cache work.
-
-2001-02-06  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml
-      Smarty.class.php:
-    change register_ function names, update documents with tables
-
-2001-02-06  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php
-      templates/index.tpl: Reworking and optimizing the cache system.
-
-    * Smarty.class.php: Restoring ?> in patterns.
-
-2001-02-05  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      docs.sgml: update cache directory creation logic
-
-2001-02-05  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: Removing once-only subpattern for now..
-
-    * Smarty.class.php: Fix modifier arg parsing.
-
-2001-02-02  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      Smarty.class.php
-      templates/index.tpl: See changelog.
-
-2001-02-01  Andrei Zmievski  <andrei@php.net>
-
-    * README: *** empty log message ***
-
-    * Smarty.class.php: Use 'echo' instead of 'print'.
-
-    * Smarty.addons.php: *** empty log message ***
-
-2001-02-01  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: rearranged variables at top of script
-
-2001-02-01  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: Retabbing.
-
-    * templates/index.tpl
-      Smarty.class.php
-      index.php: *** empty log message ***
-
-2001-02-01  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: update caching logic
-
-    * Smarty.class.php: fixed clear_all_cache bugs
-
-    * Smarty.class.php: fix .cache check
-
-    * docs.sgml
-      FAQ
-      Smarty.class.php: update .che to .cache
-
-    * FAQ
-      Smarty.class.php
-      docs.sgml: updated docs for caching, added clear_all_cache() directive
-
-2001-01-31  Monte Ohrt  <monte@ispi.net>
-
-    * index.php
-      templates/index.tpl
-      docs.sgml: upated docs for date_format and html_options
-
-2001-01-31  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-    * Smarty.addons.php
-      index.php: Added ability to pass 'options' attribute to html_options.
-
-    * Smarty.addons.php
-      Smarty.class.php
-      docs.sgml
-      index.php
-      templates/index.tpl
-      Config_File.class.php
-      NEWS
-      README: Reworking, simplifying, and speeding up cache implementation.
-    Fixing the infelicity where you couldn't have '|' and ':' inside
-    quoted modifier arguments.
-
-2001-01-31  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php
-      index.php
-      templates/index.tpl: removed DEBUG lines
-
-2001-01-30  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: changed default expire to 3600
-
-    * Config_File.class.php
-      NEWS
-      README
-      Smarty.addons.php
-      Smarty.class.php: updated version numbers
-
-    * docs.sgml
-      NEWS
-      Smarty.class.php:
-    added caching, force compile, force cache, misc performance updates
-
-2001-01-30  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS: *** empty log message ***
-
-    * Smarty.class.php
-      templates/index.tpl: Remove debug message.
-
-    * Smarty.class.php
-      templates/index.tpl: Fixing the compile directory mayhem...
-
-    * Smarty.class.php:
-    Fix problem with {strip} around {section} and {include}
-
-    * Smarty.addons.php: *** empty log message ***
-
-2001-01-29  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      NEWS
-      README
-      Smarty.class.php: fixed PHP_VERSION check, misc doc updates
-
-    * index.php
-      Config_File.class.php
-      NEWS
-      QUICKSTART
-      README
-      Smarty.addons.php
-      Smarty.class.php
-      docs.sgml: updated for 1.2.1 compile_dir changes, misc doc updates
-
-2001-01-26  Monte Ohrt  <monte@ispi.net>
-
-    * BUGS
-      README: update BUGS and README files
-
-    * FAQ: updated FAQ
-
-    * Config_File.class.php
-      FAQ
-      NEWS
-      README
-      Smarty.addons.php
-      docs.sgml
-      templates/index.tpl
-      AUTHORS: update again
-
-2001-01-26  Andrei Zmievski  <andrei@php.net>
-
-    * docs.sgml
-      NEWS
-      README
-      Smarty.class.php
-      templates/index.tpl: *** empty log message ***
-
-    * Smarty.class.php
-      index.php
-      templates/index.tpl: Added ability to index by key.
-
-2001-01-25  Monte Ohrt  <monte@ispi.net>
-
-    * NEWS: update changelog
-
-    * README
-      Smarty.addons.php
-      Smarty.class.php
-      docs.sgml
-      AUTHORS: updated versions to 1.1.0
-
-    * docs.sgml
-      templates/index.tpl
-      Config_File.class.php
-      Smarty.addons.php
-      Smarty.class.php: update copyright notice
-
-    * Config_File.class.php
-      Smarty.addons.php
-      Smarty.class.php
-      docs.sgml: added misc info
-
-2001-01-24  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.addons.php
-      index.php
-      templates/index.tpl
-      Config_File.class.php: initial commit
-
-2001-01-23  Monte Ohrt  <monte@ispi.net>
-
-    * docs.sgml: fix typo
-
-2001-01-22  Monte Ohrt  <monte@ispi.net>
-
-    * doc.sgm
-      docs.sgml: updated docs, renamed file
-
-    * FAQ: updated FAQ
-
-    * NEWS
-      README: updated Changelog and Readme
-
-    * doc.sgm: updated doc.sgm error
-
-    * AUTHORS
-      COPYING
-      INSTALL
-      NEWS
-      QUICKSTART: misc doc changes, added AUTHORS, COPYING
-
-2001-01-22  Andrei Zmievski  <andrei@php.net>
-
-    * NEWS
-      templates/index.tpl: *** empty log message ***
-
-    * Smarty.class.php
-      templates/index.tpl:
-    Fixed bug that wouldn't let you do specify non-array values for 'loop'
-    attribute.
-
-2001-01-22  Monte Ohrt  <monte@ispi.net>
-
-    * QUICKSTART: updated QUICKSTART
-
-    * BUGS
-      FAQ
-      INSTALL
-      README
-      doc.sgm: added BUGS and INSTALL, updated docs, FAQ, README
-
-2001-01-21  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ
-      doc.sgm: updates to FAQ and docs
-
-2001-01-19  Monte Ohrt  <monte@ispi.net>
-
-    * FAQ: initial commit of FAQ
-
-    * QUICKSTART
-      README
-      doc.sgm
-      index.php:
-    updated README, doc.sgm with preg_replace() parameter issue. also removed "./" from index.php file
-
-    * NEWS: initial commit of changelog
-
-    * doc.sgm
-      QUICKSTART: update quickstart text
-
-2001-01-19  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: Fix the compiled template check.
-
-2001-01-18  Andrei Zmievski  <andrei@php.net>
-
-    * doc.sgm: *** empty log message ***
-
-2001-01-18  Monte Ohrt  <monte@ispi.net>
-
-    * index.php
-      templates/index.tpl
-      QUICKSTART
-      Smarty.addons.php
-      Smarty.class.php
-      doc.sgm: update changes
-
-2001-01-18  Andrei Zmievski  <andrei@php.net>
-
-    * QUICKSTART
-      Smarty.addons.php: *** empty log message ***
-
-2001-01-18  Monte Ohrt  <monte@ispi.net>
-
-    * QUICKSTART
-      doc.sgm: add QUICKSTART, update docs for default modifier
-
-    * Smarty.addons.php
-      Smarty.class.php: added default modifier
-
-    * README
-      Smarty.addons.php
-      Smarty.class.php
-      doc.sgm
-      templates/index.tpl: added dislaimers
-
-2001-01-18  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: *** empty log message ***
-
-2001-01-16  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php
-      templates/index.tpl: Implement 'div by'.
-
-2001-01-12  Monte Ohrt  <monte@ispi.net>
-
-    * doc.sgm: update docs
-
-    * doc.sgm: doc changes
-
-    * doc.sgm: update docs
-
-2001-01-12  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php
-      doc.sgm: *** empty log message ***
-
-    * Smarty.class.php: Fix template traversal.
-
-2001-01-11  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: *** empty log message ***
-
-2001-01-09  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.addons.php
-      Smarty.class.php: *** empty log message ***
-
-2001-01-09  Monte Ohrt  <monte@ispi.net>
-
-    * doc.sgm: update manual
-
-2001-01-05  Monte Ohrt  <monte@ispi.net>
-
-    * doc.sgm
-      Smarty.addons.php: commit changes
-
-2001-01-04  Monte Ohrt  <monte@ispi.net>
-
-    * doc.sgm
-      templates/index.tpl
-      Smarty.class.php: update changes
-
-    * index.php
-      Smarty.addons.php
-      doc.sgm: add documentation
-
-2001-01-02  Monte Ohrt  <monte@ispi.net>
-
-    * index.php
-      templates/index.tpl
-      Smarty.addons.php
-      Smarty.class.php: prepend insert_ to insert tag functions
-
-    * Smarty.class.php
-      index.php
-      templates/index.tpl: remove caching logic
-
-    * README
-      Smarty.class.php
-      index.php
-      templates/index.tpl: update changes
-
-2000-12-27  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php
-      templates/header.tpl
-      templates/index.tpl
-      Smarty.addons.php: *** empty log message ***
-
-2000-12-21  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php: Fix access to template variables.
-
-    * Smarty.class.php
-      templates/header.tpl:
-    Added support for passing variables to included files.
-
-2000-12-20  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php:
-    Added support for inserting results of function processing a template.
-
-2000-12-18  Monte Ohrt  <monte@ispi.net>
-
-    * Smarty.class.php: added string_format function
-
-    * Smarty.addons.php: update format to string_format
-
-    * README
-      Smarty.addons.php
-      Smarty.class.php: added format addon function
-
-2000-12-13  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.addons.php
-      Smarty.class.php: Fix sectionelse.
-
-2000-12-07  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.addons.php
-      Smarty.class.php
-      templates/index.tpl: *** empty log message ***
-
-2000-12-04  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php
-      templates/index.tpl
-      Smarty.addons.php: *** empty log message ***
-
-2000-11-27  Andrei Zmievski  <andrei@php.net>
-
-    * templates/index.tpl
-      Smarty.class.php: *** empty log message ***
-
-2000-11-22  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php
-      templates/index.tpl: *** empty log message ***
-
-2000-11-21  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php
-      templates/index.tpl
-      Smarty.addons.php: *** empty log message ***
-
-2000-11-20  Andrei Zmievski  <andrei@php.net>
-
-    * templates/index.tpl
-      Smarty.class.php
-      Smarty.addons.php
-      index.php: *** empty log message ***
-
-    * Smarty.class.php
-      index.php
-      templates/index.tpl: Made sections work mostly.
-
-2000-11-19  Andrei Zmievski  <andrei@php.net>
-
-    * index.php
-      templates/index.tpl: *** empty log message ***
-
-2000-11-17  Andrei Zmievski  <andrei@php.net>
-
-    * Smarty.class.php
-      Smarty.addons.php: *** empty log message ***
-
-2000-11-15  Monte Ohrt  <monte@ispi.net>
-
-    * index.php
-      templates/footer.tpl
-      templates/header.tpl
-      templates/index.tpl: added template files to cvs dir
-
-    * README
-      Smarty.class.php: commit changes
-
-2000-08-08  Monte Ohrt  <monte@ispi.net>
-
-    * README
-      Smarty.class.php: update include path bug
-
-    * README: add README file
-
-    * Smarty.class.php: New file.
-
-    * Smarty.class.php: initial import
-
diff --git a/thirdparty/smarty/FAQ b/thirdparty/smarty/FAQ
deleted file mode 100644
index 1860678e7..000000000
--- a/thirdparty/smarty/FAQ
+++ /dev/null
@@ -1,284 +0,0 @@
-QUESTION INDEX
---------------
-
-GENERAL
-
-Q: What is Smarty?
-Q: What's the difference between Smarty and other template engines?
-Q: What do you mean "Compiled PHP Scripts" ?
-Q: Why can't I just use PHPA (http://php-accelerator.co.uk) or Zend Cache?
-Q: Why does smarty have a built in cache? Wouldn't it be better to handle this
-   in a separate class?
-Q: Is Smarty faster than <insert other PHP template engine>?
-Q: How can I be sure to get the best performance from Smarty?
-Q: Do you have a mailing list?
-Q: Can you change the mailing list so reply-to sends to the list and not the
-   user?
-
-TROUBLESHOOTING
-
-Q: Smarty doesn't work.
-Q: I get the following error when running Smarty:
-   Warning:  Smarty error: problem creating directory "templates_c/239/239105369"
-   in /path/to/Smarty.class.php on line 542
-Q: I get the following error when running Smarty:
-   Warning: Wrong parameter count for preg_replace() in
-   Smarty.class.php on line 371
-Q: I get this error when passing variables to {include}:
-   Fatal error: Call to undefined function: get_defined_vars() in
-   /path/to/Smarty/templates_c/index.tpl.php on line 8
-Q: I get PHP errors in my {if} tag logic.
-Q: I'm changing my php code and/or templates, and my results are not getting
-   updated.
-Q: I'm running Windows 2000 and I get blank content. My compiled PHP files are
-   also zero length.
-Q: The template goes into an infinite loop when I include included templates
-   that pass local variables
-Q: Javascript is causing Smarty errors in my templates.
-Q: I get "SAFE MODE Restriction in effect. ..."-errors when running smarty.
-
-MISC
-
-Q: Can I use Macromedia's Dreamweaver to edit my templates?
-Q: Dreamweaver is urlencoding the template delimiters when they are in a SRC or
-   HREF link. How do I get around this?
-
-HOWTO
-
-Q: How do I generate different cache files per template based on arguments
-   passed to the page?
-Q: How do I pass a template variable as a parameter? {function param={$varname}}
-   does not work.
-Q: How do I include cached template(s) within a non-cached template?
-
-
-GENERAL
--------
-
-Q: What is Smarty?
-A: Smarty is a template engine for PHP... but be aware this isn't just another
-   PHP template engine. It's much more than that.
-
-Q: What's the difference between Smarty and other template engines?
-A: Most other template engines for PHP provide basic variable substitution and
-   dynamic block functionality. Smarty takes a step further to be a "smart"
-   template engine, adding features such as configuration files, template
-   functions, variable modifiers (see the docs!) and making all of this
-   functionality as easy as possible to use for both programmers and template
-   designers. Smarty also compiles the templates into PHP scripts, eliminating
-   the need to parse the templates on every invocation, making Smarty extremely
-   scalable and manageable for large application needs.
-
-Q: What do you mean "Compiled PHP Scripts" ?
-A: Smarty reads the template files and creates PHP scripts from them. Once
-   these PHP scripts are created, Smarty executes these, never having to parse
-   the template files again. If you change a template file, Smarty will
-   recreate the PHP script for it. All this is done automatically by Smarty.
-   Template designers never need to mess with the generated PHP scripts or even
-   know of their existance. (NOTE: you can turn off this compile checking step
-   in Smarty for increased performance.)
-
-Q: Why can't I just use PHPA (http://php-accelerator.co.uk) or Zend Cache?
-A: You certainly can, and we highly recommend it! What PHPA does is caches
-   compiled bytecode of your PHP scripts in shared memory or in a file. This
-   speeds up server response and saves the compilation step. Smarty creates PHP
-   scripts, which PHPA will cache nicely. Now, Smarty's built-in cache is
-   something completely different. It caches the _output_ of the template
-   contents. For example, if you have a template that requires several database
-   queries, Smarty can cache this output, saving the need to call the database
-   every time. Smarty and PHPA (or Zend Cache) complement each other nicely. If
-   performance is of the utmost importance, we would recommend using one of
-   these with any PHP application, using Smarty or not. As you can see in the
-   benchmarks, Smartys performance _really_ excels in combination with a PHP
-   accelerator.
-
-Q: Why does Smarty have a built in cache? Wouldn't it be better to handle this
-   in a separate class?
-A: Smarty's caching functionality is tightly integrated with the template
-   engine, making it quite a bit more flexible than a simple caching wrapper.
-   For instance, you can cache select portions of a template page. Let's say
-   you have a polling box on your site. With Smarty, you can leave the poll
-   dynamic and cache the rest of the page. You can also pass templates
-   multiple cache ids, meaning that a template can have several caches
-   depending on URL, cookies, etc.
-
-Q: Is Smarty faster than <insert other PHP template engine>?
-A: See the benchmark page for some performance comparisons. Smarty's approach
-   to templates is a bit different from some languages: it compiles templates
-   into PHP scripts instead of parsing them on each invocation. This usually
-   results in great performance gains, especially with complex templates.
-   Coupled with the built-in caching of Smarty templates, the performance is
-   outstanding.
-
-Q: How can I be sure to get the best performance from Smarty?
-A: Be sure you set $compile_check=false once your templates are initially
-   compiled. This will skip the unneeded step of testing if the template has
-   changed since it was last compiled. If you have complex pages that don't
-   change too often, turn on the caching engine and adjust your application so
-   it doesn't do unnecessary work (like db calls) if a cached page is
-   available. See the documentation for examples.
-   
-Q: Do you have a mailing list?
-A:  We have a few mailing lists. "general" for you to share your ideas or ask
-	questions, "dev" for those interested in the development efforts of Smarty,
-	and "cvs" for those that would like to track the updates made in the cvs
-	repository.
-
-    send a blank e-mail message to:
-      smarty-general-subscribe@lists.php.net (subscribe to the general list)
-      smarty-general-unsubscribe@lists.php.net (unsubscribe from the general list)
-      smarty-general-digest-subscribe@lists.php.net (subscribe to digest)
-      smarty-general-digest-unsubscribe@lists.php.net (unsubscribe from digest)
-      smarty-dev-subscribe@lists.php.net (subscribe to the dev list)
-      smarty-dev-unsubscribe@lists.php.net (unsubscribe from the dev list)
-      smarty-cvs-subscribe@lists.php.net (subscribe to the cvs list)
-      smarty-cvs-unsubscribe@lists.php.net (unsubscribe from the cvs list)
-    You can also browse the mailing list archives at
-    http://marc.theaimsgroup.com/?l=smarty&r=1&w=2
-
-
-
-Q: Can you change the mailing list so Reply-To sends to the list and not the
-   user?
-A: Yes we could, but no we won't. Use "Reply-All" in your e-mail client to send
-   to the list. http://www.unicom.com/pw/reply-to-harmful.html
-
-TROUBLESHOOTING
----------------
-
-Q: Smarty doesn't work.
-A: You must be using PHP 4.0.6 or later if you use any version of Smarty
-   past 2.0.1. Read the BUGS file for more info.
-
-Q: I get the following error when running Smarty:
-   Warning:  Smarty error: problem creating directory "templates_c/239/239105369"
-   in /path/to/Smarty.class.php on line 542
-A: Your web server user does not have permission to write to the templates_c
-   directory, or is unable to create the templates_c directory. Be sure the
-   templates_c directory exists in the location defined in Smarty.class.php,
-   and the web server user can write to it. If you do not know the web server
-   user, chmod 777 the templates_c directory, reload the page, then check the
-   file ownership of the files created in templates_c. Or, you can check the
-   httpd.conf (usually in /usr/local/apache/conf) file for this setting:
-   User nobody
-   Group nobody
-
-Q: I get the following error when running Smarty: Warning: Wrong parameter
-   count for preg_replace() in Smarty.class.php on line 371
-A: preg_replace had a parameter added in PHP 4.0.2 that Smarty
-   requires. Upgrade to at least 4.0.6 to fix all known PHP issues with
-   Smarty.
-
-Q: I get this error when passing variables to {include}:
-   Fatal error: Call to undefined function: get_defined_vars() in
-   /path/to/Smarty/templates_c/index.tpl.php on line 8
-A: get_defined_vars() was added to PHP 4.0.4. If you plan on passing
-   variables to included templates, you will need PHP 4.0.6 or later.
-
-Q: I get PHP errors in my {if} tag logic.
-A: All conditional qualifiers must be separated by spaces. This syntax will not
-   work: {if $name=="Wilma"} You must instead do this: {if $name == "Wilma"}.
-   The reason for this is syntax ambiguity. Both "==" and "eq" are equivalent
-   in the template parser, so something like {if $nameeq"Wilma"} wouldn't be
-   parsable by the tokenizer.
-
-Q: I'm changing my php code and/or templates, and my results are not getting
-   updated.
-A: This may be the result of your compile or cache settings. If you are
-   changing your php code, your templates will not necessarily get recompiled
-   to reflect the changes. Use $force_compile during develpment to avoid these
-   situations. Also turn off caching during development when you aren't
-   specifically testing it. You can also remove everything from your
-   compile_dir and cache_dir and reload the page to be sure everything gets
-   regenerated.
-
-Q: I'm running Windows 2000 and I get blank content. My compiled PHP files are
-   also zero length.
-A: There seems to be a problem with some W2k machines and exclusive file
-   locking. Comment out the flock() call in _write_file to get around this,
-   although be aware this could possibly cause a problem with simultaneous
-   writes to a file, especially with caching turned on. NOTE: As of Smarty
-   1.4.0, a workaround was put in place that should solve this.
-
-Q: The template goes into an infinite loop when I include included templates
-   that pass local variables
-A: This was fixed in 1.3.2 (new global attribute)
-
-Q: Javascript is causing Smarty errors in my templates.
-A: Surround your javascript with {literal}{/literal} tags. See the docs.
-
-Q: I get "SAFE MODE Restriction in effect. ..."-errors when running smarty.
-A: Use $smarty->use_sub_dirs = false when running php in safe mode.
-
-MISC
-----
-
-Q: Can I use Macromedia's Dreamweaver to edit my templates?
-A: Certainly. You might want to change your tag delimiters from {} to something
-   that resembles valid HTML, like <!--{ }--> or <{ }> or something similar.
-   This way the editor won't view the template tags as errors.
-
-Q: Dreamweaver is urlencoding the template delimiters when they are in a SRC or
-   HREF link. How do I get around this?
-A: In Edit - Properties - Rewrite HTML you can specify if Dreamweaver should
-   change special letters to %-equivalent or not. The default is on which
-   produces this error.
-
-HOWTO
------
-   
-Q: How do I generate different cache files per template based on arguments
-   passed to the page?
-A: Use your $REQUEST_URI as the cache_id when fetching the page:
-
-   global $REQUEST_URI; // if not already present
-   $smarty->display('index.tpl',$REQUEST_URI);
-
-   This will create a separate cache file for each unique URL when you call
-   index.tpl. See the documentation for display() and fetch()
-
-Q: How do I pass a template variable as a parameter? {function param={$varname}}
-   does not work.
-A: {function param=$varname} (You cannot nest template delimiters.)
-
-Q: How do I include cached template(s) within a non-cached template?
-A: One way to do it:
-
-   $smarty->caching = true;
-   $tpl1 = $smarty->fetch("internal1.tpl");
-   $tpl2 = $smarty->fetch("internal2.tpl");
-   $tpl3 = $smarty->fetch("internal3.tpl");
-
-   $smarty->assign("tpl1_contents",$tpl1);
-   $smarty->assign("tpl2_contents",$tpl2);
-   $smarty->assign("tpl3_contents",$tpl3);
-
-   $smarty->caching = false;
-   $smarty->display('index.tpl');
-
-   index.tpl
-   ---------
-
-   <table>
-           <tr>
-                   <td>{$tpl1_contents}</td>
-                   <td>{$tpl2_contents}</td>
-                   <td>{$tpl3_contents}</td>
-           </tr>
-   </table>
-
-
-
-
-   Another approach:
-
-   You could write a custom insert function to fetch your internal
-   templates:
-
-   <table>
-           <tr>
-                   <td>{insert name=fetch_tpl tpl="internal1.tpl"}</td>
-                   <td>{insert name=fetch_tpl tpl="internal2.tpl"}</td>
-                   <td>{insert name=fetch_tpl tpl="internal3.tpl"}</td>
-           </tr>
-   </table>
diff --git a/thirdparty/smarty/INSTALL b/thirdparty/smarty/INSTALL
deleted file mode 100644
index f622ee8ff..000000000
--- a/thirdparty/smarty/INSTALL
+++ /dev/null
@@ -1,29 +0,0 @@
-REQUIREMENTS:
-
-Smarty requires PHP 4.0.6 or later.
-See the on-line documentation for complete install instructions.
-
-INSTALLATION (quick):
-
-* copy the files under the libs/ directory to a directory that is in your PHP
-  include_path, or set the SMARTY_DIR constant and put them in this directory.
-  (if you upgrade from versions before 2.5.0 be aware that up to Smarty 2.4.2
-  all necessary files where in the distribution's root directory, but are now
-  in libs/.)
-
-* for each application using Smarty, create a "templates", "configs", and a
-  "templates_c" directory, be sure to set the appropriate directory settings in
-  Smarty for them. If they are located in the same directory as your
-  application, they shouldn't need to be modified. Be sure the "templates_c"
-  directory is writable by your web server user (usually nobody). chown
-  nobody:nobody templates_c; chmod 700 templates_c You can also chmod 777 this
-  directory, but be aware of security issues for multi-user systems. If you are
-  using Smarty's built-in caching, create a "cache" directory and also chown
-  nobody:nobody.
-
-* setup your php and template files. A good working example is in the on-line
-  documentation.
-
-* TECHNICAL NOTE: If you do not have access to the php.ini file, you can change
-  non-server settings (such as your include_path) with the ini_set() command.
-  example: ini_set("include_path",".:/usr/local/lib/php");
diff --git a/thirdparty/smarty/NEWS b/thirdparty/smarty/NEWS
deleted file mode 100644
index 7364ac97c..000000000
--- a/thirdparty/smarty/NEWS
+++ /dev/null
@@ -1,1013 +0,0 @@
-Version 2.6.18 (Mar 7th, 2007)
-------------------------------
-
-- fix html_select_date separator when parts are missing (hayk,
-  monte)
-- fix broken detection of non-cached blocks introduced in 2.6.17
-  (messju)
-
-Version 2.6.17 (Mar 5th, 2007)
-------------------------------
-
-- fix php handling (monte, boots, danilo)
-- fix handling of plugin tags directly followed by an else tag (Fahr, danilo)
-- fix handling of $etc in the truncate modifier when $etc is longer
-  than $length (Sylvinus, messju)
-- fix handling of %I with mysql timestamps in the date_format modifier
-  (danilo, boots)
-- update smarty_core_write_file() and smarty_modifier_date_format() to better
-  recognize Windows (boots, danilo)
-- emulate %h, %n, %r, %R, %t in the date_format modifier on Windows 
-  (danilo, boots)
-
-Version 2.6.16 (Dec 1st, 2006)
-------------------------------
-
-- fixed replacement bug in trimwhitespace output filter that was introduced
-  in the last release (Spuerhund, boots)
-
-Version 2.6.15 (Nov 30th, 2006)
--------------------------------
-
-- change file writing semantics in smarty_core_write_file() to unlink() only
-  when rename() fails or a Windows system is detected (c960657, boots) 
-- update debug.tpl to xhtml 1.1 compliance, fix javascript escaping in debug
-  output and apply a Smarty based color scheme (cybot, boots)
-- enhance reporting precision of debug_print_var modifier (cybot, boots) 
-- make html_select_date work consistently with 0000-00-00 00:00:00 and
-  0000-00-00 inputs (cybot, boots)
-- fix wrong handling of insert's name attribute. (messju)
-- fix false replacement of "$t" inside double quotes (checat, messju)
-- added support for column headings and caption element to html_table and
-  updated the output to use thead/tbody elements (boots)
-- fixed ordering of replacements in trimwhitespace output filter (Getty, boots)
-- update mailto function plugin to work around a firefox/thunderbird
-  escaping bug (elijahlofgren, boots)
-- emulate %l in the date_format modifier on windows (boots) 
-- fix handling of apostrophes in capitalize modifier (Alec Smecher, boots)
-
-Version 2.6.14 (May 28th, 2006)
--------------------------------
-
-- fix compiler bug allowing php tags in secure templates
-  (boots,monte)
-- un-hide hidden xml open tags (boots)
-- fix handling of block-methods of registered objects (El Hombre Gris,
-  messju)
-
-Version 2.6.13 (March 9th, 2006)
---------------------------------
-
- - update regex_replace, removing possible use of "e" modifier
-
-Version 2.6.12 (Jan 18th, 2006)
--------------------------------
-
- - fix improper use of references in the compiler handling cached
-   attributes and in compiled code handling block plugins (messju)
- - make Smarty::_read_file() work on latest php (messju)
- - fixed improper tokenization of certain inline math expressions (boots)
-
-Version 2.6.11 (Dec 14, 2005)
------------------------------
-
- - fixed code generation of non-cacheable blocks to play well with php's
-   "Alternative syntax for control structures" (kihara, messju)
- - fix handling of multiple identical inserts in one display()-call (messju)
- - replace {} string access with equivalent substr() to avoid E_STRICT
-   warnings in PHP 5.1 (boots)
- - return valid reference in get_config_vars() when given var is
-   non-existant (Thomas Schulz, boots)
- - plugin html_image: fix incorrect secure_dir error when
-   file doesn't exist (monte)
- - plugin html_image: add path_prefix param (monte)
- - add char_set parameter to escape modifier (Loading, monte)
- - fix notice in debug security check (Drakla, monte)
- - return valid reference in get_template_vars() when given var is
-   non-existant (monte)
- - add escape type "urlpathinfo" to escape modifier (monte)
-
-Version 2.6.10 (Aug 5, 2005)
-----------------------------
-
-  - allow secure_dir to be a filename, not just
-    a directory name (monte)
-  - set debug.tpl as a secure_dir, not the entire
-    SMARTY_DIR (monte)
-  - fix proper escaping for literal strings in
-    Smarty_Compiler::_parse_var_props() (boots, messju)
-  - remove ambiguity for numeric values passed to smarty_make_timestamp()
-    (and thus the date_format modifier). numeric values are treated as
-    timestamps now. (andreas, messju)
-  - add passthru attribute feature to html_select_date (Sedgar,
-    monte)
-  - add "middle" parameter to truncate (monte)
-  - make form input label ids optional (monte)
-  - add error message for empty if/elseif statements (eykanal,
-    monte)
-  - cast selected value to string for comparison in html_radios
-    (Exeption, monte)
-  - updated html_select_date's year_as_text-feature to be xhtml compliant
-    (Mark West, messju)
-  - fix handling of selected month html_select_date (Yuri Weseman, messju)
-
-Version 2.6.9 (Mar 31, 2005)
-----------------------------
-
-  - disallow variable function calls in {if} statements (messju, monte)
-  - disallow variable function calls in {math} equations (messju, monte)
-
-Version 2.6.8 (Mar 21, 2005)
-----------------------------
-
-  - remove e-modifier from regex_replace modifier (messju)
-  - remove cast of object to array in foreach's from-attribute (messju)
-  - add "null" as a valid token for {if} when security is enabled (messju)
-  - add javascript_charcode encoding option to mailto function
-    (monte)
-  - add ids to html_radios labels (monte, menulis)
-  - fix handling of strip-tags with non-default delimiters (Mark West, messju)
-
-Version 2.6.7 (Feb 3, 2005)
----------------------------
-
-  - fix handling of hashed opening php-tags inside strip-blocks (messju)
-  - removed border tag from html_image function (monte)
-  - change escape:url use rawurlencode() instead of urlencode() (messju)
-  - make $smarty.const.FOO compile to "FOO", and not to "constant('foo')".
-    this is less code and a little faster execution. note that undefined
-    constants are now displayed as the constant's name. (messju)
-  - make block functions and registered objects' block methods use a
-    local variable for block_content instead of a property of $smarty (messju)
-  - fix escaping in the generated code that calls smarty_core_load_plugins
-    (jes5199, messju)
-  - fix invalid HTML issue with popup (Stefanos Harhalakis,
-    Monte)
-  - fixed {popup} to properly handle inarray and function parameters and added
-    support for mouseoff and followmouse options (boots)
-
-Version 2.6.6 (Oct 13, 2004)
-----------------------------
-
-  - fixed nocache-handling with nested includes (Lars Jankowfsky, messju)
-  - moved /libs/core to /libs/internals (boots)
-  - fixed more parsing problems (messju)
-
-Version 2.6.5 (Sept 13, 2004)
------------------------------
-
-  - fixed some parsing problems with object calls introduced
-    in 2.6.4 (Monte)
-  - add $smarty->security_settings['ALLOW_CONSTANTS']. note: this
-    defaults to false which means you have to allow them explicitly
-    in your secured templates from now on! (messju)
-
-Version 2.6.4 (Sept 7, 2004)
-----------------------------
-
-  - add $smarty.ldelim and $smarty.rdelim to smarty special var (Monte)
-  - fall back to old uniqid()-behaviour when tempnam() fails in
-    core.write_file.php (messju)
-  - fix capitalize modifier, don't rely on buggy ucwords (Monte)
-  - make html_select_date work with negative timestamps, also
-    force year range to include given date unless explicitly
-    set (Garo, Monte)
-  - fix bug with {fetch}, passing user/pass in url did not work
-    (Monte)
-  - fix occasional wrong error messages on mismatched tags when
-    {else}, {elseif}, {foreachelse} or {sectionelse} is involved (messju)
-  - fix handling of methods arguments (messju, Manfred Wischin)
-  - remove touch() call that made the compiled-template's timestamp the
-    same as the source-template's one. (messju)
-  - add assign attribute to html_checkboxes and html_radios
-    (pcg, Monte)
-  - remove non-xhtml conformant tag from mailto function
-    (tacker, Monte)
-  - handle date_format codes %e, %T and %D for windows (tip,
-    Monte)
-  - fix unnecessary call to smarty_core_get_include_path() inside
-    Smarty::_get_auto_filename() (c960657, messju)
-  - add error-messages when anything else than an identifier is passed
-    to foreach's key- or item-attribute (messju)
-  - fix handling of digits inside tagnames (messju)
-  - fix escaping of backslashes in Smarty_Compiler::_quote_replace() (messju)
-
-Version 2.6.3 (June 16, 2004)
------------------------------
-
-  - added escapement of '</' to '<\/' in escape:javascript
-    modifier (c960657, Monte)
-  - added obfuscation of protocol-string in {mailto} when using hex-
-    encoding (bharat, messju)
-  - enhanced auto-generated filenames for templates_c and cache (messju)
-  - add 'nonstd' to escape modifier for escaping non-std chars,
-    such as ms doc quote (Monte)
-  - adjusted textformat to not output wrap chars after last para
-    (Monte)
-  - use tempnam() instead of unqid() to create better temporary files in
-    smarty_core_write_file() (xces, messju)
-  - add 'mail' to escape modifier for safe display of e-mail
-    addresses (Monte)
-  - add cycle function attribute "reset" to english docs (Monte)
-  - enhanced support of numeric constants as variable-expressions (messju)
-  - add case decentity to smarty_modifier_escape() (Konstantin A. Pelepelin,
-    messju)
-  - make smarty_core_write_compiled_include() php5-aware (messju)
-  - removed unused functionality to load a subset of lines from a file (messju)
-  - fix is_secure() should only check if a file is_readable, not if
-    the directory where it is in is readable (sagi, messju)
-  - fix problem displaying debug console when $default_resource_type
-    is not "file:" (c960657, Monte)
-  - fix permission handling with security and config_load (messju)
-  - removed '.' from the list of default template locations in
-    _parse_resource_name() (messju)
-  - fix avoid warning with template_exists() on an absolute paths (messju)
-  - fix parameters passed to resource's secure()-function (messju)
-  - fix handling of integer values like width and delay im
-    smarty_function_popup() (messju)
-
-Version 2.6.2 (Feb 17, 2004)
-----------------------------
-
-  - fix allow empty years, months and days in html_select_date's
-    time-attribute (messju)
-  - fix YES and NO should not be booleanized inside triple-quotes in a
-    config-file (messju)
-  - fix accidently slurped line following a triple-quoted value in a
-    config-file (messju)
-  - change default for use_sub_dirs to false (messju)
-  - fix quoting of values in smarty_function_popup() (messju)
-  - fix handling of hidden sections in Config_File (messju)
-  - add handling of resources for {config_load} (messju)
-  - fix bug when using arrays with tr_attr and td_attr in {html_table} (messju)
-  - add unit testing to cvs core (Monte)
-
-Version 2.6.1 (Jan 16, 2004)
-----------------------------
-
-  - rename $smarty->tpl_error_reporting to $smarty->error_reporting
-    (messju)
-  - fix interpretation of $smarty->security in {html_image} (messju)
-  - add caching of requested paths to _assemble_plugin_filepath() (messju)
-  - fix handling of comments inside {php}- and {literal}-blocks (messju)
-  - fix bug handling triple-quotes in config-files (BRDude, messju)
-  - change default of request_use_auto_globals to true - $_SERVER is
-    now preferred over $HTTP_SERVER_VARS (messju)
-  - re-add support for $SCRIPT_NAME (messju)
-  - reactivate $smarty->default_modifiers (messju)
-  - add cookie persistance to debug console (Monte)
-  - allow single-digit days and months without smarty_make_timestamp()
-    in html_select_date (messju)
-  - fix headers sent erroneously with cache_modified_check and fetch()
-    (wphilips, messju)
-  - fix config_file path bug (Marc Cabadas, Monte)
-  - fix 'is even by' and 'is odd by' logic (Monte)
-  - add day_empty, month_empty, year_empty and all_empty attributes to
-    html_select_date (messju)
-  - add table of explanation for {if} qualifiers in docs (boots)
-  - fix bug when comparing array-keys to "selected" in html_options
-    and html_checkboxes (messju)
-  - add better checks for correctly nested tags when compiling (messju)
-  - remove {$SCRIPT_NAME}. use {$smarty.server.SCRIPT_NAME} instead (messju)
-  - remove $global_assign. assign global variables explicitly instead (messju)
-  - fix example for count_characters in docs (boots)
-  - add section new basic syntax section "Escaping Smarty Parsing" in docs (boots)
-  - fix error handler call in config_load (boots)
-  - remove warning in debug_print_var on php-resources (messju)
-  - move function.assign.php to compiler.assign.php (messju)
-  - add property $tpl_error_reporting (messju)
-  - remove property $undefined. "null" is used literally instead (messju)
-
-Version 2.6.0 (Nov 19, 2003)
-----------------------------
-
-  - move Smarty::quote_replace() to Smarty_Compiler::_quote_replace() (messju)
-  - remove import of of attributes of {include_php} to php's namespace.
-    use $params[name] instead (messju)
-
-Version 2.6.0-RC3 (Nov 13, 2003)
---------------------------------
-
-  - fix handling of $var.key inside [] (messju)
-  - fix handling of assign inside {insert}-tags (messju)
-  - fix handling if [...] inside triple-quotes in config-files (messju)
-  - fix handling of simple-math-operators inside modifiers (Dominik, messju)
-  - fix handling of trailing-slashes in open_basedir in
-    smarty_core_create_dir_structure() (packman, messju)
-
-Version 2.6.0-RC2 (Oct 8, 2003)
--------------------------------
-
-  - apply modifiers only once to section-loop and foreach-from attrs (messju)
-  - remove use of _smarty_cached_paths-files (messju)
-  - remove Smarty::_plugin_implementation_exists() - use is_callable() (messju)
-  - ignore {strip}/{/strip) inside {strip}-blocks (messju)
-  - fixed removal of leading/trailing newlines in {strip}-blocks (messju)
-  - fixed proper escaping of " and ' with escape:javascript (messju)
-  - fixed bug in traversal of $smarty->plugins_dir-array. now the
-    first matching plugin is taken (messju)
-  - moved {strip} back into the compiler (messju)
-  - fixed config_load: handling of section-attribute and use of
-    multiple config-files in one template (atu, messju)
-
-Version 2.6.0-RC1 (August 11, 2003)
------------------------------------
-
-  - fixed status-header for cache_modified_check under cgi-sapi (messju)
-  - added optional parameter $cache_attrs to register_function() and
-    register_block(). $cache_attrs is an array containing attribute-
-    names that should be cached on calls to functions that have
-    $cacheable set to false. (messju)
-  - enabled registration of class-methods as callbacks for the register_*-
-    functions (use: array('classname', 'method_name')) as callback) (messju)
-  - added filepath caching (Monte)
-  - added optional assign-attribute to {capture}-tag (messju)
-  - added $cacheable-parameter to register_compiler_function() (messju)
-  - added $cacheable-parameter with default=true to register_function()
-    and register_block() (messju)
-  - add math speedup to core (Dominik, Monte)
-  - fix newlines for tags without template output (Monte)
-  - added config-option "request_use_auto_globals" to make auto-globals be
-    used as request vars instead of HTTP_*_VARS (messju)
-  - speed up config_load, simplify compiling (Monte)
-  - added block-methods for registered objects (Bharat Mediratta, messju)
-  - ignore one char resource names like c:foo.tpl (Monte)
-  - added default_resource_type feature (Monte)
-  - fix bug where config file starts with hidden section (boots, Monte)
-  - add discrete error checking pertaining to $cache_dir
-    and $compile_dir, their existance and writability (Monte)
-  - fixed behaviour of start=... for {counter} (messju)
-  - fixed assign for {counter} (messju)
-  - added params vdir, hdir and inner to html_table to allow looping
-    over the data in various directions (messju)
-  - allow spaces in literal tags (Paul Lockaby, Monte)
-  - speed up compiled templates, hardcode plugin filepaths
-    instead of dynamically calculate at runtime. (Monte)
-  - abstract many core components from Smarty.class.php,
-    speeding up core class instantiation (Monte)
-  - fixed bug in _create_dir_structure() when used with open_basedir-
-    restriction and relative paths (messju)
-  - use DIRECTORY_SEPARATOR exclusively, keep DIR_SEP for BC (Monte)
-  - changed "link" to "href" in html_image. "link" is still working
-    but deprecated (messju)
-  - html_image always renders an alt-tag now (default alt="") (messju)
-  - fixed assign attribute for multiple counters (messju)
-  - added simple math operators to variables (Monte)
-  - enabled array(&$obj. 'source', 'timestamp', 'secure', 'trusted')
-    as callback for register_resource() (messju);
-  - enabled array(&$obj, 'method') as callback for
-    $default_template_handler_func (messju)
-  - remove unnecessary close/open tags from compiled templates
-    (Monte)
-  - fixed errornous creation of '//' in image_path in html_image (messju)
-  - fix escapement of special chars for key vals in debug
-    console (Monte)
-  - fixed debug timing logic for config_load (Tom Sommer, Monte)
-  - all in-code doc comments converted to phpDocumentor format (Greg)
-  - moved strip from smarty core to plugin (Monte)
-  - moved config_load from smarty core to plugin (Monte)
-  - added &$repeat-parameter to block-functions (messju)
-  - enabled hex-constants in function.math.php (messju)
-  - enabled hex-constants (0x...) as function-attributes, inside if-statements
-    and as modifier-parameters (messju)
-  - fixed bug with passing $smarty as reference in Smarty.compiler.class
-    (messju)
-  - corrected output with {strip} and PHP tag newlines (Monte)
-  - added possibility to register function-callbacks as "array(&$obj, 'method)"
-    this affects register_function(), -block, -compiler_function, -modifier,
-    -prefilter, -postfilter, -outputfilter-functions() and $cache_handler_func
-    (messju)
-  - added <labels> to html_checkboxes and html_radios (Philippe, messju)
-  - added "labels"-options to turn off labels in html_checkboxes and _radios
-    (messju)
-
-Version 2.5.0 (April 11, 2003)
-------------------------------
-
-   - fixed bug with default modifier when passing integer 0
-     (Monte)
-   - change backtic syntax from $`foo` to `$foo` (Monte)
-   - recognize $foo[][] syntax inside embedded quotes without
-     backtics (Monte)
-   - name=123 is passed as an integer (not a string) to plugins now (messju)
-   - $length is now propagated to sub-values in debug_print_var (messju)
-
-Version 2.5.0-RC2 (March 26, 2003)
-----------------------------------
-
-    - made clear_cache() ignore compile_id, when clearing cache-groups (this
-      is when no $tpl_file is supplied) (messju)
-    - made onmouseout XHTML-compliant in function.popup.php (messju)
-    - applied local-var-naming-scheme to fetch() (messju)
-    - renamed $localvars to $_localvars in cache-file-handling-functions,
-      added _get_auto_id()-function (messju)
-    - swapped compile_id and cache_id in read_cache_file and write_cache_file
-      (messju)
-    - reverted patch for cache-file-handling (messju)
-    - made html_radios and html_checkboxes accept "selected" instead
-      of "checked" optionally. (messju)
-    - made compile_id ignored in clear_cache, made order of
-      auto_file_name $cache_id.$compile_id again, applied the the new
-      variable-naming-scheme for cache_file_handing functions (messju)
-    - removed notice of undefined var in _rm_auto() (messju)
-    - added warning message when an array is passed as
-      the "checked" value of html_radios (Monte)
-    - fixed errormessage in _compile_smarty_ref() (messju)
-    - updated docs for html_image "name" -> "file" (messju)
-    - fixed bug with html_options-optgroups (Nichlas L�fdahl, messju)
-    - cleaned up calls to readdir() (messju)
-    - fixed bug with passing multiple modifiers to a parameter
-      (Monte)
-    - updated docs for html_checkboxes, html_options and html_radios (messju)
-    - fixed wrong default "name" attribute for html_options (messju)
-    - html_checkboxes now expect the options as attribute "options" instead
-      of "checkboxes. html_radios expect "options" instead of "radios".
-      cleaned up indentiation (messju)
-    - fixed too greedy str_replace in trimwhitespace outputfilter (messju)
-    - html_checkboxes and html_radios passthru all unknown paramters now
-      additionally their output is now XHTML compliant (messju)
-    - html_options passthru all unknown paramters now (messju)
-    - fix link functionality of html_image, also make
-      output XHTML compatible (Hinrich Donner, Monte)
-    - append "@" to default modifier vars/args
-      supress possible warnings (Monte)
-    - fix problem with escaped double quotes (Monte)
-    - fix html_radios to not return an array (Monte)
-    - fixed length in modifier.truncate.php (messju)
-    - fixed handling of '$'-signs in trimwhitespace outputfilter (messju)
-    - fix bug that makes config files recompile every time
-      (Nagger, Monte)
-    - add dpi functionality to html_image, change "name"
-      parameter to "file" (Thomas Shulz, Monte)
-    - fix height/width parameter index in html_image (Gerard,
-      Monte)
-    - get rid of unsetting name and script attributes
-      to insert tag (Thomas Schulz, Monte)
-    - changed argument order of string_format modifier back,
-      was right in the first place (Monte)
-
-Version 2.5.0-RC1 (March 5, 2003)
----------------------------------
-
-    - fixed notice in popup function (Nagger, Monte)
-    - fix "once" var compiling for include_php (Monte)
-    - added nl2br modifier to distribution (Monte)
-    - added html_image to distribution (Monte)
-    - added cat modifier to distribution (Monte)
-    - added html_table to distribution (Monte)
-    - added << >> <> support to if statments (SMK, Monte)
-    - fix _assign_smarty_interface to not overwrite keys
-      other than 'request' (Jerome Poudevigne, Monte)
-    - added html_checkboxes to distribution (Christopher Kvarme, Monte)
-    - added html_radios to distribution (Christopher Kvarme, Monte)
-    - fixed string_format modifier args (wrong order) (Paul
-      Lockaby, Monte)
-    - use tmp file for file writes, avoid file lock race (Monte)
-    - support syntax "$`smarty.config.foo`.tpl" for embedded
-      vars in quotes, and allow full dollar var syntax (Monte)
-    - add $smarty.config.varname variable for accessing config vars (Paul
-      Lockaby, Monte)
-    - silence PHP warnings in function.fetch.php (Eduardo,
-      Monte)
-    - added get_config_vars(), same basic functionality as
-      get_template_vars() (Monte)
-    - update get_template_vars() to be able to get
-      individual vars (Monte)
-    - fix minor logic in _fetch_template_info (Dennis Gearon,
-      Monte)
-    - fix cache groups with compile_id set (Monte)
-    - add support for merging appended vars (messju, Monte)
-    - allow null as function attribute value
-      (Andr� Rabold, Monte)
-    - support $foo->bar[index] syntax (Monte)
-    - add get_registered_object function (messju, Monte)
-    - treat unrecognized param attribute syntax as string (Monte)
-    - support $smarty.const.$foo syntax (messju, Monte)
-    - remove E_NOTICE warnings from debug.tpl,
-      escape modifier (Kanstantin, Monte)
-    - don't count non-ascii chars in count_words modifier
-      (Kanstantin, Monte)
-    - clean up param calls to _parse_var and _parse_attrs (Monte)
-    - define $template_source var, elude possible warning
-      (Monte)
-    - fix syntax problem with evaluating PHP constants (Monte)
-    - add @ and === as valid if statement tokens (Monte)
-    - enable error messages for config_load errors,
-      use $this->config_class for loading class name (Monte)
-    - fix html_options to not escape already escaped entities (Monte)
-    - send Last-Modified header on cache creation (Monte)
-    - check strict syntax of function attributes (Monte)
-    - dropped support for modifers on object parameters,
-      added support for objects as modifier parameters (Monte)
-    - fixed bug with decimal numbers in if statements (Monte)
-
-Version 2.4.2 (Feb 11, 2003)
-----------------------------
-    - support embedded variables in objects (Monte)
-    - fix bug with objects with no properties (M Mohr, Monte)
-    - support full dollar var syntax in quoted text (Monte)
-    - fixed bug in $smarty.const.FOO introduced in 2.4.1 (M
-      Mohr, Monte)
-
-Version 2.4.1 (Feb 6, 2003)
----------------------------
-
-    - ignore case in IF statements (Rainer Collet, Monte)
-    - treat undefined constants as null (Ferdinand Beyer, Monte)
-    - fix problem with inserts and nested fetches
-      (Rainer Collet, Monte)
-    - added support for passing params to include_php
-      (Tim Riley, Monte)
-    - added support for math operators in if statements (Monte)
-    - added support for $foo->bar[$x].blah syntax (Monte)
-
-Version 2.4.0 (Feb 2, 2003)
----------------------------
-
-    - fix known problems with php tag handling in templates
-      (recursion, echoing xml tags) (Monte)
-    - add support for object registration (Monte)
-    - add debug template to secure_dir, add template_dir
-      to secure_dir by default (Ferdinand Beyer, Monte)
-    - added support for assigned object access (Monte)
-    - fixed bug with directories named '0' (Frank Bauer, Monte)
-    - add javascript parameter to escape modifier (Monte)
-    - added calling function line numbers to syntax error
-      messages in compiler (Monte)
-    - added support for modifiers to function calls (Monte)
-    - support return value for custom functions
-      instead of echoing (but echo still works) (Monte)
-    - added direct access to constants
-      via $smarty.const.FOO (Monte)
-    - added support for passing modifiers
-      to static values (Monte)
-    - fix up regex code in compiler, more accurate and
-      maintainable (Monte)
-    - added day_value_format to html_select_date (Marcus
-      Bointon, Monte)
-    - assigned variables are no longer in global
-      namespace, saving extract() calls and speeding
-      up fetch() and display() linearly with no. of
-      assigned variables (Monte)
-    - added trimwhitespace output filter to dist. (Monte)
-    - fix popup function to allow newlines in text (Monte)
-    - escape html entities in html_options (Monte)
-    - fixed bug with label for html_options (Monte)
-    - added config_load API function (Monte)
-    - added caching to config file loading (Monte)
-    - added "extra" parameter to mailto function (Monte,
-      Massimiliano Perantoni)
-    - added mailto plugin to dist.  (Monte)
-
-Version 2.3.1 (Nov 19, 2002)
-----------------------------
-
-    - added optgroup support to html_options (Monte, Robert
-      Amos)
-    - set mtime on compile files so they match source
-      files (Monte, Peter Bowen)
-    - added proper support for open_basedir setting
-      (Monte, Alessandro Astarita)
-    - added strip variable modifier, updated docs (Monte)
-    - fixed access to $smarty.x variables as arrays. (Andrei)
-    - fixed errors with example setup docs (Monte, Matthew
-      Hagerty)
-    - added textformat block function (Monte)
-
-Version 2.3.0 (Aug 7, 2002)
----------------------------
-
-    - added assign_by_ref() and append_by_ref() functions
-      (Bob Silva, Monte)
-    - changed default warning type for plugin errors from
-      E_USER_WARNING to E_USER_ERROR (Monte)
-    - added $all_extra, $hour_extra, $minute_extra,
-      $second_extra and $meridian_extra parameters to
-      html_select_time function (Rainer Collet, Monte)
-    - update debug console to print objects (Simon Willison,
-      Monte)
-    - fix Config_File class to not error when there are no
-      sections (Peter Kmet, Monte)
-    - add default modifier logic (Monte)
-    - updated popup_init to be xhtml compliant (Tom Oram, Monte)
-    - fix filename bug with windows (Gary Loescher, Monte)
-    - add ability to supply expire time in seconds when clearing
-      cache or compile files (Monte)
-    - add {debug} plugin to distribution (Monte)
-    - fixed bug with insert tags, loading from "script" attribute
-      when caching is enabled (Monte)
-    - fix bug with debug_tpl file path with Windows (.SMK., Monte)
-    - fix append() function with string/array problem (Monte)
-
-Version 2.2.0 (July 11, 2002)
------------------------------
-
-    - make debug.tpl work with any delimiter (Monte)
-    - change logic in assign() and append() to test var names
-      against != '' instead of empty() (Monte)
-    - fix PHP notice in append() function (Monte)
-    - allow $plugins_dir to be an array of directories
-      (Andreas Kossmeier, Monte)
-    - move debug.tpl to SMARTY_DIR, add to constructor (Monte)
-    - fixed warning message in function.assign_debug_info (Monte)
-    - fixed $template_dir, $compile_dir, $cache_dir, $config_dir,
-      $plugin_dir to respect include_path (Monte)
-    - fixed warning message with output filter array (Monte)
-    - add optional 2nd parameter to date_format, used as
-      the default date if the passed date is empty (Monte)
-    - gave $reset a default value in cycle plugin (Monte)
-    - fixed warnings with html_select_date and timestamp
-      functions (Monte)
-    - added support for sub directory exlusion format (Monte)
-    - added support for grouping by cache_id, compile_id
-      and segments thereof (Monte)
-    - changed cache and compile files to human readable
-      format (Monte)
-    - remove overlib.js file from distribution (Monte)
-    - fixed bug with 304 Not Modified response sending
-      content (Monte)
-    - fixed cycle function to respect delimiter after
-      initial setting (Monte)
-    - update $GLOBALS references to work properly with
-      track_globals settings (Michal Prinke, Monte)
-    - fixed bug in math function with call to assign
-      (Grigory V. Kareev, Monte)
-    - optimized for loops with count() function calls (Monte)
-    - add month_value_format attribute to html_select_date
-      plugin (Gary Loescher, Monte)
-    - made it possible to use simple variables inside [] for
-      indexing. (Andrei)
-    - added "once" attribute to {include_php}. (Monte)
-
-Version 2.1.1
--------------
-    - added cycle function. (Monte)
-    - fixed bug with resource testing, and include_path. (Monte)
-    - fixed a bug with register_outputfilter function. (Monte)
-
-Version 2.1.0
--------------
-
-    - introduced output filters. (Andrei)
-    - changed the way filters are loaded, added load_filter()
-      API function and $autoload_filters variable. (Andrei)
-    - added caching logic for expire times per cache file
-      (Norbert Rocher, Monte)
-    - fixed html_select_date when field separator is "/"
-      (Roberto Berto, Monte)
-    - added YYYY-MM-DD format support to html_select_date
-      (Jan Rosier, Monte)
-    - fixed cache_lifetime logic bug, also made -1 = never
-      expire (Monte)
-    - fixed directory separator issue for Windows. (Andrei)
-    - added ability to use simple variables as array indices or
-      object properties. (Andrei)
-    - added ability to unregister pre/postfilters plugins at
-      runtime. (Andrei)
-    - added 'htmlall' attribute to escape modifier. (Monte)
-    - added template_exists() API function. (Andrei)
-    - fixed a problem with using dynamic values for 'file'
-      attribute of {include_php} tag. (Andrei)
-    - added $smarty.template variable. (Andrei)
-    - fixed several plugins that would not work if the plugin
-      directory was not the default one. (Andrei)
-    - implemented support for block functions. (Andrei)
-    - made it possible to assign variables in pre/postfilter
-      plugins. (Andrei)
-
-Version 2.0.1
--------------
-    - rename plugin .make_timestamp.php to shared.make_timestamp.php.
-      (Monte)
-    - changed crc32() generated values, replace '-' with 'N'. (Monte)
-    - added support for +/- N syntax in html_select_date year values.
-      (Monte)
-    - fixed behavior of inserts with script attribute. (Andrei)
-    - fixed bug with $smarty.cookies and $smarty.server. (Andrei)
-    - wordwrap and indent are missing from 2.0 release, now fixed.
-      (Monte)
-    - removed show_info_header and show_info_include variables. (Monte)
-
-Version 2.0.0
--------------
-    - added "eval" function plugin for evaluating variables as
-      templates. (Monte)
-    - removed $tpl_file_ext class variable, no longer used. (Monte)
-    - added "hex" and "hexentity" escape types to escape modifier.
-      (Monte)
-    - removed dependency on PEAR. (Andrei)
-    - update popup_init to accept src attribute. (Monte, Duncan Forrest)
-    - implemented several optimizations, speeding up Smarty
-      significantly in most cases. (Andrei,Monte)
-    - implemented plugin architecture. (Andrei)
-    - added wordwrap and indent modifiers. (Monte)
-    - added support for 'If-Modified-Since' headers for cached content.
-      (Monte)
-    - removed insert_tag_check class variable, no longer needed. (Monte)
-    - optimized cache fetches by scanning for insert tags only if they
-      exist. (Monte)
-    - fixed bugs in overlib. (Monte, Duncan Forrest)
-    - fixed a problem with compile_id usage. (Andrei)
-    - fixed problem with using assigned vars with {include_php ...}
-      filepath. (Monte)
-
-Version 1.5.2
--------------
-    - added Smarty object as fifth argument for template resource functions.
-      (Monte)
-    - fixed a bug with incorrectly combined cache and compile id in
-      clear_cache(). (Andrei)
-    - fixed bug in smarty_make_timestamp introduced in PHP 4.1.0. (Monte)
-    - fixed bug with cached insert debug timing. (Monte)
-    - added 'script' attribute to {insert..} which specifies the script that
-      the insert function can be found in. (Andrei)
-    - added default template function handler. (Monte)
-
-Version 1.5.1
--------------
-    - removed error message from the generic _read_file() method, the caller
-      should take care of that. (Andrei)
-    - fixed a bug with incorrectly combined cache and compile id. (Andrei)
-
-Version 1.5.0
--------------
-    - added include_php built-in function, documented. (Monte)
-    - added trusted_dir functionality, documented. (Monte)
-    - consolidated secure_dir tests to one function. (Monte)
-    - prepended _smarty_ to variable names in fetch() class function to avoid
-      namespace conflicts. (Monte)
-    - introduced $compile_id class variable that can be used to set persistent
-      compile identifier across multiple display calls, documented. (Andrei)
-    - fixed bug with concatenated null cache and compile identifiers. (Andrei)
-    - added $smarty.section.* syntax for accessing section properties,
-      documented. (Andrei)
-    - added custom cache handling function ability, documented. (Monte)
-    - added assign attribute to include, include_php, insert, fetch, math, and
-      counter functions, documented. (Monte)
-    - fixed bug with fetch testing for local file when http address. (Monte)
-    - fixed bug with counter and skipval setting. (Monte)
-    - made {config_load ...} merge globals from each config file only once per
-      scope, thus avoiding several problems. (Andrei)
-    - added {foreach ...} tag that can be used to iterate through
-      non-sequential and associative arrays, documented. (Andrei)
-    - speeded up section property access a bit. (Andrei)
-    - removed $smarty variable from storage used by normal template variables,
-      to prevent any problems. (Andrei)
-    - fixed a bug that could cause parse error with quotes inside literal
-      blocks. (Andrei, Alexander Belonosov)
-    - added 'field_array' attribute to html_select_time function, documented.
-      (Andrei, Michael Caplan)
-    - documented {section} "max" attribute. (Monte)
-    - fixed notice message in Smarty_Compiler.class.php. (Monte)
-    - fixed bug with clear_cache introduced in 1.4.6, third parameter should
-      default to null. (Monte)
-    - updated Config_File class to support '\' path separator in OS/2. (Monte,
-      Francesco Cipriani)
-    - removed secure_ext setting (not used). (Monte)
-    - made cache reading process more efficient. (Monte)
-    - fixed bug, is_cached() now supports new 1.4.6 caching behavior. (Monte)
-    - update FAQ with mailing list Reply-To header FAQ. (Monte)
-    - supress error messages for fopen(), fix cache to regenerate if cache
-      file is not available (i.e. cluster race condition). (Monte)
-    - added index key example to QUICKSTART guide. (Monte)
-
-Version 1.4.6
--------------
-    - fixed bug with {assign ...} when passing an empty value. (Monte)
-    - add more warning message fixes. (Monte, Tara Johnson)
-    - documentation updates. (Monte)
-    - update fetch function to give proper warning when fetching a non-readable
-      or non-existant file. (Monte)
-    - fixed problem with newline at the end of included templates (Monte, Andrei)
-    - added feature to regenerate cache if compile_check is enabled and an
-      involved template or config file gets modified. (Monte)
-    - added DEBUG execution times to included files: REQUIRES updated debug.tpl
-      file! (Monte)
-    - added support for hidden config variables that cannot be read by
-      templates. (Andrei)
-    - added execution time to DEBUG console, total and inserts. (Monte)
-    - fixed bug where DEBUG console would not appear with cached content. (Monte)
-    - added support for postfilter functions that are applied to compiled
-      template right after compilation. (Andrei)
-    - fixed the name of clear_compile_tpl() API function to clear_compiled_tpl.
-      (Andrei)
-    - added fix for removing comments so that the line numbers are reported
-      correctly in case of errors. (patch from Anders Janson)
-    - made html_options output xhtml compatible code. (Monte, Arnaud Limbourg)
-
-Version 1.4.5
--------------
-    - update FAQ with index of questions at the top
-    - update overlib to 3.50, adjust addon code so that the overlib.js
-      file isn't modified, and not using the mini one. (Monte)
-    - added many more options to html_select_date. (Alexander Skwar, Andrei)
-    - added support for generating different compiled templates from the same
-      source template. (Hans-Peter Oeri, Andrei)
-    - modified Smarty to pass itself to insert functions as the second
-      parameter. (Andrei)
-    - modified Smarty to pass itself to prefilter functions as the second
-      parameter. (Andrei)
-    - fixed syntax error when including a non-existant template with security
-      enabled. (Monte)
-    - fixed comments handling to allow commenting out template blocks. (Andrei)
-    - implemented named capture buffers, with results accessible via
-      $smarty.capture.<name>. (Andrei)
-    - added ability to index arrays directly by numbers. (Andrei)
-    - fixed bug with SMARTY_DIR not prepended to Config_File include. (Monte)
-
-Version 1.4.4
--------------
-    - fixed problem with including insecure templates with security enabled.
-      (Monte)
-    - numerous documentation updates. (Monte)
-    - added ENT_QUOTES to escapement of html. (Monte, Sam Beckwith)
-    - implemented access to request variables via auto-assigned $smarty
-      template variable. (Andrei)
-    - fixed a bug with parsing function arguments inside {if} tags if a comma
-      was present. (Andrei)
-    - updated debug console with config file vars. (Monte)
-    - added SMARTY_DIR constant as an alternative to relying on include_path.
-      (Monte)
-    - added popup_init and popup functions (requires overlib.js). (Monte)
-    - updated debug console with config file vars. (Monte)
-    - added debugging url control. (Monte)
-    - added 'quotes' type to escape modifier. (Monte, Mike Krus)
-    - added 'total' and 'iteration' section properties. (Andrei)
-    - added 'start', 'max', and 'step' section attributes/properties. (Andrei)
-    - fixed a bug with security checking of functions inside {if} tags.
-      (Andrei)
-    - fixed a bug in Config_File that would incorrectly booleanize values that
-      weren't really booleans. (Andrei)
-
-Version 1.4.3
--------------
-    - added regex_replace modifier, documented. (Monte)
-    - added debugging console feature and custom function assign_debug_info,
-      documented. (Monte)
-    - added 'scope' attribute for {config_load}, 'global' is now deprecated but
-      is still supported. (Andrei)
-    - reduced template symbol table pollution by moving config array into the
-      class itself. (Andrei)
-    - fixed a bug with passing quoted arguments to modifiers inside {if}
-      statements. (Andrei, Sam Beckwith)
-    - added security features for third party template editing, documented
-      (Monte)
-    - added assign custom function, documented. (Monte)
-    - fixed bug with template header using version instead of _version. (Monte)
-    - fixed a problem with putting $ followed by numbers inside {strip} and
-      {/strip} tags. (Andrei)
-    - fixed Config_File class to allow empty config paths (defaults to current
-      directory). (Andrei)
-
-Version 1.4.2
--------------
-    - move $version to internal variable, remove from docs. (Monte)
-    - cleaned up compiled templates global scope by moving some variables into
-      the class itself. (Andrei)
-    - fixed a bug that would not allow referring to a section in the including
-      file from the included file. (Andrei)
-    - configs directory missing from 1.4.1 release, added back in. (Monte)
-    - added windows include_path setup instructions to FAQ & QUICKSTART.
-      (Monte)
-
-Version 1.4.1
--------------
-    - fix LOCK_EX logic for all windows platforms (Monte)
-    - fixed indexing by section properties with the new syntax. (Andrei)
-    - updated Smarty to use absolute paths when requiring/including Smarty
-      components. (Andrei, John Lim)
-
-Version 1.4.0
--------------
-    - added {capture}{/capture} function, documented (Monte)
-    - added {counter} function, documented (Monte)
-
-Version 1.4.0b2
----------------
-    - fixed issue in Config_File.class with referencing blank sections (Andrei)
-    - fixed problem with passing variables to included files (Andrei)
-    - fixed resource path recognition for windows (Monte)
-
-Version 1.4.0b1
----------------
-    - added "componentized templates" tip into documentation (Monte)
-    - added {php}{/php} tags for embedding php code into templates (Monte)
-    - changed default value of $show_info_header to false (Monte)
-    - implemented '->' syntax for accessing properties of objects passed to the
-      template. (Andrei)
-    - allowed custom functions to receive Smarty object as the second
-      parameter; this can be used to dynamically change template variables, for
-      example. (Andrei)
-    - added custom compiler functions support, register_compiler_function() and
-      unregister_compiler_function() API functions. (Andrei, Ivo Jansch).
-    - updated GLOBAL_ASSIGN to take SCRIPT_NAME from HTTP_SERVER_VARS
-      instead of global variable. You can also assign several variables
-      in one shot with an array. (Monte, Roman Neuhauser)
-    - added template prefilters, register_prefilter() and
-      unregister_prefilter() API functions. (Monte)
-    - added RELEASE_NOTES file to distribution. (Monte)
-    - moved CREDITS out of manual into its own file. (Monte)
-    - added register_resource() and unregister_resource() API functions. (Monte)
-    - changed the syntax of indexing template variables, thus supporting
-      structures of arbitrary complexity; supplied fix_vars.php script to fix
-      old syntax. (Andrei)
-    - added $insert_tag_check to speed up cached pages if {insert ...} is not
-      used. (Monte)
-    - added $compiler_class variable to allow specifying a different compiler
-      class. (Andrei)
-    - changed Smarty to compile templates at runtime, allowing for arbitrary
-      template resources. (Monte)
-    - added fix for LOCK_EX under Windows and changed a couple of file
-      permissions for security. (Monte, Fernando Nunes)
-    - allow arbitrary date strings to date_format, html_select_date and
-      html_select_time (Monte)
-
-Version 1.3.2
--------------
-    - fixed a bug that caused some nested includes to loop infinitely. (Andrei)
-    - added optional HTML header to output. (Monte)
-    - significantly improved config_load performance. (Andrei)
-    - added format attribute to math function. (Monte)
-    - added html_select_time custom function. (Andrei)
-    - fixed minor PHP warning when attempting to unset an unset variable
-      (Monte)
-    - added count_characters, count_words, count_sentences, count_paragraphs
-      modifiers (Monte)
-
-Version 1.3.1pl1
---------------
-    - bug fix, recovered missing _syntax_error function (Monte)
-
-Version 1.3.1
--------------
-    - document first, last, index_prev, index_next (Monte)
-    - added 'first' and 'last' section properties. (Andrei)
-    - split out compiling code to separate class for faster template execution
-      time (Monte)
-    - fixed a couple of minor PHP warnings (Monte)
-    - added and documented unregister_modifier() and unregister_function() API
-      calls. (Monte)
-    - added and documented 'fetch' and 'math' functions. (Monte)
-    - added ability to index looped variables by section properties, e.g.
-      $foo.index_prev/bar. (Andrei)
-    - added index_prev and index_next section properties. (Andrei)
-    - fixed issue with php executing in literal blocks. (Monte)
-
-Version 1.3.0
--------------
-    - moved license from GPL to LGPL (Monte)
-    - implemented workaround for PHP "feature" that eats carriage returns
-      if the PHP tag is at the end of the line. (Andrei)
-    - removed $allow_php, added $php_handling logic (Monte)
-    - added file locking to prevent reader/writer problem. (Andrei)
-    - made Smarty catch unimplemented modifiers and custom functions and output
-      error messages during compilation instead of failing during run time.
-      (Andrei)
-    - removed short-tags at the top of the smarty scripts (Monte)
-    - added register_function() and register_modifier() API calls to make
-      registering stuff easier. (Andrei)
-    - added template results caching capability. (Monte, Andrei)
-    - added optional 'options' attribute to html_options custom function
-      that allows passing associative arrays for values/output. (Andrei)
-    - modifier arguments can now contain '|' and ':' characters inside quoted
-      strings. (Andrei)
-
-Version 1.2.2
--------------
-    - fixed bug that would not respect nested template directories and would
-      put all compiled files into top-level one. (Andrei)
-    - fixed bug using $PHP_VERSION instead of environment var PHP_VERSION.
-      (Monte)
-    - a couple small warning fixes. (Monte)
-
-Version 1.2.1
--------------
-    - added $compile_dir, removed $compile_dir_ext, simplified usage. (Monte)
-    - added tips & tricks chapter to documentation. (Monte)
-    - misc documentation updates. (Monte)
-
-Version 1.2.0
--------------
-    - updated documentation (Monte)
-    - added file and line number information to syntax error messages. (Andrei)
-    - added ability to index template vars by a key. (Andrei)
-
-Version 1.1.0
--------------
-    - misc documentation changes, official stable release
-
-Version 1.0b
-------------
-    - fixed the bug that prevented using non-array values for 'loop' attribute.
-      (Andrei)
-    - many misc documentation changes & additions (Monte)
-
-Version 1.0a
-------------
-    - fixed bug that caused templates to recompile every time (Monte)
-
-Version 1.0
-------------
-    - initial release
-
-/* vim: set et tw=64 ft=changelog: */
diff --git a/thirdparty/smarty/QUICK_START b/thirdparty/smarty/QUICK_START
deleted file mode 100644
index 6ae3e466a..000000000
--- a/thirdparty/smarty/QUICK_START
+++ /dev/null
@@ -1,103 +0,0 @@
-This is a simple guide to get Smarty setup and running quickly. The online
-documentation includes a very thorough explanation of a Smarty installation.
-This guide is meant to be a quick and painless way of getting Smarty working,
-and nothing more. The guide assumes you are familiar with the UNIX system
-environment. Windows users will need to make adjustments where necessary.
-
-INSTALL SMARTY LIBRARY FILES
-
-Copy the Smarty library files to your system. In our example, we place them in
-/usr/local/lib/php/Smarty/
-
-$> cd YOUR_DOWNLOAD_DIRECTORY
-$> gtar -ztvf Smarty-2.6.7.tar.gz
-$> mkdir /usr/local/lib/php/Smarty
-$> cp -r Smarty-2.6.7/libs/* /usr/local/lib/php/Smarty
-
-You should now have the following file structure:
-
-/usr/local/lib/php/Smarty/
-                          Config_File.class.php
-                          debug.tpl
-                          internals/
-                          plugins/
-                          Smarty.class.php
-                          Smarty_Compiler.class.php
-
-
-SETUP SMARTY DIRECTORIES
-
-You will need four directories setup for Smarty to work. These files are for
-templates, compiled templates, cached templates and config files. You may or
-may not use caching or config files, but it is a good idea to set them up
-anyways. It is also recommended to place them outside of the web server
-document root. The web server PHP user will need write access to the cache and
-compile directories as well.
-
-In our example, the document root is /web/www.domain.com/docs and the
-web server username is "nobody". We will keep our Smarty files under
-/web/www.domain.com/smarty
-
-$> cd /web/www.domain.com
-$> mkdir smarty
-$> mkdir smarty/templates
-$> mkdir smarty/templates_c
-$> mkdir smarty/cache
-$> mkdir smarty/configs
-$> chown nobody:nobody smarty/templates_c
-$> chown nobody:nobody smarty/cache
-$> chmod 775 smarty/templates_c
-$> chmod 775 smarty/cache
-
-
-SETUP SMARTY PHP SCRIPTS
-
-Now we setup our application in the document root:
-
-$> cd /web/www.domain.com/docs
-$> mkdir myapp
-$> cd myapp
-$> vi index.php
-
-Edit the index.php file to look like the following:
-
-<?php
-
-// put full path to Smarty.class.php
-require('/usr/local/lib/php/Smarty/Smarty.class.php');
-$smarty = new Smarty();
-
-$smarty->template_dir = '/web/www.domain.com/smarty/templates';
-$smarty->compile_dir = '/web/www.domain.com/smarty/templates_c';
-$smarty->cache_dir = '/web/www.domain.com/smarty/cache';
-$smarty->config_dir = '/web/www.domain.com/smarty/configs';
-
-$smarty->assign('name', 'Ned');
-$smarty->display('index.tpl');
-
-?>
-
-
-SETUP SMARTY TEMPLATE
-
-$> vi /web/www.domain.com/smarty/templates/index.tpl
-
-Edit the index.tpl file with the following:
-
-<html>
-<head>
-<title>Smarty</title>
-</head>
-<body>
-Hello, {$name}!
-</body>
-</html>
-
-
-
-Now go to your new application through the web browser,
-http://www.domain.com/myapp/index.php in our example. You should see the text
-"Hello Ned!" in your browser.
-
-Once you get this far, you can continue on to the Smarty Crash Course to learn
-a few more simple things, or on to the documentation to learn it all.
diff --git a/thirdparty/smarty/README b/thirdparty/smarty/README
deleted file mode 100644
index 7d3e56e00..000000000
--- a/thirdparty/smarty/README
+++ /dev/null
@@ -1,80 +0,0 @@
-NAME:
-
-    Smarty - the PHP compiling template engine
-
-VERSION: 2.6.0
-
-AUTHORS:
-    
-    Monte Ohrt <monte at ohrt dot com>
-    Andrei Zmievski <andrei@php.net>
-
-MAILING LISTS:
-
-    We have a few mailing lists. "general" for you to share your ideas or ask
-	questions, "dev" for those interested in the development efforts of Smarty,
-	and "cvs" for those that would like to track the updates made in the cvs
-	repository.
-
-    send a blank e-mail message to:
-      smarty-general-subscribe@lists.php.net (subscribe to the general list)
-      smarty-general-unsubscribe@lists.php.net (unsubscribe from the general list)
-      smarty-general-digest-subscribe@lists.php.net (subscribe to digest)
-      smarty-general-digest-unsubscribe@lists.php.net (unsubscribe from digest)
-      smarty-dev-subscribe@lists.php.net (subscribe to the dev list)
-      smarty-dev-unsubscribe@lists.php.net (unsubscribe from the dev list)
-      smarty-cvs-subscribe@lists.php.net (subscribe to the cvs list)
-      smarty-cvs-unsubscribe@lists.php.net (unsubscribe from the cvs list)
-    You can also browse the mailing list archives at
-    http://marc.theaimsgroup.com/?l=smarty&r=1&w=2
-
-SYNOPSIS:
-
-    require("Smarty.class.php");
-
-    $smarty = new Smarty;
-
-    $smarty->assign("Title","My Homepage");
-    $smarty->assign("Names",array("John","Gary","Gregg","James"));
-
-    $smarty->display("index.tpl");
-
-
-DESCRIPTION:
-
-    What is Smarty?
-
-    Smarty is a template engine for PHP. Many other template engines for PHP
-    provide basic variable substitution and dynamic block functionality.
-    Smarty takes a step further to be a "smart" template engine, adding
-    features such as configuration files, template functions, and variable
-    modifiers, and making all of this functionality as easy as possible to
-    use for both programmers and template designers. Smarty also converts
-    the templates into PHP scripts, eliminating the need to parse the
-    templates on every invocation. This makes Smarty extremely scalable and
-    manageable for large application needs.
-
-    Some of Smarty's features:
-
-    * it is extremely fast
-    * no template parsing overhead, only compiles once.
-	* it is smart about recompiling only the template files that have
-	  changed.
-    * the template language is remarkably extensible via the plugin
-      architecture.
-    * configurable template delimiter tag syntax, so you can use
-      {}, {{}}, <!--{}-->, or whatever you like.
-    * built-in caching of template output.
-    * arbitrary template sources (filesystem, databases, etc.)
-    * template if/elseif/else/endif constructs are passed to the PHP parser,
-      so the if syntax can be as simple or as complex as you like.
-    * unlimited nesting of sections, conditionals, etc. allowed
-    * it is possible to embed PHP code right in your template files,
-      although not recommended and doubtfully needed since the engine
-      is so customizable.
-    * and many more.
-
-COPYRIGHT:
-    Copyright (c) 2001-2005 New Digital Group, Inc. All rights reserved.
-    This software is released under the GNU Lesser General Public License.
-    Please read the disclaimer at the top of the Smarty.class.php file.
diff --git a/thirdparty/smarty/RELEASE_NOTES b/thirdparty/smarty/RELEASE_NOTES
deleted file mode 100644
index 2cc9896bb..000000000
--- a/thirdparty/smarty/RELEASE_NOTES
+++ /dev/null
@@ -1,428 +0,0 @@
-2.6.7
------
-
-Those using Smarty with security enabled: a hole was found that allowed PHP code to be executed from within a template file. This has been fixed and you are engouraged to upgrade immediately. Note that this hole does NOT affect the security of your web server or PHP applications, only the ability for someone editing a template to execute PHP code. Other changes in this release can be found in the NEWS file.
-
-2.5.0
------
-
-Very minor adjustments since RC2, see the NEWS file for details.
-
-2.5.0-RC2
----------
-
-Many fixes since the RC1 release. This one is as close to production quality as
-they come, so this will be the last release before 2.5.0. The SGML documentation
-files have also been removed from the tarball. If you want them, get them from
-the CVS repository.
-
-2.5.0-RC1
----------
-
-Release Candidate 1. All $smarty vars can now be dynamic, such as
-$smarty.get.$foo. A new class function get_function_object() gets you a
-reference to an assigned object, useful within your own custom functions.
-append() can now merge as well as append with a third optional attribute. A new
-class function get_config_vars() was added, and get_template_vars() can now be
-used to get individual vars. Full variable syntax is now supported within
-double quotes via a backtick (`) syntax. Files created by smarty are now
-written to a tmp file then renamed to avoid file lock retention. html_radios,
-html_checkboxes, html_table, html_image, nl2br functions added, see the NEWS
-file for full details.
-
-2.4.2
------
-Another point release. Added support for dynamic object reference syntax
-($foo->$bar), support for full variable syntax within quotes ("$foo[0].bar"),
-and other minor fixes. See the NEWS file for full details.
-
-2.4.1
------
-
-This is basically a point release, cleaning up a few things caught
-in the 2.4.0 release. See the NEWS file for full details.
-
-2.4.0
------
-
-Smarty now supports the ability to access objects within the templates. Two
-methods are available, one which closely follows Smartys conventions, and
-another that follows more traditional object syntax for those familiar with
-PHP.
-
-The internal compiling engine has also undergone some major work. The regex
-parsing was rewritten to be much more strict, more secure and more
-maintainable. Config files are now compiled, which can speed up pages quite a
-bit that use config files extensively. Assigned variables are no longer
-extracted to PHP namespace, saving an extract call for every template. There is
-now support for applying modifiers to static values and functions. You can now
-access constants with $smarty.const.VAR.  See the NEWS file for complete
-changes.
- 
-2.3.1
------
-
-The mtime on compiled files will now match the source files, in the case where
-the source file may not get the current timestamp, recompiling will still work
-as expected. Proper support for open_basedir has been added, so Smarty should
-work correctly in safe mode. Added a few new features such as textformat block
-function, strip variable modifier and optgroup support for html_options. Also
-other minor bug fixes, see the Change Log.
-
-2.3.0
------
-
-Smarty now has a {debug} template function that brings up the debugging console
-right where {debug} is called, regardless of $debugging settings. This works a
-little different than turning on $debugging in the sense that it shows all the
-template variables available at the time {debug} is called, including local
-scope vars. It does not show the templates names however, since this
-executed during runtime of the template.
-
-You can now supply an expire time when clearing cache or compile files. This is
-mostly useful for removing stale files via the API.
-
-Plugins now stop execution upon error, instead of outputting a warning and
-continuing.
-
-Two new API functions, assign_by_ref() and append_by_ref() were added. They
-allow assigning template variables by reference. This can make a significant
-performance gain, especially if you are assigning large arrays of data. PHP 5.0
-will do this implicitly, so these functions are basically workarounds.
-
-Several misc bug fixes, see the Change Log for information.
-
-
-2.2.0
------
-
-Smarty now allows an array of paths for the $plugin_dir class variable. The
-directories will be searched in the order they are given, so for efficiency keep
-the most-used plugins at the top. Also, absolute paths to the plugin directories are
-more efficient than relying on the PHP include_path.
-
-Cache files can now be grouped with the cache_id. See the documentation under
-the new "Caching" section for details. compile_id also respects the same
-grouping syntax. The cache/compile file structure changed, so be sure to clear
-out all your cache and compile files when upgrading Smarty. Also if you are
-using PHP-accelerator, restart apache. I've seen some quirky things happen if
-the phpa files do not get cleared (known issue with phpa and parent
-class-member changes, so just clear 'em.)
-
-Smarty now correctly respects the PHP include_path for $template_dir, $compile_dir,
-$cache_dir, $config_dir and $plugin_dir. Be aware that relying on the
-include_path is an overhead, try to use absolute pathnames when possible
-(or relative to working directory.)
-
-Documentation has been updated and rearranged a bit. Most notably, the
-installation instructions are completely revamped, and a new Caching section
-explains Smarty's caching in detail along with the new grouping functionality.
-
-Many misc. bug fixes and enhancements, see the full ChangeLog (NEWS file) for
-details.
-
-2.1.1
------
-
-There was a bug with template paths and the include_path, this has been fixed.
-Also register_outputfilter() did not work, this is fixed. A new template
-function named "cycle" has been added to the distribution, nice for cycling
-through a list (or array) of values.
-
-2.1.0
------
-
-This release has quite a few new features and fixes. Most notable are the
-introduction of block functions, so you can write plugins that work on a block
-of text with {func}{/func} notation. Also output filters were added, so you can
-apply a function against the output of your templates. This differs from the 
-postfilter function, which works on the compiled template at compile time, and
-output filters work on the template output at runtime.
-
-Many other features and bug fixes are noted in the NEWS file.
-
-
-2.0.1
------
-
-This is a point release, fixing a few bugs and cleaning things up. A plugin
-was renamed, the dash "-" was removed from compiled template and cached file
-names. If you're upgrading, you might want to clear them out first.  See the
-ChangeLog for details.
-
-2.0.0
------
-
-This release is a huge milestone for Smarty. Most notable new things are a
-plugin architecture, removal of PEAR dependency, and optimizations that
-drastically improve the performance of Smarty in most cases.
-
-The plugin architecture allows modifiers, custom functions, compiler functions,
-prefilters, postfilters, resources, and insert functions to be added by
-simply dropping a file into the plugins directory. Once dropped in, they are
-automatically registered by the template engine. This makes user-contributed
-plugins easy to manage, as well as the internal workings of Smarty easy to
-control and customize. This new architecture depends on the __FILE__ constant,
-which contains the full path to the executing script. Some older versions of
-PHP incorrectly gave the script name and not the full filesystem path. Be sure
-your version of PHP populates __FILE__ correctly. If you use custom template
-resource functions, the format of these changed with the plugin architecture.
-Be sure to update your functions accordingly. See the template resource section
-of the documentation.
-
-The PEAR dependancy was removed from Smarty. The Config_File class that comes
-with Smarty was actually what needed PEAR for error handling which Smarty didn't
-use, but now everything is self-contained.
-
-Performance improvements are graphed on the benchmark page, you will see that
-overall performance has been sped up by as much as 80% in some cases.
-
-Smarty-cached pages now support If-Modified-Since headers, meaning that if a
-cached template page has not changed since the last request, a "304 Not
-Modified" header will be sent instead of resending the same page. This is
-disabled by default, change the setting of $cache_modified_check.
-
-
-1.5.2
------
-
-Mostly bug fixes, added a default template resource handler.
-
-
-1.5.1
------
-
-Critical bug fix release. If you use caching, you'll need to upgrade.
-
-
-1.5.0
------
-
-Several feature enhancements were made to this version, most notably the
-{foreach ...} command which is an alternative to {section ...} with an easier
-syntax for looping through a single array of values. Several functions were
-enhanced so that the output can be automatically assigned to a template
-variable instead of displayed (assign attribute). Cache files can now be
-controlled with a custom function as an alternative to the built-in file based
-method. Many code cleanups and bug fixed went into this release as well.
-
-
-1.4.6
------
-
-The behavior with caching and compile_check has been slightly enhanced. If
-caching is enabled AND compile_check is enabled, the cache will immediately get
-regenerated if _any_ involved template or config file is updated. This imposes
-a slight performance hit because it must check all the files for changes, so be
-sure to run live sites with caching enabled and compile_check disabled for best
-performance. If you update a template or config file, simply turn on
-compile_check, load the page, then turn it back off. This will update the cache
-file with the new content. This is accomplished by maintaining a list of
-included/loaded templates and config files at the beginning of the cache file.
-Therefore it is advisable to remove all cache files after upgrading to 1.4.6
-(although not absolutely necessary, old cache files will regenerate)
-
-The debug console now has script timing and array values printed. You MUST
-update your debug.tpl file with this version of Smarty. Also, the new debug.tpl
-will not work with older versions of Smarty.
-
-
-1.4.5
------
-
-Mostly bug fixes and minor improvements. Added compile id for separate compiled
-versions of the same script. The directory format and filename convention for
-the files in templates_c has changed, so you may want to remove all of the
-existing ones before you upgrade.
-
-
-1.4.4
------
-
-A few bug fixes, new section looping attributes and properties, debugging
-console function for control via URL, and overLib integration and access
-to request variables from within the template.
-
-
-1.4.3
------
-
-This release has a few bug fixes and several enhancements. Smarty now supports
-template security for third-party template editing. These features disallow the
-ability for someone to execute commands or PHP code from the template language.
-Smarty also now has a built-in debugging console, which is a javascript pop-up
-window that displays all the included template names and assigned variables.
-
-
-1.4.2
------
-
-This was mostly one bug fix with variable scoping within included templates
-and a few documentation changes and updates. See the ChangeLog file for full
-details.
-
-
-1.4.1
------
-
-It seems that the EX_LOCK logic from the previous release didn't fix all the
-problems with windows platforms. Hopefully this one does. It basically
-disables file locking on windows, so there is a potential that two programs
-could write over the same file at the same time, fyi.
-
-The reset is minor bug fixes, please refer to the ChangeLog file.
-
-
-1.4.0
------
-
-IMPORTANT NOTICE
-
-Smarty now has a new syntax for accessing elements within section loops. The
-new syntax is easier to use and nicely handles data structures of any
-complexity. Consequently, this breaks the old syntax.
-
-Here is an example of the syntax change:
-
-old syntax:
-{$sec1/sec2/sec3/customer.phone}
-
-new syntax:
-{$customer[$sec1][$sec2][$sec3].phone}
-
-The section names used to come first, followed by the variable name. Now the
-variable name always comes first, followed by the section names in brackets.
-You can access variable indexes anywhere, depending on how you passed the
-variables in.
-
-To fix your current templates, we have provided a script that will adjust the
-syntax for you. Located in misc/fix_vars.php, run this script from the the
-command line, giving each template as an argument. Be sure to use absolute
-pathnames, or pathnames relative to the executing script. Probably the easiest
-way to do this is to copy the fix_vars.php script into your template directory
-and run 'php -q fix_vars.php *.tpl' Be sure you have proper write permission,
-and backup your scripts first to be safe! The examples in the 1.4.0
-documentation have been updated to reflect the changes.
-
-cd /path/to/templates
-cp /path/to/fix_vars.php .
-find . -name "*.tpl" -exec php -q ./fix_vars.php {} \;
-
-NEW AND IMPROVED COMPILATION PROCESS
-
-Smarty 1.4.0 also has a new compilation process. Instead of compiling all the
-templates up front, it now compiles them at runtime. This has several
-advantages. First of all, there is no longer a need to have a single template
-directory. You can now have arbitrary template sources, such as multiple
-directories or even database calls. This also speeds the performance of Smarty
-when $compile_check is enabled, since it is only checking the template that is
-being executed instead of everything found in the template directory. The
-$tpl_file_ext is no longer needed, but kept for backward compatability.
-Templates can now be named anything you like with any extension.
-
-MINOR FIXES
-
-A workaround for LOCK_EX on Windows systems was added, and changed a couple of
-file permissions for better security on public servers.
-
-$show_info_header is now defaulted to false instead of true. This header causes
-problems when displaying content other than HTML, so now you must explicitly
-set this flag to true to show the header information (or change the default in
-your copy of Smarty.)
-
-Documentation is written in docbook format. I updated the docbook -> HTML
-generating software & style-sheets, and consequently the examples are no longer
-in a different background color. If anyone wants to contribute a better
-stylesheet or help with documentation, drop me a line. <monte at ohrt dot com>
-
-CHANGES/ENHANCEMENTS/UPDATES
-
-date_format, html_select_date and html_select_time used to require a unix
-timestamp as the format of the date passed into the template. Smarty is now a
-bit smarter at this. It will take a unix timestamp, a mysql timestamp, or any
-date string that is parsable by strtotime, such as 10/01/2001 or 2001-10-01,
-etc. Just give some formats a try and see what works.
-
-Smarty now has template prefilters, meaning that you can run your templates
-through custom functions before they are compiled. This is good for things like
-removing unwanted comments, keeping an eye on words or functionality people are
-putting in templates, translating XML -> HTML, etc. See the register_prefilter
-documentation for more info.
-
-Another addition are the so-called compiler functions. These are custom
-functions registered by the user that are executed at compilation time of the
-template. They can be used to inject PHP code or time-sensitive static content
-into the compiled template.
-
-The run-time custom functions are now passed the Smarty object as the second
-parameter. This can be used, for example, to assign or clear template variables
-from inside the custom function.
-
-clear_compile_dir() was added for clearing out compiled versions of your
-templates. Not something normally needed, but you may have a need for this if
-you have $compile_check set to false and you periodically update templates via
-some automated process. As of 1.4.0, uncompiled templates _always_ get
-compiled regardless of $compile_check setting, although they won't be checked
-for recompile if $compile_check is set to false.
-
-You can now refer to properties of objects assigned from PHP by using the '->'
-symbol and specifying the property name after it, e.g. $foo->bar.
-
-{php}{/php} tags were added to embed php into the templates. Not normally
-needed, but some circumstances may call for it. Check out the "componentized
-templates" tip in the documentation for an example.
-
-{capture}{/capture} and {counter} functions were added. See the documentation
-for a complete description and examples.
-
-UPGRADE NOTES
-
-The format of the files created in the $compile_dir are now a bit different.
-The compiled template filename is the template resource name url-encoded.
-Therefore, all compiled files are now in the top directory of $compile_dir.
-This was done to make way for arbitrary template resources. Each compiled
-template also has a header that states what template resource was used to
-create it. From a unix command prompt, you can use "head -2 *" to see the first
-two lines of each file.
-
-When upgrading to 1.4.0, you will want to clear out all your old files in the
-$compile_dir. If you have $compile_check set to false and the compiled template
-does not yet exist, it will compile it regardless of this setting. This way you
-can clear out the $compile_dir and not worry about setting $compile_check to
-true to get the inital compilation under way.
-
-
-1.3.2
------
-
-Smarty now has (an optional) header prepended to the output of the Smarty
-templates. This displays the Smarty version and the date/time when the page was
-generated. This is useful for debugging your cache routines, and purely
-informational so there is evidence that the page was generated by Smarty. Set
-$show_info_header to false to disable it.
-
-{config_load ...} performance was tuned by placing the loaded variables into a
-global array, so basically a config file is read from the file system and
-placed into a php array structure only once, no matter how many times it is
-called in any of the templates. The scope of the loaded variables has changed a
-bit as well. Variables loaded by config_load used to be treated as global
-variables, meaning that parent templates (templates that included the current
-template) could see them. Now the default behavior is such that loaded
-variables are only visible by the current template and child templates (all
-templates included after the {config_load ...} is called.) To mimic the
-original behavior, provide the attribute "global=yes" like so: {config_load
-file="mystuff.conf" global=yes}. Now when you load in mystuff.conf, the
-variables will be visible to parent templates (merged with any existing config
-variables.)
-
-A formatting attribute was added to the {math ...} function, adding the ability
-to control the format of the output. Use the same formatting syntax as the PHP
-function sprintf().
-
-{html_select_time ...} was added, a custom function that works much like
-{html_select_date ...} except it displays time elements instead of dates.
-
-A few custom modifiers were added: count_characters, count_words,
-count_sentences, count_paragraphs. All pretty self-explanatory.
-
-/* vim: set et: */
diff --git a/thirdparty/smarty/TODO b/thirdparty/smarty/TODO
deleted file mode 100644
index 82b0a462c..000000000
--- a/thirdparty/smarty/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-* handle asp style tags in $php_handler
-* fix all E_NOTICE warnings
-* make simple math easier
-* caching all but parts of the template
-* change plugins so $smarty variable always comes first
-* get cache ttl with function call
-FIX: make inserts use normal functions before plugins
-UPD: change it so that if template comes from some resource,
-     that resource stays as the default, no need to specify it
-     in includes.
diff --git a/thirdparty/smarty/demo/configs/test.conf b/thirdparty/smarty/demo/configs/test.conf
deleted file mode 100644
index 5eac748ec..000000000
--- a/thirdparty/smarty/demo/configs/test.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-title = Welcome to Smarty!
-cutoff_size = 40
-
-[setup]
-bold = true
diff --git a/thirdparty/smarty/demo/index.php b/thirdparty/smarty/demo/index.php
deleted file mode 100644
index fee202f80..000000000
--- a/thirdparty/smarty/demo/index.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-require '../libs/Smarty.class.php';
-
-$smarty = new Smarty;
-
-$smarty->compile_check = true;
-$smarty->debugging = true;
-
-$smarty->assign("Name","Fred Irving Johnathan Bradley Peppergill");
-$smarty->assign("FirstName",array("John","Mary","James","Henry"));
-$smarty->assign("LastName",array("Doe","Smith","Johnson","Case"));
-$smarty->assign("Class",array(array("A","B","C","D"), array("E", "F", "G", "H"),
-	  array("I", "J", "K", "L"), array("M", "N", "O", "P")));
-
-$smarty->assign("contacts", array(array("phone" => "1", "fax" => "2", "cell" => "3"),
-	  array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234")));
-
-$smarty->assign("option_values", array("NY","NE","KS","IA","OK","TX"));
-$smarty->assign("option_output", array("New York","Nebraska","Kansas","Iowa","Oklahoma","Texas"));
-$smarty->assign("option_selected", "NE");
-
-$smarty->display('index.tpl');
-
-?>
diff --git a/thirdparty/smarty/demo/templates/footer.tpl b/thirdparty/smarty/demo/templates/footer.tpl
deleted file mode 100644
index e04310fdd..000000000
--- a/thirdparty/smarty/demo/templates/footer.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-</BODY>
-</HTML>
diff --git a/thirdparty/smarty/demo/templates/header.tpl b/thirdparty/smarty/demo/templates/header.tpl
deleted file mode 100644
index af8f61381..000000000
--- a/thirdparty/smarty/demo/templates/header.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<HEAD>
-{popup_init src="/javascripts/overlib.js"}
-<TITLE>{$title} - {$Name}</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">
diff --git a/thirdparty/smarty/demo/templates/index.tpl b/thirdparty/smarty/demo/templates/index.tpl
deleted file mode 100644
index f274cc5e1..000000000
--- a/thirdparty/smarty/demo/templates/index.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-{config_load file=test.conf section="setup"}
-{include file="header.tpl" title=foo}
-
-<PRE>
-
-{* bold and title are read from the config file *}
-{if #bold#}<b>{/if}
-{* capitalize the first letters of each word of the title *}
-Title: {#title#|capitalize}
-{if #bold#}</b>{/if}
-
-The current date and time is {$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}
-
-The value of global assigned variable $SCRIPT_NAME is {$SCRIPT_NAME}
-
-Example of accessing server environment variable SERVER_NAME: {$smarty.server.SERVER_NAME}
-
-The value of {ldelim}$Name{rdelim} is <b>{$Name}</b>
-
-variable modifier example of {ldelim}$Name|upper{rdelim}
-
-<b>{$Name|upper}</b>
-
-
-An example of a section loop:
-
-{section name=outer loop=$FirstName}
-{if $smarty.section.outer.index is odd by 2}
-	{$smarty.section.outer.rownum} . {$FirstName[outer]} {$LastName[outer]}
-{else}
-	{$smarty.section.outer.rownum} * {$FirstName[outer]} {$LastName[outer]}
-{/if}
-{sectionelse}
-	none
-{/section}
-
-An example of section looped key values:
-
-{section name=sec1 loop=$contacts}
-	phone: {$contacts[sec1].phone}<br>
-	fax: {$contacts[sec1].fax}<br>
-	cell: {$contacts[sec1].cell}<br>
-{/section}
-<p>
-
-testing strip tags
-{strip}
-<table border=0>
-	<tr>
-		<td>
-			<A HREF="{$SCRIPT_NAME}">
-			<font color="red">This is a  test     </font>
-			</A>
-		</td>
-	</tr>
-</table>
-{/strip}
-
-</PRE>
-
-This is an example of the html_select_date function:
-
-<form>
-{html_select_date start_year=1998 end_year=2010}
-</form>
-
-This is an example of the html_select_time function:
-
-<form>
-{html_select_time use_24_hours=false}
-</form>
-
-This is an example of the html_options function:
-
-<form>
-<select name=states>
-{html_options values=$option_values selected=$option_selected output=$option_output}
-</select>
-</form>
-
-{include file="footer.tpl"}
diff --git a/thirdparty/smarty/libs/Config_File.class.php b/thirdparty/smarty/libs/Config_File.class.php
deleted file mode 100644
index 3d7c1b493..000000000
--- a/thirdparty/smarty/libs/Config_File.class.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-
-/**
- * Config_File class.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @link http://smarty.php.net/
- * @version 2.6.18
- * @copyright Copyright: 2001-2005 New Digital Group, Inc.
- * @author Andrei Zmievski <andrei@php.net>
- * @access public
- * @package Smarty
- */
-
-/* $Id: Config_File.class.php,v 1.88 2007/03/06 10:40:06 messju Exp $ */
-
-/**
- * Config file reading class
- * @package Smarty
- */
-class Config_File {
-    /**#@+
-     * Options
-     * @var boolean
-     */
-    /**
-     * Controls whether variables with the same name overwrite each other.
-     */
-    var $overwrite        =    true;
-
-    /**
-     * Controls whether config values of on/true/yes and off/false/no get
-     * converted to boolean values automatically.
-     */
-    var $booleanize        =    true;
-
-    /**
-     * Controls whether hidden config sections/vars are read from the file.
-     */
-    var $read_hidden     =    true;
-
-    /**
-     * Controls whether or not to fix mac or dos formatted newlines.
-     * If set to true, \r or \r\n will be changed to \n.
-     */
-    var $fix_newlines =    true;
-    /**#@-*/
-
-    /** @access private */
-    var $_config_path    = "";
-    var $_config_data    = array();
-    /**#@-*/
-
-    /**
-     * Constructs a new config file class.
-     *
-     * @param string $config_path (optional) path to the config files
-     */
-    function Config_File($config_path = NULL)
-    {
-        if (isset($config_path))
-            $this->set_path($config_path);
-    }
-
-
-    /**
-     * Set the path where configuration files can be found.
-     *
-     * @param string $config_path path to the config files
-     */
-    function set_path($config_path)
-    {
-        if (!empty($config_path)) {
-            if (!is_string($config_path) || !file_exists($config_path) || !is_dir($config_path)) {
-                $this->_trigger_error_msg("Bad config file path '$config_path'");
-                return;
-            }
-            if(substr($config_path, -1) != DIRECTORY_SEPARATOR) {
-                $config_path .= DIRECTORY_SEPARATOR;
-            }
-
-            $this->_config_path = $config_path;
-        }
-    }
-
-
-    /**
-     * Retrieves config info based on the file, section, and variable name.
-     *
-     * @param string $file_name config file to get info for
-     * @param string $section_name (optional) section to get info for
-     * @param string $var_name (optional) variable to get info for
-     * @return string|array a value or array of values
-     */
-    function get($file_name, $section_name = NULL, $var_name = NULL)
-    {
-        if (empty($file_name)) {
-            $this->_trigger_error_msg('Empty config file name');
-            return;
-        } else {
-            $file_name = $this->_config_path . $file_name;
-            if (!isset($this->_config_data[$file_name]))
-                $this->load_file($file_name, false);
-        }
-
-        if (!empty($var_name)) {
-            if (empty($section_name)) {
-                return $this->_config_data[$file_name]["vars"][$var_name];
-            } else {
-                if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name]))
-                    return $this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name];
-                else
-                    return array();
-            }
-        } else {
-            if (empty($section_name)) {
-                return (array)$this->_config_data[$file_name]["vars"];
-            } else {
-                if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"]))
-                    return (array)$this->_config_data[$file_name]["sections"][$section_name]["vars"];
-                else
-                    return array();
-            }
-        }
-    }
-
-
-    /**
-     * Retrieves config info based on the key.
-     *
-     * @param $file_name string config key (filename/section/var)
-     * @return string|array same as get()
-     * @uses get() retrieves information from config file and returns it
-     */
-    function &get_key($config_key)
-    {
-        list($file_name, $section_name, $var_name) = explode('/', $config_key, 3);
-        $result = &$this->get($file_name, $section_name, $var_name);
-        return $result;
-    }
-
-    /**
-     * Get all loaded config file names.
-     *
-     * @return array an array of loaded config file names
-     */
-    function get_file_names()
-    {
-        return array_keys($this->_config_data);
-    }
-
-
-    /**
-     * Get all section names from a loaded file.
-     *
-     * @param string $file_name config file to get section names from
-     * @return array an array of section names from the specified file
-     */
-    function get_section_names($file_name)
-    {
-        $file_name = $this->_config_path . $file_name;
-        if (!isset($this->_config_data[$file_name])) {
-            $this->_trigger_error_msg("Unknown config file '$file_name'");
-            return;
-        }
-
-        return array_keys($this->_config_data[$file_name]["sections"]);
-    }
-
-
-    /**
-     * Get all global or section variable names.
-     *
-     * @param string $file_name config file to get info for
-     * @param string $section_name (optional) section to get info for
-     * @return array an array of variables names from the specified file/section
-     */
-    function get_var_names($file_name, $section = NULL)
-    {
-        if (empty($file_name)) {
-            $this->_trigger_error_msg('Empty config file name');
-            return;
-        } else if (!isset($this->_config_data[$file_name])) {
-            $this->_trigger_error_msg("Unknown config file '$file_name'");
-            return;
-        }
-
-        if (empty($section))
-            return array_keys($this->_config_data[$file_name]["vars"]);
-        else
-            return array_keys($this->_config_data[$file_name]["sections"][$section]["vars"]);
-    }
-
-
-    /**
-     * Clear loaded config data for a certain file or all files.
-     *
-     * @param string $file_name file to clear config data for
-     */
-    function clear($file_name = NULL)
-    {
-        if ($file_name === NULL)
-            $this->_config_data = array();
-        else if (isset($this->_config_data[$file_name]))
-            $this->_config_data[$file_name] = array();
-    }
-
-
-    /**
-     * Load a configuration file manually.
-     *
-     * @param string $file_name file name to load
-     * @param boolean $prepend_path whether current config path should be
-     *                              prepended to the filename
-     */
-    function load_file($file_name, $prepend_path = true)
-    {
-        if ($prepend_path && $this->_config_path != "")
-            $config_file = $this->_config_path . $file_name;
-        else
-            $config_file = $file_name;
-
-        ini_set('track_errors', true);
-        $fp = @fopen($config_file, "r");
-        if (!is_resource($fp)) {
-            $this->_trigger_error_msg("Could not open config file '$config_file'");
-            return false;
-        }
-
-        $contents = ($size = filesize($config_file)) ? fread($fp, $size) : '';
-        fclose($fp);
-
-        $this->_config_data[$config_file] = $this->parse_contents($contents);
-        return true;
-    }
-
-    /**
-     * Store the contents of a file manually.
-     *
-     * @param string $config_file file name of the related contents
-     * @param string $contents the file-contents to parse
-     */
-    function set_file_contents($config_file, $contents)
-    {
-        $this->_config_data[$config_file] = $this->parse_contents($contents);
-        return true;
-    }
-
-    /**
-     * parse the source of a configuration file manually.
-     *
-     * @param string $contents the file-contents to parse
-     */
-    function parse_contents($contents)
-    {
-        if($this->fix_newlines) {
-            // fix mac/dos formatted newlines
-            $contents = preg_replace('!\r\n?!', "\n", $contents);
-        }
-
-        $config_data = array();
-        $config_data['sections'] = array();
-        $config_data['vars'] = array();
-
-        /* reference to fill with data */
-        $vars =& $config_data['vars'];
-
-        /* parse file line by line */
-        preg_match_all('!^.*\r?\n?!m', $contents, $match);
-        $lines = $match[0];
-        for ($i=0, $count=count($lines); $i<$count; $i++) {
-            $line = $lines[$i];
-            if (empty($line)) continue;
-
-            if ( substr($line, 0, 1) == '[' && preg_match('!^\[(.*?)\]!', $line, $match) ) {
-                /* section found */
-                if (substr($match[1], 0, 1) == '.') {
-                    /* hidden section */
-                    if ($this->read_hidden) {
-                        $section_name = substr($match[1], 1);
-                    } else {
-                        /* break reference to $vars to ignore hidden section */
-                        unset($vars);
-                        $vars = array();
-                        continue;
-                    }
-                } else {                    
-                    $section_name = $match[1];
-                }
-                if (!isset($config_data['sections'][$section_name]))
-                    $config_data['sections'][$section_name] = array('vars' => array());
-                $vars =& $config_data['sections'][$section_name]['vars'];
-                continue;
-            }
-
-            if (preg_match('/^\s*(\.?\w+)\s*=\s*(.*)/s', $line, $match)) {
-                /* variable found */
-                $var_name = rtrim($match[1]);
-                if (strpos($match[2], '"""') === 0) {
-                    /* handle multiline-value */
-                    $lines[$i] = substr($match[2], 3);
-                    $var_value = '';
-                    while ($i<$count) {
-                        if (($pos = strpos($lines[$i], '"""')) === false) {
-                            $var_value .= $lines[$i++];
-                        } else {
-                            /* end of multiline-value */
-                            $var_value .= substr($lines[$i], 0, $pos);
-                            break;
-                        }
-                    }
-                    $booleanize = false;
-
-                } else {
-                    /* handle simple value */
-                    $var_value = preg_replace('/^([\'"])(.*)\1$/', '\2', rtrim($match[2]));
-                    $booleanize = $this->booleanize;
-
-                }
-                $this->_set_config_var($vars, $var_name, $var_value, $booleanize);
-            }
-            /* else unparsable line / means it is a comment / means ignore it */
-        }
-        return $config_data;
-    }
-
-    /**#@+ @access private */
-    /**
-     * @param array &$container
-     * @param string $var_name
-     * @param mixed $var_value
-     * @param boolean $booleanize determines whether $var_value is converted to
-     *                            to true/false
-     */
-    function _set_config_var(&$container, $var_name, $var_value, $booleanize)
-    {
-        if (substr($var_name, 0, 1) == '.') {
-            if (!$this->read_hidden)
-                return;
-            else
-                $var_name = substr($var_name, 1);
-        }
-
-        if (!preg_match("/^[a-zA-Z_]\w*$/", $var_name)) {
-            $this->_trigger_error_msg("Bad variable name '$var_name'");
-            return;
-        }
-
-        if ($booleanize) {
-            if (preg_match("/^(on|true|yes)$/i", $var_value))
-                $var_value = true;
-            else if (preg_match("/^(off|false|no)$/i", $var_value))
-                $var_value = false;
-        }
-
-        if (!isset($container[$var_name]) || $this->overwrite)
-            $container[$var_name] = $var_value;
-        else {
-            settype($container[$var_name], 'array');
-            $container[$var_name][] = $var_value;
-        }
-    }
-
-    /**
-     * @uses trigger_error() creates a PHP warning/error
-     * @param string $error_msg
-     * @param integer $error_type one of
-     */
-    function _trigger_error_msg($error_msg, $error_type = E_USER_WARNING)
-    {
-        trigger_error("Config_File error: $error_msg", $error_type);
-    }
-    /**#@-*/
-}
-
-?>
diff --git a/thirdparty/smarty/libs/Smarty.class.php b/thirdparty/smarty/libs/Smarty.class.php
deleted file mode 100644
index f6c42bc82..000000000
--- a/thirdparty/smarty/libs/Smarty.class.php
+++ /dev/null
@@ -1,1958 +0,0 @@
-<?php
-
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        Smarty.class.php
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * For questions, help, comments, discussion, etc., please join the
- * Smarty mailing list. Send a blank e-mail to
- * smarty-general-subscribe@lists.php.net
- *
- * @link http://smarty.php.net/
- * @copyright 2001-2005 New Digital Group, Inc.
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Andrei Zmievski <andrei@php.net>
- * @package Smarty
- * @version 2.6.18
- */
-
-/* $Id: Smarty.class.php,v 1.528 2007/03/06 10:40:06 messju Exp $ */
-
-/**
- * DIR_SEP isn't used anymore, but third party apps might
- */
-if(!defined('DIR_SEP')) {
-    define('DIR_SEP', DIRECTORY_SEPARATOR);
-}
-
-/**
- * set SMARTY_DIR to absolute path to Smarty library files.
- * if not defined, include_path will be used. Sets SMARTY_DIR only if user
- * application has not already defined it.
- */
-
-if (!defined('SMARTY_DIR')) {
-    define('SMARTY_DIR', dirname(__FILE__) . DIRECTORY_SEPARATOR);
-}
-
-if (!defined('SMARTY_CORE_DIR')) {
-    define('SMARTY_CORE_DIR', SMARTY_DIR . 'internals' . DIRECTORY_SEPARATOR);
-}
-
-define('SMARTY_PHP_PASSTHRU',   0);
-define('SMARTY_PHP_QUOTE',      1);
-define('SMARTY_PHP_REMOVE',     2);
-define('SMARTY_PHP_ALLOW',      3);
-
-/**
- * @package Smarty
- */
-class Smarty
-{
-    /**#@+
-     * Smarty Configuration Section
-     */
-
-    /**
-     * The name of the directory where templates are located.
-     *
-     * @var string
-     */
-    var $template_dir    =  'templates';
-
-    /**
-     * The directory where compiled templates are located.
-     *
-     * @var string
-     */
-    var $compile_dir     =  'templates_c';
-
-    /**
-     * The directory where config files are located.
-     *
-     * @var string
-     */
-    var $config_dir      =  'configs';
-
-    /**
-     * An array of directories searched for plugins.
-     *
-     * @var array
-     */
-    var $plugins_dir     =  array('plugins');
-
-    /**
-     * If debugging is enabled, a debug console window will display
-     * when the page loads (make sure your browser allows unrequested
-     * popup windows)
-     *
-     * @var boolean
-     */
-    var $debugging       =  false;
-
-    /**
-     * When set, smarty does uses this value as error_reporting-level.
-     *
-     * @var boolean
-     */
-    var $error_reporting  =  null;
-
-    /**
-     * This is the path to the debug console template. If not set,
-     * the default one will be used.
-     *
-     * @var string
-     */
-    var $debug_tpl       =  '';
-
-    /**
-     * This determines if debugging is enable-able from the browser.
-     * <ul>
-     *  <li>NONE => no debugging control allowed</li>
-     *  <li>URL => enable debugging when SMARTY_DEBUG is found in the URL.</li>
-     * </ul>
-     * @link http://www.foo.dom/index.php?SMARTY_DEBUG
-     * @var string
-     */
-    var $debugging_ctrl  =  'NONE';
-
-    /**
-     * This tells Smarty whether to check for recompiling or not. Recompiling
-     * does not need to happen unless a template or config file is changed.
-     * Typically you enable this during development, and disable for
-     * production.
-     *
-     * @var boolean
-     */
-    var $compile_check   =  true;
-
-    /**
-     * This forces templates to compile every time. Useful for development
-     * or debugging.
-     *
-     * @var boolean
-     */
-    var $force_compile   =  false;
-
-    /**
-     * This enables template caching.
-     * <ul>
-     *  <li>0 = no caching</li>
-     *  <li>1 = use class cache_lifetime value</li>
-     *  <li>2 = use cache_lifetime in cache file</li>
-     * </ul>
-     * @var integer
-     */
-    var $caching         =  0;
-
-    /**
-     * The name of the directory for cache files.
-     *
-     * @var string
-     */
-    var $cache_dir       =  'cache';
-
-    /**
-     * This is the number of seconds cached content will persist.
-     * <ul>
-     *  <li>0 = always regenerate cache</li>
-     *  <li>-1 = never expires</li>
-     * </ul>
-     *
-     * @var integer
-     */
-    var $cache_lifetime  =  3600;
-
-    /**
-     * Only used when $caching is enabled. If true, then If-Modified-Since headers
-     * are respected with cached content, and appropriate HTTP headers are sent.
-     * This way repeated hits to a cached page do not send the entire page to the
-     * client every time.
-     *
-     * @var boolean
-     */
-    var $cache_modified_check = false;
-
-    /**
-     * This determines how Smarty handles "<?php ... ?>" tags in templates.
-     * possible values:
-     * <ul>
-     *  <li>SMARTY_PHP_PASSTHRU -> print tags as plain text</li>
-     *  <li>SMARTY_PHP_QUOTE    -> escape tags as entities</li>
-     *  <li>SMARTY_PHP_REMOVE   -> remove php tags</li>
-     *  <li>SMARTY_PHP_ALLOW    -> execute php tags</li>
-     * </ul>
-     *
-     * @var integer
-     */
-    var $php_handling    =  SMARTY_PHP_PASSTHRU;
-
-    /**
-     * This enables template security. When enabled, many things are restricted
-     * in the templates that normally would go unchecked. This is useful when
-     * untrusted parties are editing templates and you want a reasonable level
-     * of security. (no direct execution of PHP in templates for example)
-     *
-     * @var boolean
-     */
-    var $security       =   false;
-
-    /**
-     * This is the list of template directories that are considered secure. This
-     * is used only if {@link $security} is enabled. One directory per array
-     * element.  {@link $template_dir} is in this list implicitly.
-     *
-     * @var array
-     */
-    var $secure_dir     =   array();
-
-    /**
-     * These are the security settings for Smarty. They are used only when
-     * {@link $security} is enabled.
-     *
-     * @var array
-     */
-    var $security_settings  = array(
-                                    'PHP_HANDLING'    => false,
-                                    'IF_FUNCS'        => array('array', 'list',
-                                                               'isset', 'empty',
-                                                               'count', 'sizeof',
-                                                               'in_array', 'is_array',
-                                                               'true', 'false', 'null'),
-                                    'INCLUDE_ANY'     => false,
-                                    'PHP_TAGS'        => false,
-                                    'MODIFIER_FUNCS'  => array('count'),
-                                    'ALLOW_CONSTANTS'  => false
-                                   );
-
-    /**
-     * This is an array of directories where trusted php scripts reside.
-     * {@link $security} is disabled during their inclusion/execution.
-     *
-     * @var array
-     */
-    var $trusted_dir        = array();
-
-    /**
-     * The left delimiter used for the template tags.
-     *
-     * @var string
-     */
-    var $left_delimiter  =  '{';
-
-    /**
-     * The right delimiter used for the template tags.
-     *
-     * @var string
-     */
-    var $right_delimiter =  '}';
-
-    /**
-     * The order in which request variables are registered, similar to
-     * variables_order in php.ini E = Environment, G = GET, P = POST,
-     * C = Cookies, S = Server
-     *
-     * @var string
-     */
-    var $request_vars_order    = 'EGPCS';
-
-    /**
-     * Indicates wether $HTTP_*_VARS[] (request_use_auto_globals=false)
-     * are uses as request-vars or $_*[]-vars. note: if
-     * request_use_auto_globals is true, then $request_vars_order has
-     * no effect, but the php-ini-value "gpc_order"
-     *
-     * @var boolean
-     */
-    var $request_use_auto_globals      = true;
-
-    /**
-     * Set this if you want different sets of compiled files for the same
-     * templates. This is useful for things like different languages.
-     * Instead of creating separate sets of templates per language, you
-     * set different compile_ids like 'en' and 'de'.
-     *
-     * @var string
-     */
-    var $compile_id            = null;
-
-    /**
-     * This tells Smarty whether or not to use sub dirs in the cache/ and
-     * templates_c/ directories. sub directories better organized, but
-     * may not work well with PHP safe mode enabled.
-     *
-     * @var boolean
-     *
-     */
-    var $use_sub_dirs          = false;
-
-    /**
-     * This is a list of the modifiers to apply to all template variables.
-     * Put each modifier in a separate array element in the order you want
-     * them applied. example: <code>array('escape:"htmlall"');</code>
-     *
-     * @var array
-     */
-    var $default_modifiers        = array();
-
-    /**
-     * This is the resource type to be used when not specified
-     * at the beginning of the resource path. examples:
-     * $smarty->display('file:index.tpl');
-     * $smarty->display('db:index.tpl');
-     * $smarty->display('index.tpl'); // will use default resource type
-     * {include file="file:index.tpl"}
-     * {include file="db:index.tpl"}
-     * {include file="index.tpl"} {* will use default resource type *}
-     *
-     * @var array
-     */
-    var $default_resource_type    = 'file';
-
-    /**
-     * The function used for cache file handling. If not set, built-in caching is used.
-     *
-     * @var null|string function name
-     */
-    var $cache_handler_func   = null;
-
-    /**
-     * This indicates which filters are automatically loaded into Smarty.
-     *
-     * @var array array of filter names
-     */
-    var $autoload_filters = array();
-
-    /**#@+
-     * @var boolean
-     */
-    /**
-     * This tells if config file vars of the same name overwrite each other or not.
-     * if disabled, same name variables are accumulated in an array.
-     */
-    var $config_overwrite = true;
-
-    /**
-     * This tells whether or not to automatically booleanize config file variables.
-     * If enabled, then the strings "on", "true", and "yes" are treated as boolean
-     * true, and "off", "false" and "no" are treated as boolean false.
-     */
-    var $config_booleanize = true;
-
-    /**
-     * This tells whether hidden sections [.foobar] are readable from the
-     * tempalates or not. Normally you would never allow this since that is
-     * the point behind hidden sections: the application can access them, but
-     * the templates cannot.
-     */
-    var $config_read_hidden = false;
-
-    /**
-     * This tells whether or not automatically fix newlines in config files.
-     * It basically converts \r (mac) or \r\n (dos) to \n
-     */
-    var $config_fix_newlines = true;
-    /**#@-*/
-
-    /**
-     * If a template cannot be found, this PHP function will be executed.
-     * Useful for creating templates on-the-fly or other special action.
-     *
-     * @var string function name
-     */
-    var $default_template_handler_func = '';
-
-    /**
-     * The file that contains the compiler class. This can a full
-     * pathname, or relative to the php_include path.
-     *
-     * @var string
-     */
-    var $compiler_file        =    'Smarty_Compiler.class.php';
-
-    /**
-     * The class used for compiling templates.
-     *
-     * @var string
-     */
-    var $compiler_class        =   'Smarty_Compiler';
-
-    /**
-     * The class used to load config vars.
-     *
-     * @var string
-     */
-    var $config_class          =   'Config_File';
-
-/**#@+
- * END Smarty Configuration Section
- * There should be no need to touch anything below this line.
- * @access private
- */
-    /**
-     * where assigned template vars are kept
-     *
-     * @var array
-     */
-    var $_tpl_vars             = array();
-
-    /**
-     * stores run-time $smarty.* vars
-     *
-     * @var null|array
-     */
-    var $_smarty_vars          = null;
-
-    /**
-     * keeps track of sections
-     *
-     * @var array
-     */
-    var $_sections             = array();
-
-    /**
-     * keeps track of foreach blocks
-     *
-     * @var array
-     */
-    var $_foreach              = array();
-
-    /**
-     * keeps track of tag hierarchy
-     *
-     * @var array
-     */
-    var $_tag_stack            = array();
-
-    /**
-     * configuration object
-     *
-     * @var Config_file
-     */
-    var $_conf_obj             = null;
-
-    /**
-     * loaded configuration settings
-     *
-     * @var array
-     */
-    var $_config               = array(array('vars'  => array(), 'files' => array()));
-
-    /**
-     * md5 checksum of the string 'Smarty'
-     *
-     * @var string
-     */
-    var $_smarty_md5           = 'f8d698aea36fcbead2b9d5359ffca76f';
-
-    /**
-     * Smarty version number
-     *
-     * @var string
-     */
-    var $_version              = '2.6.18';
-
-    /**
-     * current template inclusion depth
-     *
-     * @var integer
-     */
-    var $_inclusion_depth      = 0;
-
-    /**
-     * for different compiled templates
-     *
-     * @var string
-     */
-    var $_compile_id           = null;
-
-    /**
-     * text in URL to enable debug mode
-     *
-     * @var string
-     */
-    var $_smarty_debug_id      = 'SMARTY_DEBUG';
-
-    /**
-     * debugging information for debug console
-     *
-     * @var array
-     */
-    var $_smarty_debug_info    = array();
-
-    /**
-     * info that makes up a cache file
-     *
-     * @var array
-     */
-    var $_cache_info           = array();
-
-    /**
-     * default file permissions
-     *
-     * @var integer
-     */
-    var $_file_perms           = 0644;
-
-    /**
-     * default dir permissions
-     *
-     * @var integer
-     */
-    var $_dir_perms               = 0771;
-
-    /**
-     * registered objects
-     *
-     * @var array
-     */
-    var $_reg_objects           = array();
-
-    /**
-     * table keeping track of plugins
-     *
-     * @var array
-     */
-    var $_plugins              = array(
-                                       'modifier'      => array(),
-                                       'function'      => array(),
-                                       'block'         => array(),
-                                       'compiler'      => array(),
-                                       'prefilter'     => array(),
-                                       'postfilter'    => array(),
-                                       'outputfilter'  => array(),
-                                       'resource'      => array(),
-                                       'insert'        => array());
-
-
-    /**
-     * cache serials
-     *
-     * @var array
-     */
-    var $_cache_serials = array();
-
-    /**
-     * name of optional cache include file
-     *
-     * @var string
-     */
-    var $_cache_include = null;
-
-    /**
-     * indicate if the current code is used in a compiled
-     * include
-     *
-     * @var string
-     */
-    var $_cache_including = false;
-
-    /**#@-*/
-    /**
-     * The class constructor.
-     */
-    function Smarty()
-    {
-      $this->assign('SCRIPT_NAME', isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME']
-                    : @$GLOBALS['HTTP_SERVER_VARS']['SCRIPT_NAME']);
-    }
-
-    /**
-     * assigns values to template variables
-     *
-     * @param array|string $tpl_var the template variable name(s)
-     * @param mixed $value the value to assign
-     */
-    function assign($tpl_var, $value = null)
-    {
-        if (is_array($tpl_var)){
-            foreach ($tpl_var as $key => $val) {
-                if ($key != '') {
-                    $this->_tpl_vars[$key] = $val;
-                }
-            }
-        } else {
-            if ($tpl_var != '')
-                $this->_tpl_vars[$tpl_var] = $value;
-        }
-    }
-
-    /**
-     * assigns values to template variables by reference
-     *
-     * @param string $tpl_var the template variable name
-     * @param mixed $value the referenced value to assign
-     */
-    function assign_by_ref($tpl_var, &$value)
-    {
-        if ($tpl_var != '')
-            $this->_tpl_vars[$tpl_var] = &$value;
-    }
-
-    /**
-     * appends values to template variables
-     *
-     * @param array|string $tpl_var the template variable name(s)
-     * @param mixed $value the value to append
-     */
-    function append($tpl_var, $value=null, $merge=false)
-    {
-        if (is_array($tpl_var)) {
-            // $tpl_var is an array, ignore $value
-            foreach ($tpl_var as $_key => $_val) {
-                if ($_key != '') {
-                    if(!@is_array($this->_tpl_vars[$_key])) {
-                        settype($this->_tpl_vars[$_key],'array');
-                    }
-                    if($merge && is_array($_val)) {
-                        foreach($_val as $_mkey => $_mval) {
-                            $this->_tpl_vars[$_key][$_mkey] = $_mval;
-                        }
-                    } else {
-                        $this->_tpl_vars[$_key][] = $_val;
-                    }
-                }
-            }
-        } else {
-            if ($tpl_var != '' && isset($value)) {
-                if(!@is_array($this->_tpl_vars[$tpl_var])) {
-                    settype($this->_tpl_vars[$tpl_var],'array');
-                }
-                if($merge && is_array($value)) {
-                    foreach($value as $_mkey => $_mval) {
-                        $this->_tpl_vars[$tpl_var][$_mkey] = $_mval;
-                    }
-                } else {
-                    $this->_tpl_vars[$tpl_var][] = $value;
-                }
-            }
-        }
-    }
-
-    /**
-     * appends values to template variables by reference
-     *
-     * @param string $tpl_var the template variable name
-     * @param mixed $value the referenced value to append
-     */
-    function append_by_ref($tpl_var, &$value, $merge=false)
-    {
-        if ($tpl_var != '' && isset($value)) {
-            if(!@is_array($this->_tpl_vars[$tpl_var])) {
-             settype($this->_tpl_vars[$tpl_var],'array');
-            }
-            if ($merge && is_array($value)) {
-                foreach($value as $_key => $_val) {
-                    $this->_tpl_vars[$tpl_var][$_key] = &$value[$_key];
-                }
-            } else {
-                $this->_tpl_vars[$tpl_var][] = &$value;
-            }
-        }
-    }
-
-
-    /**
-     * clear the given assigned template variable.
-     *
-     * @param string $tpl_var the template variable to clear
-     */
-    function clear_assign($tpl_var)
-    {
-        if (is_array($tpl_var))
-            foreach ($tpl_var as $curr_var)
-                unset($this->_tpl_vars[$curr_var]);
-        else
-            unset($this->_tpl_vars[$tpl_var]);
-    }
-
-
-    /**
-     * Registers custom function to be used in templates
-     *
-     * @param string $function the name of the template function
-     * @param string $function_impl the name of the PHP function to register
-     */
-    function register_function($function, $function_impl, $cacheable=true, $cache_attrs=null)
-    {
-        $this->_plugins['function'][$function] =
-            array($function_impl, null, null, false, $cacheable, $cache_attrs);
-
-    }
-
-    /**
-     * Unregisters custom function
-     *
-     * @param string $function name of template function
-     */
-    function unregister_function($function)
-    {
-        unset($this->_plugins['function'][$function]);
-    }
-
-    /**
-     * Registers object to be used in templates
-     *
-     * @param string $object name of template object
-     * @param object &$object_impl the referenced PHP object to register
-     * @param null|array $allowed list of allowed methods (empty = all)
-     * @param boolean $smarty_args smarty argument format, else traditional
-     * @param null|array $block_functs list of methods that are block format
-     */
-    function register_object($object, &$object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
-    {
-        settype($allowed, 'array');
-        settype($smarty_args, 'boolean');
-        $this->_reg_objects[$object] =
-            array(&$object_impl, $allowed, $smarty_args, $block_methods);
-    }
-
-    /**
-     * Unregisters object
-     *
-     * @param string $object name of template object
-     */
-    function unregister_object($object)
-    {
-        unset($this->_reg_objects[$object]);
-    }
-
-
-    /**
-     * Registers block function to be used in templates
-     *
-     * @param string $block name of template block
-     * @param string $block_impl PHP function to register
-     */
-    function register_block($block, $block_impl, $cacheable=true, $cache_attrs=null)
-    {
-        $this->_plugins['block'][$block] =
-            array($block_impl, null, null, false, $cacheable, $cache_attrs);
-    }
-
-    /**
-     * Unregisters block function
-     *
-     * @param string $block name of template function
-     */
-    function unregister_block($block)
-    {
-        unset($this->_plugins['block'][$block]);
-    }
-
-    /**
-     * Registers compiler function
-     *
-     * @param string $function name of template function
-     * @param string $function_impl name of PHP function to register
-     */
-    function register_compiler_function($function, $function_impl, $cacheable=true)
-    {
-        $this->_plugins['compiler'][$function] =
-            array($function_impl, null, null, false, $cacheable);
-    }
-
-    /**
-     * Unregisters compiler function
-     *
-     * @param string $function name of template function
-     */
-    function unregister_compiler_function($function)
-    {
-        unset($this->_plugins['compiler'][$function]);
-    }
-
-    /**
-     * Registers modifier to be used in templates
-     *
-     * @param string $modifier name of template modifier
-     * @param string $modifier_impl name of PHP function to register
-     */
-    function register_modifier($modifier, $modifier_impl)
-    {
-        $this->_plugins['modifier'][$modifier] =
-            array($modifier_impl, null, null, false);
-    }
-
-    /**
-     * Unregisters modifier
-     *
-     * @param string $modifier name of template modifier
-     */
-    function unregister_modifier($modifier)
-    {
-        unset($this->_plugins['modifier'][$modifier]);
-    }
-
-    /**
-     * Registers a resource to fetch a template
-     *
-     * @param string $type name of resource
-     * @param array $functions array of functions to handle resource
-     */
-    function register_resource($type, $functions)
-    {
-        if (count($functions)==4) {
-            $this->_plugins['resource'][$type] =
-                array($functions, false);
-
-        } elseif (count($functions)==5) {
-            $this->_plugins['resource'][$type] =
-                array(array(array(&$functions[0], $functions[1])
-                            ,array(&$functions[0], $functions[2])
-                            ,array(&$functions[0], $functions[3])
-                            ,array(&$functions[0], $functions[4]))
-                      ,false);
-
-        } else {
-            $this->trigger_error("malformed function-list for '$type' in register_resource");
-
-        }
-    }
-
-    /**
-     * Unregisters a resource
-     *
-     * @param string $type name of resource
-     */
-    function unregister_resource($type)
-    {
-        unset($this->_plugins['resource'][$type]);
-    }
-
-    /**
-     * Registers a prefilter function to apply
-     * to a template before compiling
-     *
-     * @param string $function name of PHP function to register
-     */
-    function register_prefilter($function)
-    {
-    $_name = (is_array($function)) ? $function[1] : $function;
-        $this->_plugins['prefilter'][$_name]
-            = array($function, null, null, false);
-    }
-
-    /**
-     * Unregisters a prefilter function
-     *
-     * @param string $function name of PHP function
-     */
-    function unregister_prefilter($function)
-    {
-        unset($this->_plugins['prefilter'][$function]);
-    }
-
-    /**
-     * Registers a postfilter function to apply
-     * to a compiled template after compilation
-     *
-     * @param string $function name of PHP function to register
-     */
-    function register_postfilter($function)
-    {
-    $_name = (is_array($function)) ? $function[1] : $function;
-        $this->_plugins['postfilter'][$_name]
-            = array($function, null, null, false);
-    }
-
-    /**
-     * Unregisters a postfilter function
-     *
-     * @param string $function name of PHP function
-     */
-    function unregister_postfilter($function)
-    {
-        unset($this->_plugins['postfilter'][$function]);
-    }
-
-    /**
-     * Registers an output filter function to apply
-     * to a template output
-     *
-     * @param string $function name of PHP function
-     */
-    function register_outputfilter($function)
-    {
-    $_name = (is_array($function)) ? $function[1] : $function;
-        $this->_plugins['outputfilter'][$_name]
-            = array($function, null, null, false);
-    }
-
-    /**
-     * Unregisters an outputfilter function
-     *
-     * @param string $function name of PHP function
-     */
-    function unregister_outputfilter($function)
-    {
-        unset($this->_plugins['outputfilter'][$function]);
-    }
-
-    /**
-     * load a filter of specified type and name
-     *
-     * @param string $type filter type
-     * @param string $name filter name
-     */
-    function load_filter($type, $name)
-    {
-        switch ($type) {
-            case 'output':
-                $_params = array('plugins' => array(array($type . 'filter', $name, null, null, false)));
-                require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
-                smarty_core_load_plugins($_params, $this);
-                break;
-
-            case 'pre':
-            case 'post':
-                if (!isset($this->_plugins[$type . 'filter'][$name]))
-                    $this->_plugins[$type . 'filter'][$name] = false;
-                break;
-        }
-    }
-
-    /**
-     * clear cached content for the given template and cache id
-     *
-     * @param string $tpl_file name of template file
-     * @param string $cache_id name of cache_id
-     * @param string $compile_id name of compile_id
-     * @param string $exp_time expiration time
-     * @return boolean
-     */
-    function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
-    {
-
-        if (!isset($compile_id))
-            $compile_id = $this->compile_id;
-
-        if (!isset($tpl_file))
-            $compile_id = null;
-
-        $_auto_id = $this->_get_auto_id($cache_id, $compile_id);
-
-        if (!empty($this->cache_handler_func)) {
-            return call_user_func_array($this->cache_handler_func,
-                                  array('clear', &$this, &$dummy, $tpl_file, $cache_id, $compile_id, $exp_time));
-        } else {
-            $_params = array('auto_base' => $this->cache_dir,
-                            'auto_source' => $tpl_file,
-                            'auto_id' => $_auto_id,
-                            'exp_time' => $exp_time);
-            require_once(SMARTY_CORE_DIR . 'core.rm_auto.php');
-            return smarty_core_rm_auto($_params, $this);
-        }
-
-    }
-
-
-    /**
-     * clear the entire contents of cache (all templates)
-     *
-     * @param string $exp_time expire time
-     * @return boolean results of {@link smarty_core_rm_auto()}
-     */
-    function clear_all_cache($exp_time = null)
-    {
-        return $this->clear_cache(null, null, null, $exp_time);
-    }
-
-
-    /**
-     * test to see if valid cache exists for this template
-     *
-     * @param string $tpl_file name of template file
-     * @param string $cache_id
-     * @param string $compile_id
-     * @return string|false results of {@link _read_cache_file()}
-     */
-    function is_cached($tpl_file, $cache_id = null, $compile_id = null)
-    {
-        if (!$this->caching)
-            return false;
-
-        if (!isset($compile_id))
-            $compile_id = $this->compile_id;
-
-        $_params = array(
-            'tpl_file' => $tpl_file,
-            'cache_id' => $cache_id,
-            'compile_id' => $compile_id
-        );
-        require_once(SMARTY_CORE_DIR . 'core.read_cache_file.php');
-        return smarty_core_read_cache_file($_params, $this);
-    }
-
-
-    /**
-     * clear all the assigned template variables.
-     *
-     */
-    function clear_all_assign()
-    {
-        $this->_tpl_vars = array();
-    }
-
-    /**
-     * clears compiled version of specified template resource,
-     * or all compiled template files if one is not specified.
-     * This function is for advanced use only, not normally needed.
-     *
-     * @param string $tpl_file
-     * @param string $compile_id
-     * @param string $exp_time
-     * @return boolean results of {@link smarty_core_rm_auto()}
-     */
-    function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
-    {
-        if (!isset($compile_id)) {
-            $compile_id = $this->compile_id;
-        }
-        $_params = array('auto_base' => $this->compile_dir,
-                        'auto_source' => $tpl_file,
-                        'auto_id' => $compile_id,
-                        'exp_time' => $exp_time,
-                        'extensions' => array('.inc', '.php'));
-        require_once(SMARTY_CORE_DIR . 'core.rm_auto.php');
-        return smarty_core_rm_auto($_params, $this);
-    }
-
-    /**
-     * Checks whether requested template exists.
-     *
-     * @param string $tpl_file
-     * @return boolean
-     */
-    function template_exists($tpl_file)
-    {
-        $_params = array('resource_name' => $tpl_file, 'quiet'=>true, 'get_source'=>false);
-        return $this->_fetch_resource_info($_params);
-    }
-
-    /**
-     * Returns an array containing template variables
-     *
-     * @param string $name
-     * @param string $type
-     * @return array
-     */
-    function &get_template_vars($name=null)
-    {
-        if(!isset($name)) {
-            return $this->_tpl_vars;
-        } elseif(isset($this->_tpl_vars[$name])) {
-            return $this->_tpl_vars[$name];
-        } else {
-            // var non-existant, return valid reference
-            $_tmp = null;
-            return $_tmp;   
-        }
-    }
-
-    /**
-     * Returns an array containing config variables
-     *
-     * @param string $name
-     * @param string $type
-     * @return array
-     */
-    function &get_config_vars($name=null)
-    {
-        if(!isset($name) && is_array($this->_config[0])) {
-            return $this->_config[0]['vars'];
-        } else if(isset($this->_config[0]['vars'][$name])) {
-            return $this->_config[0]['vars'][$name];
-        } else {
-            // var non-existant, return valid reference
-            $_tmp = null;
-            return $_tmp;
-        }
-    }
-
-    /**
-     * trigger Smarty error
-     *
-     * @param string $error_msg
-     * @param integer $error_type
-     */
-    function trigger_error($error_msg, $error_type = E_USER_WARNING)
-    {
-        trigger_error("Smarty error: $error_msg", $error_type);
-    }
-
-
-    /**
-     * executes & displays the template results
-     *
-     * @param string $resource_name
-     * @param string $cache_id
-     * @param string $compile_id
-     */
-    function display($resource_name, $cache_id = null, $compile_id = null)
-    {
-        $this->fetch($resource_name, $cache_id, $compile_id, true);
-    }
-
-    /**
-     * executes & returns or displays the template results
-     *
-     * @param string $resource_name
-     * @param string $cache_id
-     * @param string $compile_id
-     * @param boolean $display
-     */
-    function fetch($resource_name, $cache_id = null, $compile_id = null, $display = false)
-    {
-        static $_cache_info = array();
-        
-        $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(isset($this->error_reporting)
-               ? $this->error_reporting : error_reporting() & ~E_NOTICE);
-
-        if (!$this->debugging && $this->debugging_ctrl == 'URL') {
-            $_query_string = $this->request_use_auto_globals ? $_SERVER['QUERY_STRING'] : $GLOBALS['HTTP_SERVER_VARS']['QUERY_STRING'];
-            if (@strstr($_query_string, $this->_smarty_debug_id)) {
-                if (@strstr($_query_string, $this->_smarty_debug_id . '=on')) {
-                    // enable debugging for this browser session
-                    @setcookie('SMARTY_DEBUG', true);
-                    $this->debugging = true;
-                } elseif (@strstr($_query_string, $this->_smarty_debug_id . '=off')) {
-                    // disable debugging for this browser session
-                    @setcookie('SMARTY_DEBUG', false);
-                    $this->debugging = false;
-                } else {
-                    // enable debugging for this page
-                    $this->debugging = true;
-                }
-            } else {
-                $this->debugging = (bool)($this->request_use_auto_globals ? @$_COOKIE['SMARTY_DEBUG'] : @$GLOBALS['HTTP_COOKIE_VARS']['SMARTY_DEBUG']);
-            }
-        }
-
-        if ($this->debugging) {
-            // capture time for debugging info
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $_debug_start_time = smarty_core_get_microtime($_params, $this);
-            $this->_smarty_debug_info[] = array('type'      => 'template',
-                                                'filename'  => $resource_name,
-                                                'depth'     => 0);
-            $_included_tpls_idx = count($this->_smarty_debug_info) - 1;
-        }
-
-        if (!isset($compile_id)) {
-            $compile_id = $this->compile_id;
-        }
-
-        $this->_compile_id = $compile_id;
-        $this->_inclusion_depth = 0;
-
-        if ($this->caching) {
-            // save old cache_info, initialize cache_info
-            array_push($_cache_info, $this->_cache_info);
-            $this->_cache_info = array();
-            $_params = array(
-                'tpl_file' => $resource_name,
-                'cache_id' => $cache_id,
-                'compile_id' => $compile_id,
-                'results' => null
-            );
-            require_once(SMARTY_CORE_DIR . 'core.read_cache_file.php');
-            if (smarty_core_read_cache_file($_params, $this)) {
-                $_smarty_results = $_params['results'];
-                if (!empty($this->_cache_info['insert_tags'])) {
-                    $_params = array('plugins' => $this->_cache_info['insert_tags']);
-                    require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
-                    smarty_core_load_plugins($_params, $this);
-                    $_params = array('results' => $_smarty_results);
-                    require_once(SMARTY_CORE_DIR . 'core.process_cached_inserts.php');
-                    $_smarty_results = smarty_core_process_cached_inserts($_params, $this);
-                }
-                if (!empty($this->_cache_info['cache_serials'])) {
-                    $_params = array('results' => $_smarty_results);
-                    require_once(SMARTY_CORE_DIR . 'core.process_compiled_include.php');
-                    $_smarty_results = smarty_core_process_compiled_include($_params, $this);
-                }
-
-
-                if ($display) {
-                    if ($this->debugging)
-                    {
-                        // capture time for debugging info
-                        $_params = array();
-                        require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-                        $this->_smarty_debug_info[$_included_tpls_idx]['exec_time'] = smarty_core_get_microtime($_params, $this) - $_debug_start_time;
-                        require_once(SMARTY_CORE_DIR . 'core.display_debug_console.php');
-                        $_smarty_results .= smarty_core_display_debug_console($_params, $this);
-                    }
-                    if ($this->cache_modified_check) {
-                        $_server_vars = ($this->request_use_auto_globals) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
-                        $_last_modified_date = @substr($_server_vars['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_server_vars['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
-                        $_gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT';
-                        if (@count($this->_cache_info['insert_tags']) == 0
-                            && !$this->_cache_serials
-                            && $_gmt_mtime == $_last_modified_date) {
-                            if (php_sapi_name()=='cgi')
-                                header('Status: 304 Not Modified');
-                            else
-                                header('HTTP/1.1 304 Not Modified');
-
-                        } else {
-                            header('Last-Modified: '.$_gmt_mtime);
-                            echo $_smarty_results;
-                        }
-                    } else {
-                            echo $_smarty_results;
-                    }
-                    error_reporting($_smarty_old_error_level);
-                    // restore initial cache_info
-                    $this->_cache_info = array_pop($_cache_info);
-                    return true;
-                } else {
-                    error_reporting($_smarty_old_error_level);
-                    // restore initial cache_info
-                    $this->_cache_info = array_pop($_cache_info);
-                    return $_smarty_results;
-                }
-            } else {
-                $this->_cache_info['template'][$resource_name] = true;
-                if ($this->cache_modified_check && $display) {
-                    header('Last-Modified: '.gmdate('D, d M Y H:i:s', time()).' GMT');
-                }
-            }
-        }
-
-        // load filters that are marked as autoload
-        if (count($this->autoload_filters)) {
-            foreach ($this->autoload_filters as $_filter_type => $_filters) {
-                foreach ($_filters as $_filter) {
-                    $this->load_filter($_filter_type, $_filter);
-                }
-            }
-        }
-
-        $_smarty_compile_path = $this->_get_compile_path($resource_name);
-
-        // if we just need to display the results, don't perform output
-        // buffering - for speed
-        $_cache_including = $this->_cache_including;
-        $this->_cache_including = false;
-        if ($display && !$this->caching && count($this->_plugins['outputfilter']) == 0) {
-            if ($this->_is_compiled($resource_name, $_smarty_compile_path)
-                    || $this->_compile_resource($resource_name, $_smarty_compile_path))
-            {
-                include($_smarty_compile_path);
-            }
-        } else {
-            ob_start();
-            if ($this->_is_compiled($resource_name, $_smarty_compile_path)
-                    || $this->_compile_resource($resource_name, $_smarty_compile_path))
-            {
-                include($_smarty_compile_path);
-            }
-            $_smarty_results = ob_get_contents();
-            ob_end_clean();
-
-            foreach ((array)$this->_plugins['outputfilter'] as $_output_filter) {
-                $_smarty_results = call_user_func_array($_output_filter[0], array($_smarty_results, &$this));
-            }
-        }
-
-        if ($this->caching) {
-            $_params = array('tpl_file' => $resource_name,
-                        'cache_id' => $cache_id,
-                        'compile_id' => $compile_id,
-                        'results' => $_smarty_results);
-            require_once(SMARTY_CORE_DIR . 'core.write_cache_file.php');
-            smarty_core_write_cache_file($_params, $this);
-            require_once(SMARTY_CORE_DIR . 'core.process_cached_inserts.php');
-            $_smarty_results = smarty_core_process_cached_inserts($_params, $this);
-
-            if ($this->_cache_serials) {
-                // strip nocache-tags from output
-                $_smarty_results = preg_replace('!(\{/?nocache\:[0-9a-f]{32}#\d+\})!s'
-                                                ,''
-                                                ,$_smarty_results);
-            }
-            // restore initial cache_info
-            $this->_cache_info = array_pop($_cache_info);
-        }
-        $this->_cache_including = $_cache_including;
-
-        if ($display) {
-            if (isset($_smarty_results)) { echo $_smarty_results; }
-            if ($this->debugging) {
-                // capture time for debugging info
-                $_params = array();
-                require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-                $this->_smarty_debug_info[$_included_tpls_idx]['exec_time'] = (smarty_core_get_microtime($_params, $this) - $_debug_start_time);
-                require_once(SMARTY_CORE_DIR . 'core.display_debug_console.php');
-                echo smarty_core_display_debug_console($_params, $this);
-            }
-            error_reporting($_smarty_old_error_level);
-            return;
-        } else {
-            error_reporting($_smarty_old_error_level);
-            if (isset($_smarty_results)) { return $_smarty_results; }
-        }
-    }
-
-    /**
-     * load configuration values
-     *
-     * @param string $file
-     * @param string $section
-     * @param string $scope
-     */
-    function config_load($file, $section = null, $scope = 'global')
-    {
-        require_once($this->_get_plugin_filepath('function', 'config_load'));
-        smarty_function_config_load(array('file' => $file, 'section' => $section, 'scope' => $scope), $this);
-    }
-
-    /**
-     * return a reference to a registered object
-     *
-     * @param string $name
-     * @return object
-     */
-    function &get_registered_object($name) {
-        if (!isset($this->_reg_objects[$name]))
-        $this->_trigger_fatal_error("'$name' is not a registered object");
-
-        if (!is_object($this->_reg_objects[$name][0]))
-        $this->_trigger_fatal_error("registered '$name' is not an object");
-
-        return $this->_reg_objects[$name][0];
-    }
-
-    /**
-     * clear configuration values
-     *
-     * @param string $var
-     */
-    function clear_config($var = null)
-    {
-        if(!isset($var)) {
-            // clear all values
-            $this->_config = array(array('vars'  => array(),
-                                         'files' => array()));
-        } else {
-            unset($this->_config[0]['vars'][$var]);
-        }
-    }
-
-    /**
-     * get filepath of requested plugin
-     *
-     * @param string $type
-     * @param string $name
-     * @return string|false
-     */
-    function _get_plugin_filepath($type, $name)
-    {
-        $_params = array('type' => $type, 'name' => $name);
-        require_once(SMARTY_CORE_DIR . 'core.assemble_plugin_filepath.php');
-        return smarty_core_assemble_plugin_filepath($_params, $this);
-    }
-
-   /**
-     * test if resource needs compiling
-     *
-     * @param string $resource_name
-     * @param string $compile_path
-     * @return boolean
-     */
-    function _is_compiled($resource_name, $compile_path)
-    {
-        if (!$this->force_compile && file_exists($compile_path)) {
-            if (!$this->compile_check) {
-                // no need to check compiled file
-                return true;
-            } else {
-                // get file source and timestamp
-                $_params = array('resource_name' => $resource_name, 'get_source'=>false);
-                if (!$this->_fetch_resource_info($_params)) {
-                    return false;
-                }
-                if ($_params['resource_timestamp'] <= filemtime($compile_path)) {
-                    // template not expired, no recompile
-                    return true;
-                } else {
-                    // compile template
-                    return false;
-                }
-            }
-        } else {
-            // compiled template does not exist, or forced compile
-            return false;
-        }
-    }
-
-   /**
-     * compile the template
-     *
-     * @param string $resource_name
-     * @param string $compile_path
-     * @return boolean
-     */
-    function _compile_resource($resource_name, $compile_path)
-    {
-
-        $_params = array('resource_name' => $resource_name);
-        if (!$this->_fetch_resource_info($_params)) {
-            return false;
-        }
-
-        $_source_content = $_params['source_content'];
-        $_cache_include    = substr($compile_path, 0, -4).'.inc';
-
-        if ($this->_compile_source($resource_name, $_source_content, $_compiled_content, $_cache_include)) {
-            // if a _cache_serial was set, we also have to write an include-file:
-            if ($this->_cache_include_info) {
-                require_once(SMARTY_CORE_DIR . 'core.write_compiled_include.php');
-                smarty_core_write_compiled_include(array_merge($this->_cache_include_info, array('compiled_content'=>$_compiled_content, 'resource_name'=>$resource_name)),  $this);
-            }
-
-            $_params = array('compile_path'=>$compile_path, 'compiled_content' => $_compiled_content);
-            require_once(SMARTY_CORE_DIR . 'core.write_compiled_resource.php');
-            smarty_core_write_compiled_resource($_params, $this);
-
-            return true;
-        } else {
-            return false;
-        }
-
-    }
-
-   /**
-     * compile the given source
-     *
-     * @param string $resource_name
-     * @param string $source_content
-     * @param string $compiled_content
-     * @return boolean
-     */
-    function _compile_source($resource_name, &$source_content, &$compiled_content, $cache_include_path=null)
-    {
-        if (file_exists(SMARTY_DIR . $this->compiler_file)) {
-            require_once(SMARTY_DIR . $this->compiler_file);
-        } else {
-            // use include_path
-            require_once($this->compiler_file);
-        }
-
-
-        $smarty_compiler = new $this->compiler_class;
-
-        $smarty_compiler->template_dir      = $this->template_dir;
-        $smarty_compiler->compile_dir       = $this->compile_dir;
-        $smarty_compiler->plugins_dir       = $this->plugins_dir;
-        $smarty_compiler->config_dir        = $this->config_dir;
-        $smarty_compiler->force_compile     = $this->force_compile;
-        $smarty_compiler->caching           = $this->caching;
-        $smarty_compiler->php_handling      = $this->php_handling;
-        $smarty_compiler->left_delimiter    = $this->left_delimiter;
-        $smarty_compiler->right_delimiter   = $this->right_delimiter;
-        $smarty_compiler->_version          = $this->_version;
-        $smarty_compiler->security          = $this->security;
-        $smarty_compiler->secure_dir        = $this->secure_dir;
-        $smarty_compiler->security_settings = $this->security_settings;
-        $smarty_compiler->trusted_dir       = $this->trusted_dir;
-        $smarty_compiler->use_sub_dirs      = $this->use_sub_dirs;
-        $smarty_compiler->_reg_objects      = &$this->_reg_objects;
-        $smarty_compiler->_plugins          = &$this->_plugins;
-        $smarty_compiler->_tpl_vars         = &$this->_tpl_vars;
-        $smarty_compiler->default_modifiers = $this->default_modifiers;
-        $smarty_compiler->compile_id        = $this->_compile_id;
-        $smarty_compiler->_config            = $this->_config;
-        $smarty_compiler->request_use_auto_globals  = $this->request_use_auto_globals;
-
-        if (isset($cache_include_path) && isset($this->_cache_serials[$cache_include_path])) {
-            $smarty_compiler->_cache_serial = $this->_cache_serials[$cache_include_path];
-        }
-        $smarty_compiler->_cache_include = $cache_include_path;
-
-
-        $_results = $smarty_compiler->_compile_file($resource_name, $source_content, $compiled_content);
-
-        if ($smarty_compiler->_cache_serial) {
-            $this->_cache_include_info = array(
-                'cache_serial'=>$smarty_compiler->_cache_serial
-                ,'plugins_code'=>$smarty_compiler->_plugins_code
-                ,'include_file_path' => $cache_include_path);
-
-        } else {
-            $this->_cache_include_info = null;
-
-        }
-
-        return $_results;
-    }
-
-    /**
-     * Get the compile path for this resource
-     *
-     * @param string $resource_name
-     * @return string results of {@link _get_auto_filename()}
-     */
-    function _get_compile_path($resource_name)
-    {
-        return $this->_get_auto_filename($this->compile_dir, $resource_name,
-                                         $this->_compile_id) . '.php';
-    }
-
-    /**
-     * fetch the template info. Gets timestamp, and source
-     * if get_source is true
-     *
-     * sets $source_content to the source of the template, and
-     * $resource_timestamp to its time stamp
-     * @param string $resource_name
-     * @param string $source_content
-     * @param integer $resource_timestamp
-     * @param boolean $get_source
-     * @param boolean $quiet
-     * @return boolean
-     */
-
-    function _fetch_resource_info(&$params)
-    {
-        if(!isset($params['get_source'])) { $params['get_source'] = true; }
-        if(!isset($params['quiet'])) { $params['quiet'] = false; }
-
-        $_return = false;
-        $_params = array('resource_name' => $params['resource_name']) ;
-        if (isset($params['resource_base_path']))
-            $_params['resource_base_path'] = $params['resource_base_path'];
-        else
-            $_params['resource_base_path'] = $this->template_dir;
-
-        if ($this->_parse_resource_name($_params)) {
-            $_resource_type = $_params['resource_type'];
-            $_resource_name = $_params['resource_name'];
-            switch ($_resource_type) {
-                case 'file':
-                    if ($params['get_source']) {
-                        $params['source_content'] = $this->_read_file($_resource_name);
-                    }
-                    $params['resource_timestamp'] = filemtime($_resource_name);
-                    $_return = is_file($_resource_name);
-                    break;
-
-                default:
-                    // call resource functions to fetch the template source and timestamp
-                    if ($params['get_source']) {
-                        $_source_return = isset($this->_plugins['resource'][$_resource_type]) &&
-                            call_user_func_array($this->_plugins['resource'][$_resource_type][0][0],
-                                                 array($_resource_name, &$params['source_content'], &$this));
-                    } else {
-                        $_source_return = true;
-                    }
-
-                    $_timestamp_return = isset($this->_plugins['resource'][$_resource_type]) &&
-                        call_user_func_array($this->_plugins['resource'][$_resource_type][0][1],
-                                             array($_resource_name, &$params['resource_timestamp'], &$this));
-
-                    $_return = $_source_return && $_timestamp_return;
-                    break;
-            }
-        }
-
-        if (!$_return) {
-            // see if we can get a template with the default template handler
-            if (!empty($this->default_template_handler_func)) {
-                if (!is_callable($this->default_template_handler_func)) {
-                    $this->trigger_error("default template handler function \"$this->default_template_handler_func\" doesn't exist.");
-                } else {
-                    $_return = call_user_func_array(
-                        $this->default_template_handler_func,
-                        array($_params['resource_type'], $_params['resource_name'], &$params['source_content'], &$params['resource_timestamp'], &$this));
-                }
-            }
-        }
-
-        if (!$_return) {
-            if (!$params['quiet']) {
-                $this->trigger_error('unable to read resource: "' . $params['resource_name'] . '"');
-            }
-        } else if ($_return && $this->security) {
-            require_once(SMARTY_CORE_DIR . 'core.is_secure.php');
-            if (!smarty_core_is_secure($_params, $this)) {
-                if (!$params['quiet'])
-                    $this->trigger_error('(secure mode) accessing "' . $params['resource_name'] . '" is not allowed');
-                $params['source_content'] = null;
-                $params['resource_timestamp'] = null;
-                return false;
-            }
-        }
-        return $_return;
-    }
-
-
-    /**
-     * parse out the type and name from the resource
-     *
-     * @param string $resource_base_path
-     * @param string $resource_name
-     * @param string $resource_type
-     * @param string $resource_name
-     * @return boolean
-     */
-
-    function _parse_resource_name(&$params)
-    {
-
-        // split tpl_path by the first colon
-        $_resource_name_parts = explode(':', $params['resource_name'], 2);
-
-        if (count($_resource_name_parts) == 1) {
-            // no resource type given
-            $params['resource_type'] = $this->default_resource_type;
-            $params['resource_name'] = $_resource_name_parts[0];
-        } else {
-            if(strlen($_resource_name_parts[0]) == 1) {
-                // 1 char is not resource type, but part of filepath
-                $params['resource_type'] = $this->default_resource_type;
-                $params['resource_name'] = $params['resource_name'];
-            } else {
-                $params['resource_type'] = $_resource_name_parts[0];
-                $params['resource_name'] = $_resource_name_parts[1];
-            }
-        }
-
-        if ($params['resource_type'] == 'file') {
-            if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $params['resource_name'])) {
-                // relative pathname to $params['resource_base_path']
-                // use the first directory where the file is found
-                foreach ((array)$params['resource_base_path'] as $_curr_path) {
-                    $_fullpath = $_curr_path . DIRECTORY_SEPARATOR . $params['resource_name'];
-                    if (file_exists($_fullpath) && is_file($_fullpath)) {
-                        $params['resource_name'] = $_fullpath;
-                        return true;
-                    }
-                    // didn't find the file, try include_path
-                    $_params = array('file_path' => $_fullpath);
-                    require_once(SMARTY_CORE_DIR . 'core.get_include_path.php');
-                    if(smarty_core_get_include_path($_params, $this)) {
-                        $params['resource_name'] = $_params['new_file_path'];
-                        return true;
-                    }
-                }
-                return false;
-            } else {
-                /* absolute path */
-                return file_exists($params['resource_name']);
-            }
-        } elseif (empty($this->_plugins['resource'][$params['resource_type']])) {
-            $_params = array('type' => $params['resource_type']);
-            require_once(SMARTY_CORE_DIR . 'core.load_resource_plugin.php');
-            smarty_core_load_resource_plugin($_params, $this);
-        }
-
-        return true;
-    }
-
-
-    /**
-     * Handle modifiers
-     *
-     * @param string|null $modifier_name
-     * @param array|null $map_array
-     * @return string result of modifiers
-     */
-    function _run_mod_handler()
-    {
-        $_args = func_get_args();
-        list($_modifier_name, $_map_array) = array_splice($_args, 0, 2);
-        list($_func_name, $_tpl_file, $_tpl_line) =
-            $this->_plugins['modifier'][$_modifier_name];
-
-        $_var = $_args[0];
-        foreach ($_var as $_key => $_val) {
-            $_args[0] = $_val;
-            $_var[$_key] = call_user_func_array($_func_name, $_args);
-        }
-        return $_var;
-    }
-
-    /**
-     * Remove starting and ending quotes from the string
-     *
-     * @param string $string
-     * @return string
-     */
-    function _dequote($string)
-    {
-        if ((substr($string, 0, 1) == "'" || substr($string, 0, 1) == '"') &&
-            substr($string, -1) == substr($string, 0, 1))
-            return substr($string, 1, -1);
-        else
-            return $string;
-    }
-
-
-    /**
-     * read in a file
-     *
-     * @param string $filename
-     * @return string
-     */
-    function _read_file($filename)
-    {
-        if ( file_exists($filename) && ($fd = @fopen($filename, 'rb')) ) {
-            $contents = '';
-            while (!feof($fd)) {
-                $contents .= fread($fd, 8192);
-            }
-            fclose($fd);
-            return $contents;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * get a concrete filename for automagically created content
-     *
-     * @param string $auto_base
-     * @param string $auto_source
-     * @param string $auto_id
-     * @return string
-     * @staticvar string|null
-     * @staticvar string|null
-     */
-    function _get_auto_filename($auto_base, $auto_source = null, $auto_id = null)
-    {
-        $_compile_dir_sep =  $this->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
-        $_return = $auto_base . DIRECTORY_SEPARATOR;
-
-        if(isset($auto_id)) {
-            // make auto_id safe for directory names
-            $auto_id = str_replace('%7C',$_compile_dir_sep,(urlencode($auto_id)));
-            // split into separate directories
-            $_return .= $auto_id . $_compile_dir_sep;
-        }
-
-        if(isset($auto_source)) {
-            // make source name safe for filename
-            $_filename = urlencode(basename($auto_source));
-            $_crc32 = sprintf('%08X', $this->encryptCrc32($auto_source));
-            // prepend %% to avoid name conflicts with
-            // with $params['auto_id'] names
-            $_crc32 = substr($_crc32, 0, 2) . $_compile_dir_sep .
-                      substr($_crc32, 0, 3) . $_compile_dir_sep . $_crc32;
-            $_return .= '%%' . $_crc32 . '%%' . $_filename;
-        }
-
-        return $_return;
-    }
-
-    /**
-     * unlink a file, possibly using expiration time
-     *
-     * @param string $resource
-     * @param integer $exp_time
-     */
-    function _unlink($resource, $exp_time = null)
-    {
-        if(isset($exp_time)) {
-            if(time() - @filemtime($resource) >= $exp_time) {
-                return @unlink($resource);
-            }
-        } else {
-            return @unlink($resource);
-        }
-    }
-
-    /**
-     * returns an auto_id for auto-file-functions
-     *
-     * @param string $cache_id
-     * @param string $compile_id
-     * @return string|null
-     */
-    function _get_auto_id($cache_id=null, $compile_id=null) {
-    if (isset($cache_id))
-        return (isset($compile_id)) ? $cache_id . '|' . $compile_id  : $cache_id;
-    elseif(isset($compile_id))
-        return $compile_id;
-    else
-        return null;
-    }
-
-    /**
-     * trigger Smarty plugin error
-     *
-     * @param string $error_msg
-     * @param string $tpl_file
-     * @param integer $tpl_line
-     * @param string $file
-     * @param integer $line
-     * @param integer $error_type
-     */
-    function _trigger_fatal_error($error_msg, $tpl_file = null, $tpl_line = null,
-            $file = null, $line = null, $error_type = E_USER_ERROR)
-    {
-        if(isset($file) && isset($line)) {
-            $info = ' ('.basename($file).", line $line)";
-        } else {
-            $info = '';
-        }
-        if (isset($tpl_line) && isset($tpl_file)) {
-            $this->trigger_error('[in ' . $tpl_file . ' line ' . $tpl_line . "]: $error_msg$info", $error_type);
-        } else {
-            $this->trigger_error($error_msg . $info, $error_type);
-        }
-    }
-
-
-    /**
-     * callback function for preg_replace, to call a non-cacheable block
-     * @return string
-     */
-    function _process_compiled_include_callback($match) {
-        $_func = '_smarty_tplfunc_'.$match[2].'_'.$match[3];
-        ob_start();
-        $_func($this);
-        $_ret = ob_get_contents();
-        ob_end_clean();
-        return $_ret;
-    }
-
-
-    /**
-     * called for included templates
-     *
-     * @param string $_smarty_include_tpl_file
-     * @param string $_smarty_include_vars
-     */
-
-    // $_smarty_include_tpl_file, $_smarty_include_vars
-
-    function _smarty_include($params)
-    {
-        if ($this->debugging) {
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $debug_start_time = smarty_core_get_microtime($_params, $this);
-            $this->_smarty_debug_info[] = array('type'      => 'template',
-                                                  'filename'  => $params['smarty_include_tpl_file'],
-                                                  'depth'     => ++$this->_inclusion_depth);
-            $included_tpls_idx = count($this->_smarty_debug_info) - 1;
-        }
-
-        $this->_tpl_vars = array_merge($this->_tpl_vars, $params['smarty_include_vars']);
-
-        // config vars are treated as local, so push a copy of the
-        // current ones onto the front of the stack
-        array_unshift($this->_config, $this->_config[0]);
-
-        $_smarty_compile_path = $this->_get_compile_path($params['smarty_include_tpl_file']);
-
-
-        if ($this->_is_compiled($params['smarty_include_tpl_file'], $_smarty_compile_path)
-            || $this->_compile_resource($params['smarty_include_tpl_file'], $_smarty_compile_path))
-        {
-            include($_smarty_compile_path);
-        }
-
-        // pop the local vars off the front of the stack
-        array_shift($this->_config);
-
-        $this->_inclusion_depth--;
-
-        if ($this->debugging) {
-            // capture time for debugging info
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $this->_smarty_debug_info[$included_tpls_idx]['exec_time'] = smarty_core_get_microtime($_params, $this) - $debug_start_time;
-        }
-
-        if ($this->caching) {
-            $this->_cache_info['template'][$params['smarty_include_tpl_file']] = true;
-        }
-    }
-
-
-    /**
-     * get or set an array of cached attributes for function that is
-     * not cacheable
-     * @return array
-     */
-    function &_smarty_cache_attrs($cache_serial, $count) {
-        $_cache_attrs =& $this->_cache_info['cache_attrs'][$cache_serial][$count];
-
-        if ($this->_cache_including) {
-            /* return next set of cache_attrs */
-            $_return = current($_cache_attrs);
-            next($_cache_attrs);
-            return $_return;
-
-        } else {
-            /* add a reference to a new set of cache_attrs */
-            $_cache_attrs[] = array();
-            return $_cache_attrs[count($_cache_attrs)-1];
-
-        }
-
-    }
-
-
-    /**
-     * wrapper for include() retaining $this
-     * @return mixed
-     */
-    function _include($filename, $once=false, $params=null)
-    {
-        if ($once) {
-            return include_once($filename);
-        } else {
-            return include($filename);
-        }
-    }
-
-
-    /**
-     * wrapper for eval() retaining $this
-     * @return mixed
-     */
-    function _eval($code, $params=null)
-    {
-        return eval($code);
-    }
-    /**#@-*/
-    
-    public function encryptCrc32($string)
-    {
-        if (!class_exists('G')) {
-            $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
-            $docuroot = explode( '/', $realdocuroot );
-            array_pop( $docuroot );
-            $pathhome = implode( '/', $docuroot ) . '/';
-            array_pop( $docuroot );
-            $pathTrunk = implode( '/', $docuroot ) . '/';
-            require_once($pathTrunk.'gulliver/system/class.g.php');
-        }
-        return G::encryptCrc32($string);
-    }
-
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/Smarty_Compiler.class.php b/thirdparty/smarty/libs/Smarty_Compiler.class.php
deleted file mode 100644
index 0b7431587..000000000
--- a/thirdparty/smarty/libs/Smarty_Compiler.class.php
+++ /dev/null
@@ -1,2341 +0,0 @@
-<?php
-
-/**
- * Project:     Smarty: the PHP compiling template engine
- * File:        Smarty_Compiler.class.php
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @link http://smarty.php.net/
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author Andrei Zmievski <andrei@php.net>
- * @version 2.6.18
- * @copyright 2001-2005 New Digital Group, Inc.
- * @package Smarty
- */
-
-/* $Id: Smarty_Compiler.class.php,v 1.395 2007/03/06 10:40:06 messju Exp $ */
-
-/**
- * Template compiling class
- * @package Smarty
- */
-class Smarty_Compiler extends Smarty {
-
-    // internal vars
-    /**#@+
-     * @access private
-     */
-    var $_folded_blocks         =   array();    // keeps folded template blocks
-    var $_current_file          =   null;       // the current template being compiled
-    var $_current_line_no       =   1;          // line number for error messages
-    var $_capture_stack         =   array();    // keeps track of nested capture buffers
-    var $_plugin_info           =   array();    // keeps track of plugins to load
-    var $_init_smarty_vars      =   false;
-    var $_permitted_tokens      =   array('true','false','yes','no','on','off','null');
-    var $_db_qstr_regexp        =   null;        // regexps are setup in the constructor
-    var $_si_qstr_regexp        =   null;
-    var $_qstr_regexp           =   null;
-    var $_func_regexp           =   null;
-    var $_reg_obj_regexp        =   null;
-    var $_var_bracket_regexp    =   null;
-    var $_num_const_regexp      =   null;
-    var $_dvar_guts_regexp      =   null;
-    var $_dvar_regexp           =   null;
-    var $_cvar_regexp           =   null;
-    var $_svar_regexp           =   null;
-    var $_avar_regexp           =   null;
-    var $_mod_regexp            =   null;
-    var $_var_regexp            =   null;
-    var $_parenth_param_regexp  =   null;
-    var $_func_call_regexp      =   null;
-    var $_obj_ext_regexp        =   null;
-    var $_obj_start_regexp      =   null;
-    var $_obj_params_regexp     =   null;
-    var $_obj_call_regexp       =   null;
-    var $_cacheable_state       =   0;
-    var $_cache_attrs_count     =   0;
-    var $_nocache_count         =   0;
-    var $_cache_serial          =   null;
-    var $_cache_include         =   null;
-
-    var $_strip_depth           =   0;
-    var $_additional_newline    =   "\n";
-
-    /**#@-*/
-    /**
-     * The class constructor.
-     */
-    function Smarty_Compiler()
-    {
-        // matches double quoted strings:
-        // "foobar"
-        // "foo\"bar"
-        $this->_db_qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"';
-
-        // matches single quoted strings:
-        // 'foobar'
-        // 'foo\'bar'
-        $this->_si_qstr_regexp = '\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'';
-
-        // matches single or double quoted strings
-        $this->_qstr_regexp = '(?:' . $this->_db_qstr_regexp . '|' . $this->_si_qstr_regexp . ')';
-
-        // matches bracket portion of vars
-        // [0]
-        // [foo]
-        // [$bar]
-        $this->_var_bracket_regexp = '\[\$?[\w\.]+\]';
-
-        // matches numerical constants
-        // 30
-        // -12
-        // 13.22
-        $this->_num_const_regexp = '(?:\-?\d+(?:\.\d+)?)';
-
-        // matches $ vars (not objects):
-        // $foo
-        // $foo.bar
-        // $foo.bar.foobar
-        // $foo[0]
-        // $foo[$bar]
-        // $foo[5][blah]
-        // $foo[5].bar[$foobar][4]
-        $this->_dvar_math_regexp = '(?:[\+\*\/\%]|(?:-(?!>)))';
-        $this->_dvar_math_var_regexp = '[\$\w\.\+\-\*\/\%\d\>\[\]]';
-        $this->_dvar_guts_regexp = '\w+(?:' . $this->_var_bracket_regexp
-                . ')*(?:\.\$?\w+(?:' . $this->_var_bracket_regexp . ')*)*(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?';
-        $this->_dvar_regexp = '\$' . $this->_dvar_guts_regexp;
-
-        // matches config vars:
-        // #foo#
-        // #foobar123_foo#
-        $this->_cvar_regexp = '\#\w+\#';
-
-        // matches section vars:
-        // %foo.bar%
-        $this->_svar_regexp = '\%\w+\.\w+\%';
-
-        // matches all valid variables (no quotes, no modifiers)
-        $this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|'
-           . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
-
-        // matches valid variable syntax:
-        // $foo
-        // $foo
-        // #foo#
-        // #foo#
-        // "text"
-        // "text"
-        $this->_var_regexp = '(?:' . $this->_avar_regexp . '|' . $this->_qstr_regexp . ')';
-
-        // matches valid object call (one level of object nesting allowed in parameters):
-        // $foo->bar
-        // $foo->bar()
-        // $foo->bar("text")
-        // $foo->bar($foo, $bar, "text")
-        // $foo->bar($foo, "foo")
-        // $foo->bar->foo()
-        // $foo->bar->foo->bar()
-        // $foo->bar($foo->bar)
-        // $foo->bar($foo->bar())
-        // $foo->bar($foo->bar($blah,$foo,44,"foo",$foo[0].bar))
-        $this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')';
-        $this->_obj_restricted_param_regexp = '(?:'
-                . '(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')(?:' . $this->_obj_ext_regexp . '(?:\((?:(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')'
-                . '(?:\s*,\s*(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . '))*)?\))?)*)';
-        $this->_obj_single_param_regexp = '(?:\w+|' . $this->_obj_restricted_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
-                . $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)';
-        $this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp
-                . '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
-        $this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
-        $this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
-        
-        // matches valid modifier syntax:
-        // |foo
-        // |@foo
-        // |foo:"bar"
-        // |foo:$bar
-        // |foo:"bar":$foobar
-        // |foo|bar
-        // |foo:$foo->bar
-        $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|' . $this->_num_const_regexp . '|'
-           . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
-
-        // matches valid function name:
-        // foo123
-        // _foo_bar
-        $this->_func_regexp = '[a-zA-Z_]\w*';
-
-        // matches valid registered object:
-        // foo->bar
-        $this->_reg_obj_regexp = '[a-zA-Z_]\w*->[a-zA-Z_]\w*';
-
-        // matches valid parameter values:
-        // true
-        // $foo
-        // $foo|bar
-        // #foo#
-        // #foo#|bar
-        // "text"
-        // "text"|bar
-        // $foo->bar
-        $this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|'
-           . $this->_var_regexp . '|' . $this->_num_const_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
-
-        // matches valid parenthesised function parameters:
-        //
-        // "text"
-        //    $foo, $bar, "text"
-        // $foo|bar, "foo"|bar, $foo->bar($foo)|bar
-        $this->_parenth_param_regexp = '(?:\((?:\w+|'
-                . $this->_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
-                . $this->_param_regexp . ')))*)?\))';
-
-        // matches valid function call:
-        // foo()
-        // foo_bar($foo)
-        // _foo_bar($foo,"bar")
-        // foo123($foo,$foo->bar(),"foo")
-        $this->_func_call_regexp = '(?:' . $this->_func_regexp . '\s*(?:'
-           . $this->_parenth_param_regexp . '))';
-    }
-
-    /**
-     * compile a resource
-     *
-     * sets $compiled_content to the compiled source
-     * @param string $resource_name
-     * @param string $source_content
-     * @param string $compiled_content
-     * @return true
-     */
-    function _compile_file($resource_name, $source_content, &$compiled_content)
-    {
-
-        if ($this->security) {
-            // do not allow php syntax to be executed unless specified
-            if ($this->php_handling == SMARTY_PHP_ALLOW &&
-                !$this->security_settings['PHP_HANDLING']) {
-                $this->php_handling = SMARTY_PHP_PASSTHRU;
-            }
-        }
-
-        $this->_load_filters();
-
-        $this->_current_file = $resource_name;
-        $this->_current_line_no = 1;
-        $ldq = preg_quote($this->left_delimiter, '~');
-        $rdq = preg_quote($this->right_delimiter, '~');
-
-        // run template source through prefilter functions
-        if (count($this->_plugins['prefilter']) > 0) {
-            foreach ($this->_plugins['prefilter'] as $filter_name => $prefilter) {
-                if ($prefilter === false) continue;
-                if ($prefilter[3] || is_callable($prefilter[0])) {
-                    $source_content = call_user_func_array($prefilter[0],
-                                                            array($source_content, &$this));
-                    $this->_plugins['prefilter'][$filter_name][3] = true;
-                } else {
-                    $this->_trigger_fatal_error("[plugin] prefilter '$filter_name' is not implemented");
-                }
-            }
-        }
-
-        /* fetch all special blocks */
-        $search = "~{$ldq}\*(.*?)\*{$rdq}|{$ldq}\s*literal\s*{$rdq}(.*?){$ldq}\s*/literal\s*{$rdq}|{$ldq}\s*php\s*{$rdq}(.*?){$ldq}\s*/php\s*{$rdq}~s";
-
-        preg_match_all($search, $source_content, $match,  PREG_SET_ORDER);
-        $this->_folded_blocks = $match;
-        reset($this->_folded_blocks);
-
-        /* replace special blocks by "{php}" */
-        $source_content = preg_replace($search.'e', "'"
-                                       . $this->_quote_replace($this->left_delimiter) . 'php'
-                                       . "' . str_repeat(\"\n\", substr_count('\\0', \"\n\")) .'"
-                                       . $this->_quote_replace($this->right_delimiter)
-                                       . "'"
-                                       , $source_content);
-
-        /* Gather all template tags. */
-        preg_match_all("~{$ldq}\s*(.*?)\s*{$rdq}~s", $source_content, $_match);
-        $template_tags = $_match[1];
-        /* Split content by template tags to obtain non-template content. */
-        $text_blocks = preg_split("~{$ldq}.*?{$rdq}~s", $source_content);
-
-        /* loop through text blocks */
-        for ($curr_tb = 0, $for_max = count($text_blocks); $curr_tb < $for_max; $curr_tb++) {
-            /* match anything resembling php tags */
-            if (preg_match_all('~(<\?(?:\w+|=)?|\?>|language\s*=\s*[\"\']?\s*php\s*[\"\']?)~is', $text_blocks[$curr_tb], $sp_match)) {
-                /* replace tags with placeholders to prevent recursive replacements */
-                $sp_match[1] = array_unique($sp_match[1]);
-                usort($sp_match[1], '_smarty_sort_length');
-                for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; $curr_sp++) {
-                    $text_blocks[$curr_tb] = str_replace($sp_match[1][$curr_sp],'%%%SMARTYSP'.$curr_sp.'%%%',$text_blocks[$curr_tb]);
-                }
-                /* process each one */
-                for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; $curr_sp++) {
-                    if ($this->php_handling == SMARTY_PHP_PASSTHRU) {
-                        /* echo php contents */
-                        $text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', '<?php echo \''.str_replace("'", "\'", $sp_match[1][$curr_sp]).'\'; ?>'."\n", $text_blocks[$curr_tb]);
-                    } else if ($this->php_handling == SMARTY_PHP_QUOTE) {
-                        /* quote php tags */
-                        $text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', htmlspecialchars($sp_match[1][$curr_sp]), $text_blocks[$curr_tb]);
-                    } else if ($this->php_handling == SMARTY_PHP_REMOVE) {
-                        /* remove php tags */
-                        $text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', '', $text_blocks[$curr_tb]);
-                    } else {
-                        /* SMARTY_PHP_ALLOW, but echo non php starting tags */
-                        $sp_match[1][$curr_sp] = preg_replace('~(<\?(?!php|=|$))~i', '<?php echo \'\\1\'?>'."\n", $sp_match[1][$curr_sp]);
-                        $text_blocks[$curr_tb] = str_replace('%%%SMARTYSP'.$curr_sp.'%%%', $sp_match[1][$curr_sp], $text_blocks[$curr_tb]);
-                    }
-                }
-            }
-        }
-        
-        /* Compile the template tags into PHP code. */
-        $compiled_tags = array();
-        for ($i = 0, $for_max = count($template_tags); $i < $for_max; $i++) {
-            $this->_current_line_no += substr_count($text_blocks[$i], "\n");
-            $compiled_tags[] = $this->_compile_tag($template_tags[$i]);
-            $this->_current_line_no += substr_count($template_tags[$i], "\n");
-        }
-        if (count($this->_tag_stack)>0) {
-            list($_open_tag, $_line_no) = end($this->_tag_stack);
-            $this->_syntax_error("unclosed tag \{$_open_tag} (opened line $_line_no).", E_USER_ERROR, __FILE__, __LINE__);
-            return;
-        }
-
-        /* Reformat $text_blocks between 'strip' and '/strip' tags,
-           removing spaces, tabs and newlines. */
-        $strip = false;
-        for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) {
-            if ($compiled_tags[$i] == '{strip}') {
-                $compiled_tags[$i] = '';
-                $strip = true;
-                /* remove leading whitespaces */
-                $text_blocks[$i + 1] = ltrim($text_blocks[$i + 1]);
-            }
-            if ($strip) {
-                /* strip all $text_blocks before the next '/strip' */
-                for ($j = $i + 1; $j < $for_max; $j++) {
-                    /* remove leading and trailing whitespaces of each line */
-                    $text_blocks[$j] = preg_replace('![\t ]*[\r\n]+[\t ]*!', '', $text_blocks[$j]);
-                    if ($compiled_tags[$j] == '{/strip}') {                       
-                        /* remove trailing whitespaces from the last text_block */
-                        $text_blocks[$j] = rtrim($text_blocks[$j]);
-                    }
-                    $text_blocks[$j] = "<?php echo '" . strtr($text_blocks[$j], array("'"=>"\'", "\\"=>"\\\\")) . "'; ?>";
-                    if ($compiled_tags[$j] == '{/strip}') {
-                        $compiled_tags[$j] = "\n"; /* slurped by php, but necessary
-                                    if a newline is following the closing strip-tag */
-                        $strip = false;
-                        $i = $j;
-                        break;
-                    }
-                }
-            }
-        }
-        $compiled_content = '';
-        
-        $tag_guard = '%%%SMARTYOTG' . $this->encryptOld(uniqid(rand(), true)) . '%%%';
-        
-        /* Interleave the compiled contents and text blocks to get the final result. */
-        for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) {
-            if ($compiled_tags[$i] == '') {
-                // tag result empty, remove first newline from following text block
-                $text_blocks[$i+1] = preg_replace('~^(\r\n|\r|\n)~', '', $text_blocks[$i+1]);
-            }
-            // replace legit PHP tags with placeholder
-            $text_blocks[$i] = str_replace('<?', $tag_guard, $text_blocks[$i]);
-            $compiled_tags[$i] = str_replace('<?', $tag_guard, $compiled_tags[$i]);
-            
-            $compiled_content .= $text_blocks[$i] . $compiled_tags[$i];
-        }
-        $compiled_content .= str_replace('<?', $tag_guard, $text_blocks[$i]);
-
-        // escape php tags created by interleaving
-        $compiled_content = str_replace('<?', "<?php echo '<?' ?>\n", $compiled_content);
-        $compiled_content = preg_replace("~(?<!')language\s*=\s*[\"\']?\s*php\s*[\"\']?~", "<?php echo 'language=php' ?>\n", $compiled_content);
-
-        // recover legit tags
-        $compiled_content = str_replace($tag_guard, '<?', $compiled_content); 
-        
-        // remove \n from the end of the file, if any
-        if (strlen($compiled_content) && (substr($compiled_content, -1) == "\n") ) {
-            $compiled_content = substr($compiled_content, 0, -1);
-        }
-
-        if (!empty($this->_cache_serial)) {
-            $compiled_content = "<?php \$this->_cache_serials['".$this->_cache_include."'] = '".$this->_cache_serial."'; ?>" . $compiled_content;
-        }
-
-        // run compiled template through postfilter functions
-        if (count($this->_plugins['postfilter']) > 0) {
-            foreach ($this->_plugins['postfilter'] as $filter_name => $postfilter) {
-                if ($postfilter === false) continue;
-                if ($postfilter[3] || is_callable($postfilter[0])) {
-                    $compiled_content = call_user_func_array($postfilter[0],
-                                                              array($compiled_content, &$this));
-                    $this->_plugins['postfilter'][$filter_name][3] = true;
-                } else {
-                    $this->_trigger_fatal_error("Smarty plugin error: postfilter '$filter_name' is not implemented");
-                }
-            }
-        }
-
-        // put header at the top of the compiled template
-        $template_header = "<?php /* Smarty version ".$this->_version.", created on ".strftime("%Y-%m-%d %H:%M:%S")."\n";
-        $template_header .= "         compiled from ".strtr(urlencode($resource_name), array('%2F'=>'/', '%3A'=>':'))." */ ?>\n";
-
-        /* Emit code to load needed plugins. */
-        $this->_plugins_code = '';
-        if (count($this->_plugin_info)) {
-            $_plugins_params = "array('plugins' => array(";
-            foreach ($this->_plugin_info as $plugin_type => $plugins) {
-                foreach ($plugins as $plugin_name => $plugin_info) {
-                    $_plugins_params .= "array('$plugin_type', '$plugin_name', '" . strtr($plugin_info[0], array("'" => "\\'", "\\" => "\\\\")) . "', $plugin_info[1], ";
-                    $_plugins_params .= $plugin_info[2] ? 'true),' : 'false),';
-                }
-            }
-            $_plugins_params .= '))';
-            $plugins_code = "<?php require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');\nsmarty_core_load_plugins($_plugins_params, \$this); ?>\n";
-            $template_header .= $plugins_code;
-            $this->_plugin_info = array();
-            $this->_plugins_code = $plugins_code;
-        }
-
-        if ($this->_init_smarty_vars) {
-            $template_header .= "<?php require_once(SMARTY_CORE_DIR . 'core.assign_smarty_interface.php');\nsmarty_core_assign_smarty_interface(null, \$this); ?>\n";
-            $this->_init_smarty_vars = false;
-        }
-
-        $compiled_content = $template_header . $compiled_content;
-        return true;
-    }
-
-    /**
-     * Compile a template tag
-     *
-     * @param string $template_tag
-     * @return string
-     */
-    function _compile_tag($template_tag)
-    {
-        /* Matched comment. */
-        if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*')
-            return '';
-        
-        /* Split tag into two three parts: command, command modifiers and the arguments. */
-        if(! preg_match('~^(?:(' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp
-                . '|\/?' . $this->_reg_obj_regexp . '|\/?' . $this->_func_regexp . ')(' . $this->_mod_regexp . '*))
-                      (?:\s+(.*))?$
-                    ~xs', $template_tag, $match)) {
-            $this->_syntax_error("unrecognized tag: $template_tag", E_USER_ERROR, __FILE__, __LINE__);
-        }
-        
-        $tag_command = $match[1];
-        $tag_modifier = isset($match[2]) ? $match[2] : null;
-        $tag_args = isset($match[3]) ? $match[3] : null;
-
-        if (preg_match('~^' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '$~', $tag_command)) {
-            /* tag name is a variable or object */
-            $_return = $this->_parse_var_props($tag_command . $tag_modifier);
-            return "<?php echo $_return; ?>" . $this->_additional_newline;
-        }
-
-        /* If the tag name is a registered object, we process it. */
-        if (preg_match('~^\/?' . $this->_reg_obj_regexp . '$~', $tag_command)) {
-            return $this->_compile_registered_object_tag($tag_command, $this->_parse_attrs($tag_args), $tag_modifier);
-        }
-
-        switch ($tag_command) {
-            case 'include':
-                return $this->_compile_include_tag($tag_args);
-
-            case 'include_php':
-                return $this->_compile_include_php_tag($tag_args);
-
-            case 'if':
-                $this->_push_tag('if');
-                return $this->_compile_if_tag($tag_args);
-
-            case 'else':
-                list($_open_tag) = end($this->_tag_stack);
-                if ($_open_tag != 'if' && $_open_tag != 'elseif')
-                    $this->_syntax_error('unexpected {else}', E_USER_ERROR, __FILE__, __LINE__);
-                else
-                    $this->_push_tag('else');
-                return '<?php else: ?>';
-
-            case 'elseif':
-                list($_open_tag) = end($this->_tag_stack);
-                if ($_open_tag != 'if' && $_open_tag != 'elseif')
-                    $this->_syntax_error('unexpected {elseif}', E_USER_ERROR, __FILE__, __LINE__);
-                if ($_open_tag == 'if')
-                    $this->_push_tag('elseif');
-                return $this->_compile_if_tag($tag_args, true);
-
-            case '/if':
-                $this->_pop_tag('if');
-                return '<?php endif; ?>';
-
-            case 'capture':
-                return $this->_compile_capture_tag(true, $tag_args);
-
-            case '/capture':
-                return $this->_compile_capture_tag(false);
-
-            case 'ldelim':
-                return $this->left_delimiter;
-
-            case 'rdelim':
-                return $this->right_delimiter;
-
-            case 'section':
-                $this->_push_tag('section');
-                return $this->_compile_section_start($tag_args);
-
-            case 'sectionelse':
-                $this->_push_tag('sectionelse');
-                return "<?php endfor; else: ?>";
-                break;
-
-            case '/section':
-                $_open_tag = $this->_pop_tag('section');
-                if ($_open_tag == 'sectionelse')
-                    return "<?php endif; ?>";
-                else
-                    return "<?php endfor; endif; ?>";
-
-            case 'foreach':
-                $this->_push_tag('foreach');
-                return $this->_compile_foreach_start($tag_args);
-                break;
-
-            case 'foreachelse':
-                $this->_push_tag('foreachelse');
-                return "<?php endforeach; else: ?>";
-
-            case '/foreach':
-                $_open_tag = $this->_pop_tag('foreach');
-                if ($_open_tag == 'foreachelse')
-                    return "<?php endif; unset(\$_from); ?>";
-                else
-                    return "<?php endforeach; endif; unset(\$_from); ?>";
-                break;
-
-            case 'strip':
-            case '/strip':
-                if (substr($tag_command, 0, 1)=='/') {
-                    $this->_pop_tag('strip');
-                    if (--$this->_strip_depth==0) { /* outermost closing {/strip} */
-                        $this->_additional_newline = "\n";
-                        return '{' . $tag_command . '}';
-                    }
-                } else {
-                    $this->_push_tag('strip');
-                    if ($this->_strip_depth++==0) { /* outermost opening {strip} */
-                        $this->_additional_newline = "";
-                        return '{' . $tag_command . '}';
-                    }
-                }
-                return '';
-
-            case 'php':
-                /* handle folded tags replaced by {php} */
-                list(, $block) = each($this->_folded_blocks);
-                $this->_current_line_no += substr_count($block[0], "\n");
-                /* the number of matched elements in the regexp in _compile_file()
-                   determins the type of folded tag that was found */
-                switch (count($block)) {
-                    case 2: /* comment */
-                        return '';
-
-                    case 3: /* literal */
-                        return "<?php echo '" . strtr($block[2], array("'"=>"\'", "\\"=>"\\\\")) . "'; ?>" . $this->_additional_newline;
-
-                    case 4: /* php */
-                        if ($this->security && !$this->security_settings['PHP_TAGS']) {
-                            $this->_syntax_error("(secure mode) php tags not permitted", E_USER_WARNING, __FILE__, __LINE__);
-                            return;
-                        }
-                        return '<?php ' . $block[3] .' ?>';
-                }
-                break;
-
-            case 'insert':
-                return $this->_compile_insert_tag($tag_args);
-
-            default:
-                if ($this->_compile_compiler_tag($tag_command, $tag_args, $output)) {
-                    return $output;
-                } else if ($this->_compile_block_tag($tag_command, $tag_args, $tag_modifier, $output)) {
-                    return $output;
-                } else if ($this->_compile_custom_tag($tag_command, $tag_args, $tag_modifier, $output)) {
-                    return $output;                    
-                } else {
-                    $this->_syntax_error("unrecognized tag '$tag_command'", E_USER_ERROR, __FILE__, __LINE__);
-                }
-
-        }
-    }
-
-
-    /**
-     * compile the custom compiler tag
-     *
-     * sets $output to the compiled custom compiler tag
-     * @param string $tag_command
-     * @param string $tag_args
-     * @param string $output
-     * @return boolean
-     */
-    function _compile_compiler_tag($tag_command, $tag_args, &$output)
-    {
-        $found = false;
-        $have_function = true;
-
-        /*
-         * First we check if the compiler function has already been registered
-         * or loaded from a plugin file.
-         */
-        if (isset($this->_plugins['compiler'][$tag_command])) {
-            $found = true;
-            $plugin_func = $this->_plugins['compiler'][$tag_command][0];
-            if (!is_callable($plugin_func)) {
-                $message = "compiler function '$tag_command' is not implemented";
-                $have_function = false;
-            }
-        }
-        /*
-         * Otherwise we need to load plugin file and look for the function
-         * inside it.
-         */
-        else if ($plugin_file = $this->_get_plugin_filepath('compiler', $tag_command)) {
-            $found = true;
-
-            include_once $plugin_file;
-
-            $plugin_func = 'smarty_compiler_' . $tag_command;
-            if (!is_callable($plugin_func)) {
-                $message = "plugin function $plugin_func() not found in $plugin_file\n";
-                $have_function = false;
-            } else {
-                $this->_plugins['compiler'][$tag_command] = array($plugin_func, null, null, null, true);
-            }
-        }
-
-        /*
-         * True return value means that we either found a plugin or a
-         * dynamically registered function. False means that we didn't and the
-         * compiler should now emit code to load custom function plugin for this
-         * tag.
-         */
-        if ($found) {
-            if ($have_function) {
-                $output = call_user_func_array($plugin_func, array($tag_args, &$this));
-                if($output != '') {
-                $output = '<?php ' . $this->_push_cacheable_state('compiler', $tag_command)
-                                   . $output
-                                   . $this->_pop_cacheable_state('compiler', $tag_command) . ' ?>';
-                }
-            } else {
-                $this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
-            }
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-
-    /**
-     * compile block function tag
-     *
-     * sets $output to compiled block function tag
-     * @param string $tag_command
-     * @param string $tag_args
-     * @param string $tag_modifier
-     * @param string $output
-     * @return boolean
-     */
-    function _compile_block_tag($tag_command, $tag_args, $tag_modifier, &$output)
-    {
-        if (substr($tag_command, 0, 1) == '/') {
-            $start_tag = false;
-            $tag_command = substr($tag_command, 1);
-        } else
-            $start_tag = true;
-
-        $found = false;
-        $have_function = true;
-
-        /*
-         * First we check if the block function has already been registered
-         * or loaded from a plugin file.
-         */
-        if (isset($this->_plugins['block'][$tag_command])) {
-            $found = true;
-            $plugin_func = $this->_plugins['block'][$tag_command][0];
-            if (!is_callable($plugin_func)) {
-                $message = "block function '$tag_command' is not implemented";
-                $have_function = false;
-            }
-        }
-        /*
-         * Otherwise we need to load plugin file and look for the function
-         * inside it.
-         */
-        else if ($plugin_file = $this->_get_plugin_filepath('block', $tag_command)) {
-            $found = true;
-
-            include_once $plugin_file;
-
-            $plugin_func = 'smarty_block_' . $tag_command;
-            if (!function_exists($plugin_func)) {
-                $message = "plugin function $plugin_func() not found in $plugin_file\n";
-                $have_function = false;
-            } else {
-                $this->_plugins['block'][$tag_command] = array($plugin_func, null, null, null, true);
-
-            }
-        }
-
-        if (!$found) {
-            return false;
-        } else if (!$have_function) {
-            $this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
-            return true;
-        }
-
-        /*
-         * Even though we've located the plugin function, compilation
-         * happens only once, so the plugin will still need to be loaded
-         * at runtime for future requests.
-         */
-        $this->_add_plugin('block', $tag_command);
-
-        if ($start_tag)
-            $this->_push_tag($tag_command);
-        else
-            $this->_pop_tag($tag_command);
-
-        if ($start_tag) {
-            $output = '<?php ' . $this->_push_cacheable_state('block', $tag_command);
-            $attrs = $this->_parse_attrs($tag_args);
-            $_cache_attrs='';
-            $arg_list = $this->_compile_arg_list('block', $tag_command, $attrs, $_cache_attrs);
-            $output .= "$_cache_attrs\$this->_tag_stack[] = array('$tag_command', array(".implode(',', $arg_list).')); ';
-            $output .= '$_block_repeat=true;' . $this->_compile_plugin_call('block', $tag_command).'($this->_tag_stack[count($this->_tag_stack)-1][1], null, $this, $_block_repeat);';
-            $output .= 'while ($_block_repeat) { ob_start(); ?>';
-        } else {
-            $output = '<?php $_block_content = ob_get_contents(); ob_end_clean(); ';
-            $_out_tag_text = $this->_compile_plugin_call('block', $tag_command).'($this->_tag_stack[count($this->_tag_stack)-1][1], $_block_content, $this, $_block_repeat)';
-            if ($tag_modifier != '') {
-                $this->_parse_modifiers($_out_tag_text, $tag_modifier);
-            }
-            $output .= '$_block_repeat=false;echo ' . $_out_tag_text . '; } ';
-            $output .= " array_pop(\$this->_tag_stack); " . $this->_pop_cacheable_state('block', $tag_command) . '?>';
-        }
-
-        return true;
-    }
-
-
-    /**
-     * compile custom function tag
-     *
-     * @param string $tag_command
-     * @param string $tag_args
-     * @param string $tag_modifier
-     * @return string
-     */
-    function _compile_custom_tag($tag_command, $tag_args, $tag_modifier, &$output)
-    {
-        $found = false;
-        $have_function = true;
-
-        /*
-         * First we check if the custom function has already been registered
-         * or loaded from a plugin file.
-         */
-        if (isset($this->_plugins['function'][$tag_command])) {
-            $found = true;
-            $plugin_func = $this->_plugins['function'][$tag_command][0];
-            if (!is_callable($plugin_func)) {
-                $message = "custom function '$tag_command' is not implemented";
-                $have_function = false;
-            }
-        }
-        /*
-         * Otherwise we need to load plugin file and look for the function
-         * inside it.
-         */
-        else if ($plugin_file = $this->_get_plugin_filepath('function', $tag_command)) {
-            $found = true;
-
-            include_once $plugin_file;
-
-            $plugin_func = 'smarty_function_' . $tag_command;
-            if (!function_exists($plugin_func)) {
-                $message = "plugin function $plugin_func() not found in $plugin_file\n";
-                $have_function = false;
-            } else {
-                $this->_plugins['function'][$tag_command] = array($plugin_func, null, null, null, true);
-
-            }
-        }
-
-        if (!$found) {
-            return false;
-        } else if (!$have_function) {
-            $this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
-            return true;
-        }
-
-        /* declare plugin to be loaded on display of the template that
-           we compile right now */
-        $this->_add_plugin('function', $tag_command);
-
-        $_cacheable_state = $this->_push_cacheable_state('function', $tag_command);
-        $attrs = $this->_parse_attrs($tag_args);
-        $_cache_attrs = '';
-        $arg_list = $this->_compile_arg_list('function', $tag_command, $attrs, $_cache_attrs);
-
-        $output = $this->_compile_plugin_call('function', $tag_command).'(array('.implode(',', $arg_list)."), \$this)";
-        if($tag_modifier != '') {
-            $this->_parse_modifiers($output, $tag_modifier);
-        }
-
-        if($output != '') {
-            $output =  '<?php ' . $_cacheable_state . $_cache_attrs . 'echo ' . $output . ';'
-                . $this->_pop_cacheable_state('function', $tag_command) . "?>" . $this->_additional_newline;
-        }
-
-        return true;
-    }
-
-    /**
-     * compile a registered object tag
-     *
-     * @param string $tag_command
-     * @param array $attrs
-     * @param string $tag_modifier
-     * @return string
-     */
-    function _compile_registered_object_tag($tag_command, $attrs, $tag_modifier)
-    {
-        if (substr($tag_command, 0, 1) == '/') {
-            $start_tag = false;
-            $tag_command = substr($tag_command, 1);
-        } else {
-            $start_tag = true;
-        }
-
-        list($object, $obj_comp) = explode('->', $tag_command);
-
-        $arg_list = array();
-        if(count($attrs)) {
-            $_assign_var = false;
-            foreach ($attrs as $arg_name => $arg_value) {
-                if($arg_name == 'assign') {
-                    $_assign_var = $arg_value;
-                    unset($attrs['assign']);
-                    continue;
-                }
-                if (is_bool($arg_value))
-                    $arg_value = $arg_value ? 'true' : 'false';
-                $arg_list[] = "'$arg_name' => $arg_value";
-            }
-        }
-
-        if($this->_reg_objects[$object][2]) {
-            // smarty object argument format
-            $args = "array(".implode(',', (array)$arg_list)."), \$this";
-        } else {
-            // traditional argument format
-            $args = implode(',', array_values($attrs));
-            if (empty($args)) {
-                $args = 'null';
-            }
-        }
-
-        $prefix = '';
-        $postfix = '';
-        $newline = '';
-        if(!is_object($this->_reg_objects[$object][0])) {
-            $this->_trigger_fatal_error("registered '$object' is not an object" , $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
-        } elseif(!empty($this->_reg_objects[$object][1]) && !in_array($obj_comp, $this->_reg_objects[$object][1])) {
-            $this->_trigger_fatal_error("'$obj_comp' is not a registered component of object '$object'", $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
-        } elseif(method_exists($this->_reg_objects[$object][0], $obj_comp)) {
-            // method
-            if(in_array($obj_comp, $this->_reg_objects[$object][3])) {
-                // block method
-                if ($start_tag) {
-                    $prefix = "\$this->_tag_stack[] = array('$obj_comp', $args); ";
-                    $prefix .= "\$_block_repeat=true; \$this->_reg_objects['$object'][0]->$obj_comp(\$this->_tag_stack[count(\$this->_tag_stack)-1][1], null, \$this, \$_block_repeat); ";
-                    $prefix .= "while (\$_block_repeat) { ob_start();";
-                    $return = null;
-                    $postfix = '';
-                } else {
-                    $prefix = "\$_obj_block_content = ob_get_contents(); ob_end_clean(); \$_block_repeat=false;";
-                    $return = "\$this->_reg_objects['$object'][0]->$obj_comp(\$this->_tag_stack[count(\$this->_tag_stack)-1][1], \$_obj_block_content, \$this, \$_block_repeat)";
-                    $postfix = "} array_pop(\$this->_tag_stack);";
-                }
-            } else {
-                // non-block method
-                $return = "\$this->_reg_objects['$object'][0]->$obj_comp($args)";
-            }
-        } else {
-            // property
-            $return = "\$this->_reg_objects['$object'][0]->$obj_comp";
-        }
-
-        if($return != null) {
-            if($tag_modifier != '') {
-                $this->_parse_modifiers($return, $tag_modifier);
-            }
-
-            if(!empty($_assign_var)) {
-                $output = "\$this->assign('" . $this->_dequote($_assign_var) ."',  $return);";
-            } else {
-                $output = 'echo ' . $return . ';';
-                $newline = $this->_additional_newline;
-            }
-        } else {
-            $output = '';
-        }
-
-        return '<?php ' . $prefix . $output . $postfix . "?>" . $newline;
-    }
-
-    /**
-     * Compile {insert ...} tag
-     *
-     * @param string $tag_args
-     * @return string
-     */
-    function _compile_insert_tag($tag_args)
-    {
-        $attrs = $this->_parse_attrs($tag_args);
-        $name = $this->_dequote($attrs['name']);
-
-        if (empty($name)) {
-            return $this->_syntax_error("missing insert name", E_USER_ERROR, __FILE__, __LINE__);
-        }
-        
-        if (!preg_match('~^\w+$~', $name)) {
-            return $this->_syntax_error("'insert: 'name' must be an insert function name", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        if (!empty($attrs['script'])) {
-            $delayed_loading = true;
-        } else {
-            $delayed_loading = false;
-        }
-
-        foreach ($attrs as $arg_name => $arg_value) {
-            if (is_bool($arg_value))
-                $arg_value = $arg_value ? 'true' : 'false';
-            $arg_list[] = "'$arg_name' => $arg_value";
-        }
-
-        $this->_add_plugin('insert', $name, $delayed_loading);
-
-        $_params = "array('args' => array(".implode(', ', (array)$arg_list)."))";
-
-        return "<?php require_once(SMARTY_CORE_DIR . 'core.run_insert_handler.php');\necho smarty_core_run_insert_handler($_params, \$this); ?>" . $this->_additional_newline;
-    }
-
-    /**
-     * Compile {include ...} tag
-     *
-     * @param string $tag_args
-     * @return string
-     */
-    function _compile_include_tag($tag_args)
-    {
-        $attrs = $this->_parse_attrs($tag_args);
-        $arg_list = array();
-
-        if (empty($attrs['file'])) {
-            $this->_syntax_error("missing 'file' attribute in include tag", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        foreach ($attrs as $arg_name => $arg_value) {
-            if ($arg_name == 'file') {
-                $include_file = $arg_value;
-                continue;
-            } else if ($arg_name == 'assign') {
-                $assign_var = $arg_value;
-                continue;
-            }
-            if (is_bool($arg_value))
-                $arg_value = $arg_value ? 'true' : 'false';
-            $arg_list[] = "'$arg_name' => $arg_value";
-        }
-
-        $output = '<?php ';
-
-        if (isset($assign_var)) {
-            $output .= "ob_start();\n";
-        }
-
-        $output .=
-            "\$_smarty_tpl_vars = \$this->_tpl_vars;\n";
-
-
-        $_params = "array('smarty_include_tpl_file' => " . $include_file . ", 'smarty_include_vars' => array(".implode(',', (array)$arg_list)."))";
-        $output .= "\$this->_smarty_include($_params);\n" .
-        "\$this->_tpl_vars = \$_smarty_tpl_vars;\n" .
-        "unset(\$_smarty_tpl_vars);\n";
-
-        if (isset($assign_var)) {
-            $output .= "\$this->assign(" . $assign_var . ", ob_get_contents()); ob_end_clean();\n";
-        }
-
-        $output .= ' ?>';
-
-        return $output;
-
-    }
-
-    /**
-     * Compile {include ...} tag
-     *
-     * @param string $tag_args
-     * @return string
-     */
-    function _compile_include_php_tag($tag_args)
-    {
-        $attrs = $this->_parse_attrs($tag_args);
-
-        if (empty($attrs['file'])) {
-            $this->_syntax_error("missing 'file' attribute in include_php tag", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        $assign_var = (empty($attrs['assign'])) ? '' : $this->_dequote($attrs['assign']);
-        $once_var = (empty($attrs['once']) || $attrs['once']=='false') ? 'false' : 'true';
-
-        $arg_list = array();
-        foreach($attrs as $arg_name => $arg_value) {
-            if($arg_name != 'file' AND $arg_name != 'once' AND $arg_name != 'assign') {
-                if(is_bool($arg_value))
-                    $arg_value = $arg_value ? 'true' : 'false';
-                $arg_list[] = "'$arg_name' => $arg_value";
-            }
-        }
-
-        $_params = "array('smarty_file' => " . $attrs['file'] . ", 'smarty_assign' => '$assign_var', 'smarty_once' => $once_var, 'smarty_include_vars' => array(".implode(',', $arg_list)."))";
-
-        return "<?php require_once(SMARTY_CORE_DIR . 'core.smarty_include_php.php');\nsmarty_core_smarty_include_php($_params, \$this); ?>" . $this->_additional_newline;
-    }
-
-
-    /**
-     * Compile {section ...} tag
-     *
-     * @param string $tag_args
-     * @return string
-     */
-    function _compile_section_start($tag_args)
-    {
-        $attrs = $this->_parse_attrs($tag_args);
-        $arg_list = array();
-
-        $output = '<?php ';
-        $section_name = $attrs['name'];
-        if (empty($section_name)) {
-            $this->_syntax_error("missing section name", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        $output .= "unset(\$this->_sections[$section_name]);\n";
-        $section_props = "\$this->_sections[$section_name]";
-
-        foreach ($attrs as $attr_name => $attr_value) {
-            switch ($attr_name) {
-                case 'loop':
-                    $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int)\$_loop); unset(\$_loop);\n";
-                    break;
-
-                case 'show':
-                    if (is_bool($attr_value))
-                        $show_attr_value = $attr_value ? 'true' : 'false';
-                    else
-                        $show_attr_value = "(bool)$attr_value";
-                    $output .= "{$section_props}['show'] = $show_attr_value;\n";
-                    break;
-
-                case 'name':
-                    $output .= "{$section_props}['$attr_name'] = $attr_value;\n";
-                    break;
-
-                case 'max':
-                case 'start':
-                    $output .= "{$section_props}['$attr_name'] = (int)$attr_value;\n";
-                    break;
-
-                case 'step':
-                    $output .= "{$section_props}['$attr_name'] = ((int)$attr_value) == 0 ? 1 : (int)$attr_value;\n";
-                    break;
-
-                default:
-                    $this->_syntax_error("unknown section attribute - '$attr_name'", E_USER_ERROR, __FILE__, __LINE__);
-                    break;
-            }
-        }
-
-        if (!isset($attrs['show']))
-            $output .= "{$section_props}['show'] = true;\n";
-
-        if (!isset($attrs['loop']))
-            $output .= "{$section_props}['loop'] = 1;\n";
-
-        if (!isset($attrs['max']))
-            $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
-        else
-            $output .= "if ({$section_props}['max'] < 0)\n" .
-                       "    {$section_props}['max'] = {$section_props}['loop'];\n";
-
-        if (!isset($attrs['step']))
-            $output .= "{$section_props}['step'] = 1;\n";
-
-        if (!isset($attrs['start']))
-            $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
-        else {
-            $output .= "if ({$section_props}['start'] < 0)\n" .
-                       "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" .
-                       "else\n" .
-                       "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
-        }
-
-        $output .= "if ({$section_props}['show']) {\n";
-        if (!isset($attrs['start']) && !isset($attrs['step']) && !isset($attrs['max'])) {
-            $output .= "    {$section_props}['total'] = {$section_props}['loop'];\n";
-        } else {
-            $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
-        }
-        $output .= "    if ({$section_props}['total'] == 0)\n" .
-                   "        {$section_props}['show'] = false;\n" .
-                   "} else\n" .
-                   "    {$section_props}['total'] = 0;\n";
-
-        $output .= "if ({$section_props}['show']):\n";
-        $output .= "
-            for ({$section_props}['index'] = {$section_props}['start'], {$section_props}['iteration'] = 1;
-                 {$section_props}['iteration'] <= {$section_props}['total'];
-                 {$section_props}['index'] += {$section_props}['step'], {$section_props}['iteration']++):\n";
-        $output .= "{$section_props}['rownum'] = {$section_props}['iteration'];\n";
-        $output .= "{$section_props}['index_prev'] = {$section_props}['index'] - {$section_props}['step'];\n";
-        $output .= "{$section_props}['index_next'] = {$section_props}['index'] + {$section_props}['step'];\n";
-        $output .= "{$section_props}['first']      = ({$section_props}['iteration'] == 1);\n";
-        $output .= "{$section_props}['last']       = ({$section_props}['iteration'] == {$section_props}['total']);\n";
-
-        $output .= "?>";
-
-        return $output;
-    }
-
-
-    /**
-     * Compile {foreach ...} tag.
-     *
-     * @param string $tag_args
-     * @return string
-     */
-    function _compile_foreach_start($tag_args)
-    {
-        $attrs = $this->_parse_attrs($tag_args);
-        $arg_list = array();
-
-        if (empty($attrs['from'])) {
-            return $this->_syntax_error("foreach: missing 'from' attribute", E_USER_ERROR, __FILE__, __LINE__);
-        }
-        $from = $attrs['from'];
-
-        if (empty($attrs['item'])) {
-            return $this->_syntax_error("foreach: missing 'item' attribute", E_USER_ERROR, __FILE__, __LINE__);
-        }
-        $item = $this->_dequote($attrs['item']);
-        if (!preg_match('~^\w+$~', $item)) {
-            return $this->_syntax_error("'foreach: 'item' must be a variable name (literal string)", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        if (isset($attrs['key'])) {
-            $key  = $this->_dequote($attrs['key']);
-            if (!preg_match('~^\w+$~', $key)) {
-                return $this->_syntax_error("foreach: 'key' must to be a variable name (literal string)", E_USER_ERROR, __FILE__, __LINE__);
-            }
-            $key_part = "\$this->_tpl_vars['$key'] => ";
-        } else {
-            $key = null;
-            $key_part = '';
-        }
-
-        if (isset($attrs['name'])) {
-            $name = $attrs['name'];
-        } else {
-            $name = null;
-        }
-
-        $output = '<?php ';
-        $output .= "\$_from = $from; if (!is_array(\$_from) && !is_object(\$_from)) { settype(\$_from, 'array'); }";
-        if (isset($name)) {
-            $foreach_props = "\$this->_foreach[$name]";
-            $output .= "{$foreach_props} = array('total' => count(\$_from), 'iteration' => 0);\n";
-            $output .= "if ({$foreach_props}['total'] > 0):\n";
-            $output .= "    foreach (\$_from as $key_part\$this->_tpl_vars['$item']):\n";
-            $output .= "        {$foreach_props}['iteration']++;\n";
-        } else {
-            $output .= "if (count(\$_from)):\n";
-            $output .= "    foreach (\$_from as $key_part\$this->_tpl_vars['$item']):\n";
-        }
-        $output .= '?>';
-
-        return $output;
-    }
-
-
-    /**
-     * Compile {capture} .. {/capture} tags
-     *
-     * @param boolean $start true if this is the {capture} tag
-     * @param string $tag_args
-     * @return string
-     */
-
-    function _compile_capture_tag($start, $tag_args = '')
-    {
-        $attrs = $this->_parse_attrs($tag_args);
-
-        if ($start) {
-            if (isset($attrs['name']))
-                $buffer = $attrs['name'];
-            else
-                $buffer = "'default'";
-
-            if (isset($attrs['assign']))
-                $assign = $attrs['assign'];
-            else
-                $assign = null;
-            $output = "<?php ob_start(); ?>";
-            $this->_capture_stack[] = array($buffer, $assign);
-        } else {
-            list($buffer, $assign) = array_pop($this->_capture_stack);
-            $output = "<?php \$this->_smarty_vars['capture'][$buffer] = ob_get_contents(); ";
-            if (isset($assign)) {
-                $output .= " \$this->assign($assign, ob_get_contents());";
-            }
-            $output .= "ob_end_clean(); ?>";
-        }
-
-        return $output;
-    }
-
-    /**
-     * Compile {if ...} tag
-     *
-     * @param string $tag_args
-     * @param boolean $elseif if true, uses elseif instead of if
-     * @return string
-     */
-    function _compile_if_tag($tag_args, $elseif = false)
-    {
-
-        /* Tokenize args for 'if' tag. */
-        preg_match_all('~(?>
-                ' . $this->_obj_call_regexp . '(?:' . $this->_mod_regexp . '*)? | # valid object call
-                ' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)?    | # var or quoted string
-                \-?0[xX][0-9a-fA-F]+|\-?\d+(?:\.\d+)?|\.\d+|!==|===|==|!=|<>|<<|>>|<=|>=|\&\&|\|\||\(|\)|,|\!|\^|=|\&|\~|<|>|\||\%|\+|\-|\/|\*|\@    | # valid non-word token
-                \b\w+\b                                                        | # valid word token
-                \S+                                                           # anything else
-                )~x', $tag_args, $match);
-
-        $tokens = $match[0];
-
-        if(empty($tokens)) {
-            $_error_msg = $elseif ? "'elseif'" : "'if'";
-            $_error_msg .= ' statement requires arguments'; 
-            $this->_syntax_error($_error_msg, E_USER_ERROR, __FILE__, __LINE__);
-        }
-            
-                
-        // make sure we have balanced parenthesis
-        $token_count = array_count_values($tokens);
-        if(isset($token_count['(']) && $token_count['('] != $token_count[')']) {
-            $this->_syntax_error("unbalanced parenthesis in if statement", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        $is_arg_stack = array();
-
-        for ($i = 0; $i < count($tokens); $i++) {
-
-            $token = &$tokens[$i];
-
-            switch (strtolower($token)) {
-                case '!':
-                case '%':
-                case '!==':
-                case '==':
-                case '===':
-                case '>':
-                case '<':
-                case '!=':
-                case '<>':
-                case '<<':
-                case '>>':
-                case '<=':
-                case '>=':
-                case '&&':
-                case '||':
-                case '|':
-                case '^':
-                case '&':
-                case '~':
-                case ')':
-                case ',':
-                case '+':
-                case '-':
-                case '*':
-                case '/':
-                case '@':
-                    break;
-
-                case 'eq':
-                    $token = '==';
-                    break;
-
-                case 'ne':
-                case 'neq':
-                    $token = '!=';
-                    break;
-
-                case 'lt':
-                    $token = '<';
-                    break;
-
-                case 'le':
-                case 'lte':
-                    $token = '<=';
-                    break;
-
-                case 'gt':
-                    $token = '>';
-                    break;
-
-                case 'ge':
-                case 'gte':
-                    $token = '>=';
-                    break;
-
-                case 'and':
-                    $token = '&&';
-                    break;
-
-                case 'or':
-                    $token = '||';
-                    break;
-
-                case 'not':
-                    $token = '!';
-                    break;
-
-                case 'mod':
-                    $token = '%';
-                    break;
-
-                case '(':
-                    array_push($is_arg_stack, $i);
-                    break;
-
-                case 'is':
-                    /* If last token was a ')', we operate on the parenthesized
-                       expression. The start of the expression is on the stack.
-                       Otherwise, we operate on the last encountered token. */
-                    if ($tokens[$i-1] == ')')
-                        $is_arg_start = array_pop($is_arg_stack);
-                    else
-                        $is_arg_start = $i-1;
-                    /* Construct the argument for 'is' expression, so it knows
-                       what to operate on. */
-                    $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
-
-                    /* Pass all tokens from next one until the end to the
-                       'is' expression parsing function. The function will
-                       return modified tokens, where the first one is the result
-                       of the 'is' expression and the rest are the tokens it
-                       didn't touch. */
-                    $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
-
-                    /* Replace the old tokens with the new ones. */
-                    array_splice($tokens, $is_arg_start, count($tokens), $new_tokens);
-
-                    /* Adjust argument start so that it won't change from the
-                       current position for the next iteration. */
-                    $i = $is_arg_start;
-                    break;
-
-                default:
-                    if(preg_match('~^' . $this->_func_regexp . '$~', $token) ) {
-                            // function call
-                            if($this->security &&
-                               !in_array($token, $this->security_settings['IF_FUNCS'])) {
-                                $this->_syntax_error("(secure mode) '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
-                            }
-                    } elseif(preg_match('~^' . $this->_var_regexp . '$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i+1]) && $tokens[$i+1] == '(') {
-                        // variable function call
-                        $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);                      
-                    } elseif(preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)$~', $token)) {
-                        // object or variable
-                        $token = $this->_parse_var_props($token);
-                    } elseif(is_numeric($token)) {
-                        // number, skip it
-                    } else {
-                        $this->_syntax_error("unidentified token '$token'", E_USER_ERROR, __FILE__, __LINE__);
-                    }
-                    break;
-            }
-        }
-
-        if ($elseif)
-            return '<?php elseif ('.implode(' ', $tokens).'): ?>';
-        else
-            return '<?php if ('.implode(' ', $tokens).'): ?>';
-    }
-
-
-    function _compile_arg_list($type, $name, $attrs, &$cache_code) {
-        $arg_list = array();
-
-        if (isset($type) && isset($name)
-            && isset($this->_plugins[$type])
-            && isset($this->_plugins[$type][$name])
-            && empty($this->_plugins[$type][$name][4])
-            && is_array($this->_plugins[$type][$name][5])
-            ) {
-            /* we have a list of parameters that should be cached */
-            $_cache_attrs = $this->_plugins[$type][$name][5];
-            $_count = $this->_cache_attrs_count++;
-            $cache_code = "\$_cache_attrs =& \$this->_smarty_cache_attrs('$this->_cache_serial','$_count');";
-
-        } else {
-            /* no parameters are cached */
-            $_cache_attrs = null;
-        }
-
-        foreach ($attrs as $arg_name => $arg_value) {
-            if (is_bool($arg_value))
-                $arg_value = $arg_value ? 'true' : 'false';
-            if (is_null($arg_value))
-                $arg_value = 'null';
-            if ($_cache_attrs && in_array($arg_name, $_cache_attrs)) {
-                $arg_list[] = "'$arg_name' => (\$this->_cache_including) ? \$_cache_attrs['$arg_name'] : (\$_cache_attrs['$arg_name']=$arg_value)";
-            } else {
-                $arg_list[] = "'$arg_name' => $arg_value";
-            }
-        }
-        return $arg_list;
-    }
-
-    /**
-     * Parse is expression
-     *
-     * @param string $is_arg
-     * @param array $tokens
-     * @return array
-     */
-    function _parse_is_expr($is_arg, $tokens)
-    {
-        $expr_end = 0;
-        $negate_expr = false;
-
-        if (($first_token = array_shift($tokens)) == 'not') {
-            $negate_expr = true;
-            $expr_type = array_shift($tokens);
-        } else
-            $expr_type = $first_token;
-
-        switch ($expr_type) {
-            case 'even':
-                if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
-                    $expr_end++;
-                    $expr_arg = $tokens[$expr_end++];
-                    $expr = "!(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
-                } else
-                    $expr = "!(1 & $is_arg)";
-                break;
-
-            case 'odd':
-                if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
-                    $expr_end++;
-                    $expr_arg = $tokens[$expr_end++];
-                    $expr = "(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
-                } else
-                    $expr = "(1 & $is_arg)";
-                break;
-
-            case 'div':
-                if (@$tokens[$expr_end] == 'by') {
-                    $expr_end++;
-                    $expr_arg = $tokens[$expr_end++];
-                    $expr = "!($is_arg % " . $this->_parse_var_props($expr_arg) . ")";
-                } else {
-                    $this->_syntax_error("expecting 'by' after 'div'", E_USER_ERROR, __FILE__, __LINE__);
-                }
-                break;
-
-            default:
-                $this->_syntax_error("unknown 'is' expression - '$expr_type'", E_USER_ERROR, __FILE__, __LINE__);
-                break;
-        }
-
-        if ($negate_expr) {
-            $expr = "!($expr)";
-        }
-
-        array_splice($tokens, 0, $expr_end, $expr);
-
-        return $tokens;
-    }
-
-
-    /**
-     * Parse attribute string
-     *
-     * @param string $tag_args
-     * @return array
-     */
-    function _parse_attrs($tag_args)
-    {
-
-        /* Tokenize tag attributes. */
-        preg_match_all('~(?:' . $this->_obj_call_regexp . '|' . $this->_qstr_regexp . ' | (?>[^"\'=\s]+)
-                         )+ |
-                         [=]
-                        ~x', $tag_args, $match);
-        $tokens       = $match[0];
-
-        $attrs = array();
-        /* Parse state:
-            0 - expecting attribute name
-            1 - expecting '='
-            2 - expecting attribute value (not '=') */
-        $state = 0;
-
-        foreach ($tokens as $token) {
-            switch ($state) {
-                case 0:
-                    /* If the token is a valid identifier, we set attribute name
-                       and go to state 1. */
-                    if (preg_match('~^\w+$~', $token)) {
-                        $attr_name = $token;
-                        $state = 1;
-                    } else
-                        $this->_syntax_error("invalid attribute name: '$token'", E_USER_ERROR, __FILE__, __LINE__);
-                    break;
-
-                case 1:
-                    /* If the token is '=', then we go to state 2. */
-                    if ($token == '=') {
-                        $state = 2;
-                    } else
-                        $this->_syntax_error("expecting '=' after attribute name '$last_token'", E_USER_ERROR, __FILE__, __LINE__);
-                    break;
-
-                case 2:
-                    /* If token is not '=', we set the attribute value and go to
-                       state 0. */
-                    if ($token != '=') {
-                        /* We booleanize the token if it's a non-quoted possible
-                           boolean value. */
-                        if (preg_match('~^(on|yes|true)$~', $token)) {
-                            $token = 'true';
-                        } else if (preg_match('~^(off|no|false)$~', $token)) {
-                            $token = 'false';
-                        } else if ($token == 'null') {
-                            $token = 'null';
-                        } else if (preg_match('~^' . $this->_num_const_regexp . '|0[xX][0-9a-fA-F]+$~', $token)) {
-                            /* treat integer literally */
-                        } else if (!preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . ')*$~', $token)) {
-                            /* treat as a string, double-quote it escaping quotes */
-                            $token = '"'.addslashes($token).'"';
-                        }
-
-                        $attrs[$attr_name] = $token;
-                        $state = 0;
-                    } else
-                        $this->_syntax_error("'=' cannot be an attribute value", E_USER_ERROR, __FILE__, __LINE__);
-                    break;
-            }
-            $last_token = $token;
-        }
-
-        if($state != 0) {
-            if($state == 1) {
-                $this->_syntax_error("expecting '=' after attribute name '$last_token'", E_USER_ERROR, __FILE__, __LINE__);
-            } else {
-                $this->_syntax_error("missing attribute value", E_USER_ERROR, __FILE__, __LINE__);
-            }
-        }
-
-        $this->_parse_vars_props($attrs);
-
-        return $attrs;
-    }
-
-    /**
-     * compile multiple variables and section properties tokens into
-     * PHP code
-     *
-     * @param array $tokens
-     */
-    function _parse_vars_props(&$tokens)
-    {
-        foreach($tokens as $key => $val) {
-            $tokens[$key] = $this->_parse_var_props($val);
-        }
-    }
-
-    /**
-     * compile single variable and section properties token into
-     * PHP code
-     *
-     * @param string $val
-     * @param string $tag_attrs
-     * @return string
-     */
-    function _parse_var_props($val)
-    {
-        $val = trim($val);
-
-        if(preg_match('~^(' . $this->_obj_call_regexp . '|' . $this->_dvar_regexp . ')(' . $this->_mod_regexp . '*)$~', $val, $match)) {
-            // $ variable or object
-            $return = $this->_parse_var($match[1]);
-            $modifiers = $match[2];
-            if (!empty($this->default_modifiers) && !preg_match('~(^|\|)smarty:nodefaults($|\|)~',$modifiers)) {
-                $_default_mod_string = implode('|',(array)$this->default_modifiers);
-                $modifiers = empty($modifiers) ? $_default_mod_string : $_default_mod_string . '|' . $modifiers;
-            }
-            $this->_parse_modifiers($return, $modifiers);
-            return $return;
-        } elseif (preg_match('~^' . $this->_db_qstr_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
-                // double quoted text
-                preg_match('~^(' . $this->_db_qstr_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
-                $return = $this->_expand_quoted_text($match[1]);
-                if($match[2] != '') {
-                    $this->_parse_modifiers($return, $match[2]);
-                }
-                return $return;
-            }
-        elseif(preg_match('~^' . $this->_num_const_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
-                // numerical constant
-                preg_match('~^(' . $this->_num_const_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
-                if($match[2] != '') {
-                    $this->_parse_modifiers($match[1], $match[2]);
-                    return $match[1];
-                }
-            }
-        elseif(preg_match('~^' . $this->_si_qstr_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
-                // single quoted text
-                preg_match('~^(' . $this->_si_qstr_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
-                if($match[2] != '') {
-                    $this->_parse_modifiers($match[1], $match[2]);
-                    return $match[1];
-                }
-            }
-        elseif(preg_match('~^' . $this->_cvar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
-                // config var
-                return $this->_parse_conf_var($val);
-            }
-        elseif(preg_match('~^' . $this->_svar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
-                // section var
-                return $this->_parse_section_prop($val);
-            }
-        elseif(!in_array($val, $this->_permitted_tokens) && !is_numeric($val)) {
-            // literal string
-            return $this->_expand_quoted_text('"' . strtr($val, array('\\' => '\\\\', '"' => '\\"')) .'"');
-        }
-        return $val;
-    }
-
-    /**
-     * expand quoted text with embedded variables
-     *
-     * @param string $var_expr
-     * @return string
-     */
-    function _expand_quoted_text($var_expr)
-    {
-        // if contains unescaped $, expand it
-        if(preg_match_all('~(?:\`(?<!\\\\)\$' . $this->_dvar_guts_regexp . '(?:' . $this->_obj_ext_regexp . ')*\`)|(?:(?<!\\\\)\$\w+(\[[a-zA-Z0-9]+\])*)~', $var_expr, $_match)) {
-            $_match = $_match[0];
-            $_replace = array();
-            foreach($_match as $_var) {
-                $_replace[$_var] = '".(' . $this->_parse_var(str_replace('`','',$_var)) . ')."';
-            }
-            $var_expr = strtr($var_expr, $_replace);
-            $_return = preg_replace('~\.""|(?<!\\\\)""\.~', '', $var_expr);
-        } else {
-            $_return = $var_expr;
-        }
-        // replace double quoted literal string with single quotes
-        $_return = preg_replace('~^"([\s\w]+)"$~',"'\\1'",$_return);
-        return $_return;
-    }
-
-    /**
-     * parse variable expression into PHP code
-     *
-     * @param string $var_expr
-     * @param string $output
-     * @return string
-     */
-    function _parse_var($var_expr)
-    {
-        $_has_math = false;
-        $_math_vars = preg_split('~('.$this->_dvar_math_regexp.'|'.$this->_qstr_regexp.')~', $var_expr, -1, PREG_SPLIT_DELIM_CAPTURE);
-
-        if(count($_math_vars) > 1) {
-            $_first_var = "";
-            $_complete_var = "";
-            $_output = "";
-            // simple check if there is any math, to stop recursion (due to modifiers with "xx % yy" as parameter)
-            foreach($_math_vars as $_k => $_math_var) {
-                $_math_var = $_math_vars[$_k];
-
-                if(!empty($_math_var) || is_numeric($_math_var)) {
-                    // hit a math operator, so process the stuff which came before it
-                    if(preg_match('~^' . $this->_dvar_math_regexp . '$~', $_math_var)) {
-                        $_has_math = true;
-                        if(!empty($_complete_var) || is_numeric($_complete_var)) {
-                            $_output .= $this->_parse_var($_complete_var);
-                        }
-
-                        // just output the math operator to php
-                        $_output .= $_math_var;
-
-                        if(empty($_first_var))
-                            $_first_var = $_complete_var;
-
-                        $_complete_var = "";
-                    } else {
-                        $_complete_var .= $_math_var;
-                    }
-                }
-            }
-            if($_has_math) {
-                if(!empty($_complete_var) || is_numeric($_complete_var))
-                    $_output .= $this->_parse_var($_complete_var);
-
-                // get the modifiers working (only the last var from math + modifier is left)
-                $var_expr = $_complete_var;
-            }
-        }
-
-        // prevent cutting of first digit in the number (we _definitly_ got a number if the first char is a digit)
-        if(is_numeric(substr($var_expr, 0, 1)))
-            $_var_ref = $var_expr;
-        else
-            $_var_ref = substr($var_expr, 1);
-        
-        if(!$_has_math) {
-            
-            // get [foo] and .foo and ->foo and (...) pieces
-            preg_match_all('~(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $match);
-                        
-            $_indexes = $match[0];
-            $_var_name = array_shift($_indexes);
-
-            /* Handle $smarty.* variable references as a special case. */
-            if ($_var_name == 'smarty') {
-                /*
-                 * If the reference could be compiled, use the compiled output;
-                 * otherwise, fall back on the $smarty variable generated at
-                 * run-time.
-                 */
-                if (($smarty_ref = $this->_compile_smarty_ref($_indexes)) !== null) {
-                    $_output = $smarty_ref;
-                } else {
-                    $_var_name = substr(array_shift($_indexes), 1);
-                    $_output = "\$this->_smarty_vars['$_var_name']";
-                }
-            } elseif(is_numeric($_var_name) && is_numeric(substr($var_expr, 0, 1))) {
-                // because . is the operator for accessing arrays thru inidizes we need to put it together again for floating point numbers
-                if(count($_indexes) > 0)
-                {
-                    $_var_name .= implode("", $_indexes);
-                    $_indexes = array();
-                }
-                $_output = $_var_name;
-            } else {
-                $_output = "\$this->_tpl_vars['$_var_name']";
-            }
-
-            foreach ($_indexes as $_index) {
-                if (substr($_index, 0, 1) == '[') {
-                    $_index = substr($_index, 1, -1);
-                    if (is_numeric($_index)) {
-                        $_output .= "[$_index]";
-                    } elseif (substr($_index, 0, 1) == '$') {
-                        if (strpos($_index, '.') !== false) {
-                            $_output .= '[' . $this->_parse_var($_index) . ']';
-                        } else {
-                            $_output .= "[\$this->_tpl_vars['" . substr($_index, 1) . "']]";
-                        }
-                    } else {
-                        $_var_parts = explode('.', $_index);
-                        $_var_section = $_var_parts[0];
-                        $_var_section_prop = isset($_var_parts[1]) ? $_var_parts[1] : 'index';
-                        $_output .= "[\$this->_sections['$_var_section']['$_var_section_prop']]";
-                    }
-                } else if (substr($_index, 0, 1) == '.') {
-                    if (substr($_index, 1, 1) == '$')
-                        $_output .= "[\$this->_tpl_vars['" . substr($_index, 2) . "']]";
-                    else
-                        $_output .= "['" . substr($_index, 1) . "']";
-                } else if (substr($_index,0,2) == '->') {
-                    if(substr($_index,2,2) == '__') {
-                        $this->_syntax_error('call to internal object members is not allowed', E_USER_ERROR, __FILE__, __LINE__);
-                    } elseif($this->security && substr($_index, 2, 1) == '_') {
-                        $this->_syntax_error('(secure) call to private object member is not allowed', E_USER_ERROR, __FILE__, __LINE__);
-                    } elseif (substr($_index, 2, 1) == '$') {
-                        if ($this->security) {
-                            $this->_syntax_error('(secure) call to dynamic object member is not allowed', E_USER_ERROR, __FILE__, __LINE__);
-                        } else {
-                            $_output .= '->{(($_var=$this->_tpl_vars[\''.substr($_index,3).'\']) && substr($_var,0,2)!=\'__\') ? $_var : $this->trigger_error("cannot access property \\"$_var\\"")}';
-                        }
-                    } else {
-                        $_output .= $_index;
-                    }
-                } elseif (substr($_index, 0, 1) == '(') {
-                    $_index = $this->_parse_parenth_args($_index);
-                    $_output .= $_index;
-                } else {
-                    $_output .= $_index;
-                }
-            }
-        }
-
-        return $_output;
-    }
-
-    /**
-     * parse arguments in function call parenthesis
-     *
-     * @param string $parenth_args
-     * @return string
-     */
-    function _parse_parenth_args($parenth_args)
-    {
-        preg_match_all('~' . $this->_param_regexp . '~',$parenth_args, $match);
-        $orig_vals = $match = $match[0];
-        $this->_parse_vars_props($match);
-        $replace = array();
-        for ($i = 0, $count = count($match); $i < $count; $i++) {
-            $replace[$orig_vals[$i]] = $match[$i];
-        }
-        return strtr($parenth_args, $replace);
-    }
-
-    /**
-     * parse configuration variable expression into PHP code
-     *
-     * @param string $conf_var_expr
-     */
-    function _parse_conf_var($conf_var_expr)
-    {
-        $parts = explode('|', $conf_var_expr, 2);
-        $var_ref = $parts[0];
-        $modifiers = isset($parts[1]) ? $parts[1] : '';
-
-        $var_name = substr($var_ref, 1, -1);
-
-        $output = "\$this->_config[0]['vars']['$var_name']";
-
-        $this->_parse_modifiers($output, $modifiers);
-
-        return $output;
-    }
-
-    /**
-     * parse section property expression into PHP code
-     *
-     * @param string $section_prop_expr
-     * @return string
-     */
-    function _parse_section_prop($section_prop_expr)
-    {
-        $parts = explode('|', $section_prop_expr, 2);
-        $var_ref = $parts[0];
-        $modifiers = isset($parts[1]) ? $parts[1] : '';
-
-        preg_match('!%(\w+)\.(\w+)%!', $var_ref, $match);
-        $section_name = $match[1];
-        $prop_name = $match[2];
-
-        $output = "\$this->_sections['$section_name']['$prop_name']";
-
-        $this->_parse_modifiers($output, $modifiers);
-
-        return $output;
-    }
-
-
-    /**
-     * parse modifier chain into PHP code
-     *
-     * sets $output to parsed modified chain
-     * @param string $output
-     * @param string $modifier_string
-     */
-    function _parse_modifiers(&$output, $modifier_string)
-    {
-        preg_match_all('~\|(@?\w+)((?>:(?:'. $this->_qstr_regexp . '|[^|]+))*)~', '|' . $modifier_string, $_match);
-        list(, $_modifiers, $modifier_arg_strings) = $_match;
-
-        for ($_i = 0, $_for_max = count($_modifiers); $_i < $_for_max; $_i++) {
-            $_modifier_name = $_modifiers[$_i];
-
-            if($_modifier_name == 'smarty') {
-                // skip smarty modifier
-                continue;
-            }
-
-            preg_match_all('~:(' . $this->_qstr_regexp . '|[^:]+)~', $modifier_arg_strings[$_i], $_match);
-            $_modifier_args = $_match[1];
-
-            if (substr($_modifier_name, 0, 1) == '@') {
-                $_map_array = false;
-                $_modifier_name = substr($_modifier_name, 1);
-            } else {
-                $_map_array = true;
-            }
-
-            if (empty($this->_plugins['modifier'][$_modifier_name])
-                && !$this->_get_plugin_filepath('modifier', $_modifier_name)
-                && function_exists($_modifier_name)) {
-                if ($this->security && !in_array($_modifier_name, $this->security_settings['MODIFIER_FUNCS'])) {
-                    $this->_trigger_fatal_error("[plugin] (secure mode) modifier '$_modifier_name' is not allowed" , $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
-                } else {
-                    $this->_plugins['modifier'][$_modifier_name] = array($_modifier_name,  null, null, false);
-                }
-            }
-            $this->_add_plugin('modifier', $_modifier_name);
-
-            $this->_parse_vars_props($_modifier_args);
-
-            if($_modifier_name == 'default') {
-                // supress notifications of default modifier vars and args
-                if(substr($output, 0, 1) == '$') {
-                    $output = '@' . $output;
-                }
-                if(isset($_modifier_args[0]) && substr($_modifier_args[0], 0, 1) == '$') {
-                    $_modifier_args[0] = '@' . $_modifier_args[0];
-                }
-            }
-            if (count($_modifier_args) > 0)
-                $_modifier_args = ', '.implode(', ', $_modifier_args);
-            else
-                $_modifier_args = '';
-
-            if ($_map_array) {
-                $output = "((is_array(\$_tmp=$output)) ? \$this->_run_mod_handler('$_modifier_name', true, \$_tmp$_modifier_args) : " . $this->_compile_plugin_call('modifier', $_modifier_name) . "(\$_tmp$_modifier_args))";
-
-            } else {
-
-                $output = $this->_compile_plugin_call('modifier', $_modifier_name)."($output$_modifier_args)";
-
-            }
-        }
-    }
-
-
-    /**
-     * add plugin
-     *
-     * @param string $type
-     * @param string $name
-     * @param boolean? $delayed_loading
-     */
-    function _add_plugin($type, $name, $delayed_loading = null)
-    {
-        if (!isset($this->_plugin_info[$type])) {
-            $this->_plugin_info[$type] = array();
-        }
-        if (!isset($this->_plugin_info[$type][$name])) {
-            $this->_plugin_info[$type][$name] = array($this->_current_file,
-                                                      $this->_current_line_no,
-                                                      $delayed_loading);
-        }
-    }
-
-
-    /**
-     * Compiles references of type $smarty.foo
-     *
-     * @param string $indexes
-     * @return string
-     */
-    function _compile_smarty_ref(&$indexes)
-    {
-        /* Extract the reference name. */
-        $_ref = substr($indexes[0], 1);
-        foreach($indexes as $_index_no=>$_index) {
-            if (substr($_index, 0, 1) != '.' && $_index_no<2 || !preg_match('~^(\.|\[|->)~', $_index)) {
-                $this->_syntax_error('$smarty' . implode('', array_slice($indexes, 0, 2)) . ' is an invalid reference', E_USER_ERROR, __FILE__, __LINE__);
-            }
-        }
-
-        switch ($_ref) {
-            case 'now':
-                $compiled_ref = 'time()';
-                $_max_index = 1;
-                break;
-
-            case 'foreach':
-                array_shift($indexes);
-                $_var = $this->_parse_var_props(substr($indexes[0], 1));
-                $_propname = substr($indexes[1], 1);
-                $_max_index = 1;
-                switch ($_propname) {
-                    case 'index':
-                        array_shift($indexes);
-                        $compiled_ref = "(\$this->_foreach[$_var]['iteration']-1)";
-                        break;
-                        
-                    case 'first':
-                        array_shift($indexes);
-                        $compiled_ref = "(\$this->_foreach[$_var]['iteration'] <= 1)";
-                        break;
-
-                    case 'last':
-                        array_shift($indexes);
-                        $compiled_ref = "(\$this->_foreach[$_var]['iteration'] == \$this->_foreach[$_var]['total'])";
-                        break;
-                        
-                    case 'show':
-                        array_shift($indexes);
-                        $compiled_ref = "(\$this->_foreach[$_var]['total'] > 0)";
-                        break;
-                        
-                    default:
-                        unset($_max_index);
-                        $compiled_ref = "\$this->_foreach[$_var]";
-                }
-                break;
-
-            case 'section':
-                array_shift($indexes);
-                $_var = $this->_parse_var_props(substr($indexes[0], 1));
-                $compiled_ref = "\$this->_sections[$_var]";
-                break;
-
-            case 'get':
-                $compiled_ref = ($this->request_use_auto_globals) ? '$_GET' : "\$GLOBALS['HTTP_GET_VARS']";
-                break;
-
-            case 'post':
-                $compiled_ref = ($this->request_use_auto_globals) ? '$_POST' : "\$GLOBALS['HTTP_POST_VARS']";
-                break;
-
-            case 'cookies':
-                $compiled_ref = ($this->request_use_auto_globals) ? '$_COOKIE' : "\$GLOBALS['HTTP_COOKIE_VARS']";
-                break;
-
-            case 'env':
-                $compiled_ref = ($this->request_use_auto_globals) ? '$_ENV' : "\$GLOBALS['HTTP_ENV_VARS']";
-                break;
-
-            case 'server':
-                $compiled_ref = ($this->request_use_auto_globals) ? '$_SERVER' : "\$GLOBALS['HTTP_SERVER_VARS']";
-                break;
-
-            case 'session':
-                $compiled_ref = ($this->request_use_auto_globals) ? '$_SESSION' : "\$GLOBALS['HTTP_SESSION_VARS']";
-                break;
-
-            /*
-             * These cases are handled either at run-time or elsewhere in the
-             * compiler.
-             */
-            case 'request':
-                if ($this->request_use_auto_globals) {
-                    $compiled_ref = '$_REQUEST';
-                    break;
-                } else {
-                    $this->_init_smarty_vars = true;
-                }
-                return null;
-
-            case 'capture':
-                return null;
-
-            case 'template':
-                $compiled_ref = "'$this->_current_file'";
-                $_max_index = 1;
-                break;
-
-            case 'version':
-                $compiled_ref = "'$this->_version'";
-                $_max_index = 1;
-                break;
-
-            case 'const':
-                if ($this->security && !$this->security_settings['ALLOW_CONSTANTS']) {
-                    $this->_syntax_error("(secure mode) constants not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
-                    return;
-                }
-                array_shift($indexes);
-                if (preg_match('!^\.\w+$!', $indexes[0])) {
-                    $compiled_ref = '@' . substr($indexes[0], 1);
-                } else {
-                    $_val = $this->_parse_var_props(substr($indexes[0], 1));
-                    $compiled_ref = '@constant(' . $_val . ')';
-                }
-                $_max_index = 1;
-                break;
-
-            case 'config':
-                $compiled_ref = "\$this->_config[0]['vars']";
-                $_max_index = 3;
-                break;
-
-            case 'ldelim':
-                $compiled_ref = "'$this->left_delimiter'";
-                break;
-
-            case 'rdelim':
-                $compiled_ref = "'$this->right_delimiter'";
-                break;
-                
-            default:
-                $this->_syntax_error('$smarty.' . $_ref . ' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__);
-                break;
-        }
-
-        if (isset($_max_index) && count($indexes) > $_max_index) {
-            $this->_syntax_error('$smarty' . implode('', $indexes) .' is an invalid reference', E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        array_shift($indexes);
-        return $compiled_ref;
-    }
-
-    /**
-     * compiles call to plugin of type $type with name $name
-     * returns a string containing the function-name or method call
-     * without the paramter-list that would have follow to make the
-     * call valid php-syntax
-     *
-     * @param string $type
-     * @param string $name
-     * @return string
-     */
-    function _compile_plugin_call($type, $name) {
-        if (isset($this->_plugins[$type][$name])) {
-            /* plugin loaded */
-            if (is_array($this->_plugins[$type][$name][0])) {
-                return ((is_object($this->_plugins[$type][$name][0][0])) ?
-                        "\$this->_plugins['$type']['$name'][0][0]->"    /* method callback */
-                        : (string)($this->_plugins[$type][$name][0][0]).'::'    /* class callback */
-                       ). $this->_plugins[$type][$name][0][1];
-
-            } else {
-                /* function callback */
-                return $this->_plugins[$type][$name][0];
-
-            }
-        } else {
-            /* plugin not loaded -> auto-loadable-plugin */
-            return 'smarty_'.$type.'_'.$name;
-
-        }
-    }
-
-    /**
-     * load pre- and post-filters
-     */
-    function _load_filters()
-    {
-        if (count($this->_plugins['prefilter']) > 0) {
-            foreach ($this->_plugins['prefilter'] as $filter_name => $prefilter) {
-                if ($prefilter === false) {
-                    unset($this->_plugins['prefilter'][$filter_name]);
-                    $_params = array('plugins' => array(array('prefilter', $filter_name, null, null, false)));
-                    require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
-                    smarty_core_load_plugins($_params, $this);
-                }
-            }
-        }
-        if (count($this->_plugins['postfilter']) > 0) {
-            foreach ($this->_plugins['postfilter'] as $filter_name => $postfilter) {
-                if ($postfilter === false) {
-                    unset($this->_plugins['postfilter'][$filter_name]);
-                    $_params = array('plugins' => array(array('postfilter', $filter_name, null, null, false)));
-                    require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
-                    smarty_core_load_plugins($_params, $this);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Quote subpattern references
-     *
-     * @param string $string
-     * @return string
-     */
-    function _quote_replace($string)
-    {
-        return strtr($string, array('\\' => '\\\\', '$' => '\\$'));
-    }
-
-    /**
-     * display Smarty syntax error
-     *
-     * @param string $error_msg
-     * @param integer $error_type
-     * @param string $file
-     * @param integer $line
-     */
-    function _syntax_error($error_msg, $error_type = E_USER_ERROR, $file=null, $line=null)
-    {
-        $this->_trigger_fatal_error("syntax error: $error_msg", $this->_current_file, $this->_current_line_no, $file, $line, $error_type);
-    }
-
-
-    /**
-     * check if the compilation changes from cacheable to
-     * non-cacheable state with the beginning of the current
-     * plugin. return php-code to reflect the transition.
-     * @return string
-     */
-    function _push_cacheable_state($type, $name) {
-        $_cacheable = !isset($this->_plugins[$type][$name]) || $this->_plugins[$type][$name][4];
-        if ($_cacheable
-            || 0<$this->_cacheable_state++) return '';
-        if (!isset($this->_cache_serial)) $this->_cache_serial = $this->encryptOld(uniqid('Smarty'));
-        $_ret = 'if ($this->caching && !$this->_cache_including): echo \'{nocache:'
-            . $this->_cache_serial . '#' . $this->_nocache_count
-            . '}\'; endif;';
-        return $_ret;
-    }
-
-
-    /**
-     * check if the compilation changes from non-cacheable to
-     * cacheable state with the end of the current plugin return
-     * php-code to reflect the transition.
-     * @return string
-     */
-    function _pop_cacheable_state($type, $name) {
-        $_cacheable = !isset($this->_plugins[$type][$name]) || $this->_plugins[$type][$name][4];
-        if ($_cacheable
-            || --$this->_cacheable_state>0) return '';
-        return 'if ($this->caching && !$this->_cache_including): echo \'{/nocache:'
-            . $this->_cache_serial . '#' . ($this->_nocache_count++)
-            . '}\'; endif;';
-    }
-
-
-    /**
-     * push opening tag-name, file-name and line-number on the tag-stack
-     * @param string the opening tag's name
-     */
-    function _push_tag($open_tag)
-    {
-        array_push($this->_tag_stack, array($open_tag, $this->_current_line_no));
-    }
-
-    /**
-     * pop closing tag-name
-     * raise an error if this stack-top doesn't match with the closing tag
-     * @param string the closing tag's name
-     * @return string the opening tag's name
-     */
-    function _pop_tag($close_tag)
-    {
-        $message = '';
-        if (count($this->_tag_stack)>0) {
-            list($_open_tag, $_line_no) = array_pop($this->_tag_stack);
-            if ($close_tag == $_open_tag) {
-                return $_open_tag;
-            }
-            if ($close_tag == 'if' && ($_open_tag == 'else' || $_open_tag == 'elseif' )) {
-                return $this->_pop_tag($close_tag);
-            }
-            if ($close_tag == 'section' && $_open_tag == 'sectionelse') {
-                $this->_pop_tag($close_tag);
-                return $_open_tag;
-            }
-            if ($close_tag == 'foreach' && $_open_tag == 'foreachelse') {
-                $this->_pop_tag($close_tag);
-                return $_open_tag;
-            }
-            if ($_open_tag == 'else' || $_open_tag == 'elseif') {
-                $_open_tag = 'if';
-            } elseif ($_open_tag == 'sectionelse') {
-                $_open_tag = 'section';
-            } elseif ($_open_tag == 'foreachelse') {
-                $_open_tag = 'foreach';
-            }
-            $message = " expected {/$_open_tag} (opened line $_line_no).";
-        }
-        $this->_syntax_error("mismatched tag {/$close_tag}.$message",
-                             E_USER_ERROR, __FILE__, __LINE__);
-    }
-    
-    public function encryptOld($string)
-    {
-        if (!class_exists('G')) {
-            $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
-            $docuroot = explode( '/', $realdocuroot );
-            array_pop( $docuroot );
-            $pathhome = implode( '/', $docuroot ) . '/';
-            array_pop( $docuroot );
-            $pathTrunk = implode( '/', $docuroot ) . '/';
-            require_once($pathTrunk.'gulliver/system/class.g.php');
-        }
-        return G::encryptOld($string);
-    }
-
-}
-
-/**
- * compare to values by their string length
- *
- * @access private
- * @param string $a
- * @param string $b
- * @return 0|-1|1
- */
-function _smarty_sort_length($a, $b)
-{
-    if($a == $b)
-        return 0;
-
-    if(strlen($a) == strlen($b))
-        return ($a > $b) ? -1 : 1;
-
-    return (strlen($a) > strlen($b)) ? -1 : 1;
-}
-
-
-/* vim: set et: */
-
-?>
diff --git a/thirdparty/smarty/libs/debug.tpl b/thirdparty/smarty/libs/debug.tpl
deleted file mode 100644
index c05ef5d0b..000000000
--- a/thirdparty/smarty/libs/debug.tpl
+++ /dev/null
@@ -1,157 +0,0 @@
-{* Smarty *}
-{* debug.tpl, last updated version 2.1.0 *}
-{assign_debug_info}
-{capture assign=debug_output}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-    <title>Smarty Debug Console</title>
-{literal}
-<style type="text/css">
-/* <![CDATA[ */
-body, h1, h2, td, th, p {
-    font-family: sans-serif;
-    font-weight: normal;
-    font-size: 0.9em;
-    margin: 1px;
-    padding: 0;
-}
-
-h1 {
-    margin: 0;
-    text-align: left;
-    padding: 2px;
-    background-color: #f0c040;
-    color:  black;
-    font-weight: bold;
-    font-size: 1.2em;
- }
-
-h2 {
-    background-color: #9B410E;
-    color: white;
-    text-align: left;
-    font-weight: bold;
-    padding: 2px;
-    border-top: 1px solid black;
-}
-
-body {
-    background: black; 
-}
-
-p, table, div {
-    background: #f0ead8;
-} 
-
-p {
-    margin: 0;
-    font-style: italic;
-    text-align: center;
-}
-
-table {
-    width: 100%;
-}
-
-th, td {
-    font-family: monospace;
-    vertical-align: top;
-    text-align: left;
-    width: 50%;
-}
-
-td {
-    color: green;
-}
-
-.odd {
-    background-color: #eeeeee;
-}
-
-.even {
-    background-color: #fafafa;
-}
-
-.exectime {
-    font-size: 0.8em;
-    font-style: italic;
-}
-
-#table_assigned_vars th {
-    color: blue;
-}
-
-#table_config_vars th {
-    color: maroon;
-}
-/* ]]> */
-</style>
-{/literal}
-</head>
-<body>
-
-<h1>Smarty Debug Console</h1>
-
-<h2>included templates &amp; config files (load time in seconds)</h2>
-
-<div>
-{section name=templates loop=$_debug_tpls}
-    {section name=indent loop=$_debug_tpls[templates].depth}&nbsp;&nbsp;&nbsp;{/section}
-    <font color={if $_debug_tpls[templates].type eq "template"}brown{elseif $_debug_tpls[templates].type eq "insert"}black{else}green{/if}>
-        {$_debug_tpls[templates].filename|escape:html}</font>
-    {if isset($_debug_tpls[templates].exec_time)}
-        <span class="exectime">
-        ({$_debug_tpls[templates].exec_time|string_format:"%.5f"})
-        {if %templates.index% eq 0}(total){/if}
-        </span>
-    {/if}
-    <br />
-{sectionelse}
-    <p>no templates included</p>
-{/section}
-</div>
-
-<h2>assigned template variables</h2>
-
-<table id="table_assigned_vars">
-    {section name=vars loop=$_debug_keys}
-        <tr class="{cycle values="odd,even"}">
-            <th>{ldelim}${$_debug_keys[vars]|escape:'html'}{rdelim}</th>
-            <td>{$_debug_vals[vars]|@debug_print_var}</td></tr>
-    {sectionelse}
-        <tr><td><p>no template variables assigned</p></td></tr>
-    {/section}
-</table>
-
-<h2>assigned config file variables (outer template scope)</h2>
-
-<table id="table_config_vars">
-    {section name=config_vars loop=$_debug_config_keys}
-        <tr class="{cycle values="odd,even"}">
-            <th>{ldelim}#{$_debug_config_keys[config_vars]|escape:'html'}#{rdelim}</th>
-            <td>{$_debug_config_vals[config_vars]|@debug_print_var}</td></tr>
-    {sectionelse}
-        <tr><td><p>no config vars assigned</p></td></tr>
-    {/section}
-</table>
-</body>
-</html>
-{/capture}
-{if isset($_smarty_debug_output) and $_smarty_debug_output eq "html"}
-    {$debug_output}
-{else}
-<script type="text/javascript">
-// <![CDATA[
-    if ( self.name == '' ) {ldelim}
-       var title = 'Console';
-    {rdelim}
-    else {ldelim}
-       var title = 'Console_' + self.name;
-    {rdelim}
-    _smarty_console = window.open("",title.value,"width=680,height=600,resizable,scrollbars=yes");
-    _smarty_console.document.write('{$debug_output|escape:'javascript'}');
-    _smarty_console.document.close();
-// ]]>
-</script>
-{/if}
\ No newline at end of file
diff --git a/thirdparty/smarty/libs/internals/core.assemble_plugin_filepath.php b/thirdparty/smarty/libs/internals/core.assemble_plugin_filepath.php
deleted file mode 100644
index 690d3ddbc..000000000
--- a/thirdparty/smarty/libs/internals/core.assemble_plugin_filepath.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * assemble filepath of requested plugin
- *
- * @param string $type
- * @param string $name
- * @return string|false
- */
-function smarty_core_assemble_plugin_filepath($params, &$smarty)
-{
-    static $_filepaths_cache = array();
-
-    $_plugin_filename = $params['type'] . '.' . $params['name'] . '.php';
-    if (isset($_filepaths_cache[$_plugin_filename])) {
-        return $_filepaths_cache[$_plugin_filename];
-    }
-    $_return = false;
-
-    foreach ((array)$smarty->plugins_dir as $_plugin_dir) {
-
-        $_plugin_filepath = $_plugin_dir . DIRECTORY_SEPARATOR . $_plugin_filename;
-
-        // see if path is relative
-        if (!preg_match("/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/", $_plugin_dir)) {
-            $_relative_paths[] = $_plugin_dir;
-            // relative path, see if it is in the SMARTY_DIR
-            if (@is_readable(SMARTY_DIR . $_plugin_filepath)) {
-                $_return = SMARTY_DIR . $_plugin_filepath;
-                break;
-            }
-        }
-        // try relative to cwd (or absolute)
-        if (@is_readable($_plugin_filepath)) {
-            $_return = $_plugin_filepath;
-            break;
-        }
-    }
-
-    if($_return === false) {
-        // still not found, try PHP include_path
-        if(isset($_relative_paths)) {
-            foreach ((array)$_relative_paths as $_plugin_dir) {
-
-                $_plugin_filepath = $_plugin_dir . DIRECTORY_SEPARATOR . $_plugin_filename;
-
-                $_params = array('file_path' => $_plugin_filepath);
-                require_once(SMARTY_CORE_DIR . 'core.get_include_path.php');
-                if(smarty_core_get_include_path($_params, $smarty)) {
-                    $_return = $_params['new_file_path'];
-                    break;
-                }
-            }
-        }
-    }
-    $_filepaths_cache[$_plugin_filename] = $_return;
-    return $_return;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.assign_smarty_interface.php b/thirdparty/smarty/libs/internals/core.assign_smarty_interface.php
deleted file mode 100644
index 7e65a73ec..000000000
--- a/thirdparty/smarty/libs/internals/core.assign_smarty_interface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Smarty assign_smarty_interface core plugin
- *
- * Type:     core<br>
- * Name:     assign_smarty_interface<br>
- * Purpose:  assign the $smarty interface variable
- * @param array Format: null
- * @param Smarty
- */
-function smarty_core_assign_smarty_interface($params, &$smarty)
-{
-        if (isset($smarty->_smarty_vars) && isset($smarty->_smarty_vars['request'])) {
-            return;
-        }
-
-        $_globals_map = array('g'  => 'HTTP_GET_VARS',
-                             'p'  => 'HTTP_POST_VARS',
-                             'c'  => 'HTTP_COOKIE_VARS',
-                             's'  => 'HTTP_SERVER_VARS',
-                             'e'  => 'HTTP_ENV_VARS');
-
-        $_smarty_vars_request  = array();
-
-        foreach (preg_split('!!', strtolower($smarty->request_vars_order)) as $_c) {
-            if (isset($_globals_map[$_c])) {
-                $_smarty_vars_request = array_merge($_smarty_vars_request, $GLOBALS[$_globals_map[$_c]]);
-            }
-        }
-        $_smarty_vars_request = @array_merge($_smarty_vars_request, $GLOBALS['HTTP_SESSION_VARS']);
-
-        $smarty->_smarty_vars['request'] = $_smarty_vars_request;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.create_dir_structure.php b/thirdparty/smarty/libs/internals/core.create_dir_structure.php
deleted file mode 100644
index 3eecc4972..000000000
--- a/thirdparty/smarty/libs/internals/core.create_dir_structure.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * create full directory structure
- *
- * @param string $dir
- */
-
-// $dir
-
-function smarty_core_create_dir_structure($params, &$smarty)
-{
-    if (!file_exists($params['dir'])) {
-        $_open_basedir_ini = ini_get('open_basedir');
-
-        if (DIRECTORY_SEPARATOR=='/') {
-            /* unix-style paths */
-            $_dir = $params['dir'];
-            $_dir_parts = preg_split('!/+!', $_dir, -1, PREG_SPLIT_NO_EMPTY);
-            $_new_dir = (substr($_dir, 0, 1)=='/') ? '/' : getcwd().'/';
-            if($_use_open_basedir = !empty($_open_basedir_ini)) {
-                $_open_basedirs = explode(':', $_open_basedir_ini);
-            }
-
-        } else {
-            /* other-style paths */
-            $_dir = str_replace('\\','/', $params['dir']);
-            $_dir_parts = preg_split('!/+!', $_dir, -1, PREG_SPLIT_NO_EMPTY);
-            if (preg_match('!^((//)|([a-zA-Z]:/))!', $_dir, $_root_dir)) {
-                /* leading "//" for network volume, or "[letter]:/" for full path */
-                $_new_dir = $_root_dir[1];
-                /* remove drive-letter from _dir_parts */
-                if (isset($_root_dir[3])) array_shift($_dir_parts);
-
-            } else {
-                $_new_dir = str_replace('\\', '/', getcwd()).'/';
-
-            }
-
-            if($_use_open_basedir = !empty($_open_basedir_ini)) {
-                $_open_basedirs = explode(';', str_replace('\\', '/', $_open_basedir_ini));
-            }
-
-        }
-
-        /* all paths use "/" only from here */
-        foreach ($_dir_parts as $_dir_part) {
-            $_new_dir .= $_dir_part;
-
-            if ($_use_open_basedir) {
-                // do not attempt to test or make directories outside of open_basedir
-                $_make_new_dir = false;
-                foreach ($_open_basedirs as $_open_basedir) {
-                    if (substr($_new_dir, 0, strlen($_open_basedir)) == $_open_basedir) {
-                        $_make_new_dir = true;
-                        break;
-                    }
-                }
-            } else {
-                $_make_new_dir = true;
-            }
-
-            if ($_make_new_dir && !file_exists($_new_dir) && !@mkdir($_new_dir, $smarty->_dir_perms) && !is_dir($_new_dir)) {
-                $smarty->trigger_error("problem creating directory '" . $_new_dir . "'");
-                return false;
-            }
-            $_new_dir .= '/';
-        }
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.display_debug_console.php b/thirdparty/smarty/libs/internals/core.display_debug_console.php
deleted file mode 100644
index 1a80f3909..000000000
--- a/thirdparty/smarty/libs/internals/core.display_debug_console.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Smarty debug_console function plugin
- *
- * Type:     core<br>
- * Name:     display_debug_console<br>
- * Purpose:  display the javascript debug console window
- * @param array Format: null
- * @param Smarty
- */
-function smarty_core_display_debug_console($params, &$smarty)
-{
-    // we must force compile the debug template in case the environment
-    // changed between separate applications.
-
-    if(empty($smarty->debug_tpl)) {
-        // set path to debug template from SMARTY_DIR
-        $smarty->debug_tpl = SMARTY_DIR . 'debug.tpl';
-        if($smarty->security && is_file($smarty->debug_tpl)) {
-            $smarty->secure_dir[] = realpath($smarty->debug_tpl);
-        }
-        $smarty->debug_tpl = 'file:' . SMARTY_DIR . 'debug.tpl';
-    }
-
-    $_ldelim_orig = $smarty->left_delimiter;
-    $_rdelim_orig = $smarty->right_delimiter;
-
-    $smarty->left_delimiter = '{';
-    $smarty->right_delimiter = '}';
-
-    $_compile_id_orig = $smarty->_compile_id;
-    $smarty->_compile_id = null;
-
-    $_compile_path = $smarty->_get_compile_path($smarty->debug_tpl);
-    if ($smarty->_compile_resource($smarty->debug_tpl, $_compile_path))
-    {
-        ob_start();
-        $smarty->_include($_compile_path);
-        $_results = ob_get_contents();
-        ob_end_clean();
-    } else {
-        $_results = '';
-    }
-
-    $smarty->_compile_id = $_compile_id_orig;
-
-    $smarty->left_delimiter = $_ldelim_orig;
-    $smarty->right_delimiter = $_rdelim_orig;
-
-    return $_results;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.get_include_path.php b/thirdparty/smarty/libs/internals/core.get_include_path.php
deleted file mode 100644
index 43432412b..000000000
--- a/thirdparty/smarty/libs/internals/core.get_include_path.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Get path to file from include_path
- *
- * @param string $file_path
- * @param string $new_file_path
- * @return boolean
- * @staticvar array|null
- */
-
-//  $file_path, &$new_file_path
-
-function smarty_core_get_include_path(&$params, &$smarty)
-{
-    static $_path_array = null;
-
-    if(!isset($_path_array)) {
-        $_ini_include_path = ini_get('include_path');
-
-        if(strstr($_ini_include_path,';')) {
-            // windows pathnames
-            $_path_array = explode(';',$_ini_include_path);
-        } else {
-            $_path_array = explode(':',$_ini_include_path);
-        }
-    }
-    foreach ($_path_array as $_include_path) {
-        if (@is_readable($_include_path . DIRECTORY_SEPARATOR . $params['file_path'])) {
-               $params['new_file_path'] = $_include_path . DIRECTORY_SEPARATOR . $params['file_path'];
-            return true;
-        }
-    }
-    return false;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.get_microtime.php b/thirdparty/smarty/libs/internals/core.get_microtime.php
deleted file mode 100644
index f1a28e042..000000000
--- a/thirdparty/smarty/libs/internals/core.get_microtime.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Get seconds and microseconds
- * @return double
- */
-function smarty_core_get_microtime($params, &$smarty)
-{
-    $mtime = microtime();
-    $mtime = explode(" ", $mtime);
-    $mtime = (double)($mtime[1]) + (double)($mtime[0]);
-    return ($mtime);
-}
-
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.get_php_resource.php b/thirdparty/smarty/libs/internals/core.get_php_resource.php
deleted file mode 100644
index 786d4e78e..000000000
--- a/thirdparty/smarty/libs/internals/core.get_php_resource.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Retrieves PHP script resource
- *
- * sets $php_resource to the returned resource
- * @param string $resource
- * @param string $resource_type
- * @param  $php_resource
- * @return boolean
- */
-
-function smarty_core_get_php_resource(&$params, &$smarty)
-{
-
-    $params['resource_base_path'] = $smarty->trusted_dir;
-    $smarty->_parse_resource_name($params, $smarty);
-
-    /*
-     * Find out if the resource exists.
-     */
-
-    if ($params['resource_type'] == 'file') {
-        $_readable = false;
-        if(file_exists($params['resource_name']) && is_readable($params['resource_name'])) {
-            $_readable = true;
-        } else {
-            // test for file in include_path
-            $_params = array('file_path' => $params['resource_name']);
-            require_once(SMARTY_CORE_DIR . 'core.get_include_path.php');
-            if(smarty_core_get_include_path($_params, $smarty)) {
-                $_include_path = $_params['new_file_path'];
-                $_readable = true;
-            }
-        }
-    } else if ($params['resource_type'] != 'file') {
-        $_template_source = null;
-        $_readable = is_callable($smarty->_plugins['resource'][$params['resource_type']][0][0])
-            && call_user_func_array($smarty->_plugins['resource'][$params['resource_type']][0][0],
-                                    array($params['resource_name'], &$_template_source, &$smarty));
-    }
-
-    /*
-     * Set the error function, depending on which class calls us.
-     */
-    if (method_exists($smarty, '_syntax_error')) {
-        $_error_funcc = '_syntax_error';
-    } else {
-        $_error_funcc = 'trigger_error';
-    }
-
-    if ($_readable) {
-        if ($smarty->security) {
-            require_once(SMARTY_CORE_DIR . 'core.is_trusted.php');
-            if (!smarty_core_is_trusted($params, $smarty)) {
-                $smarty->$_error_funcc('(secure mode) ' . $params['resource_type'] . ':' . $params['resource_name'] . ' is not trusted');
-                return false;
-            }
-        }
-    } else {
-        $smarty->$_error_funcc($params['resource_type'] . ':' . $params['resource_name'] . ' is not readable');
-        return false;
-    }
-
-    if ($params['resource_type'] == 'file') {
-        $params['php_resource'] = $params['resource_name'];
-    } else {
-        $params['php_resource'] = $_template_source;
-    }
-    return true;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.is_secure.php b/thirdparty/smarty/libs/internals/core.is_secure.php
deleted file mode 100644
index d54abd432..000000000
--- a/thirdparty/smarty/libs/internals/core.is_secure.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * determines if a resource is secure or not.
- *
- * @param string $resource_type
- * @param string $resource_name
- * @return boolean
- */
-
-//  $resource_type, $resource_name
-
-function smarty_core_is_secure($params, &$smarty)
-{
-    if (!$smarty->security || $smarty->security_settings['INCLUDE_ANY']) {
-        return true;
-    }
-
-    if ($params['resource_type'] == 'file') {
-        $_rp = realpath($params['resource_name']);
-        if (isset($params['resource_base_path'])) {
-            foreach ((array)$params['resource_base_path'] as $curr_dir) {
-                if ( ($_cd = realpath($curr_dir)) !== false &&
-                     strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
-                     substr($_rp, strlen($_cd), 1) == DIRECTORY_SEPARATOR ) {
-                    return true;
-                }
-            }
-        }
-        if (!empty($smarty->secure_dir)) {
-            foreach ((array)$smarty->secure_dir as $curr_dir) {
-                if ( ($_cd = realpath($curr_dir)) !== false) {
-                    if($_cd == $_rp) {
-                        return true;
-                    } elseif (strncmp($_rp, $_cd, strlen($_cd)) == 0 &&
-                        substr($_rp, strlen($_cd), 1) == DIRECTORY_SEPARATOR) {
-                        return true;
-                    }
-                }
-            }
-        }
-    } else {
-        // resource is not on local file system
-        return call_user_func_array(
-            $smarty->_plugins['resource'][$params['resource_type']][0][2],
-            array($params['resource_name'], &$smarty));
-    }
-
-    return false;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.is_trusted.php b/thirdparty/smarty/libs/internals/core.is_trusted.php
deleted file mode 100644
index 429973158..000000000
--- a/thirdparty/smarty/libs/internals/core.is_trusted.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * determines if a resource is trusted or not
- *
- * @param string $resource_type
- * @param string $resource_name
- * @return boolean
- */
-
- // $resource_type, $resource_name
-
-function smarty_core_is_trusted($params, &$smarty)
-{
-    $_smarty_trusted = false;
-    if ($params['resource_type'] == 'file') {
-        if (!empty($smarty->trusted_dir)) {
-            $_rp = realpath($params['resource_name']);
-            foreach ((array)$smarty->trusted_dir as $curr_dir) {
-                if (!empty($curr_dir) && is_readable ($curr_dir)) {
-                    $_cd = realpath($curr_dir);
-                    if (strncmp($_rp, $_cd, strlen($_cd)) == 0
-                        && substr($_rp, strlen($_cd), 1) == DIRECTORY_SEPARATOR ) {
-                        $_smarty_trusted = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-    } else {
-        // resource is not on local file system
-        $_smarty_trusted = call_user_func_array($smarty->_plugins['resource'][$params['resource_type']][0][3],
-                                                array($params['resource_name'], $smarty));
-    }
-
-    return $_smarty_trusted;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.load_plugins.php b/thirdparty/smarty/libs/internals/core.load_plugins.php
deleted file mode 100644
index 6db1dc51d..000000000
--- a/thirdparty/smarty/libs/internals/core.load_plugins.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Load requested plugins
- *
- * @param array $plugins
- */
-
-// $plugins
-
-function smarty_core_load_plugins($params, &$smarty)
-{
-
-    foreach ($params['plugins'] as $_plugin_info) {
-        list($_type, $_name, $_tpl_file, $_tpl_line, $_delayed_loading) = $_plugin_info;
-        $_plugin = &$smarty->_plugins[$_type][$_name];
-
-        /*
-         * We do not load plugin more than once for each instance of Smarty.
-         * The following code checks for that. The plugin can also be
-         * registered dynamically at runtime, in which case template file
-         * and line number will be unknown, so we fill them in.
-         *
-         * The final element of the info array is a flag that indicates
-         * whether the dynamically registered plugin function has been
-         * checked for existence yet or not.
-         */
-        if (isset($_plugin)) {
-            if (empty($_plugin[3])) {
-                if (!is_callable($_plugin[0])) {
-                    $smarty->_trigger_fatal_error("[plugin] $_type '$_name' is not implemented", $_tpl_file, $_tpl_line, __FILE__, __LINE__);
-                } else {
-                    $_plugin[1] = $_tpl_file;
-                    $_plugin[2] = $_tpl_line;
-                    $_plugin[3] = true;
-                    if (!isset($_plugin[4])) $_plugin[4] = true; /* cacheable */
-                }
-            }
-            continue;
-        } else if ($_type == 'insert') {
-            /*
-             * For backwards compatibility, we check for insert functions in
-             * the symbol table before trying to load them as a plugin.
-             */
-            $_plugin_func = 'insert_' . $_name;
-            if (function_exists($_plugin_func)) {
-                $_plugin = array($_plugin_func, $_tpl_file, $_tpl_line, true, false);
-                continue;
-            }
-        }
-
-        $_plugin_file = $smarty->_get_plugin_filepath($_type, $_name);
-
-        if (! $_found = ($_plugin_file != false)) {
-            $_message = "could not load plugin file '$_type.$_name.php'\n";
-        }
-
-        /*
-         * If plugin file is found, it -must- provide the properly named
-         * plugin function. In case it doesn't, simply output the error and
-         * do not fall back on any other method.
-         */
-        if ($_found) {
-            include_once $_plugin_file;
-
-            $_plugin_func = 'smarty_' . $_type . '_' . $_name;
-            if (!function_exists($_plugin_func)) {
-                $smarty->_trigger_fatal_error("[plugin] function $_plugin_func() not found in $_plugin_file", $_tpl_file, $_tpl_line, __FILE__, __LINE__);
-                continue;
-            }
-        }
-        /*
-         * In case of insert plugins, their code may be loaded later via
-         * 'script' attribute.
-         */
-        else if ($_type == 'insert' && $_delayed_loading) {
-            $_plugin_func = 'smarty_' . $_type . '_' . $_name;
-            $_found = true;
-        }
-
-        /*
-         * Plugin specific processing and error checking.
-         */
-        if (!$_found) {
-            if ($_type == 'modifier') {
-                /*
-                 * In case modifier falls back on using PHP functions
-                 * directly, we only allow those specified in the security
-                 * context.
-                 */
-                if ($smarty->security && !in_array($_name, $smarty->security_settings['MODIFIER_FUNCS'])) {
-                    $_message = "(secure mode) modifier '$_name' is not allowed";
-                } else {
-                    if (!function_exists($_name)) {
-                        $_message = "modifier '$_name' is not implemented";
-                    } else {
-                        $_plugin_func = $_name;
-                        $_found = true;
-                    }
-                }
-            } else if ($_type == 'function') {
-                /*
-                 * This is a catch-all situation.
-                 */
-                $_message = "unknown tag - '$_name'";
-            }
-        }
-
-        if ($_found) {
-            $smarty->_plugins[$_type][$_name] = array($_plugin_func, $_tpl_file, $_tpl_line, true, true);
-        } else {
-            // output error
-            $smarty->_trigger_fatal_error('[plugin] ' . $_message, $_tpl_file, $_tpl_line, __FILE__, __LINE__);
-        }
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.load_resource_plugin.php b/thirdparty/smarty/libs/internals/core.load_resource_plugin.php
deleted file mode 100644
index a7d37d1af..000000000
--- a/thirdparty/smarty/libs/internals/core.load_resource_plugin.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * load a resource plugin
- *
- * @param string $type
- */
-
-// $type
-
-function smarty_core_load_resource_plugin($params, &$smarty)
-{
-    /*
-     * Resource plugins are not quite like the other ones, so they are
-     * handled differently. The first element of plugin info is the array of
-     * functions provided by the plugin, the second one indicates whether
-     * all of them exist or not.
-     */
-
-    $_plugin = &$smarty->_plugins['resource'][$params['type']];
-    if (isset($_plugin)) {
-        if (!$_plugin[1] && count($_plugin[0])) {
-            $_plugin[1] = true;
-            foreach ($_plugin[0] as $_plugin_func) {
-                if (!is_callable($_plugin_func)) {
-                    $_plugin[1] = false;
-                    break;
-                }
-            }
-        }
-
-        if (!$_plugin[1]) {
-            $smarty->_trigger_fatal_error("[plugin] resource '" . $params['type'] . "' is not implemented", null, null, __FILE__, __LINE__);
-        }
-
-        return;
-    }
-
-    $_plugin_file = $smarty->_get_plugin_filepath('resource', $params['type']);
-    $_found = ($_plugin_file != false);
-
-    if ($_found) {            /*
-         * If the plugin file is found, it -must- provide the properly named
-         * plugin functions.
-         */
-        include_once($_plugin_file);
-
-        /*
-         * Locate functions that we require the plugin to provide.
-         */
-        $_resource_ops = array('source', 'timestamp', 'secure', 'trusted');
-        $_resource_funcs = array();
-        foreach ($_resource_ops as $_op) {
-            $_plugin_func = 'smarty_resource_' . $params['type'] . '_' . $_op;
-            if (!function_exists($_plugin_func)) {
-                $smarty->_trigger_fatal_error("[plugin] function $_plugin_func() not found in $_plugin_file", null, null, __FILE__, __LINE__);
-                return;
-            } else {
-                $_resource_funcs[] = $_plugin_func;
-            }
-        }
-
-        $smarty->_plugins['resource'][$params['type']] = array($_resource_funcs, true);
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.process_cached_inserts.php b/thirdparty/smarty/libs/internals/core.process_cached_inserts.php
deleted file mode 100644
index 1d78edd93..000000000
--- a/thirdparty/smarty/libs/internals/core.process_cached_inserts.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Replace cached inserts with the actual results
- *
- * @param string $results
- * @return string
- */
-function smarty_core_process_cached_inserts($params, &$smarty)
-{
-    preg_match_all('!'.$smarty->_smarty_md5.'{insert_cache (.*)}'.$smarty->_smarty_md5.'!Uis',
-                   $params['results'], $match);
-    list($cached_inserts, $insert_args) = $match;
-
-    for ($i = 0, $for_max = count($cached_inserts); $i < $for_max; $i++) {
-        if ($smarty->debugging) {
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $debug_start_time = smarty_core_get_microtime($_params, $smarty);
-        }
-
-        $args = unserialize($insert_args[$i]);
-        $name = $args['name'];
-
-        if (isset($args['script'])) {
-            $_params = array('resource_name' => $smarty->_dequote($args['script']));
-            require_once(SMARTY_CORE_DIR . 'core.get_php_resource.php');
-            if(!smarty_core_get_php_resource($_params, $smarty)) {
-                return false;
-            }
-            $resource_type = $_params['resource_type'];
-            $php_resource = $_params['php_resource'];
-
-
-            if ($resource_type == 'file') {
-                $smarty->_include($php_resource, true);
-            } else {
-                $smarty->_eval($php_resource);
-            }
-        }
-
-        $function_name = $smarty->_plugins['insert'][$name][0];
-        if (empty($args['assign'])) {
-            $replace = $function_name($args, $smarty);
-        } else {
-            $smarty->assign($args['assign'], $function_name($args, $smarty));
-            $replace = '';
-        }
-
-        $params['results'] = substr_replace($params['results'], $replace, strpos($params['results'], $cached_inserts[$i]), strlen($cached_inserts[$i]));
-        if ($smarty->debugging) {
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $smarty->_smarty_debug_info[] = array('type'      => 'insert',
-                                                'filename'  => 'insert_'.$name,
-                                                'depth'     => $smarty->_inclusion_depth,
-                                                'exec_time' => smarty_core_get_microtime($_params, $smarty) - $debug_start_time);
-        }
-    }
-
-    return $params['results'];
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.process_compiled_include.php b/thirdparty/smarty/libs/internals/core.process_compiled_include.php
deleted file mode 100644
index d539423bf..000000000
--- a/thirdparty/smarty/libs/internals/core.process_compiled_include.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Replace nocache-tags by results of the corresponding non-cacheable
- * functions and return it
- *
- * @param string $compiled_tpl
- * @param string $cached_source
- * @return string
- */
-
-function smarty_core_process_compiled_include($params, &$smarty)
-{
-    $_cache_including = $smarty->_cache_including;
-    $smarty->_cache_including = true;
-
-    $_return = $params['results'];
-
-    foreach ($smarty->_cache_info['cache_serials'] as $_include_file_path=>$_cache_serial) {
-        $smarty->_include($_include_file_path, true);
-    }
-
-    foreach ($smarty->_cache_serials as $_include_file_path=>$_cache_serial) {
-        $_return = preg_replace_callback('!(\{nocache\:('.$_cache_serial.')#(\d+)\})!s',
-                                         array(&$smarty, '_process_compiled_include_callback'),
-                                         $_return);
-    }
-    $smarty->_cache_including = $_cache_including;
-    return $_return;
-}
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.read_cache_file.php b/thirdparty/smarty/libs/internals/core.read_cache_file.php
deleted file mode 100644
index c60e113a7..000000000
--- a/thirdparty/smarty/libs/internals/core.read_cache_file.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * read a cache file, determine if it needs to be
- * regenerated or not
- *
- * @param string $tpl_file
- * @param string $cache_id
- * @param string $compile_id
- * @param string $results
- * @return boolean
- */
-
-//  $tpl_file, $cache_id, $compile_id, &$results
-
-function smarty_core_read_cache_file(&$params, &$smarty)
-{
-    static  $content_cache = array();
-
-    if ($smarty->force_compile) {
-        // force compile enabled, always regenerate
-        return false;
-    }
-
-    if (isset($content_cache[$params['tpl_file'].','.$params['cache_id'].','.$params['compile_id']])) {
-        list($params['results'], $smarty->_cache_info) = $content_cache[$params['tpl_file'].','.$params['cache_id'].','.$params['compile_id']];
-        return true;
-    }
-
-    if (!empty($smarty->cache_handler_func)) {
-        // use cache_handler function
-        call_user_func_array($smarty->cache_handler_func,
-                             array('read', &$smarty, &$params['results'], $params['tpl_file'], $params['cache_id'], $params['compile_id'], null));
-    } else {
-        // use local cache file
-        $_auto_id = $smarty->_get_auto_id($params['cache_id'], $params['compile_id']);
-        $_cache_file = $smarty->_get_auto_filename($smarty->cache_dir, $params['tpl_file'], $_auto_id);
-        $params['results'] = $smarty->_read_file($_cache_file);
-    }
-
-    if (empty($params['results'])) {
-        // nothing to parse (error?), regenerate cache
-        return false;
-    }
-
-    $_contents = $params['results'];
-    $_info_start = strpos($_contents, "\n") + 1;
-    $_info_len = (int)substr($_contents, 0, $_info_start - 1);
-    $_cache_info = unserialize(substr($_contents, $_info_start, $_info_len));
-    $params['results'] = substr($_contents, $_info_start + $_info_len);
-
-    if ($smarty->caching == 2 && isset ($_cache_info['expires'])){
-        // caching by expiration time
-        if ($_cache_info['expires'] > -1 && (time() > $_cache_info['expires'])) {
-            // cache expired, regenerate
-            return false;
-        }
-    } else {
-        // caching by lifetime
-        if ($smarty->cache_lifetime > -1 && (time() - $_cache_info['timestamp'] > $smarty->cache_lifetime)) {
-            // cache expired, regenerate
-            return false;
-        }
-    }
-
-    if ($smarty->compile_check) {
-        $_params = array('get_source' => false, 'quiet'=>true);
-        foreach (array_keys($_cache_info['template']) as $_template_dep) {
-            $_params['resource_name'] = $_template_dep;
-            if (!$smarty->_fetch_resource_info($_params) || $_cache_info['timestamp'] < $_params['resource_timestamp']) {
-                // template file has changed, regenerate cache
-                return false;
-            }
-        }
-
-        if (isset($_cache_info['config'])) {
-            $_params = array('resource_base_path' => $smarty->config_dir, 'get_source' => false, 'quiet'=>true);
-            foreach (array_keys($_cache_info['config']) as $_config_dep) {
-                $_params['resource_name'] = $_config_dep;
-                if (!$smarty->_fetch_resource_info($_params) || $_cache_info['timestamp'] < $_params['resource_timestamp']) {
-                    // config file has changed, regenerate cache
-                    return false;
-                }
-            }
-        }
-    }
-
-    $content_cache[$params['tpl_file'].','.$params['cache_id'].','.$params['compile_id']] = array($params['results'], $_cache_info);
-
-    $smarty->_cache_info = $_cache_info;
-    return true;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.rm_auto.php b/thirdparty/smarty/libs/internals/core.rm_auto.php
deleted file mode 100644
index b251f6491..000000000
--- a/thirdparty/smarty/libs/internals/core.rm_auto.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * delete an automagically created file by name and id
- *
- * @param string $auto_base
- * @param string $auto_source
- * @param string $auto_id
- * @param integer $exp_time
- * @return boolean
- */
-
-// $auto_base, $auto_source = null, $auto_id = null, $exp_time = null
-
-function smarty_core_rm_auto($params, &$smarty)
-{
-    if (!@is_dir($params['auto_base']))
-      return false;
-
-    if(!isset($params['auto_id']) && !isset($params['auto_source'])) {
-        $_params = array(
-            'dirname' => $params['auto_base'],
-            'level' => 0,
-            'exp_time' => $params['exp_time']
-        );
-        require_once(SMARTY_CORE_DIR . 'core.rmdir.php');
-        $_res = smarty_core_rmdir($_params, $smarty);
-    } else {
-        $_tname = $smarty->_get_auto_filename($params['auto_base'], $params['auto_source'], $params['auto_id']);
-
-        if(isset($params['auto_source'])) {
-            if (isset($params['extensions'])) {
-                $_res = false;
-                foreach ((array)$params['extensions'] as $_extension)
-                    $_res |= $smarty->_unlink($_tname.$_extension, $params['exp_time']);
-            } else {
-                $_res = $smarty->_unlink($_tname, $params['exp_time']);
-            }
-        } elseif ($smarty->use_sub_dirs) {
-            $_params = array(
-                'dirname' => $_tname,
-                'level' => 1,
-                'exp_time' => $params['exp_time']
-            );
-            require_once(SMARTY_CORE_DIR . 'core.rmdir.php');
-            $_res = smarty_core_rmdir($_params, $smarty);
-        } else {
-            // remove matching file names
-            $_handle = opendir($params['auto_base']);
-            $_res = true;
-            while (false !== ($_filename = readdir($_handle))) {
-                if($_filename == '.' || $_filename == '..') {
-                    continue;
-                } elseif (substr($params['auto_base'] . DIRECTORY_SEPARATOR . $_filename, 0, strlen($_tname)) == $_tname) {
-                    $_res &= (bool)$smarty->_unlink($params['auto_base'] . DIRECTORY_SEPARATOR . $_filename, $params['exp_time']);
-                }
-            }
-        }
-    }
-
-    return $_res;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.rmdir.php b/thirdparty/smarty/libs/internals/core.rmdir.php
deleted file mode 100644
index 2166c44d2..000000000
--- a/thirdparty/smarty/libs/internals/core.rmdir.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * delete a dir recursively (level=0 -> keep root)
- * WARNING: no tests, it will try to remove what you tell it!
- *
- * @param string $dirname
- * @param integer $level
- * @param integer $exp_time
- * @return boolean
- */
-
-//  $dirname, $level = 1, $exp_time = null
-
-function smarty_core_rmdir($params, &$smarty)
-{
-   if(!isset($params['level'])) { $params['level'] = 1; }
-   if(!isset($params['exp_time'])) { $params['exp_time'] = null; }
-
-   if($_handle = @opendir($params['dirname'])) {
-
-        while (false !== ($_entry = readdir($_handle))) {
-            if ($_entry != '.' && $_entry != '..') {
-                if (@is_dir($params['dirname'] . DIRECTORY_SEPARATOR . $_entry)) {
-                    $_params = array(
-                        'dirname' => $params['dirname'] . DIRECTORY_SEPARATOR . $_entry,
-                        'level' => $params['level'] + 1,
-                        'exp_time' => $params['exp_time']
-                    );
-                    smarty_core_rmdir($_params, $smarty);
-                }
-                else {
-                    $smarty->_unlink($params['dirname'] . DIRECTORY_SEPARATOR . $_entry, $params['exp_time']);
-                }
-            }
-        }
-        closedir($_handle);
-   }
-
-   if ($params['level']) {
-       return @rmdir($params['dirname']);
-   }
-   return (bool)$_handle;
-
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.run_insert_handler.php b/thirdparty/smarty/libs/internals/core.run_insert_handler.php
deleted file mode 100644
index 71c384508..000000000
--- a/thirdparty/smarty/libs/internals/core.run_insert_handler.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Handle insert tags
- *
- * @param array $args
- * @return string
- */
-function smarty_core_run_insert_handler($params, &$smarty)
-{
-
-    require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-    if ($smarty->debugging) {
-        $_params = array();
-        $_debug_start_time = smarty_core_get_microtime($_params, $smarty);
-    }
-
-    if ($smarty->caching) {
-        $_arg_string = serialize($params['args']);
-        $_name = $params['args']['name'];
-        if (!isset($smarty->_cache_info['insert_tags'][$_name])) {
-            $smarty->_cache_info['insert_tags'][$_name] = array('insert',
-                                                             $_name,
-                                                             $smarty->_plugins['insert'][$_name][1],
-                                                             $smarty->_plugins['insert'][$_name][2],
-                                                             !empty($params['args']['script']) ? true : false);
-        }
-        return $smarty->_smarty_md5."{insert_cache $_arg_string}".$smarty->_smarty_md5;
-    } else {
-        if (isset($params['args']['script'])) {
-            $_params = array('resource_name' => $smarty->_dequote($params['args']['script']));
-            require_once(SMARTY_CORE_DIR . 'core.get_php_resource.php');
-            if(!smarty_core_get_php_resource($_params, $smarty)) {
-                return false;
-            }
-
-            if ($_params['resource_type'] == 'file') {
-                $smarty->_include($_params['php_resource'], true);
-            } else {
-                $smarty->_eval($_params['php_resource']);
-            }
-            unset($params['args']['script']);
-        }
-
-        $_funcname = $smarty->_plugins['insert'][$params['args']['name']][0];
-        $_content = $_funcname($params['args'], $smarty);
-        if ($smarty->debugging) {
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $smarty->_smarty_debug_info[] = array('type'      => 'insert',
-                                                'filename'  => 'insert_'.$params['args']['name'],
-                                                'depth'     => $smarty->_inclusion_depth,
-                                                'exec_time' => smarty_core_get_microtime($_params, $smarty) - $_debug_start_time);
-        }
-
-        if (!empty($params['args']["assign"])) {
-            $smarty->assign($params['args']["assign"], $_content);
-        } else {
-            return $_content;
-        }
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.smarty_include_php.php b/thirdparty/smarty/libs/internals/core.smarty_include_php.php
deleted file mode 100644
index 30c6e7654..000000000
--- a/thirdparty/smarty/libs/internals/core.smarty_include_php.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * called for included php files within templates
- *
- * @param string $smarty_file
- * @param string $smarty_assign variable to assign the included template's
- *               output into
- * @param boolean $smarty_once uses include_once if this is true
- * @param array $smarty_include_vars associative array of vars from
- *              {include file="blah" var=$var}
- */
-
-//  $file, $assign, $once, $_smarty_include_vars
-
-function smarty_core_smarty_include_php($params, &$smarty)
-{
-    $_params = array('resource_name' => $params['smarty_file']);
-    require_once(SMARTY_CORE_DIR . 'core.get_php_resource.php');
-    smarty_core_get_php_resource($_params, $smarty);
-    $_smarty_resource_type = $_params['resource_type'];
-    $_smarty_php_resource = $_params['php_resource'];
-
-    if (!empty($params['smarty_assign'])) {
-        ob_start();
-        if ($_smarty_resource_type == 'file') {
-            $smarty->_include($_smarty_php_resource, $params['smarty_once'], $params['smarty_include_vars']);
-        } else {
-            $smarty->_eval($_smarty_php_resource, $params['smarty_include_vars']);
-        }
-        $smarty->assign($params['smarty_assign'], ob_get_contents());
-        ob_end_clean();
-    } else {
-        if ($_smarty_resource_type == 'file') {
-            $smarty->_include($_smarty_php_resource, $params['smarty_once'], $params['smarty_include_vars']);
-        } else {
-            $smarty->_eval($_smarty_php_resource, $params['smarty_include_vars']);
-        }
-    }
-}
-
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.write_cache_file.php b/thirdparty/smarty/libs/internals/core.write_cache_file.php
deleted file mode 100644
index 72f785b74..000000000
--- a/thirdparty/smarty/libs/internals/core.write_cache_file.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Prepend the cache information to the cache file
- * and write it
- *
- * @param string $tpl_file
- * @param string $cache_id
- * @param string $compile_id
- * @param string $results
- * @return true|null
- */
-
- // $tpl_file, $cache_id, $compile_id, $results
-
-function smarty_core_write_cache_file($params, &$smarty)
-{
-
-    // put timestamp in cache header
-    $smarty->_cache_info['timestamp'] = time();
-    if ($smarty->cache_lifetime > -1){
-        // expiration set
-        $smarty->_cache_info['expires'] = $smarty->_cache_info['timestamp'] + $smarty->cache_lifetime;
-    } else {
-        // cache will never expire
-        $smarty->_cache_info['expires'] = -1;
-    }
-
-    // collapse nocache.../nocache-tags
-    if (preg_match_all('!\{(/?)nocache\:[0-9a-f]{32}#\d+\}!', $params['results'], $match, PREG_PATTERN_ORDER)) {
-        // remove everything between every pair of outermost noache.../nocache-tags
-        // and replace it by a single nocache-tag
-        // this new nocache-tag will be replaced by dynamic contents in
-        // smarty_core_process_compiled_includes() on a cache-read
-        
-        $match_count = count($match[0]);
-        $results = preg_split('!(\{/?nocache\:[0-9a-f]{32}#\d+\})!', $params['results'], -1, PREG_SPLIT_DELIM_CAPTURE);
-        
-        $level = 0;
-        $j = 0;
-        for ($i=0, $results_count = count($results); $i < $results_count && $j < $match_count; $i++) {
-            if ($results[$i] == $match[0][$j]) {
-                // nocache tag
-                if ($match[1][$j]) { // closing tag
-                    $level--;
-                    unset($results[$i]);
-                } else { // opening tag
-                    if ($level++ > 0) unset($results[$i]);
-                }
-                $j++;
-            } elseif ($level > 0) {
-                unset($results[$i]);
-            }
-        }
-        $params['results'] = implode('', $results);
-    }
-    $smarty->_cache_info['cache_serials'] = $smarty->_cache_serials;
-
-    // prepend the cache header info into cache file
-    $_cache_info = serialize($smarty->_cache_info);
-    $params['results'] = strlen($_cache_info) . "\n" . $_cache_info . $params['results'];
-
-    if (!empty($smarty->cache_handler_func)) {
-        // use cache_handler function
-        call_user_func_array($smarty->cache_handler_func,
-                             array('write', &$smarty, &$params['results'], $params['tpl_file'], $params['cache_id'], $params['compile_id'], null));
-    } else {
-        // use local cache file
-
-        if(!@is_writable($smarty->cache_dir)) {
-            // cache_dir not writable, see if it exists
-            if(!@is_dir($smarty->cache_dir)) {
-                $smarty->trigger_error('the $cache_dir \'' . $smarty->cache_dir . '\' does not exist, or is not a directory.', E_USER_ERROR);
-                return false;
-            }
-            $smarty->trigger_error('unable to write to $cache_dir \'' . realpath($smarty->cache_dir) . '\'. Be sure $cache_dir is writable by the web server user.', E_USER_ERROR);
-            return false;
-        }
-
-        $_auto_id = $smarty->_get_auto_id($params['cache_id'], $params['compile_id']);
-        $_cache_file = $smarty->_get_auto_filename($smarty->cache_dir, $params['tpl_file'], $_auto_id);
-        $_params = array('filename' => $_cache_file, 'contents' => $params['results'], 'create_dirs' => true);
-        require_once(SMARTY_CORE_DIR . 'core.write_file.php');
-        smarty_core_write_file($_params, $smarty);
-        return true;
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.write_compiled_include.php b/thirdparty/smarty/libs/internals/core.write_compiled_include.php
deleted file mode 100644
index c14adb5f4..000000000
--- a/thirdparty/smarty/libs/internals/core.write_compiled_include.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Extract non-cacheable parts out of compiled template and write it
- *
- * @param string $compile_path
- * @param string $template_compiled
- * @return boolean
- */
-
-function smarty_core_write_compiled_include($params, &$smarty)
-{
-    $_tag_start = 'if \(\$this->caching && \!\$this->_cache_including\)\: echo \'\{nocache\:('.$params['cache_serial'].')#(\d+)\}\'; endif;';
-    $_tag_end   = 'if \(\$this->caching && \!\$this->_cache_including\)\: echo \'\{/nocache\:(\\2)#(\\3)\}\'; endif;';
-
-    preg_match_all('!('.$_tag_start.'(.*)'.$_tag_end.')!Us',
-                   $params['compiled_content'], $_match_source, PREG_SET_ORDER);
-    
-    // no nocache-parts found: done
-    if (count($_match_source)==0) return;
-
-    // convert the matched php-code to functions
-    $_include_compiled =  "<?php /* Smarty version ".$smarty->_version.", created on ".strftime("%Y-%m-%d %H:%M:%S")."\n";
-    $_include_compiled .= "         compiled from " . strtr(urlencode($params['resource_name']), array('%2F'=>'/', '%3A'=>':')) . " */\n\n";
-
-    $_compile_path = $params['include_file_path'];
-
-    $smarty->_cache_serials[$_compile_path] = $params['cache_serial'];
-    $_include_compiled .= "\$this->_cache_serials['".$_compile_path."'] = '".$params['cache_serial']."';\n\n?>";
-
-    $_include_compiled .= $params['plugins_code'];
-    $_include_compiled .= "<?php";
-
-    $this_varname = ((double)phpversion() >= 5.0) ? '_smarty' : 'this';
-    for ($_i = 0, $_for_max = count($_match_source); $_i < $_for_max; $_i++) {
-        $_match =& $_match_source[$_i];
-        $source = $_match[4];
-        if ($this_varname == '_smarty') {
-            /* rename $this to $_smarty in the sourcecode */
-            $tokens = token_get_all('<?php ' . $_match[4]);
-
-            /* remove trailing <?php */
-            $open_tag = '';
-            while ($tokens) {
-                $token = array_shift($tokens);
-                if (is_array($token)) {
-                    $open_tag .= $token[1];
-                } else {
-                    $open_tag .= $token;
-                }
-                if ($open_tag == '<?php ') break;
-            }
-
-            for ($i=0, $count = count($tokens); $i < $count; $i++) {
-                if (is_array($tokens[$i])) {
-                    if ($tokens[$i][0] == T_VARIABLE && $tokens[$i][1] == '$this') {
-                        $tokens[$i] = '$' . $this_varname;
-                    } else {
-                        $tokens[$i] = $tokens[$i][1];
-                    }                   
-                }
-            }
-            $source = implode('', $tokens);
-        }
-
-        /* add function to compiled include */
-        $_include_compiled .= "
-function _smarty_tplfunc_$_match[2]_$_match[3](&\$$this_varname)
-{
-$source
-}
-
-";
-    }
-    $_include_compiled .= "\n\n?>\n";
-
-    $_params = array('filename' => $_compile_path,
-                     'contents' => $_include_compiled, 'create_dirs' => true);
-
-    require_once(SMARTY_CORE_DIR . 'core.write_file.php');
-    smarty_core_write_file($_params, $smarty);
-    return true;
-}
-
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.write_compiled_resource.php b/thirdparty/smarty/libs/internals/core.write_compiled_resource.php
deleted file mode 100644
index b902eff3c..000000000
--- a/thirdparty/smarty/libs/internals/core.write_compiled_resource.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * write the compiled resource
- *
- * @param string $compile_path
- * @param string $compiled_content
- * @return true
- */
-function smarty_core_write_compiled_resource($params, &$smarty)
-{
-    if(!@is_writable($smarty->compile_dir)) {
-        // compile_dir not writable, see if it exists
-        if(!@is_dir($smarty->compile_dir)) {
-            $smarty->trigger_error('the $compile_dir \'' . $smarty->compile_dir . '\' does not exist, or is not a directory.', E_USER_ERROR);
-            return false;
-        }
-        $smarty->trigger_error('unable to write to $compile_dir \'' . realpath($smarty->compile_dir) . '\'. Be sure $compile_dir is writable by the web server user.', E_USER_ERROR);
-        return false;
-    }
-
-    $_params = array('filename' => $params['compile_path'], 'contents' => $params['compiled_content'], 'create_dirs' => true);
-    require_once(SMARTY_CORE_DIR . 'core.write_file.php');
-    smarty_core_write_file($_params, $smarty);
-    return true;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/internals/core.write_file.php b/thirdparty/smarty/libs/internals/core.write_file.php
deleted file mode 100644
index 8a3a3b398..000000000
--- a/thirdparty/smarty/libs/internals/core.write_file.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * write out a file to disk
- *
- * @param string $filename
- * @param string $contents
- * @param boolean $create_dirs
- * @return boolean
- */
-function smarty_core_write_file($params, &$smarty)
-{
-    $_dirname = dirname($params['filename']);
-
-    if ($params['create_dirs']) {
-        $_params = array('dir' => $_dirname);
-        require_once(SMARTY_CORE_DIR . 'core.create_dir_structure.php');
-        smarty_core_create_dir_structure($_params, $smarty);
-    }
-
-    // write to tmp file, then rename it to avoid file locking race condition
-    $_tmp_file = tempnam($_dirname, 'wrt');
-
-    if (!($fd = @fopen($_tmp_file, 'wb'))) {
-        $_tmp_file = $_dirname . DIRECTORY_SEPARATOR . uniqid('wrt');
-        if (!($fd = @fopen($_tmp_file, 'wb'))) {
-            $smarty->trigger_error("problem writing temporary file '$_tmp_file'");
-            return false;
-        }
-    }
-
-    fwrite($fd, $params['contents']);
-    fclose($fd);
-
-    if (DIRECTORY_SEPARATOR == '\\' || !@rename($_tmp_file, $params['filename'])) {
-        // On platforms and filesystems that cannot overwrite with rename() 
-        // delete the file before renaming it -- because windows always suffers
-        // this, it is short-circuited to avoid the initial rename() attempt
-        @unlink($params['filename']);
-        @rename($_tmp_file, $params['filename']);
-    }
-    @chmod($params['filename'], $smarty->_file_perms);
-
-    return true;
-}
-
-/* vim: set expandtab: */
-
-?>
\ No newline at end of file
diff --git a/thirdparty/smarty/libs/plugins/block.textformat.php b/thirdparty/smarty/libs/plugins/block.textformat.php
deleted file mode 100644
index 8cd010acb..000000000
--- a/thirdparty/smarty/libs/plugins/block.textformat.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Smarty {textformat}{/textformat} block plugin
- *
- * Type:     block function<br>
- * Name:     textformat<br>
- * Purpose:  format text a certain way with preset styles
- *           or custom wrap/indent settings<br>
- * @link http://smarty.php.net/manual/en/language.function.textformat.php {textformat}
- *       (Smarty online manual)
- * @param array
- * <pre>
- * Params:   style: string (email)
- *           indent: integer (0)
- *           wrap: integer (80)
- *           wrap_char string ("\n")
- *           indent_char: string (" ")
- *           wrap_boundary: boolean (true)
- * </pre>
- * @author Monte Ohrt <monte at ohrt dot com>
- * @param string contents of the block
- * @param Smarty clever simulation of a method
- * @return string string $content re-formatted
- */
-function smarty_block_textformat($params, $content, &$smarty)
-{
-    if (is_null($content)) {
-        return;
-    }
-
-    $style = null;
-    $indent = 0;
-    $indent_first = 0;
-    $indent_char = ' ';
-    $wrap = 80;
-    $wrap_char = "\n";
-    $wrap_cut = false;
-    $assign = null;
-    
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'style':
-            case 'indent_char':
-            case 'wrap_char':
-            case 'assign':
-                $$_key = (string)$_val;
-                break;
-
-            case 'indent':
-            case 'indent_first':
-            case 'wrap':
-                $$_key = (int)$_val;
-                break;
-
-            case 'wrap_cut':
-                $$_key = (bool)$_val;
-                break;
-
-            default:
-                $smarty->trigger_error("textformat: unknown attribute '$_key'");
-        }
-    }
-
-    if ($style == 'email') {
-        $wrap = 72;
-    }
-
-    // split into paragraphs
-    $_paragraphs = preg_split('![\r\n][\r\n]!',$content);
-    $_output = '';
-
-    for($_x = 0, $_y = count($_paragraphs); $_x < $_y; $_x++) {
-        if ($_paragraphs[$_x] == '') {
-            continue;
-        }
-        // convert mult. spaces & special chars to single space
-        $_paragraphs[$_x] = preg_replace(array('!\s+!','!(^\s+)|(\s+$)!'), array(' ',''), $_paragraphs[$_x]);
-        // indent first line
-        if($indent_first > 0) {
-            $_paragraphs[$_x] = str_repeat($indent_char, $indent_first) . $_paragraphs[$_x];
-        }
-        // wordwrap sentences
-        $_paragraphs[$_x] = wordwrap($_paragraphs[$_x], $wrap - $indent, $wrap_char, $wrap_cut);
-        // indent lines
-        if($indent > 0) {
-            $_paragraphs[$_x] = preg_replace('!^!m', str_repeat($indent_char, $indent), $_paragraphs[$_x]);
-        }
-    }
-    $_output = implode($wrap_char . $wrap_char, $_paragraphs);
-
-    return $assign ? $smarty->assign($assign, $_output) : $_output;
-
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/compiler.assign.php b/thirdparty/smarty/libs/plugins/compiler.assign.php
deleted file mode 100644
index be1729850..000000000
--- a/thirdparty/smarty/libs/plugins/compiler.assign.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Smarty {assign} compiler function plugin
- *
- * Type:     compiler function<br>
- * Name:     assign<br>
- * Purpose:  assign a value to a template variable
- * @link http://smarty.php.net/manual/en/language.custom.functions.php#LANGUAGE.FUNCTION.ASSIGN {assign}
- *       (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com> (initial author)
- * @auther messju mohr <messju at lammfellpuschen dot de> (conversion to compiler function)
- * @param string containing var-attribute and value-attribute
- * @param Smarty_Compiler
- */
-function smarty_compiler_assign($tag_attrs, &$compiler)
-{
-    $_params = $compiler->_parse_attrs($tag_attrs);
-
-    if (!isset($_params['var'])) {
-        $compiler->_syntax_error("assign: missing 'var' parameter", E_USER_WARNING);
-        return;
-    }
-
-    if (!isset($_params['value'])) {
-        $compiler->_syntax_error("assign: missing 'value' parameter", E_USER_WARNING);
-        return;
-    }
-
-    return "\$this->assign({$_params['var']}, {$_params['value']});";
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.assign_debug_info.php b/thirdparty/smarty/libs/plugins/function.assign_debug_info.php
deleted file mode 100644
index 654049876..000000000
--- a/thirdparty/smarty/libs/plugins/function.assign_debug_info.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Smarty {assign_debug_info} function plugin
- *
- * Type:     function<br>
- * Name:     assign_debug_info<br>
- * Purpose:  assign debug info to the template<br>
- * @author Monte Ohrt <monte at ohrt dot com>
- * @param array unused in this plugin, this plugin uses {@link Smarty::$_config},
- *              {@link Smarty::$_tpl_vars} and {@link Smarty::$_smarty_debug_info}
- * @param Smarty
- */
-function smarty_function_assign_debug_info($params, &$smarty)
-{
-    $assigned_vars = $smarty->_tpl_vars;
-    ksort($assigned_vars);
-    if (@is_array($smarty->_config[0])) {
-        $config_vars = $smarty->_config[0];
-        ksort($config_vars);
-        $smarty->assign("_debug_config_keys", array_keys($config_vars));
-        $smarty->assign("_debug_config_vals", array_values($config_vars));
-    }
-    
-    $included_templates = $smarty->_smarty_debug_info;
-    
-    $smarty->assign("_debug_keys", array_keys($assigned_vars));
-    $smarty->assign("_debug_vals", array_values($assigned_vars));
-    
-    $smarty->assign("_debug_tpls", $included_templates);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.config_load.php b/thirdparty/smarty/libs/plugins/function.config_load.php
deleted file mode 100644
index db89f638c..000000000
--- a/thirdparty/smarty/libs/plugins/function.config_load.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Smarty {config_load} function plugin
- *
- * Type:     function<br>
- * Name:     config_load<br>
- * Purpose:  load config file vars
- * @link http://smarty.php.net/manual/en/language.function.config.load.php {config_load}
- *       (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author messju mohr <messju at lammfellpuschen dot de> (added use of resources)
- * @param array Format:
- * <pre>
- * array('file' => required config file name,
- *       'section' => optional config file section to load
- *       'scope' => local/parent/global
- *       'global' => overrides scope, setting to parent if true)
- * </pre>
- * @param Smarty
- */
-function smarty_function_config_load($params, &$smarty)
-{
-        if ($smarty->debugging) {
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $_debug_start_time = smarty_core_get_microtime($_params, $smarty);
-        }
-
-        $_file = isset($params['file']) ? $smarty->_dequote($params['file']) : null;
-        $_section = isset($params['section']) ? $smarty->_dequote($params['section']) : null;
-        $_scope = isset($params['scope']) ? $smarty->_dequote($params['scope']) : 'global';
-        $_global = isset($params['global']) ? $smarty->_dequote($params['global']) : false;
-
-        if (!isset($_file) || strlen($_file) == 0) {
-            $smarty->trigger_error("missing 'file' attribute in config_load tag", E_USER_ERROR, __FILE__, __LINE__);
-        }
-
-        if (isset($_scope)) {
-            if ($_scope != 'local' &&
-                $_scope != 'parent' &&
-                $_scope != 'global') {
-                $smarty->trigger_error("invalid 'scope' attribute value", E_USER_ERROR, __FILE__, __LINE__);
-            }
-        } else {
-            if ($_global) {
-                $_scope = 'parent';
-            } else {
-                $_scope = 'local';
-            }
-        }
-
-        $_params = array('resource_name' => $_file,
-                         'resource_base_path' => $smarty->config_dir,
-                         'get_source' => false);
-        $smarty->_parse_resource_name($_params);
-        $_file_path = $_params['resource_type'] . ':' . $_params['resource_name'];
-        if (isset($_section))
-            $_compile_file = $smarty->_get_compile_path($_file_path.'|'.$_section);
-        else
-            $_compile_file = $smarty->_get_compile_path($_file_path);
-
-        if($smarty->force_compile || !file_exists($_compile_file)) {
-            $_compile = true;
-        } elseif ($smarty->compile_check) {
-            $_params = array('resource_name' => $_file,
-                             'resource_base_path' => $smarty->config_dir,
-                             'get_source' => false);
-            $_compile = $smarty->_fetch_resource_info($_params) &&
-                $_params['resource_timestamp'] > filemtime($_compile_file);
-        } else {
-            $_compile = false;
-        }
-
-        if($_compile) {
-            // compile config file
-            if(!is_object($smarty->_conf_obj)) {
-                require_once SMARTY_DIR . $smarty->config_class . '.class.php';
-                $smarty->_conf_obj = new $smarty->config_class();
-                $smarty->_conf_obj->overwrite = $smarty->config_overwrite;
-                $smarty->_conf_obj->booleanize = $smarty->config_booleanize;
-                $smarty->_conf_obj->read_hidden = $smarty->config_read_hidden;
-                $smarty->_conf_obj->fix_newlines = $smarty->config_fix_newlines;
-            }
-
-            $_params = array('resource_name' => $_file,
-                             'resource_base_path' => $smarty->config_dir,
-                             $_params['get_source'] = true);
-            if (!$smarty->_fetch_resource_info($_params)) {
-                return;
-            }
-            $smarty->_conf_obj->set_file_contents($_file, $_params['source_content']);
-            $_config_vars = array_merge($smarty->_conf_obj->get($_file),
-                    $smarty->_conf_obj->get($_file, $_section));
-            if(function_exists('var_export')) {
-                $_output = '<?php $_config_vars = ' . var_export($_config_vars, true) . '; ?>';
-            } else {
-                $_output = '<?php $_config_vars = unserialize(\'' . strtr(serialize($_config_vars),array('\''=>'\\\'', '\\'=>'\\\\')) . '\'); ?>';
-            }
-            $_params = (array('compile_path' => $_compile_file, 'compiled_content' => $_output, 'resource_timestamp' => $_params['resource_timestamp']));
-            require_once(SMARTY_CORE_DIR . 'core.write_compiled_resource.php');
-            smarty_core_write_compiled_resource($_params, $smarty);
-        } else {
-            include($_compile_file);
-        }
-
-        if ($smarty->caching) {
-            $smarty->_cache_info['config'][$_file] = true;
-        }
-
-        $smarty->_config[0]['vars'] = @array_merge($smarty->_config[0]['vars'], $_config_vars);
-        $smarty->_config[0]['files'][$_file] = true;
-
-        if ($_scope == 'parent') {
-                $smarty->_config[1]['vars'] = @array_merge($smarty->_config[1]['vars'], $_config_vars);
-                $smarty->_config[1]['files'][$_file] = true;
-        } else if ($_scope == 'global') {
-            for ($i = 1, $for_max = count($smarty->_config); $i < $for_max; $i++) {
-                $smarty->_config[$i]['vars'] = @array_merge($smarty->_config[$i]['vars'], $_config_vars);
-                $smarty->_config[$i]['files'][$_file] = true;
-            }
-        }
-
-        if ($smarty->debugging) {
-            $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
-            $smarty->_smarty_debug_info[] = array('type'      => 'config',
-                                                'filename'  => $_file.' ['.$_section.'] '.$_scope,
-                                                'depth'     => $smarty->_inclusion_depth,
-                                                'exec_time' => smarty_core_get_microtime($_params, $smarty) - $_debug_start_time);
-        }
-
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.counter.php b/thirdparty/smarty/libs/plugins/function.counter.php
deleted file mode 100644
index 1f26db5fb..000000000
--- a/thirdparty/smarty/libs/plugins/function.counter.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {counter} function plugin
- *
- * Type:     function<br>
- * Name:     counter<br>
- * Purpose:  print out a counter value
- * @author Monte Ohrt <monte at ohrt dot com>
- * @link http://smarty.php.net/manual/en/language.function.counter.php {counter}
- *       (Smarty online manual)
- * @param array parameters
- * @param Smarty
- * @return string|null
- */
-function smarty_function_counter($params, &$smarty)
-{
-    static $counters = array();
-
-    $name = (isset($params['name'])) ? $params['name'] : 'default';
-    if (!isset($counters[$name])) {
-        $counters[$name] = array(
-            'start'=>1,
-            'skip'=>1,
-            'direction'=>'up',
-            'count'=>1
-            );
-    }
-    $counter =& $counters[$name];
-
-    if (isset($params['start'])) {
-        $counter['start'] = $counter['count'] = (int)$params['start'];
-    }
-
-    if (!empty($params['assign'])) {
-        $counter['assign'] = $params['assign'];
-    }
-
-    if (isset($counter['assign'])) {
-        $smarty->assign($counter['assign'], $counter['count']);
-    }
-    
-    if (isset($params['print'])) {
-        $print = (bool)$params['print'];
-    } else {
-        $print = empty($counter['assign']);
-    }
-
-    if ($print) {
-        $retval = $counter['count'];
-    } else {
-        $retval = null;
-    }
-
-    if (isset($params['skip'])) {
-        $counter['skip'] = $params['skip'];
-    }
-    
-    if (isset($params['direction'])) {
-        $counter['direction'] = $params['direction'];
-    }
-
-    if ($counter['direction'] == "down")
-        $counter['count'] -= $counter['skip'];
-    else
-        $counter['count'] += $counter['skip'];
-    
-    return $retval;
-    
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.cycle.php b/thirdparty/smarty/libs/plugins/function.cycle.php
deleted file mode 100644
index fe78bb87d..000000000
--- a/thirdparty/smarty/libs/plugins/function.cycle.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Smarty {cycle} function plugin
- *
- * Type:     function<br>
- * Name:     cycle<br>
- * Date:     May 3, 2002<br>
- * Purpose:  cycle through given values<br>
- * Input:
- *         - name = name of cycle (optional)
- *         - values = comma separated list of values to cycle,
- *                    or an array of values to cycle
- *                    (this can be left out for subsequent calls)
- *         - reset = boolean - resets given var to true
- *         - print = boolean - print var or not. default is true
- *         - advance = boolean - whether or not to advance the cycle
- *         - delimiter = the value delimiter, default is ","
- *         - assign = boolean, assigns to template var instead of
- *                    printed.
- *
- * Examples:<br>
- * <pre>
- * {cycle values="#eeeeee,#d0d0d0d"}
- * {cycle name=row values="one,two,three" reset=true}
- * {cycle name=row}
- * </pre>
- * @link http://smarty.php.net/manual/en/language.function.cycle.php {cycle}
- *       (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @author credit to Mark Priatel <mpriatel@rogers.com>
- * @author credit to Gerard <gerard@interfold.com>
- * @author credit to Jason Sweat <jsweat_php@yahoo.com>
- * @version  1.3
- * @param array
- * @param Smarty
- * @return string|null
- */
-function smarty_function_cycle($params, &$smarty)
-{
-    static $cycle_vars;
-    
-    $name = (empty($params['name'])) ? 'default' : $params['name'];
-    $print = (isset($params['print'])) ? (bool)$params['print'] : true;
-    $advance = (isset($params['advance'])) ? (bool)$params['advance'] : true;
-    $reset = (isset($params['reset'])) ? (bool)$params['reset'] : false;
-            
-    if (!in_array('values', array_keys($params))) {
-        if(!isset($cycle_vars[$name]['values'])) {
-            $smarty->trigger_error("cycle: missing 'values' parameter");
-            return;
-        }
-    } else {
-        if(isset($cycle_vars[$name]['values'])
-            && $cycle_vars[$name]['values'] != $params['values'] ) {
-            $cycle_vars[$name]['index'] = 0;
-        }
-        $cycle_vars[$name]['values'] = $params['values'];
-    }
-
-    $cycle_vars[$name]['delimiter'] = (isset($params['delimiter'])) ? $params['delimiter'] : ',';
-    
-    if(is_array($cycle_vars[$name]['values'])) {
-        $cycle_array = $cycle_vars[$name]['values'];
-    } else {
-        $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
-    }
-    
-    if(!isset($cycle_vars[$name]['index']) || $reset ) {
-        $cycle_vars[$name]['index'] = 0;
-    }
-    
-    if (isset($params['assign'])) {
-        $print = false;
-        $smarty->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
-    }
-        
-    if($print) {
-        $retval = $cycle_array[$cycle_vars[$name]['index']];
-    } else {
-        $retval = null;
-    }
-
-    if($advance) {
-        if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) {
-            $cycle_vars[$name]['index'] = 0;
-        } else {
-            $cycle_vars[$name]['index']++;
-        }
-    }
-    
-    return $retval;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.debug.php b/thirdparty/smarty/libs/plugins/function.debug.php
deleted file mode 100644
index 43452307b..000000000
--- a/thirdparty/smarty/libs/plugins/function.debug.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {debug} function plugin
- *
- * Type:     function<br>
- * Name:     debug<br>
- * Date:     July 1, 2002<br>
- * Purpose:  popup debug window
- * @link http://smarty.php.net/manual/en/language.function.debug.php {debug}
- *       (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @version  1.0
- * @param array
- * @param Smarty
- * @return string output from {@link Smarty::_generate_debug_output()}
- */
-function smarty_function_debug($params, &$smarty)
-{
-    if (isset($params['output'])) {
-        $smarty->assign('_smarty_debug_output', $params['output']);
-    }
-    require_once(SMARTY_CORE_DIR . 'core.display_debug_console.php');
-    return smarty_core_display_debug_console(null, $smarty);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.eval.php b/thirdparty/smarty/libs/plugins/function.eval.php
deleted file mode 100644
index ff0472de2..000000000
--- a/thirdparty/smarty/libs/plugins/function.eval.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {eval} function plugin
- *
- * Type:     function<br>
- * Name:     eval<br>
- * Purpose:  evaluate a template variable as a template<br>
- * @link http://smarty.php.net/manual/en/language.function.eval.php {eval}
- *       (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @param array
- * @param Smarty
- */
-function smarty_function_eval($params, &$smarty)
-{
-
-    if (!isset($params['var'])) {
-        $smarty->trigger_error("eval: missing 'var' parameter");
-        return;
-    }
-
-    if($params['var'] == '') {
-        return;
-    }
-
-    $smarty->_compile_source('evaluated template', $params['var'], $_var_compiled);
-
-    ob_start();
-    $smarty->_eval('?>' . $_var_compiled);
-    $_contents = ob_get_contents();
-    ob_end_clean();
-
-    if (!empty($params['assign'])) {
-        $smarty->assign($params['assign'], $_contents);
-    } else {
-        return $_contents;
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.fetch.php b/thirdparty/smarty/libs/plugins/function.fetch.php
deleted file mode 100644
index 8b36ce3c2..000000000
--- a/thirdparty/smarty/libs/plugins/function.fetch.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {fetch} plugin
- *
- * Type:     function<br>
- * Name:     fetch<br>
- * Purpose:  fetch file, web or ftp data and display results
- * @link http://smarty.php.net/manual/en/language.function.fetch.php {fetch}
- *       (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @param array
- * @param Smarty
- * @return string|null if the assign parameter is passed, Smarty assigns the
- *                     result to a template variable
- */
-function smarty_function_fetch($params, &$smarty)
-{
-    if (empty($params['file'])) {
-        $smarty->_trigger_fatal_error("[plugin] parameter 'file' cannot be empty");
-        return;
-    }
-
-    $content = '';
-    if ($smarty->security && !preg_match('!^(http|ftp)://!i', $params['file'])) {
-        $_params = array('resource_type' => 'file', 'resource_name' => $params['file']);
-        require_once(SMARTY_CORE_DIR . 'core.is_secure.php');
-        if(!smarty_core_is_secure($_params, $smarty)) {
-            $smarty->_trigger_fatal_error('[plugin] (secure mode) fetch \'' . $params['file'] . '\' is not allowed');
-            return;
-        }
-        
-        // fetch the file
-        if($fp = @fopen($params['file'],'r')) {
-            while(!feof($fp)) {
-                $content .= fgets ($fp,4096);
-            }
-            fclose($fp);
-        } else {
-            $smarty->_trigger_fatal_error('[plugin] fetch cannot read file \'' . $params['file'] . '\'');
-            return;
-        }
-    } else {
-        // not a local file
-        if(preg_match('!^http://!i',$params['file'])) {
-            // http fetch
-            if($uri_parts = parse_url($params['file'])) {
-                // set defaults
-                $host = $server_name = $uri_parts['host'];
-                $timeout = 30;
-                $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
-                $agent = "Smarty Template Engine ".$smarty->_version;
-                $referer = "";
-                $uri = !empty($uri_parts['path']) ? $uri_parts['path'] : '/';
-                $uri .= !empty($uri_parts['query']) ? '?' . $uri_parts['query'] : '';
-                $_is_proxy = false;
-                if(empty($uri_parts['port'])) {
-                    $port = 80;
-                } else {
-                    $port = $uri_parts['port'];
-                }
-                if(!empty($uri_parts['user'])) {
-                    $user = $uri_parts['user'];
-                }
-                if(!empty($uri_parts['pass'])) {
-                    $pass = $uri_parts['pass'];
-                }
-                // loop through parameters, setup headers
-                foreach($params as $param_key => $param_value) {
-                    switch($param_key) {
-                        case "file":
-                        case "assign":
-                        case "assign_headers":
-                            break;
-                        case "user":
-                            if(!empty($param_value)) {
-                                $user = $param_value;
-                            }
-                            break;
-                        case "pass":
-                            if(!empty($param_value)) {
-                                $pass = $param_value;
-                            }
-                            break;
-                        case "accept":
-                            if(!empty($param_value)) {
-                                $accept = $param_value;
-                            }
-                            break;
-                        case "header":
-                            if(!empty($param_value)) {
-                                if(!preg_match('![\w\d-]+: .+!',$param_value)) {
-                                    $smarty->_trigger_fatal_error("[plugin] invalid header format '".$param_value."'");
-                                    return;
-                                } else {
-                                    $extra_headers[] = $param_value;
-                                }
-                            }
-                            break;
-                        case "proxy_host":
-                            if(!empty($param_value)) {
-                                $proxy_host = $param_value;
-                            }
-                            break;
-                        case "proxy_port":
-                            if(!preg_match('!\D!', $param_value)) {
-                                $proxy_port = (int) $param_value;
-                            } else {
-                                $smarty->_trigger_fatal_error("[plugin] invalid value for attribute '".$param_key."'");
-                                return;
-                            }
-                            break;
-                        case "agent":
-                            if(!empty($param_value)) {
-                                $agent = $param_value;
-                            }
-                            break;
-                        case "referer":
-                            if(!empty($param_value)) {
-                                $referer = $param_value;
-                            }
-                            break;
-                        case "timeout":
-                            if(!preg_match('!\D!', $param_value)) {
-                                $timeout = (int) $param_value;
-                            } else {
-                                $smarty->_trigger_fatal_error("[plugin] invalid value for attribute '".$param_key."'");
-                                return;
-                            }
-                            break;
-                        default:
-                            $smarty->_trigger_fatal_error("[plugin] unrecognized attribute '".$param_key."'");
-                            return;
-                    }
-                }
-                if(!empty($proxy_host) && !empty($proxy_port)) {
-                    $_is_proxy = true;
-                    $fp = fsockopen($proxy_host,$proxy_port,$errno,$errstr,$timeout);
-                } else {
-                    $fp = fsockopen($server_name,$port,$errno,$errstr,$timeout);
-                }
-
-                if(!$fp) {
-                    $smarty->_trigger_fatal_error("[plugin] unable to fetch: $errstr ($errno)");
-                    return;
-                } else {
-                    if($_is_proxy) {
-                        fputs($fp, 'GET ' . $params['file'] . " HTTP/1.0\r\n");
-                    } else {
-                        fputs($fp, "GET $uri HTTP/1.0\r\n");
-                    }
-                    if(!empty($host)) {
-                        fputs($fp, "Host: $host\r\n");
-                    }
-                    if(!empty($accept)) {
-                        fputs($fp, "Accept: $accept\r\n");
-                    }
-                    if(!empty($agent)) {
-                        fputs($fp, "User-Agent: $agent\r\n");
-                    }
-                    if(!empty($referer)) {
-                        fputs($fp, "Referer: $referer\r\n");
-                    }
-                    if(isset($extra_headers) && is_array($extra_headers)) {
-                        foreach($extra_headers as $curr_header) {
-                            fputs($fp, $curr_header."\r\n");
-                        }
-                    }
-                    if(!empty($user) && !empty($pass)) {
-                        fputs($fp, "Authorization: BASIC ".base64_encode("$user:$pass")."\r\n");
-                    }
-
-                    fputs($fp, "\r\n");
-                    while(!feof($fp)) {
-                        $content .= fgets($fp,4096);
-                    }
-                    fclose($fp);
-                    $csplit = explode("\r\n\r\n",$content,2);
-
-                    $content = $csplit[1];
-
-                    if(!empty($params['assign_headers'])) {
-                        $smarty->assign($params['assign_headers'],explode("\r\n",$csplit[0]));
-                    }
-                }
-            } else {
-                $smarty->_trigger_fatal_error("[plugin] unable to parse URL, check syntax");
-                return;
-            }
-        } else {
-            // ftp fetch
-            if($fp = @fopen($params['file'],'r')) {
-                while(!feof($fp)) {
-                    $content .= fgets ($fp,4096);
-                }
-                fclose($fp);
-            } else {
-                $smarty->_trigger_fatal_error('[plugin] fetch cannot read file \'' . $params['file'] .'\'');
-                return;
-            }
-        }
-
-    }
-
-
-    if (!empty($params['assign'])) {
-        $smarty->assign($params['assign'],$content);
-    } else {
-        return $content;
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.html_checkboxes.php b/thirdparty/smarty/libs/plugins/function.html_checkboxes.php
deleted file mode 100644
index ed8ad7f33..000000000
--- a/thirdparty/smarty/libs/plugins/function.html_checkboxes.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {html_checkboxes} function plugin
- *
- * File:       function.html_checkboxes.php<br>
- * Type:       function<br>
- * Name:       html_checkboxes<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of checkbox input types<br>
- * Input:<br>
- *           - name       (optional) - string default "checkbox"
- *           - values     (required) - array
- *           - options    (optional) - associative array
- *           - checked    (optional) - array default not set
- *           - separator  (optional) - ie <br> or &nbsp;
- *           - output     (optional) - the output next to each checkbox
- *           - assign     (optional) - assign the output as an array to this variable
- * Examples:
- * <pre>
- * {html_checkboxes values=$ids output=$names}
- * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
- * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
- * @link http://smarty.php.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
- *      (Smarty online manual)
- * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author credits to Monte Ohrt <monte at ohrt dot com>
- * @version    1.0
- * @param array
- * @param Smarty
- * @return string
- * @uses smarty_function_escape_special_chars()
- */
-function smarty_function_html_checkboxes($params, &$smarty)
-{
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
-
-    $name = 'checkbox';
-    $values = null;
-    $options = null;
-    $selected = null;
-    $separator = '';
-    $labels = true;
-    $output = null;
-
-    $extra = '';
-
-    foreach($params as $_key => $_val) {
-        switch($_key) {
-            case 'name':
-            case 'separator':
-                $$_key = $_val;
-                break;
-
-            case 'labels':
-                $$_key = (bool)$_val;
-                break;
-
-            case 'options':
-                $$_key = (array)$_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array)$_val);
-                break;
-
-            case 'checked':
-            case 'selected':
-                $selected = array_map('strval', array_values((array)$_val));
-                break;
-
-            case 'checkboxes':
-                $smarty->trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', E_USER_WARNING);
-                $options = (array)$_val;
-                break;
-
-            case 'assign':
-                break;
-
-            default:
-                if(!is_array($_val)) {
-                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
-                } else {
-                    $smarty->trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
-
-    settype($selected, 'array');
-    $_html_result = array();
-
-    if (isset($options)) {
-
-        foreach ($options as $_key=>$_val)
-            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
-
-
-    } else {
-        foreach ($values as $_i=>$_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
-            $_html_result[] = smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
-        }
-
-    }
-
-    if(!empty($params['assign'])) {
-        $smarty->assign($params['assign'], $_html_result);
-    } else {
-        return implode("\n",$_html_result);
-    }
-
-}
-
-function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels) {
-    $_output = '';
-    if ($labels) $_output .= '<label>';
-    $_output .= '<input type="checkbox" name="'
-        . smarty_function_escape_special_chars($name) . '[]" value="'
-        . smarty_function_escape_special_chars($value) . '"';
-
-    if (in_array((string)$value, $selected)) {
-        $_output .= ' checked="checked"';
-    }
-    $_output .= $extra . ' />' . $output;
-    if ($labels) $_output .= '</label>';
-    $_output .=  $separator;
-
-    return $_output;
-}
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.html_image.php b/thirdparty/smarty/libs/plugins/function.html_image.php
deleted file mode 100644
index 9abae72ef..000000000
--- a/thirdparty/smarty/libs/plugins/function.html_image.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {html_image} function plugin
- *
- * Type:     function<br>
- * Name:     html_image<br>
- * Date:     Feb 24, 2003<br>
- * Purpose:  format HTML tags for the image<br>
- * Input:<br>
- *         - file = file (and path) of image (required)
- *         - height = image height (optional, default actual height)
- *         - width = image width (optional, default actual width)
- *         - basedir = base directory for absolute paths, default
- *                     is environment variable DOCUMENT_ROOT
- *         - path_prefix = prefix for path output (optional, default empty)
- *
- * Examples: {html_image file="/images/masthead.gif"}
- * Output:   <img src="/images/masthead.gif" width=400 height=23>
- * @link http://smarty.php.net/manual/en/language.function.html.image.php {html_image}
- *      (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author credits to Duda <duda@big.hu> - wrote first image function
- *           in repository, helped with lots of functionality
- * @version  1.0
- * @param array
- * @param Smarty
- * @return string
- * @uses smarty_function_escape_special_chars()
- */
-function smarty_function_html_image($params, &$smarty)
-{
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
-    
-    $alt = '';
-    $file = '';
-    $height = '';
-    $width = '';
-    $extra = '';
-    $prefix = '';
-    $suffix = '';
-    $path_prefix = '';
-    $server_vars = ($smarty->request_use_auto_globals) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
-    $basedir = isset($server_vars['DOCUMENT_ROOT']) ? $server_vars['DOCUMENT_ROOT'] : '';
-    foreach($params as $_key => $_val) {
-        switch($_key) {
-            case 'file':
-            case 'height':
-            case 'width':
-            case 'dpi':
-            case 'path_prefix':
-            case 'basedir':
-                $$_key = $_val;
-                break;
-
-            case 'alt':
-                if(!is_array($_val)) {
-                    $$_key = smarty_function_escape_special_chars($_val);
-                } else {
-                    $smarty->trigger_error("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-
-            case 'link':
-            case 'href':
-                $prefix = '<a href="' . $_val . '">';
-                $suffix = '</a>';
-                break;
-
-            default:
-                if(!is_array($_val)) {
-                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
-                } else {
-                    $smarty->trigger_error("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (empty($file)) {
-        $smarty->trigger_error("html_image: missing 'file' parameter", E_USER_NOTICE);
-        return;
-    }
-
-    if (substr($file,0,1) == '/') {
-        $_image_path = $basedir . $file;
-    } else {
-        $_image_path = $file;
-    }
-    
-    if(!isset($params['width']) || !isset($params['height'])) {
-        if(!$_image_data = @getimagesize($_image_path)) {
-            if(!file_exists($_image_path)) {
-                $smarty->trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
-                return;
-            } else if(!is_readable($_image_path)) {
-                $smarty->trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
-                return;
-            } else {
-                $smarty->trigger_error("html_image: '$_image_path' is not a valid image file", E_USER_NOTICE);
-                return;
-            }
-        }
-        if ($smarty->security &&
-            ($_params = array('resource_type' => 'file', 'resource_name' => $_image_path)) &&
-            (require_once(SMARTY_CORE_DIR . 'core.is_secure.php')) &&
-            (!smarty_core_is_secure($_params, $smarty)) ) {
-            $smarty->trigger_error("html_image: (secure) '$_image_path' not in secure directory", E_USER_NOTICE);
-        }        
-        
-        if(!isset($params['width'])) {
-            $width = $_image_data[0];
-        }
-        if(!isset($params['height'])) {
-            $height = $_image_data[1];
-        }
-
-    }
-
-    if(isset($params['dpi'])) {
-        if(strstr($server_vars['HTTP_USER_AGENT'], 'Mac')) {
-            $dpi_default = 72;
-        } else {
-            $dpi_default = 96;
-        }
-        $_resize = $dpi_default/$params['dpi'];
-        $width = round($width * $_resize);
-        $height = round($height * $_resize);
-    }
-
-    return $prefix . '<img src="'.$path_prefix.$file.'" alt="'.$alt.'" width="'.$width.'" height="'.$height.'"'.$extra.' />' . $suffix;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.html_options.php b/thirdparty/smarty/libs/plugins/function.html_options.php
deleted file mode 100644
index cebadde47..000000000
--- a/thirdparty/smarty/libs/plugins/function.html_options.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {html_options} function plugin
- *
- * Type:     function<br>
- * Name:     html_options<br>
- * Input:<br>
- *           - name       (optional) - string default "select"
- *           - values     (required if no options supplied) - array
- *           - options    (required if no values supplied) - associative array
- *           - selected   (optional) - string default not set
- *           - output     (required if not options supplied) - array
- * Purpose:  Prints the list of <option> tags generated from
- *           the passed parameters
- * @link http://smarty.php.net/manual/en/language.function.html.options.php {html_image}
- *      (Smarty online manual)
- * @author Monte Ohrt <monte at ohrt dot com>
- * @param array
- * @param Smarty
- * @return string
- * @uses smarty_function_escape_special_chars()
- */
-function smarty_function_html_options($params, &$smarty)
-{
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
-    
-    $name = null;
-    $values = null;
-    $options = null;
-    $selected = array();
-    $output = null;
-    
-    $extra = '';
-    
-    foreach($params as $_key => $_val) {
-        switch($_key) {
-            case 'name':
-                $$_key = (string)$_val;
-                break;
-            
-            case 'options':
-                $$_key = (array)$_val;
-                break;
-                
-            case 'values':
-            case 'output':
-                $$_key = array_values((array)$_val);
-                break;
-
-            case 'selected':
-                $$_key = array_map('strval', array_values((array)$_val));
-                break;
-                
-            default:
-                if(!is_array($_val)) {
-                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
-                } else {
-                    $smarty->trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
-
-    $_html_result = '';
-
-    if (isset($options)) {
-        
-        foreach ($options as $_key=>$_val)
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
-
-    } else {
-        
-        foreach ($values as $_i=>$_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
-        }
-
-    }
-
-    if(!empty($name)) {
-        $_html_result = '<select name="' . $name . '"' . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
-    }
-
-    return $_html_result;
-
-}
-
-function smarty_function_html_options_optoutput($key, $value, $selected) {
-    if(!is_array($value)) {
-        $_html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' .
-            smarty_function_escape_special_chars($key) . '"';
-        if (in_array((string)$key, $selected))
-            $_html_result .= ' selected="selected"';
-        $_html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
-    } else {
-        $_html_result = smarty_function_html_options_optgroup($key, $value, $selected);
-    }
-    return $_html_result;
-}
-
-function smarty_function_html_options_optgroup($key, $values, $selected) {
-    $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
-    foreach ($values as $key => $value) {
-        $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected);
-    }
-    $optgroup_html .= "</optgroup>\n";
-    return $optgroup_html;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.html_radios.php b/thirdparty/smarty/libs/plugins/function.html_radios.php
deleted file mode 100644
index 7503cfaca..000000000
--- a/thirdparty/smarty/libs/plugins/function.html_radios.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {html_radios} function plugin
- *
- * File:       function.html_radios.php<br>
- * Type:       function<br>
- * Name:       html_radios<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of radio input types<br>
- * Input:<br>
- *           - name       (optional) - string default "radio"
- *           - values     (required) - array
- *           - options    (optional) - associative array
- *           - checked    (optional) - array default not set
- *           - separator  (optional) - ie <br> or &nbsp;
- *           - output     (optional) - the output next to each radio button
- *           - assign     (optional) - assign the output as an array to this variable
- * Examples:
- * <pre>
- * {html_radios values=$ids output=$names}
- * {html_radios values=$ids name='box' separator='<br>' output=$names}
- * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
- * @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
- *      (Smarty online manual)
- * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author credits to Monte Ohrt <monte at ohrt dot com>
- * @version    1.0
- * @param array
- * @param Smarty
- * @return string
- * @uses smarty_function_escape_special_chars()
- */
-function smarty_function_html_radios($params, &$smarty)
-{
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
-   
-    $name = 'radio';
-    $values = null;
-    $options = null;
-    $selected = null;
-    $separator = '';
-    $labels = true;
-    $label_ids = false;
-    $output = null;
-    $extra = '';
-
-    foreach($params as $_key => $_val) {
-        switch($_key) {
-            case 'name':
-            case 'separator':
-                $$_key = (string)$_val;
-                break;
-
-            case 'checked':
-            case 'selected':
-                if(is_array($_val)) {
-                    $smarty->trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
-                } else {
-                    $selected = (string)$_val;
-                }
-                break;
-
-            case 'labels':
-            case 'label_ids':
-                $$_key = (bool)$_val;
-                break;
-
-            case 'options':
-                $$_key = (array)$_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array)$_val);
-                break;
-
-            case 'radios':
-                $smarty->trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead', E_USER_WARNING);
-                $options = (array)$_val;
-                break;
-
-            case 'assign':
-                break;
-
-            default:
-                if(!is_array($_val)) {
-                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
-                } else {
-                    $smarty->trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
-
-    $_html_result = array();
-
-    if (isset($options)) {
-
-        foreach ($options as $_key=>$_val)
-            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
-
-    } else {
-
-        foreach ($values as $_i=>$_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
-            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
-        }
-
-    }
-
-    if(!empty($params['assign'])) {
-        $smarty->assign($params['assign'], $_html_result);
-    } else {
-        return implode("\n",$_html_result);
-    }
-
-}
-
-function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids) {
-    $_output = '';
-    if ($labels) {
-      if($label_ids) {
-          $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
-          $_output .= '<label for="' . $_id . '">';
-      } else {
-          $_output .= '<label>';           
-      }
-   }
-   $_output .= '<input type="radio" name="'
-        . smarty_function_escape_special_chars($name) . '" value="'
-        . smarty_function_escape_special_chars($value) . '"';
-
-   if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
-
-    if ((string)$value==$selected) {
-        $_output .= ' checked="checked"';
-    }
-    $_output .= $extra . ' />' . $output;
-    if ($labels) $_output .= '</label>';
-    $_output .=  $separator;
-
-    return $_output;
-}
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.html_select_date.php b/thirdparty/smarty/libs/plugins/function.html_select_date.php
deleted file mode 100644
index e5eb18307..000000000
--- a/thirdparty/smarty/libs/plugins/function.html_select_date.php
+++ /dev/null
@@ -1,331 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Smarty {html_select_date} plugin
- *
- * Type:     function<br>
- * Name:     html_select_date<br>
- * Purpose:  Prints the dropdowns for date selection.
- *
- * ChangeLog:<br>
- *           - 1.0 initial release
- *           - 1.1 added support for +/- N syntax for begin
- *                and end year values. (Monte)
- *           - 1.2 added support for yyyy-mm-dd syntax for
- *                time value. (Jan Rosier)
- *           - 1.3 added support for choosing format for
- *                month values (Gary Loescher)
- *           - 1.3.1 added support for choosing format for
- *                day values (Marcus Bointon)
- *           - 1.3.2 support negative timestamps, force year
- *             dropdown to include given date unless explicitly set (Monte)
- *           - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
- *             of 0000-00-00 dates (cybot, boots)
- * @link http://smarty.php.net/manual/en/language.function.html.select.date.php {html_select_date}
- *      (Smarty online manual)
- * @version 1.3.4
- * @author Andrei Zmievski
- * @author Monte Ohrt <monte at ohrt dot com>
- * @param array
- * @param Smarty
- * @return string
- */
-function smarty_function_html_select_date($params, &$smarty)
-{
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
-    require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
-    require_once $smarty->_get_plugin_filepath('function','html_options');
-    /* Default values. */
-    $prefix          = "Date_";
-    $start_year      = strftime("%Y");
-    $end_year        = $start_year;
-    $display_days    = true;
-    $display_months  = true;
-    $display_years   = true;
-    $month_format    = "%B";
-    /* Write months as numbers by default  GL */
-    $month_value_format = "%m";
-    $day_format      = "%02d";
-    /* Write day values using this format MB */
-    $day_value_format = "%d";
-    $year_as_text    = false;
-    /* Display years in reverse order? Ie. 2000,1999,.... */
-    $reverse_years   = false;
-    /* Should the select boxes be part of an array when returned from PHP?
-       e.g. setting it to "birthday", would create "birthday[Day]",
-       "birthday[Month]" & "birthday[Year]". Can be combined with prefix */
-    $field_array     = null;
-    /* <select size>'s of the different <select> tags.
-       If not set, uses default dropdown. */
-    $day_size        = null;
-    $month_size      = null;
-    $year_size       = null;
-    /* Unparsed attributes common to *ALL* the <select>/<input> tags.
-       An example might be in the template: all_extra ='class ="foo"'. */
-    $all_extra       = null;
-    /* Separate attributes for the tags. */
-    $day_extra       = null;
-    $month_extra     = null;
-    $year_extra      = null;
-    /* Order in which to display the fields.
-       "D" -> day, "M" -> month, "Y" -> year. */
-    $field_order     = 'MDY';
-    /* String printed between the different fields. */
-    $field_separator = "\n";
-    $time = time();
-    $all_empty       = null;
-    $day_empty       = null;
-    $month_empty     = null;
-    $year_empty      = null;
-    $extra_attrs     = '';
-
-    foreach ($params as $_key=>$_value) {
-        switch ($_key) {
-            case 'prefix':
-            case 'time':
-            case 'start_year':
-            case 'end_year':
-            case 'month_format':
-            case 'day_format':
-            case 'day_value_format':
-            case 'field_array':
-            case 'day_size':
-            case 'month_size':
-            case 'year_size':
-            case 'all_extra':
-            case 'day_extra':
-            case 'month_extra':
-            case 'year_extra':
-            case 'field_order':
-            case 'field_separator':
-            case 'month_value_format':
-            case 'month_empty':
-            case 'day_empty':
-            case 'year_empty':
-                $$_key = (string)$_value;
-                break;
-
-            case 'all_empty':
-                $$_key = (string)$_value;
-                $day_empty = $month_empty = $year_empty = $all_empty;
-                break;
-
-            case 'display_days':
-            case 'display_months':
-            case 'display_years':
-            case 'year_as_text':
-            case 'reverse_years':
-                $$_key = (bool)$_value;
-                break;
-
-            default:
-                if(!is_array($_value)) {
-                    $extra_attrs .= ' '.$_key.'="'.smarty_function_escape_special_chars($_value).'"';
-                } else {
-                    $smarty->trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (preg_match('!^-\d+$!', $time)) {
-        // negative timestamp, use date()
-        $time = date('Y-m-d', $time);
-    }
-    // If $time is not in format yyyy-mm-dd
-    if (preg_match('/^(\d{0,4}-\d{0,2}-\d{0,2})/', $time, $found)) {
-        $time = $found[1];
-    } else {
-        // use smarty_make_timestamp to get an unix timestamp and
-        // strftime to make yyyy-mm-dd
-        $time = strftime('%Y-%m-%d', smarty_make_timestamp($time));
-    }
-    // Now split this in pieces, which later can be used to set the select
-    $time = explode("-", $time);
-
-    // make syntax "+N" or "-N" work with start_year and end_year
-    if (preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match)) {
-        if ($match[1] == '+') {
-            $end_year = strftime('%Y') + $match[2];
-        } else {
-            $end_year = strftime('%Y') - $match[2];
-        }
-    }
-    if (preg_match('!^(\+|\-)\s*(\d+)$!', $start_year, $match)) {
-        if ($match[1] == '+') {
-            $start_year = strftime('%Y') + $match[2];
-        } else {
-            $start_year = strftime('%Y') - $match[2];
-        }
-    }
-    if (strlen($time[0]) > 0) {
-        if ($start_year > $time[0] && !isset($params['start_year'])) {
-            // force start year to include given date if not explicitly set
-            $start_year = $time[0];
-        }
-        if($end_year < $time[0] && !isset($params['end_year'])) {
-            // force end year to include given date if not explicitly set
-            $end_year = $time[0];
-        }
-    }
-
-    $field_order = strtoupper($field_order);
-
-    $html_result = $month_result = $day_result = $year_result = "";
-
-    $field_separator_count = -1;
-    if ($display_months) {
-    	$field_separator_count++;
-        $month_names = array();
-        $month_values = array();
-        if(isset($month_empty)) {
-            $month_names[''] = $month_empty;
-            $month_values[''] = '';
-        }
-        for ($i = 1; $i <= 12; $i++) {
-            $month_names[$i] = strftime($month_format, mktime(0, 0, 0, $i, 1, 2000));
-            $month_values[$i] = strftime($month_value_format, mktime(0, 0, 0, $i, 1, 2000));
-        }
-
-        $month_result .= '<select name=';
-        if (null !== $field_array){
-            $month_result .= '"' . $field_array . '[' . $prefix . 'Month]"';
-        } else {
-            $month_result .= '"' . $prefix . 'Month"';
-        }
-        if (null !== $month_size){
-            $month_result .= ' size="' . $month_size . '"';
-        }
-        if (null !== $month_extra){
-            $month_result .= ' ' . $month_extra;
-        }
-        if (null !== $all_extra){
-            $month_result .= ' ' . $all_extra;
-        }
-        $month_result .= $extra_attrs . '>'."\n";
-
-        $month_result .= smarty_function_html_options(array('output'     => $month_names,
-                                                            'values'     => $month_values,
-                                                            'selected'   => (int)$time[1] ? strftime($month_value_format, mktime(0, 0, 0, (int)$time[1], 1, 2000)) : '',
-                                                            'print_result' => false),
-                                                      $smarty);
-        $month_result .= '</select>';
-    }
-
-    if ($display_days) {
-    	$field_separator_count++;
-        $days = array();
-        if (isset($day_empty)) {
-            $days[''] = $day_empty;
-            $day_values[''] = '';
-        }
-        for ($i = 1; $i <= 31; $i++) {
-            $days[] = sprintf($day_format, $i);
-            $day_values[] = sprintf($day_value_format, $i);
-        }
-
-        $day_result .= '<select name=';
-        if (null !== $field_array){
-            $day_result .= '"' . $field_array . '[' . $prefix . 'Day]"';
-        } else {
-            $day_result .= '"' . $prefix . 'Day"';
-        }
-        if (null !== $day_size){
-            $day_result .= ' size="' . $day_size . '"';
-        }
-        if (null !== $all_extra){
-            $day_result .= ' ' . $all_extra;
-        }
-        if (null !== $day_extra){
-            $day_result .= ' ' . $day_extra;
-        }
-        $day_result .= $extra_attrs . '>'."\n";
-        $day_result .= smarty_function_html_options(array('output'     => $days,
-                                                          'values'     => $day_values,
-                                                          'selected'   => $time[2],
-                                                          'print_result' => false),
-                                                    $smarty);
-        $day_result .= '</select>';
-    }
-
-    if ($display_years) {
-    	$field_separator_count++;
-        if (null !== $field_array){
-            $year_name = $field_array . '[' . $prefix . 'Year]';
-        } else {
-            $year_name = $prefix . 'Year';
-        }
-        if ($year_as_text) {
-            $year_result .= '<input type="text" name="' . $year_name . '" value="' . $time[0] . '" size="4" maxlength="4"';
-            if (null !== $all_extra){
-                $year_result .= ' ' . $all_extra;
-            }
-            if (null !== $year_extra){
-                $year_result .= ' ' . $year_extra;
-            }
-            $year_result .= ' />';
-        } else {
-            $years = range((int)$start_year, (int)$end_year);
-            if ($reverse_years) {
-                rsort($years, SORT_NUMERIC);
-            } else {
-                sort($years, SORT_NUMERIC);
-            }
-            $yearvals = $years;
-            if(isset($year_empty)) {
-                array_unshift($years, $year_empty);
-                array_unshift($yearvals, '');
-            }
-            $year_result .= '<select name="' . $year_name . '"';
-            if (null !== $year_size){
-                $year_result .= ' size="' . $year_size . '"';
-            }
-            if (null !== $all_extra){
-                $year_result .= ' ' . $all_extra;
-            }
-            if (null !== $year_extra){
-                $year_result .= ' ' . $year_extra;
-            }
-            $year_result .= $extra_attrs . '>'."\n";
-            $year_result .= smarty_function_html_options(array('output' => $years,
-                                                               'values' => $yearvals,
-                                                               'selected'   => $time[0],
-                                                               'print_result' => false),
-                                                         $smarty);
-            $year_result .= '</select>';
-        }
-    }
-
-    // Loop thru the field_order field
-    for ($i = 0; $i <= 2; $i++){
-        $c = substr($field_order, $i, 1);
-        switch ($c){
-            case 'D':
-                $html_result .= $day_result;
-                break;
-
-            case 'M':
-                $html_result .= $month_result;
-                break;
-
-            case 'Y':
-                $html_result .= $year_result;
-                break;
-        }
-        // Add the field seperator
-        if($i < $field_separator_count) {
-            $html_result .= $field_separator;
-        }
-    }
-
-    return $html_result;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.html_select_time.php b/thirdparty/smarty/libs/plugins/function.html_select_time.php
deleted file mode 100644
index 2e5be7efe..000000000
--- a/thirdparty/smarty/libs/plugins/function.html_select_time.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {html_select_time} function plugin
- *
- * Type:     function<br>
- * Name:     html_select_time<br>
- * Purpose:  Prints the dropdowns for time selection
- * @link http://smarty.php.net/manual/en/language.function.html.select.time.php {html_select_time}
- *          (Smarty online manual)
- * @author Roberto Berto <roberto@berto.net>
- * @credits Monte Ohrt <monte AT ohrt DOT com>
- * @param array
- * @param Smarty
- * @return string
- * @uses smarty_make_timestamp()
- */
-function smarty_function_html_select_time($params, &$smarty)
-{
-    require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
-    require_once $smarty->_get_plugin_filepath('function','html_options');
-    /* Default values. */
-    $prefix             = "Time_";
-    $time               = time();
-    $display_hours      = true;
-    $display_minutes    = true;
-    $display_seconds    = true;
-    $display_meridian   = true;
-    $use_24_hours       = true;
-    $minute_interval    = 1;
-    $second_interval    = 1;
-    /* Should the select boxes be part of an array when returned from PHP?
-       e.g. setting it to "birthday", would create "birthday[Hour]",
-       "birthday[Minute]", "birthday[Seconds]" & "birthday[Meridian]".
-       Can be combined with prefix. */
-    $field_array        = null;
-    $all_extra          = null;
-    $hour_extra         = null;
-    $minute_extra       = null;
-    $second_extra       = null;
-    $meridian_extra     = null;
-
-    foreach ($params as $_key=>$_value) {
-        switch ($_key) {
-            case 'prefix':
-            case 'time':
-            case 'field_array':
-            case 'all_extra':
-            case 'hour_extra':
-            case 'minute_extra':
-            case 'second_extra':
-            case 'meridian_extra':
-                $$_key = (string)$_value;
-                break;
-
-            case 'display_hours':
-            case 'display_minutes':
-            case 'display_seconds':
-            case 'display_meridian':
-            case 'use_24_hours':
-                $$_key = (bool)$_value;
-                break;
-
-            case 'minute_interval':
-            case 'second_interval':
-                $$_key = (int)$_value;
-                break;
-
-            default:
-                $smarty->trigger_error("[html_select_time] unknown parameter $_key", E_USER_WARNING);
-        }
-    }
-
-    $time = smarty_make_timestamp($time);
-
-    $html_result = '';
-
-    if ($display_hours) {
-        $hours       = $use_24_hours ? range(0, 23) : range(1, 12);
-        $hour_fmt = $use_24_hours ? '%H' : '%I';
-        for ($i = 0, $for_max = count($hours); $i < $for_max; $i++)
-            $hours[$i] = sprintf('%02d', $hours[$i]);
-        $html_result .= '<select name=';
-        if (null !== $field_array) {
-            $html_result .= '"' . $field_array . '[' . $prefix . 'Hour]"';
-        } else {
-            $html_result .= '"' . $prefix . 'Hour"';
-        }
-        if (null !== $hour_extra){
-            $html_result .= ' ' . $hour_extra;
-        }
-        if (null !== $all_extra){
-            $html_result .= ' ' . $all_extra;
-        }
-        $html_result .= '>'."\n";
-        $html_result .= smarty_function_html_options(array('output'          => $hours,
-                                                           'values'          => $hours,
-                                                           'selected'      => strftime($hour_fmt, $time),
-                                                           'print_result' => false),
-                                                     $smarty);
-        $html_result .= "</select>\n";
-    }
-
-    if ($display_minutes) {
-        $all_minutes = range(0, 59);
-        for ($i = 0, $for_max = count($all_minutes); $i < $for_max; $i+= $minute_interval)
-            $minutes[] = sprintf('%02d', $all_minutes[$i]);
-        $selected = intval(floor(strftime('%M', $time) / $minute_interval) * $minute_interval);
-        $html_result .= '<select name=';
-        if (null !== $field_array) {
-            $html_result .= '"' . $field_array . '[' . $prefix . 'Minute]"';
-        } else {
-            $html_result .= '"' . $prefix . 'Minute"';
-        }
-        if (null !== $minute_extra){
-            $html_result .= ' ' . $minute_extra;
-        }
-        if (null !== $all_extra){
-            $html_result .= ' ' . $all_extra;
-        }
-        $html_result .= '>'."\n";
-        
-        $html_result .= smarty_function_html_options(array('output'          => $minutes,
-                                                           'values'          => $minutes,
-                                                           'selected'      => $selected,
-                                                           'print_result' => false),
-                                                     $smarty);
-        $html_result .= "</select>\n";
-    }
-
-    if ($display_seconds) {
-        $all_seconds = range(0, 59);
-        for ($i = 0, $for_max = count($all_seconds); $i < $for_max; $i+= $second_interval)
-            $seconds[] = sprintf('%02d', $all_seconds[$i]);
-        $selected = intval(floor(strftime('%S', $time) / $second_interval) * $second_interval);
-        $html_result .= '<select name=';
-        if (null !== $field_array) {
-            $html_result .= '"' . $field_array . '[' . $prefix . 'Second]"';
-        } else {
-            $html_result .= '"' . $prefix . 'Second"';
-        }
-        
-        if (null !== $second_extra){
-            $html_result .= ' ' . $second_extra;
-        }
-        if (null !== $all_extra){
-            $html_result .= ' ' . $all_extra;
-        }
-        $html_result .= '>'."\n";
-        
-        $html_result .= smarty_function_html_options(array('output'          => $seconds,
-                                                           'values'          => $seconds,
-                                                           'selected'      => $selected,
-                                                           'print_result' => false),
-                                                     $smarty);
-        $html_result .= "</select>\n";
-    }
-
-    if ($display_meridian && !$use_24_hours) {
-        $html_result .= '<select name=';
-        if (null !== $field_array) {
-            $html_result .= '"' . $field_array . '[' . $prefix . 'Meridian]"';
-        } else {
-            $html_result .= '"' . $prefix . 'Meridian"';
-        }
-        
-        if (null !== $meridian_extra){
-            $html_result .= ' ' . $meridian_extra;
-        }
-        if (null !== $all_extra){
-            $html_result .= ' ' . $all_extra;
-        }
-        $html_result .= '>'."\n";
-        
-        $html_result .= smarty_function_html_options(array('output'          => array('AM', 'PM'),
-                                                           'values'          => array('am', 'pm'),
-                                                           'selected'      => strtolower(strftime('%p', $time)),
-                                                           'print_result' => false),
-                                                     $smarty);
-        $html_result .= "</select>\n";
-    }
-
-    return $html_result;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.html_table.php b/thirdparty/smarty/libs/plugins/function.html_table.php
deleted file mode 100644
index 32aeba83c..000000000
--- a/thirdparty/smarty/libs/plugins/function.html_table.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {html_table} function plugin
- *
- * Type:     function<br>
- * Name:     html_table<br>
- * Date:     Feb 17, 2003<br>
- * Purpose:  make an html table from an array of data<br>
- * Input:<br>
- *         - loop = array to loop through
- *         - cols = number of columns, comma separated list of column names
- *                  or array of column names
- *         - rows = number of rows
- *         - table_attr = table attributes
- *         - th_attr = table heading attributes (arrays are cycled)
- *         - tr_attr = table row attributes (arrays are cycled)
- *         - td_attr = table cell attributes (arrays are cycled)
- *         - trailpad = value to pad trailing cells with
- *         - caption = text for caption element 
- *         - vdir = vertical direction (default: "down", means top-to-bottom)
- *         - hdir = horizontal direction (default: "right", means left-to-right)
- *         - inner = inner loop (default "cols": print $loop line by line,
- *                   $loop will be printed column by column otherwise)
- *
- *
- * Examples:
- * <pre>
- * {table loop=$data}
- * {table loop=$data cols=4 tr_attr='"bgcolor=red"'}
- * {table loop=$data cols="first,second,third" tr_attr=$colors}
- * </pre>
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author credit to Messju Mohr <messju at lammfellpuschen dot de>
- * @author credit to boots <boots dot smarty at yahoo dot com>
- * @version  1.1
- * @link http://smarty.php.net/manual/en/language.function.html.table.php {html_table}
- *          (Smarty online manual)
- * @param array
- * @param Smarty
- * @return string
- */
-function smarty_function_html_table($params, &$smarty)
-{
-    $table_attr = 'border="1"';
-    $tr_attr = '';
-    $th_attr = '';
-    $td_attr = '';
-    $cols = $cols_count = 3;
-    $rows = 3;
-    $trailpad = '&nbsp;';
-    $vdir = 'down';
-    $hdir = 'right';
-    $inner = 'cols';
-    $caption = '';
-
-    if (!isset($params['loop'])) {
-        $smarty->trigger_error("html_table: missing 'loop' parameter");
-        return;
-    }
-
-    foreach ($params as $_key=>$_value) {
-        switch ($_key) {
-            case 'loop':
-                $$_key = (array)$_value;
-                break;
-
-            case 'cols':
-                if (is_array($_value) && !empty($_value)) {
-                    $cols = $_value;
-                    $cols_count = count($_value);
-                } elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
-                    $cols = explode(',', $_value);
-                    $cols_count = count($cols);
-                } elseif (!empty($_value)) {
-                    $cols_count = (int)$_value;
-                } else {
-                    $cols_count = $cols;
-                }
-                break;
-
-            case 'rows':
-                $$_key = (int)$_value;
-                break;
-
-            case 'table_attr':
-            case 'trailpad':
-            case 'hdir':
-            case 'vdir':
-            case 'inner':
-            case 'caption':
-                $$_key = (string)$_value;
-                break;
-
-            case 'tr_attr':
-            case 'td_attr':
-            case 'th_attr':
-                $$_key = $_value;
-                break;
-        }
-    }
-
-    $loop_count = count($loop);
-    if (empty($params['rows'])) {
-        /* no rows specified */
-        $rows = ceil($loop_count/$cols_count);
-    } elseif (empty($params['cols'])) {
-        if (!empty($params['rows'])) {
-            /* no cols specified, but rows */
-            $cols_count = ceil($loop_count/$rows);
-        }
-    }
-
-    $output = "<table $table_attr>\n";
-
-    if (!empty($caption)) {
-        $output .= '<caption>' . $caption . "</caption>\n";
-    }
-
-    if (is_array($cols)) {
-        $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
-        $output .= "<thead><tr>\n";
-
-        for ($r=0; $r<$cols_count; $r++) {
-            $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
-            $output .= $cols[$r];
-            $output .= "</th>\n";
-        }
-        $output .= "</tr></thead>\n";
-    }
-
-    $output .= "<tbody>\n";
-    for ($r=0; $r<$rows; $r++) {
-        $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-        $rx =  ($vdir == 'down') ? $r*$cols_count : ($rows-1-$r)*$cols_count;
-
-        for ($c=0; $c<$cols_count; $c++) {
-            $x =  ($hdir == 'right') ? $rx+$c : $rx+$cols_count-1-$c;
-            if ($inner!='cols') {
-                /* shuffle x to loop over rows*/
-                $x = floor($x/$cols_count) + ($x%$cols_count)*$rows;
-            }
-
-            if ($x<$loop_count) {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[$x] . "</td>\n";
-            } else {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
-            }
-        }
-        $output .= "</tr>\n";
-    }
-    $output .= "</tbody>\n";
-    $output .= "</table>\n";
-    
-    return $output;
-}
-
-function smarty_function_html_table_cycle($name, $var, $no) {
-    if(!is_array($var)) {
-        $ret = $var;
-    } else {
-        $ret = $var[$no % count($var)];
-    }
-    
-    return ($ret) ? ' '.$ret : '';
-}
-
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.mailto.php b/thirdparty/smarty/libs/plugins/function.mailto.php
deleted file mode 100644
index 20e9ed984..000000000
--- a/thirdparty/smarty/libs/plugins/function.mailto.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {mailto} function plugin
- *
- * Type:     function<br>
- * Name:     mailto<br>
- * Date:     May 21, 2002
- * Purpose:  automate mailto address link creation, and optionally
- *           encode them.<br>
- * Input:<br>
- *         - address = e-mail address
- *         - text = (optional) text to display, default is address
- *         - encode = (optional) can be one of:
- *                * none : no encoding (default)
- *                * javascript : encode with javascript
- *                * javascript_charcode : encode with javascript charcode
- *                * hex : encode with hexidecimal (no javascript)
- *         - cc = (optional) address(es) to carbon copy
- *         - bcc = (optional) address(es) to blind carbon copy
- *         - subject = (optional) e-mail subject
- *         - newsgroups = (optional) newsgroup(s) to post to
- *         - followupto = (optional) address(es) to follow up to
- *         - extra = (optional) extra tags for the href link
- *
- * Examples:
- * <pre>
- * {mailto address="me@domain.com"}
- * {mailto address="me@domain.com" encode="javascript"}
- * {mailto address="me@domain.com" encode="hex"}
- * {mailto address="me@domain.com" subject="Hello to you!"}
- * {mailto address="me@domain.com" cc="you@domain.com,they@domain.com"}
- * {mailto address="me@domain.com" extra='class="mailto"'}
- * </pre>
- * @link http://smarty.php.net/manual/en/language.function.mailto.php {mailto}
- *          (Smarty online manual)
- * @version  1.2
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author   credits to Jason Sweat (added cc, bcc and subject functionality)
- * @param    array
- * @param    Smarty
- * @return   string
- */
-function smarty_function_mailto($params, &$smarty)
-{
-    $extra = '';
-
-    if (empty($params['address'])) {
-        $smarty->trigger_error("mailto: missing 'address' parameter");
-        return;
-    } else {
-        $address = $params['address'];
-    }
-
-    $text = $address;
-
-    // netscape and mozilla do not decode %40 (@) in BCC field (bug?)
-    // so, don't encode it.
-    $search = array('%40', '%2C');
-    $replace  = array('@', ',');
-    $mail_parms = array();
-    foreach ($params as $var=>$value) {
-        switch ($var) {
-            case 'cc':
-            case 'bcc':
-            case 'followupto':
-                if (!empty($value))
-                    $mail_parms[] = $var.'='.str_replace($search,$replace,rawurlencode($value));
-                break;
-                
-            case 'subject':
-            case 'newsgroups':
-                $mail_parms[] = $var.'='.rawurlencode($value);
-                break;
-
-            case 'extra':
-            case 'text':
-                $$var = $value;
-
-            default:
-        }
-    }
-
-    $mail_parm_vals = '';
-    for ($i=0; $i<count($mail_parms); $i++) {
-        $mail_parm_vals .= (0==$i) ? '?' : '&';
-        $mail_parm_vals .= $mail_parms[$i];
-    }
-    $address .= $mail_parm_vals;
-
-    $encode = (empty($params['encode'])) ? 'none' : $params['encode'];
-    if (!in_array($encode,array('javascript','javascript_charcode','hex','none')) ) {
-        $smarty->trigger_error("mailto: 'encode' parameter must be none, javascript or hex");
-        return;
-    }
-
-    if ($encode == 'javascript' ) {
-        $string = 'document.write(\'<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>\');';
-
-        $js_encode = '';
-        for ($x=0; $x < strlen($string); $x++) {
-            $js_encode .= '%' . bin2hex($string[$x]);
-        }
-
-        return '<script type="text/javascript">eval(unescape(\''.$js_encode.'\'))</script>';
-
-    } elseif ($encode == 'javascript_charcode' ) {
-        $string = '<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>';
-
-        for($x = 0, $y = strlen($string); $x < $y; $x++ ) {
-            $ord[] = ord($string[$x]);   
-        }
-
-        $_ret = "<script type=\"text/javascript\" language=\"javascript\">\n";
-        $_ret .= "<!--\n";
-        $_ret .= "{document.write(String.fromCharCode(";
-        $_ret .= implode(',',$ord);
-        $_ret .= "))";
-        $_ret .= "}\n";
-        $_ret .= "//-->\n";
-        $_ret .= "</script>\n";
-        
-        return $_ret;
-        
-        
-    } elseif ($encode == 'hex') {
-
-        preg_match('!^(.*)(\?.*)$!',$address,$match);
-        if(!empty($match[2])) {
-            $smarty->trigger_error("mailto: hex encoding does not work with extra attributes. Try javascript.");
-            return;
-        }
-        $address_encode = '';
-        for ($x=0; $x < strlen($address); $x++) {
-            if(preg_match('!\w!',$address[$x])) {
-                $address_encode .= '%' . bin2hex($address[$x]);
-            } else {
-                $address_encode .= $address[$x];
-            }
-        }
-        $text_encode = '';
-        for ($x=0; $x < strlen($text); $x++) {
-            $text_encode .= '&#x' . bin2hex($text[$x]).';';
-        }
-
-        $mailto = "&#109;&#97;&#105;&#108;&#116;&#111;&#58;";
-        return '<a href="'.$mailto.$address_encode.'" '.$extra.'>'.$text_encode.'</a>';
-
-    } else {
-        // no encoding
-        return '<a href="mailto:'.$address.'" '.$extra.'>'.$text.'</a>';
-
-    }
-
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.math.php b/thirdparty/smarty/libs/plugins/function.math.php
deleted file mode 100644
index 71672fea4..000000000
--- a/thirdparty/smarty/libs/plugins/function.math.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {math} function plugin
- *
- * Type:     function<br>
- * Name:     math<br>
- * Purpose:  handle math computations in template<br>
- * @link http://smarty.php.net/manual/en/language.function.math.php {math}
- *          (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param array
- * @param Smarty
- * @return string
- */
-function smarty_function_math($params, &$smarty)
-{
-    // be sure equation parameter is present
-    if (empty($params['equation'])) {
-        $smarty->trigger_error("math: missing equation parameter");
-        return;
-    }
-
-    $equation = $params['equation'];
-
-    // make sure parenthesis are balanced
-    if (substr_count($equation,"(") != substr_count($equation,")")) {
-        $smarty->trigger_error("math: unbalanced parenthesis");
-        return;
-    }
-
-    // match all vars in equation, make sure all are passed
-    preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]+)!",$equation, $match);
-    $allowed_funcs = array('int','abs','ceil','cos','exp','floor','log','log10',
-                           'max','min','pi','pow','rand','round','sin','sqrt','srand','tan');
-    
-    foreach($match[1] as $curr_var) {
-        if ($curr_var && !in_array($curr_var, array_keys($params)) && !in_array($curr_var, $allowed_funcs)) {
-            $smarty->trigger_error("math: function call $curr_var not allowed");
-            return;
-        }
-    }
-
-    foreach($params as $key => $val) {
-        if ($key != "equation" && $key != "format" && $key != "assign") {
-            // make sure value is not empty
-            if (strlen($val)==0) {
-                $smarty->trigger_error("math: parameter $key is empty");
-                return;
-            }
-            if (!is_numeric($val)) {
-                $smarty->trigger_error("math: parameter $key: is not numeric");
-                return;
-            }
-            $equation = preg_replace("/\b$key\b/", " \$params['$key'] ", $equation);
-        }
-    }
-
-    eval("\$smarty_math_result = ".$equation.";");
-
-    if (empty($params['format'])) {
-        if (empty($params['assign'])) {
-            return $smarty_math_result;
-        } else {
-            $smarty->assign($params['assign'],$smarty_math_result);
-        }
-    } else {
-        if (empty($params['assign'])){
-            printf($params['format'],$smarty_math_result);
-        } else {
-            $smarty->assign($params['assign'],sprintf($params['format'],$smarty_math_result));
-        }
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.popup.php b/thirdparty/smarty/libs/plugins/function.popup.php
deleted file mode 100644
index 3a76b785a..000000000
--- a/thirdparty/smarty/libs/plugins/function.popup.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {popup} function plugin
- *
- * Type:     function<br>
- * Name:     popup<br>
- * Purpose:  make text pop up in windows via overlib
- * @link http://smarty.php.net/manual/en/language.function.popup.php {popup}
- *          (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param array
- * @param Smarty
- * @return string
- */
-function smarty_function_popup($params, &$smarty)
-{
-    $append = '';
-    foreach ($params as $_key=>$_value) {
-        switch ($_key) {
-            case 'text':
-            case 'trigger':
-            case 'function':
-            case 'inarray':
-                $$_key = (string)$_value;
-                if ($_key == 'function' || $_key == 'inarray')
-                    $append .= ',' . strtoupper($_key) . ",'$_value'";
-                break;
-
-            case 'caption':
-            case 'closetext':
-            case 'status':
-                $append .= ',' . strtoupper($_key) . ",'" . str_replace("'","\'",$_value) . "'";
-                break;
-
-            case 'fgcolor':
-            case 'bgcolor':
-            case 'textcolor':
-            case 'capcolor':
-            case 'closecolor':
-            case 'textfont':
-            case 'captionfont':
-            case 'closefont':
-            case 'fgbackground':
-            case 'bgbackground':
-            case 'caparray':
-            case 'capicon':
-            case 'background':
-            case 'frame':
-                $append .= ',' . strtoupper($_key) . ",'$_value'";
-                break;
-
-            case 'textsize':
-            case 'captionsize':
-            case 'closesize':
-            case 'width':
-            case 'height':
-            case 'border':
-            case 'offsetx':
-            case 'offsety':
-            case 'snapx':
-            case 'snapy':
-            case 'fixx':
-            case 'fixy':
-            case 'padx':
-            case 'pady':
-            case 'timeout':
-            case 'delay':
-                $append .= ',' . strtoupper($_key) . ",$_value";
-                break;
-
-            case 'sticky':
-            case 'left':
-            case 'right':
-            case 'center':
-            case 'above':
-            case 'below':
-            case 'noclose':
-            case 'autostatus':
-            case 'autostatuscap':
-            case 'fullhtml':
-            case 'hauto':
-            case 'vauto':
-            case 'mouseoff':
-            case 'followmouse':
-            case 'closeclick':
-                if ($_value) $append .= ',' . strtoupper($_key);
-                break;
-
-            default:
-                $smarty->trigger_error("[popup] unknown parameter $_key", E_USER_WARNING);
-        }
-    }
-
-    if (empty($text) && !isset($inarray) && empty($function)) {
-        $smarty->trigger_error("overlib: attribute 'text' or 'inarray' or 'function' required");
-        return false;
-    }
-
-    if (empty($trigger)) { $trigger = "onmouseover"; }
-
-    $retval = $trigger . '="return overlib(\''.preg_replace(array("!'!","![\r\n]!"),array("\'",'\r'),$text).'\'';
-    $retval .= $append . ');"';
-    if ($trigger == 'onmouseover')
-       $retval .= ' onmouseout="nd();"';
-
-
-    return $retval;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/function.popup_init.php b/thirdparty/smarty/libs/plugins/function.popup_init.php
deleted file mode 100644
index 93cb45450..000000000
--- a/thirdparty/smarty/libs/plugins/function.popup_init.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {popup_init} function plugin
- *
- * Type:     function<br>
- * Name:     popup_init<br>
- * Purpose:  initialize overlib
- * @link http://smarty.php.net/manual/en/language.function.popup.init.php {popup_init}
- *          (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param array
- * @param Smarty
- * @return string
- */
-function smarty_function_popup_init($params, &$smarty)
-{
-    $zindex = 1000;
-    
-    if (!empty($params['zindex'])) {
-        $zindex = $params['zindex'];
-    }
-    
-    if (!empty($params['src'])) {
-        return '<div id="overDiv" style="position:absolute; visibility:hidden; z-index:'.$zindex.';"></div>' . "\n"
-         . '<script type="text/javascript" language="JavaScript" src="'.$params['src'].'"></script>' . "\n";
-    } else {
-        $smarty->trigger_error("popup_init: missing src parameter");
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.capitalize.php b/thirdparty/smarty/libs/plugins/modifier.capitalize.php
deleted file mode 100644
index 4a611d9f0..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.capitalize.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty capitalize modifier plugin
- *
- * Type:     modifier<br>
- * Name:     capitalize<br>
- * Purpose:  capitalize words in the string
- * @link http://smarty.php.net/manual/en/language.modifiers.php#LANGUAGE.MODIFIER.CAPITALIZE
- *      capitalize (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @return string
- */
-function smarty_modifier_capitalize($string, $uc_digits = false)
-{
-    smarty_modifier_capitalize_ucfirst(null, $uc_digits);
-    return preg_replace_callback('!\'?\b\w(\w|\')*\b!', 'smarty_modifier_capitalize_ucfirst', $string);
-}
-
-function smarty_modifier_capitalize_ucfirst($string, $uc_digits = null)
-{
-    static $_uc_digits = false;
-    
-    if(isset($uc_digits)) {
-        $_uc_digits = $uc_digits;
-        return;
-    }
-    
-    if(substr($string[0],0,1) != "'" && !preg_match("!\d!",$string[0]) || $_uc_digits)
-        return ucfirst($string[0]);
-    else
-        return $string[0];
-}
-
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.cat.php b/thirdparty/smarty/libs/plugins/modifier.cat.php
deleted file mode 100644
index 2e37940d4..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.cat.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty cat modifier plugin
- *
- * Type:     modifier<br>
- * Name:     cat<br>
- * Date:     Feb 24, 2003
- * Purpose:  catenate a value to a variable
- * Input:    string to catenate
- * Example:  {$var|cat:"foo"}
- * @link http://smarty.php.net/manual/en/language.modifier.cat.php cat
- *          (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @version 1.0
- * @param string
- * @param string
- * @return string
- */
-function smarty_modifier_cat($string, $cat)
-{
-    return $string . $cat;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.count_characters.php b/thirdparty/smarty/libs/plugins/modifier.count_characters.php
deleted file mode 100644
index 5ed9a87cd..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.count_characters.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty count_characters modifier plugin
- *
- * Type:     modifier<br>
- * Name:     count_characteres<br>
- * Purpose:  count the number of characters in a text
- * @link http://smarty.php.net/manual/en/language.modifier.count.characters.php
- *          count_characters (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @param boolean include whitespace in the character count
- * @return integer
- */
-function smarty_modifier_count_characters($string, $include_spaces = false)
-{
-    if ($include_spaces)
-       return(strlen($string));
-
-    return preg_match_all("/[^\s]/",$string, $match);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.count_paragraphs.php b/thirdparty/smarty/libs/plugins/modifier.count_paragraphs.php
deleted file mode 100644
index e0e274da7..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.count_paragraphs.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty count_paragraphs modifier plugin
- *
- * Type:     modifier<br>
- * Name:     count_paragraphs<br>
- * Purpose:  count the number of paragraphs in a text
- * @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
- *          count_paragraphs (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @return integer
- */
-function smarty_modifier_count_paragraphs($string)
-{
-    // count \r or \n characters
-    return count(preg_split('/[\r\n]+/', $string));
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.count_sentences.php b/thirdparty/smarty/libs/plugins/modifier.count_sentences.php
deleted file mode 100644
index f66ea1703..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.count_sentences.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty count_sentences modifier plugin
- *
- * Type:     modifier<br>
- * Name:     count_sentences
- * Purpose:  count the number of sentences in a text
- * @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
- *          count_sentences (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @return integer
- */
-function smarty_modifier_count_sentences($string)
-{
-    // find periods with a word before but not after.
-    return preg_match_all('/[^\s]\.(?!\w)/', $string, $match);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.count_words.php b/thirdparty/smarty/libs/plugins/modifier.count_words.php
deleted file mode 100644
index 9d339f542..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.count_words.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty count_words modifier plugin
- *
- * Type:     modifier<br>
- * Name:     count_words<br>
- * Purpose:  count the number of words in a text
- * @link http://smarty.php.net/manual/en/language.modifier.count.words.php
- *          count_words (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @return integer
- */
-function smarty_modifier_count_words($string)
-{
-    // split text by ' ',\r,\n,\f,\t
-    $split_array = preg_split('/\s+/',$string);
-    // count matches that contain alphanumerics
-    $word_count = preg_grep('/[a-zA-Z0-9\\x80-\\xff]/', $split_array);
-
-    return count($word_count);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.date_format.php b/thirdparty/smarty/libs/plugins/modifier.date_format.php
deleted file mode 100644
index 8cf7d5e14..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.date_format.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Include the {@link shared.make_timestamp.php} plugin
- */
-require_once $smarty->_get_plugin_filepath('shared', 'make_timestamp');
-/**
- * Smarty date_format modifier plugin
- *
- * Type:     modifier<br>
- * Name:     date_format<br>
- * Purpose:  format datestamps via strftime<br>
- * Input:<br>
- *         - string: input date string
- *         - format: strftime format for output
- *         - default_date: default date if $string is empty
- * @link http://smarty.php.net/manual/en/language.modifier.date.format.php
- *          date_format (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @param string
- * @param string
- * @return string|void
- * @uses smarty_make_timestamp()
- */
-function smarty_modifier_date_format($string, $format = '%b %e, %Y', $default_date = '')
-{
-    if ($string != '') {
-        $timestamp = smarty_make_timestamp($string);
-    } elseif ($default_date != '') {
-        $timestamp = smarty_make_timestamp($default_date);
-    } else {
-        return;
-    }
-    if (DIRECTORY_SEPARATOR == '\\') {
-        $_win_from = array('%D',       '%h', '%n', '%r',          '%R',    '%t', '%T');
-        $_win_to   = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
-        if (strpos($format, '%e') !== false) {
-            $_win_from[] = '%e';
-            $_win_to[]   = sprintf('%\' 2d', date('j', $timestamp));
-        }
-        if (strpos($format, '%l') !== false) {
-            $_win_from[] = '%l';
-            $_win_to[]   = sprintf('%\' 2d', date('h', $timestamp));
-        }
-        $format = str_replace($_win_from, $_win_to, $format);
-    }
-    return strftime($format, $timestamp);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.debug_print_var.php b/thirdparty/smarty/libs/plugins/modifier.debug_print_var.php
deleted file mode 100644
index e4f7bc0cc..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.debug_print_var.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty debug_print_var modifier plugin
- *
- * Type:     modifier<br>
- * Name:     debug_print_var<br>
- * Purpose:  formats variable contents for display in the console
- * @link http://smarty.php.net/manual/en/language.modifier.debug.print.var.php
- *          debug_print_var (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param array|object
- * @param integer
- * @param integer
- * @return string
- */
-function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40)
-{
-    $_replace = array(
-        "\n" => '<i>\n</i>',
-        "\r" => '<i>\r</i>',
-        "\t" => '<i>\t</i>'
-    );
-
-    switch (gettype($var)) {
-        case 'array' :
-            $results = '<b>Array (' . count($var) . ')</b>';
-            foreach ($var as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-                    . '<b>' . strtr($curr_key, $_replace) . '</b> =&gt; '
-                    . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
-                    $depth--;
-            }
-            break;
-        case 'object' :
-            $object_vars = get_object_vars($var);
-            $results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
-            foreach ($object_vars as $curr_key => $curr_val) {
-                $results .= '<br>' . str_repeat('&nbsp;', $depth * 2)
-                    . '<b> -&gt;' . strtr($curr_key, $_replace) . '</b> = '
-                    . smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
-                    $depth--;
-            }
-            break;
-        case 'boolean' :
-        case 'NULL' :
-        case 'resource' :
-            if (true === $var) {
-                $results = 'true';
-            } elseif (false === $var) {
-                $results = 'false';
-            } elseif (null === $var) {
-                $results = 'null';
-            } else {
-                $results = htmlspecialchars((string) $var);
-            }
-            $results = '<i>' . $results . '</i>';
-            break;
-        case 'integer' :
-        case 'float' :
-            $results = htmlspecialchars((string) $var);
-            break;
-        case 'string' :
-            $results = strtr($var, $_replace);
-            if (strlen($var) > $length ) {
-                $results = substr($var, 0, $length - 3) . '...';
-            }
-            $results = htmlspecialchars('"' . $results . '"');
-            break;
-        case 'unknown type' :
-        default :
-            $results = strtr((string) $var, $_replace);
-            if (strlen($results) > $length ) {
-                $results = substr($results, 0, $length - 3) . '...';
-            }
-            $results = htmlspecialchars($results);
-    }
-
-    return $results;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.default.php b/thirdparty/smarty/libs/plugins/modifier.default.php
deleted file mode 100644
index 70011fd6b..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.default.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty default modifier plugin
- *
- * Type:     modifier<br>
- * Name:     default<br>
- * Purpose:  designate default value for empty variables
- * @link http://smarty.php.net/manual/en/language.modifier.default.php
- *          default (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @param string
- * @return string
- */
-function smarty_modifier_default($string, $default = '')
-{
-    if (!isset($string) || $string === '')
-        return $default;
-    else
-        return $string;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.escape.php b/thirdparty/smarty/libs/plugins/modifier.escape.php
deleted file mode 100644
index a2f52b232..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.escape.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty escape modifier plugin
- *
- * Type:     modifier<br>
- * Name:     escape<br>
- * Purpose:  Escape the string according to escapement type
- * @link http://smarty.php.net/manual/en/language.modifier.escape.php
- *          escape (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @param html|htmlall|url|quotes|hex|hexentity|javascript
- * @return string
- */
-function smarty_modifier_escape($string, $esc_type = 'html', $char_set = 'ISO-8859-1')
-{
-    switch ($esc_type) {
-        case 'html':
-            return htmlspecialchars($string, ENT_QUOTES, $char_set);
-
-        case 'htmlall':
-            return htmlentities($string, ENT_QUOTES, $char_set);
-
-        case 'url':
-            return rawurlencode($string);
-
-        case 'urlpathinfo':
-            return str_replace('%2F','/',rawurlencode($string));
-            
-        case 'quotes':
-            // escape unescaped single quotes
-            return preg_replace("%(?<!\\\\)'%", "\\'", $string);
-
-        case 'hex':
-            // escape every character into hex
-            $return = '';
-            for ($x=0; $x < strlen($string); $x++) {
-                $return .= '%' . bin2hex($string[$x]);
-            }
-            return $return;
-            
-        case 'hexentity':
-            $return = '';
-            for ($x=0; $x < strlen($string); $x++) {
-                $return .= '&#x' . bin2hex($string[$x]) . ';';
-            }
-            return $return;
-
-        case 'decentity':
-            $return = '';
-            for ($x=0; $x < strlen($string); $x++) {
-                $return .= '&#' . ord($string[$x]) . ';';
-            }
-            return $return;
-
-        case 'javascript':
-            // escape quotes and backslashes, newlines, etc.
-            return strtr($string, array('\\'=>'\\\\',"'"=>"\\'",'"'=>'\\"',"\r"=>'\\r',"\n"=>'\\n','</'=>'<\/'));
-            
-        case 'mail':
-            // safe way to display e-mail address on a web page
-            return str_replace(array('@', '.'),array(' [AT] ', ' [DOT] '), $string);
-            
-        case 'nonstd':
-           // escape non-standard chars, such as ms document quotes
-           $_res = '';
-           for($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) {
-               $_ord = ord(substr($string, $_i, 1));
-               // non-standard char, escape it
-               if($_ord >= 126){
-                   $_res .= '&#' . $_ord . ';';
-               }
-               else {
-                   $_res .= substr($string, $_i, 1);
-               }
-           }
-           return $_res;
-
-        default:
-            return $string;
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.indent.php b/thirdparty/smarty/libs/plugins/modifier.indent.php
deleted file mode 100644
index 394147a29..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.indent.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty indent modifier plugin
- *
- * Type:     modifier<br>
- * Name:     indent<br>
- * Purpose:  indent lines of text
- * @link http://smarty.php.net/manual/en/language.modifier.indent.php
- *          indent (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @param integer
- * @param string
- * @return string
- */
-function smarty_modifier_indent($string,$chars=4,$char=" ")
-{
-    return preg_replace('!^!m',str_repeat($char,$chars),$string);
-}
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.lower.php b/thirdparty/smarty/libs/plugins/modifier.lower.php
deleted file mode 100644
index 20e7a8d39..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.lower.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty lower modifier plugin
- *
- * Type:     modifier<br>
- * Name:     lower<br>
- * Purpose:  convert string to lowercase
- * @link http://smarty.php.net/manual/en/language.modifier.lower.php
- *          lower (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @return string
- */
-function smarty_modifier_lower($string)
-{
-    return strtolower($string);
-}
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.nl2br.php b/thirdparty/smarty/libs/plugins/modifier.nl2br.php
deleted file mode 100644
index d6fabff64..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.nl2br.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty plugin
- *
- * Type:     modifier<br>
- * Name:     nl2br<br>
- * Date:     Feb 26, 2003
- * Purpose:  convert \r\n, \r or \n to <<br>>
- * Input:<br>
- *         - contents = contents to replace
- *         - preceed_test = if true, includes preceeding break tags
- *           in replacement
- * Example:  {$text|nl2br}
- * @link http://smarty.php.net/manual/en/language.modifier.nl2br.php
- *          nl2br (Smarty online manual)
- * @version  1.0
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @return string
- */
-function smarty_modifier_nl2br($string)
-{
-    return nl2br($string);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.regex_replace.php b/thirdparty/smarty/libs/plugins/modifier.regex_replace.php
deleted file mode 100644
index d4d20309d..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.regex_replace.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty regex_replace modifier plugin
- *
- * Type:     modifier<br>
- * Name:     regex_replace<br>
- * Purpose:  regular expression search/replace
- * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
- *          regex_replace (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @param string|array
- * @param string|array
- * @return string
- */
-function smarty_modifier_regex_replace($string, $search, $replace)
-{
-    if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
-        /* remove eval-modifier from $search */
-        $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
-    }
-       
-    return preg_replace($search, $replace, $string);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.replace.php b/thirdparty/smarty/libs/plugins/modifier.replace.php
deleted file mode 100644
index df041c884..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.replace.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty replace modifier plugin
- *
- * Type:     modifier<br>
- * Name:     replace<br>
- * Purpose:  simple search/replace
- * @link http://smarty.php.net/manual/en/language.modifier.replace.php
- *          replace (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @param string
- * @param string
- * @return string
- */
-function smarty_modifier_replace($string, $search, $replace)
-{
-    return str_replace($search, $replace, $string);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.spacify.php b/thirdparty/smarty/libs/plugins/modifier.spacify.php
deleted file mode 100644
index c2423f4f2..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.spacify.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty spacify modifier plugin
- *
- * Type:     modifier<br>
- * Name:     spacify<br>
- * Purpose:  add spaces between characters in a string
- * @link http://smarty.php.net/manual/en/language.modifier.spacify.php
- *          spacify (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @param string
- * @return string
- */
-function smarty_modifier_spacify($string, $spacify_char = ' ')
-{
-    return implode($spacify_char,
-                   preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY));
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.string_format.php b/thirdparty/smarty/libs/plugins/modifier.string_format.php
deleted file mode 100644
index 9e051a578..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.string_format.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty string_format modifier plugin
- *
- * Type:     modifier<br>
- * Name:     string_format<br>
- * Purpose:  format strings via sprintf
- * @link http://smarty.php.net/manual/en/language.modifier.string.format.php
- *          string_format (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @param string
- * @return string
- */
-function smarty_modifier_string_format($string, $format)
-{
-    return sprintf($format, $string);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.strip.php b/thirdparty/smarty/libs/plugins/modifier.strip.php
deleted file mode 100644
index cc5c453c8..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.strip.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty strip modifier plugin
- *
- * Type:     modifier<br>
- * Name:     strip<br>
- * Purpose:  Replace all repeated spaces, newlines, tabs
- *           with a single space or supplied replacement string.<br>
- * Example:  {$var|strip} {$var|strip:"&nbsp;"}
- * Date:     September 25th, 2002
- * @link http://smarty.php.net/manual/en/language.modifier.strip.php
- *          strip (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @version  1.0
- * @param string
- * @param string
- * @return string
- */
-function smarty_modifier_strip($text, $replace = ' ')
-{
-    return preg_replace('!\s+!', $replace, $text);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.strip_tags.php b/thirdparty/smarty/libs/plugins/modifier.strip_tags.php
deleted file mode 100644
index 93011a892..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.strip_tags.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty strip_tags modifier plugin
- *
- * Type:     modifier<br>
- * Name:     strip_tags<br>
- * Purpose:  strip html tags from text
- * @link http://smarty.php.net/manual/en/language.modifier.strip.tags.php
- *          strip_tags (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @param boolean
- * @return string
- */
-function smarty_modifier_strip_tags($string, $replace_with_space = true)
-{
-    if ($replace_with_space)
-        return preg_replace('!<[^>]*?>!', ' ', $string);
-    else
-        return strip_tags($string);
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.truncate.php b/thirdparty/smarty/libs/plugins/modifier.truncate.php
deleted file mode 100644
index 35c89690a..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.truncate.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty truncate modifier plugin
- *
- * Type:     modifier<br>
- * Name:     truncate<br>
- * Purpose:  Truncate a string to a certain length if necessary,
- *           optionally splitting in the middle of a word, and
- *           appending the $etc string or inserting $etc into the middle.
- * @link http://smarty.php.net/manual/en/language.modifier.truncate.php
- *          truncate (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @param integer
- * @param string
- * @param boolean
- * @param boolean
- * @return string
- */
-function smarty_modifier_truncate($string, $length = 80, $etc = '...',
-                                  $break_words = false, $middle = false)
-{
-    if ($length == 0)
-        return '';
-
-    if (strlen($string) > $length) {
-        $length -= min($length, strlen($etc));
-        if (!$break_words && !$middle) {
-            $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length+1));
-        }
-        if(!$middle) {
-            return substr($string, 0, $length) . $etc;
-        } else {
-            return substr($string, 0, $length/2) . $etc . substr($string, -$length/2);
-        }
-    } else {
-        return $string;
-    }
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.upper.php b/thirdparty/smarty/libs/plugins/modifier.upper.php
deleted file mode 100644
index c12480fbd..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.upper.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty upper modifier plugin
- *
- * Type:     modifier<br>
- * Name:     upper<br>
- * Purpose:  convert string to uppercase
- * @link http://smarty.php.net/manual/en/language.modifier.upper.php
- *          upper (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @return string
- */
-function smarty_modifier_upper($string)
-{
-    return strtoupper($string);
-}
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/modifier.wordwrap.php b/thirdparty/smarty/libs/plugins/modifier.wordwrap.php
deleted file mode 100644
index ce0718156..000000000
--- a/thirdparty/smarty/libs/plugins/modifier.wordwrap.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty wordwrap modifier plugin
- *
- * Type:     modifier<br>
- * Name:     wordwrap<br>
- * Purpose:  wrap a string of text at a given length
- * @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php
- *          wordwrap (Smarty online manual)
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @param integer
- * @param string
- * @param boolean
- * @return string
- */
-function smarty_modifier_wordwrap($string,$length=80,$break="\n",$cut=false)
-{
-    return wordwrap($string,$length,$break,$cut);
-}
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/outputfilter.trimwhitespace.php b/thirdparty/smarty/libs/plugins/outputfilter.trimwhitespace.php
deleted file mode 100644
index 97b0d21e8..000000000
--- a/thirdparty/smarty/libs/plugins/outputfilter.trimwhitespace.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-/**
- * Smarty trimwhitespace outputfilter plugin
- *
- * File:     outputfilter.trimwhitespace.php<br>
- * Type:     outputfilter<br>
- * Name:     trimwhitespace<br>
- * Date:     Jan 25, 2003<br>
- * Purpose:  trim leading white space and blank lines from
- *           template source after it gets interpreted, cleaning
- *           up code and saving bandwidth. Does not affect
- *           <<PRE>></PRE> and <SCRIPT></SCRIPT> blocks.<br>
- * Install:  Drop into the plugin directory, call
- *           <code>$smarty->load_filter('output','trimwhitespace');</code>
- *           from application.
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @author Contributions from Lars Noschinski <lars@usenet.noschinski.de>
- * @version  1.3
- * @param string
- * @param Smarty
- */
-function smarty_outputfilter_trimwhitespace($source, &$smarty)
-{
-    // Pull out the script blocks
-    preg_match_all("!<script[^>]+>.*?</script>!is", $source, $match);
-    $_script_blocks = $match[0];
-    $source = preg_replace("!<script[^>]+>.*?</script>!is",
-                           '@@@SMARTY:TRIM:SCRIPT@@@', $source);
-
-    // Pull out the pre blocks
-    preg_match_all("!<pre>.*?</pre>!is", $source, $match);
-    $_pre_blocks = $match[0];
-    $source = preg_replace("!<pre>.*?</pre>!is",
-                           '@@@SMARTY:TRIM:PRE@@@', $source);
-
-    // Pull out the textarea blocks
-    preg_match_all("!<textarea[^>]+>.*?</textarea>!is", $source, $match);
-    $_textarea_blocks = $match[0];
-    $source = preg_replace("!<textarea[^>]+>.*?</textarea>!is",
-                           '@@@SMARTY:TRIM:TEXTAREA@@@', $source);
-
-    // remove all leading spaces, tabs and carriage returns NOT
-    // preceeded by a php close tag.
-    $source = trim(preg_replace('/((?<!\?>)\n)[\s]+/m', '\1', $source));
-
-    // replace textarea blocks
-    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$_textarea_blocks, $source);
-
-    // replace pre blocks
-    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:PRE@@@",$_pre_blocks, $source);
-
-    // replace script blocks
-    smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:SCRIPT@@@",$_script_blocks, $source);
-
-    return $source;
-}
-
-function smarty_outputfilter_trimwhitespace_replace($search_str, $replace, &$subject) {
-    $_len = strlen($search_str);
-    $_pos = 0;
-    for ($_i=0, $_count=count($replace); $_i<$_count; $_i++)
-        if (($_pos=strpos($subject, $search_str, $_pos))!==false)
-            $subject = substr_replace($subject, $replace[$_i], $_pos, $_len);
-        else
-            break;
-
-}
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/shared.escape_special_chars.php b/thirdparty/smarty/libs/plugins/shared.escape_special_chars.php
deleted file mode 100644
index c07ce31be..000000000
--- a/thirdparty/smarty/libs/plugins/shared.escape_special_chars.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * escape_special_chars common function
- *
- * Function: smarty_function_escape_special_chars<br>
- * Purpose:  used by other smarty functions to escape
- *           special chars except for already escaped ones
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @return string
- */
-function smarty_function_escape_special_chars($string)
-{
-    if(!is_array($string)) {
-        $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string);
-        $string = htmlspecialchars($string);
-        $string = str_replace(array('%%%SMARTY_START%%%','%%%SMARTY_END%%%'), array('&',';'), $string);
-    }
-    return $string;
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/libs/plugins/shared.make_timestamp.php b/thirdparty/smarty/libs/plugins/shared.make_timestamp.php
deleted file mode 100644
index b42eb11d8..000000000
--- a/thirdparty/smarty/libs/plugins/shared.make_timestamp.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Smarty shared plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Function: smarty_make_timestamp<br>
- * Purpose:  used by other smarty functions to make a timestamp
- *           from a string.
- * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @return string
- */
-function smarty_make_timestamp($string)
-{
-    if(empty($string)) {
-        // use "now":
-        $time = time();
-
-    } elseif (preg_match('/^\d{14}$/', $string)) {
-        // it is mysql timestamp format of YYYYMMDDHHMMSS?            
-        $time = mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
-                       substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
-        
-    } elseif (is_numeric($string)) {
-        // it is a numeric string, we handle it as timestamp
-        $time = (int)$string;
-        
-    } else {
-        // strtotime should handle it
-        $time = strtotime($string);
-        if ($time == -1 || $time === false) {
-            // strtotime() was not able to parse $string, use "now":
-            $time = time();
-        }
-    }
-    return $time;
-
-}
-
-/* vim: set expandtab: */
-
-?>
diff --git a/thirdparty/smarty/misc/smarty_icon.README b/thirdparty/smarty/misc/smarty_icon.README
deleted file mode 100644
index a5b4d05cc..000000000
--- a/thirdparty/smarty/misc/smarty_icon.README
+++ /dev/null
@@ -1,6 +0,0 @@
-Feel free to put the smarty icon on your site.
-You can cut-and-paste the following code, be sure
-to adjust the path to the image:
-
-<a href="http://smarty.php.net/">
-<img src="smarty_icon.gif" border="0" height="31" width="88" /></a>
diff --git a/thirdparty/smarty/misc/smarty_icon.gif b/thirdparty/smarty/misc/smarty_icon.gif
deleted file mode 100644
index 5d5196995..000000000
Binary files a/thirdparty/smarty/misc/smarty_icon.gif and /dev/null differ
diff --git a/thirdparty/smarty/unit_test/README b/thirdparty/smarty/unit_test/README
deleted file mode 100644
index d4d973130..000000000
--- a/thirdparty/smarty/unit_test/README
+++ /dev/null
@@ -1,32 +0,0 @@
-Smarty Unit Testing
--------------------
-
-Smarty unit tests require the PEAR PHPUnit
-package to be installed. See if you have that
-installed with the following command:
-
-$> pear list
-
-If you don't see PHPUnit, install with this:
-
-$> pear install PHPUnit
-
-Edit the config.php file,
-be sure everything is defined correctly.
-
-Be sure the following directories are present:
-
-templates
-configs
-templates_c (writable)
-cache (writable)
-
-Then run from the command line:
-php -q smarty_unit_test.php
-
-Or from the web browser:
-http://www.your_domain.com/path/to/smarty_unit_test_gui.php
-
-This will run a unit test for every component
-of Smarty and dump the results. All should pass
-with flying colors. :)
diff --git a/thirdparty/smarty/unit_test/config.php b/thirdparty/smarty/unit_test/config.php
deleted file mode 100644
index 5e7da0561..000000000
--- a/thirdparty/smarty/unit_test/config.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-define('SMARTY_DIR', '../libs/');
-
-?>
diff --git a/thirdparty/smarty/unit_test/configs/globals_double_quotes.conf b/thirdparty/smarty/unit_test/configs/globals_double_quotes.conf
deleted file mode 100644
index 5abc475eb..000000000
--- a/thirdparty/smarty/unit_test/configs/globals_double_quotes.conf
+++ /dev/null
@@ -1 +0,0 @@
-foo = "bar"
diff --git a/thirdparty/smarty/unit_test/configs/globals_single_quotes.conf b/thirdparty/smarty/unit_test/configs/globals_single_quotes.conf
deleted file mode 100644
index 4517b7bd1..000000000
--- a/thirdparty/smarty/unit_test/configs/globals_single_quotes.conf
+++ /dev/null
@@ -1 +0,0 @@
-foo = 'bar'
diff --git a/thirdparty/smarty/unit_test/smarty_unit_test.php b/thirdparty/smarty/unit_test/smarty_unit_test.php
deleted file mode 100644
index c56a61a0e..000000000
--- a/thirdparty/smarty/unit_test/smarty_unit_test.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-require_once 'test_cases.php';
-require_once 'PHPUnit.php';
-
-$suite = new PHPUnit_TestSuite("SmartyTest");
-$result = PHPUnit::run($suite);
-
-echo $result -> toString();
-?>
diff --git a/thirdparty/smarty/unit_test/smarty_unit_test_gui.php b/thirdparty/smarty/unit_test/smarty_unit_test_gui.php
deleted file mode 100644
index 03309d4cb..000000000
--- a/thirdparty/smarty/unit_test/smarty_unit_test_gui.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-require_once 'test_cases.php';
-require_once 'PHPUnit.php';
-
-$suite = new PHPUnit_TestSuite("SmartyTest");
-$result = PHPUnit::run($suite);
-
-echo $result -> toHTML();
-?>
diff --git a/thirdparty/smarty/unit_test/templates/assign_var.tpl b/thirdparty/smarty/unit_test/templates/assign_var.tpl
deleted file mode 100644
index acc4b66a4..000000000
--- a/thirdparty/smarty/unit_test/templates/assign_var.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{$foo}
diff --git a/thirdparty/smarty/unit_test/templates/constant.tpl b/thirdparty/smarty/unit_test/templates/constant.tpl
deleted file mode 100644
index 7ae11f1dc..000000000
--- a/thirdparty/smarty/unit_test/templates/constant.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{$smarty.const.TEST_CONSTANT}
diff --git a/thirdparty/smarty/unit_test/templates/index.tpl b/thirdparty/smarty/unit_test/templates/index.tpl
deleted file mode 100644
index fb6aad233..000000000
--- a/thirdparty/smarty/unit_test/templates/index.tpl
+++ /dev/null
@@ -1 +0,0 @@
-TEST STRING
diff --git a/thirdparty/smarty/unit_test/templates/parse_math.tpl b/thirdparty/smarty/unit_test/templates/parse_math.tpl
deleted file mode 100644
index 0b787d363..000000000
--- a/thirdparty/smarty/unit_test/templates/parse_math.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{foreach name=loop from=$items item=i}
-{$smarty.foreach.loop.iteration+2}
-{$smarty.foreach.loop.iteration+$flt}
-{$smarty.foreach.loop.iteration+$obj->six()}
-{$smarty.foreach.loop.iteration+$obj->ten}
-{/foreach}
-{$obj->ten+$flt}
-{$obj->ten*$flt}
-{$obj->six()+$obj->ten}
-{$obj->ten+$obj->ten}
-{$obj->six()+$flt}
-{$obj->six()+$items.0}
diff --git a/thirdparty/smarty/unit_test/templates/parse_obj_meth.tpl b/thirdparty/smarty/unit_test/templates/parse_obj_meth.tpl
deleted file mode 100644
index ab198327f..000000000
--- a/thirdparty/smarty/unit_test/templates/parse_obj_meth.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{$obj->meth($foo, 2.5)}
-{$obj->meth(2.5, $foo)}
-{$obj->meth(2.5)}
-{$obj->meth($obj->val, "foo")}
-{$obj->meth("foo", $obj->val)}
-{$obj->meth("foo", $foo)}
-{$obj->meth($obj->arr.one, 2)}
-{$obj->meth($obj->meth("foo", $foo))}
diff --git a/thirdparty/smarty/unit_test/test_cases.php b/thirdparty/smarty/unit_test/test_cases.php
deleted file mode 100644
index 2df920e90..000000000
--- a/thirdparty/smarty/unit_test/test_cases.php
+++ /dev/null
@@ -1,450 +0,0 @@
-<?php
-
-require_once './config.php';
-require_once SMARTY_DIR . 'Smarty.class.php';
-require_once 'PHPUnit.php';
-
-class Obj {
-    var $val = 'val';
-    var $arr = array('one' => 'one', 'two' => 2);
-    var $ten = 10;
-
-    function meth($a="a", $b="b") {
-        return "$a:$b";
-    }
-
-    function six() {
-        return 6;
-    }
-}
-
-    
-class SmartyTest extends PHPUnit_TestCase {   
-    // contains the object handle of the string class
-    var $abc;
-    // contains the last triggered error's errorlevel
-    var $errorlevel;
-
-    // constructor of the test suite
-    function SmartyTest($name) {
-       $this->PHPUnit_TestCase($name);
-    }
-
-    // called before the test functions will be executed    
-    // this function is defined in PHPUnit_TestCase and overwritten 
-    // here
-    function setUp() {
-        // create a new instance of String with the
-        // string 'abc'
-        $this->smarty = new Smarty;
-    }
-    // called after the test functions are executed    
-    // this function is defined in PHPUnit_TestCase and overwritten 
-    // here    
-    function tearDown() {
-        // delete your instance
-        unset($this->smarty);
-    }
-    
-    // dummy errorhandler for functions that are supposed to call trigger_error()
-    function error_handler($errorlevel) {
-        if ($errorlevel) $this->errorlevel = $errorlevel;
-    }
-
-    /* DIRECTORY TESTS */
-    
-    // test that template_dir exists
-    function test_template_dir_exists() {
-        $this->assertTrue(file_exists($this->smarty->template_dir));                       
-    }
-    // test that template_dir is a directory
-    function test_template_dir_is_dir() {
-        $this->assertTrue(is_dir($this->smarty->template_dir));                       
-    }
-    // test that template_dir is readable
-    function test_template_dir_is_readable() {
-        $this->assertTrue(is_readable($this->smarty->template_dir));                       
-    }
-    // test that config_dir exists
-    function test_config_dir_exists() {
-        $this->assertTrue(file_exists($this->smarty->config_dir));                       
-    }
-    // test that config_dir is a directory
-    function test_config_dir_is_dir() {
-        $this->assertTrue(is_dir($this->smarty->config_dir));                       
-    }
-    // test that config_dir is readable
-    function test_config_dir_is_readable() {
-        $this->assertTrue(is_readable($this->smarty->config_dir));                       
-    }
-    // test that compile_dir exists
-    function test_compile_dir_exists() {
-        $this->assertTrue(file_exists($this->smarty->compile_dir));                       
-    }
-    // test that compile_dir is a directory
-    function test_compile_dir_is_dir() {
-        $this->assertTrue(is_dir($this->smarty->compile_dir));                       
-    }
-    // test that compile_dir is readable
-    function test_compile_dir_is_readable() {
-        $this->assertTrue(is_readable($this->smarty->compile_dir));                       
-    }
-    // test that compile_dir is writable
-    function test_compile_dir_is_writable() {
-        $this->assertTrue(is_writable($this->smarty->compile_dir));                       
-    }
-    // test that cache_dir exists
-    function test_cache_dir_exists() {
-        $this->assertTrue(file_exists($this->smarty->cache_dir));                       
-    }
-    // test that cache_dir is a directory
-    function test_cache_dir_is_dir() {
-        $this->assertTrue(is_dir($this->smarty->cache_dir));                       
-    }
-    // test that cache_dir is readable
-    function test_cache_dir_is_readable() {
-        $this->assertTrue(is_readable($this->smarty->cache_dir));                       
-    }
-    // test that cache_dir is writable
-    function test_cache_dir_is_writable() {
-        $this->assertTrue(is_writable($this->smarty->cache_dir));                       
-    }
-
-    /* METHOD EXISTS TESTS */
-    function test_assign_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'assign'));
-    }
-    function test_assign_by_ref_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'assign_by_ref'));
-    }
-    function test_append_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'append'));
-    }
-    function test_append_by_ref_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'append_by_ref'));
-    }
-    function test_clear_assign_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'clear_assign'));
-    }
-    function test_register_function_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'register_function'));
-    }
-    function test_unregister_function_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'unregister_function'));
-    }
-    function test_register_object_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'register_object'));
-    }
-    function test_unregister_object_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'unregister_object'));
-    }
-    function test_register_block_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'register_block'));
-    }
-    function test_unregister_block_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'unregister_block'));
-    }
-    function test_register_compiler_function_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'register_compiler_function'));
-    }
-    function test_unregister_compiler_function_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'unregister_compiler_function'));
-    }
-    function test_register_modifier_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'register_modifier'));
-    }
-    function test_unregister_modifier_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'unregister_modifier'));
-    }
-    function test_register_resource_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'register_resource'));
-    }
-    function test_unregister_resource_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'unregister_resource'));
-    }
-    function test_register_prefilter_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'register_prefilter'));
-    }
-    function test_unregister_prefilter_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'unregister_prefilter'));
-    }
-    function test_register_postfilter_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'register_postfilter'));
-    }
-    function test_unregister_postfilter_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'unregister_postfilter'));
-    }
-    function test_register_outputfilter_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'register_outputfilter'));
-    }
-    function test_unregister_outputfilter_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'unregister_outputfilter'));
-    }
-    function test_load_filter_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'load_filter'));
-    }
-    function test_clear_cache_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'clear_cache'));
-    }
-    function test_clear_all_cache_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'clear_all_cache'));
-    }
-    function test_is_cached_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'is_cached'));
-    }
-    function test_clear_all_assign_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'clear_all_assign'));
-    }
-    function test_clear_compiled_tpl_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'clear_compiled_tpl'));
-    }
-    function test_template_exists_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'template_exists'));
-    }
-    function test_get_template_vars_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'get_template_vars'));
-    }
-    function test_get_config_vars_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'get_config_vars'));
-    }
-    function test_trigger_error_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'trigger_error'));
-    }
-    function test_display_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'display'));
-    }
-    function test_fetch_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'fetch'));
-    }
-    function test_config_load_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'config_load'));
-    }
-    function test_get_registered_object_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'get_registered_object'));
-    }
-    function test_clear_config_method_exists() {
-        $this->assertTrue(method_exists($this->smarty, 'clear_config'));
-    }
-    function test_get_plugin_filepath() {
-        $this->assertTrue(method_exists($this->smarty, '_get_plugin_filepath'));
-    }
-
-    
-    function test_clear_compiled_tpl() {
-        $this->assertTrue($this->smarty->clear_compiled_tpl());
-    }
-    
-    /* DISPLAY TESTS */
-    
-    // test that display() executes properly
-    function test_call_to_display() {
-        ob_start();
-        $this->smarty->display('index.tpl');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertEquals($output, 'TEST STRING');
-    }
-
-    /* FETCH TESTS */
-
-    // test that fetch() executes properly
-    function test_call_to_fetch() {
-        $this->assertEquals($this->smarty->fetch('index.tpl'), 'TEST STRING');
-    }
-    
-    /* ASSIGN TESTS */
-
-    // test assigning a simple template variable
-    function test_assign_var() {
-        $this->smarty->assign('foo', 'bar');
-        $this->assertEquals($this->smarty->fetch('assign_var.tpl'), 'bar');
-    }
-
-    /* PARSING TESTS */
-    
-    // test assigning and calling an object
-    function test_parse_obj_meth() {
-        $obj  = new Obj();
-        $this->smarty->assign('obj', $obj);
-        $this->smarty->assign('foo', 'foo');
-        $this->assertEquals('foo:2.5
-2.5:foo
-2.5:b
-val:foo
-foo:val
-foo:foo
-one:2
-foo:foo:b', $this->smarty->fetch('parse_obj_meth.tpl'));
-    }
-    
-    // test assigning and calling an object
-    function test_parse_math() {
-        $obj  = new Obj();
-        $this->smarty->assign('obj', $obj);
-        $this->smarty->assign('flt', 2.5);
-        $this->smarty->assign('items', array(1, 2));
-        $this->assertEquals('3
-3.5
-7
-11
-4
-4.5
-8
-12
-12.5
-25
-16
-20
-8.5
-7', $this->smarty->fetch('parse_math.tpl'));
-    }
-    
-    /* CONFIG FILE TESTS */
-
-    // test assigning a double quoted global variable
-    function test_config_load_globals_double_quotes() {
-        // load the global var
-        $this->smarty->config_load('globals_double_quotes.conf');
-        // test that it is assigned
-        $this->assertEquals($this->smarty->_config[0]['vars']['foo'], 'bar');
-    }
-
-    // test assigning a single quoted global variable
-    function test_config_load_globals_single_quotes() {
-        // load the global var
-        $this->smarty->config_load('globals_single_quotes.conf');
-        // test that it is assigned
-        $this->assertEquals($this->smarty->_config[0]['vars']['foo'], 'bar');
-    }
-
-    // test loading and running modifier.escape.php
-    function test_escape_modifier_get_plugins_filepath() {
-        $filepath = $this->smarty->_get_plugin_filepath('modifier', 'escape');
-        $this->assertTrue($filepath);
-    }
-
-    function test_escape_modifier_include_file() {
-        $filepath = $this->smarty->_get_plugin_filepath('modifier', 'escape');
-        $this->assertTrue(include($filepath));
-    }
-
-    function test_escape_modifier_function_exists() {
-        $this->assertTrue(function_exists('smarty_modifier_escape'));
-    }
-
-    function test_escape_modifier_escape_default() {
-        $string = smarty_modifier_escape("<html><body></body></html>");
-        $this->assertEquals('&lt;html&gt;&lt;body&gt;&lt;/body&gt;&lt;/html&gt;',
-                            $string);
-    }
-
-    function test_escape_modifier_escape_html() {
-        $string = smarty_modifier_escape("<html><body></body></html>", 'html');
-        $this->assertEquals('&lt;html&gt;&lt;body&gt;&lt;/body&gt;&lt;/html&gt;',
-                            $string);
-    }
-
-    function test_escape_modifier_escape_htmlall() {
-        $string = smarty_modifier_escape("<html><body></body></html>", 'htmlall');
-        $this->assertEquals('&lt;html&gt;&lt;body&gt;&lt;/body&gt;&lt;/html&gt;',
-                            $string);
-    }
-
-    function test_escape_modifier_escape_url() {
-        $string = smarty_modifier_escape("http://test.com?foo=bar", 'url');
-        $this->assertEquals('http%3A%2F%2Ftest.com%3Ffoo%3Dbar', $string);
-    }
-
-    function test_escape_modifier_escape_quotes() {
-        $string = smarty_modifier_escape("'\\'\\''", 'quotes');
-        $this->assertEquals("\\'\\'\\'\\'", $string);
-    }
-
-    function test_escape_modifier_escape_hex() {
-        $string = smarty_modifier_escape("abcd", 'hex');
-        $this->assertEquals('%61%62%63%64', $string);
-    }
-
-    function test_escape_modifier_escape_hexentity() {
-        $string = smarty_modifier_escape("ABCD", 'hexentity');
-        $this->assertEquals('&#x41;&#x42;&#x43;&#x44;', $string);
-    }
-
-    function test_escape_modifier_escape_javascript() {
-        $string = smarty_modifier_escape("\r\n\\", 'javascript');
-        $this->assertEquals('\\r\\n\\\\', $string);
-    }
-
-
-    function test_core_is_secure_file_exists() {
-        $file = SMARTY_CORE_DIR . 'core.is_secure.php';
-        $this->assertTrue(file_exists($file));
-    }
-
-    function test_core_is_secure_file_include() {
-        $file = SMARTY_CORE_DIR . 'core.is_secure.php';
-        $this->assertTrue(include($file));
-    }
-
-    function test_core_is_secure_function_exists() {
-        $this->assertTrue(function_exists('smarty_core_is_secure'));
-    }
-
-    function test_core_is_secure_function_is_secure_true() {
-        $security = $this->smarty->security;
-        $this->smarty->security = true;
-
-        /* check if index.tpl is secure (should be true) */
-        $params = array('resource_type' => 'file',
-                        'resource_base_path' => dirname(__FILE__) . '/templates',
-                        'resource_name' => dirname(__FILE__) . '/templates/index.tpl');
-        $this->assertTrue(smarty_core_is_secure($params, $this->smarty));
-        $this->smarty->security = $security;
-    }
-
-    function test_core_is_secure_function_is_secure_false() {
-        $security = $this->smarty->security;
-        $this->smarty->security = true;
-        /* check if test_cases.php is secure (should be false) */
-        $params = array('resource_type' => 'file',
-                        'resource_base_path' => dirname(__FILE__) . '/templates',
-                        'resource_name' => __FILE__);
-        $this->assertFalse(smarty_core_is_secure($params, $this->smarty));
-        $this->smarty->security = $security;
-
-    }
-
-    // test constants and security
-    function test_core_is_secure_function_smarty_var_const() {
-        define('TEST_CONSTANT', 'test constant');
-        $this->assertEquals('test constant', $this->smarty->fetch('constant.tpl',
-                                                             null, 'var_const'));
-    }
-
-    function test_core_is_secure_function_smarty_var_const_allowed() {
-        $security = $this->smarty->security;
-        $security_settings = $this->smarty->security_settings;
-        $this->smarty->security_settings['ALLOW_CONSTANTS'] = true;
-        $this->smarty->security = true;
-        $this->assertEquals('test constant', $this->smarty->fetch('constant.tpl',
-                                                     null, 'var_const_allowed'));
-        $this->smarty->security_settings = $security_settings;
-        $this->smarty->security = $security;   
-    }
-
-    function test_core_is_secure_function_smarty_var_const_not_allowed() {
-        $security = $this->smarty->security;
-        $this->smarty->security = true;
-        /* catch errors: */
-        $this->errorlevel = null;
-        set_error_handler(array(&$this, 'error_handler'));
-        $this->smarty->fetch('constant.tpl', null, 'var_const_not_allowed');
-        restore_error_handler();
-
-        $this->assertEquals( $this->errorlevel, E_USER_WARNING);
-        $this->smarty->security = $security;
-    }
-
-}
-
-?>
diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php
index 48ee1abf9..cc9dc246e 100644
--- a/workflow/engine/bin/cron_single.php
+++ b/workflow/engine/bin/cron_single.php
@@ -39,19 +39,19 @@ try {
     //Set variables
     $osIsLinux = strtoupper(substr(PHP_OS, 0, 3)) != 'WIN';
 
-    $pathHome     = $argv[1];
-    $pathTrunk    = $argv[2];
+    $pathHome = $argv[1];
+    $pathTrunk = $argv[2];
     $pathOutTrunk = $argv[3];
-    $cronName     = $argv[4];
-    $workspace    = $argv[5];
-    $dateSystem   = $argv[6];
-    $sNow         = $argv[7]; //$date
+    $cronName = $argv[4];
+    $workspace = $argv[5];
+    $dateSystem = $argv[6];
+    $sNow = $argv[7]; //$date
 
     //Defines constants
-    define('PATH_SEP', ($osIsLinux)? '/' : '\\');
+    define('PATH_SEP', ($osIsLinux) ? '/' : '\\');
 
-    define('PATH_HOME',     $pathHome);
-    define('PATH_TRUNK',    $pathTrunk);
+    define('PATH_HOME', $pathHome);
+    define('PATH_TRUNK', $pathTrunk);
     define('PATH_OUTTRUNK', $pathOutTrunk);
 
     define('PATH_CLASSES', PATH_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP);
@@ -70,33 +70,34 @@ try {
     //Add vendors to autoloader
     //$classLoader->add(PATH_TRUNK . 'vendor' . PATH_SEP . 'luracast' . PATH_SEP . 'restler' . PATH_SEP . 'vendor', 'Luracast');
     //$classLoader->add(PATH_TRUNK . 'vendor' . PATH_SEP . 'bshaffer' . PATH_SEP . 'oauth2-server-php' . PATH_SEP . 'src' . PATH_SEP, 'OAuth2');
-    $classLoader->addClass('Bootstrap', PATH_TRUNK . 'gulliver' . PATH_SEP . 'system' . PATH_SEP . 'class.bootstrap.php');
+    $classLoader->addClass('Bootstrap',
+        PATH_TRUNK . 'gulliver' . PATH_SEP . 'system' . PATH_SEP . 'class.bootstrap.php');
 
     $classLoader->addModelClassPath(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model' . PATH_SEP);
 
     $arraySystemConfiguration = System::getSystemConfiguration('', '', $workspace);
 
-    $e_all = (defined('E_DEPRECATED'))?            E_ALL  & ~E_DEPRECATED : E_ALL;
-    $e_all = (defined('E_STRICT'))?                $e_all & ~E_STRICT     : $e_all;
-    $e_all = ($arraySystemConfiguration['debug'])? $e_all                 : $e_all & ~E_NOTICE;
+    $e_all = (defined('E_DEPRECATED')) ? E_ALL & ~E_DEPRECATED : E_ALL;
+    $e_all = (defined('E_STRICT')) ? $e_all & ~E_STRICT : $e_all;
+    $e_all = ($arraySystemConfiguration['debug']) ? $e_all : $e_all & ~E_NOTICE;
 
     app()->useStoragePath(realpath(PATH_DATA));
     app()->make(Kernel::class)->bootstrap();
     restore_error_handler();
     //Do not change any of these settings directly, use env.ini instead
-    ini_set('display_errors',  $arraySystemConfiguration['debug']);
+    ini_set('display_errors', $arraySystemConfiguration['debug']);
     ini_set('error_reporting', $e_all);
-    ini_set('short_open_tag',  'On');
+    ini_set('short_open_tag', 'On');
     ini_set('default_charset', 'UTF-8');
     //ini_set('memory_limit',    $arraySystemConfiguration['memory_limit']);
     ini_set('soap.wsdl_cache_enabled', $arraySystemConfiguration['wsdl_cache']);
     ini_set('date.timezone', $arraySystemConfiguration['time_zone']);
 
-    define('DEBUG_SQL_LOG',  $arraySystemConfiguration['debug_sql']);
+    define('DEBUG_SQL_LOG', $arraySystemConfiguration['debug_sql']);
     define('DEBUG_TIME_LOG', $arraySystemConfiguration['debug_time']);
     define('DEBUG_CALENDAR_LOG', $arraySystemConfiguration['debug_calendar']);
-    define('MEMCACHED_ENABLED',  $arraySystemConfiguration['memcached']);
-    define('MEMCACHED_SERVER',   $arraySystemConfiguration['memcached_server']);
+    define('MEMCACHED_ENABLED', $arraySystemConfiguration['memcached']);
+    define('MEMCACHED_SERVER', $arraySystemConfiguration['memcached_server']);
 
     //require_once(PATH_GULLIVER . PATH_SEP . 'class.bootstrap.php');
     //define('PATH_GULLIVER_HOME', PATH_TRUNK . 'gulliver' . PATH_SEP);
@@ -105,7 +106,7 @@ try {
 
     //Set variables
     /*----------------------------------********---------------------------------*/
-    $dateInit   = null;
+    $dateInit = null;
     $dateFinish = null;
     /*----------------------------------********---------------------------------*/
 
@@ -115,12 +116,12 @@ try {
         /*----------------------------------********---------------------------------*/
         if (strpos($argv[$i], '+init-date') !== false) {
             $dateInit = substr($argv[$i], 10);
-        } else if (strpos($argv[$i], '+finish-date') !== false) {
+        } elseif (strpos($argv[$i], '+finish-date') !== false) {
             $dateFinish = substr($argv[$i], 12);
         } else {
-        /*----------------------------------********---------------------------------*/
-            $argvx = $argvx . (($argvx != '')? ' ' : '') . $argv[$i];
-        /*----------------------------------********---------------------------------*/
+            /*----------------------------------********---------------------------------*/
+            $argvx = $argvx . (($argvx != '') ? ' ' : '') . $argv[$i];
+            /*----------------------------------********---------------------------------*/
         }
         /*----------------------------------********---------------------------------*/
     }
@@ -138,12 +139,12 @@ try {
         include_once(PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php');
 
         //PM Paths DATA
-        define('PATH_DATA_SITE',                PATH_DATA      . 'sites/' . config("system.workspace") . '/');
-        define('PATH_DOCUMENT',                 PATH_DATA_SITE . 'files/');
-        define('PATH_DATA_MAILTEMPLATES',       PATH_DATA_SITE . 'mailTemplates/');
-        define('PATH_DATA_PUBLIC',              PATH_DATA_SITE . 'public/');
-        define('PATH_DATA_REPORTS',             PATH_DATA_SITE . 'reports/');
-        define('PATH_DYNAFORM',                 PATH_DATA_SITE . 'xmlForms/');
+        define('PATH_DATA_SITE', PATH_DATA . 'sites/' . config("system.workspace") . '/');
+        define('PATH_DOCUMENT', PATH_DATA_SITE . 'files/');
+        define('PATH_DATA_MAILTEMPLATES', PATH_DATA_SITE . 'mailTemplates/');
+        define('PATH_DATA_PUBLIC', PATH_DATA_SITE . 'public/');
+        define('PATH_DATA_REPORTS', PATH_DATA_SITE . 'reports/');
+        define('PATH_DYNAFORM', PATH_DATA_SITE . 'xmlForms/');
         define('PATH_IMAGES_ENVIRONMENT_FILES', PATH_DATA_SITE . 'usersFiles' . PATH_SEP);
         define('PATH_IMAGES_ENVIRONMENT_USERS', PATH_DATA_SITE . 'usersPhotographies' . PATH_SEP);
 
@@ -167,7 +168,8 @@ try {
             while (!feof($fileDb)) {
                 $buffer = fgets($fileDb, 4096); //Read a line
 
-                $phpCode .= preg_replace('/define\s*\(\s*[\x22\x27](.*)[\x22\x27]\s*,\s*(\x22.*\x22|\x27.*\x27)\s*\)\s*;/i', '$$1 = $2;', $buffer);
+                $phpCode .= preg_replace('/define\s*\(\s*[\x22\x27](.*)[\x22\x27]\s*,\s*(\x22.*\x22|\x27.*\x27)\s*\)\s*;/i',
+                    '$$1 = $2;', $buffer);
             }
 
             fclose($fileDb);
@@ -177,9 +179,9 @@ try {
 
         eval($phpCode);
 
-        $dsn     = $DB_ADAPTER . '://' . $DB_USER . ':' . $DB_PASS . '@' . $DB_HOST . '/' . $DB_NAME;
+        $dsn = $DB_ADAPTER . '://' . $DB_USER . ':' . $DB_PASS . '@' . $DB_HOST . '/' . $DB_NAME;
         $dsnRbac = $DB_ADAPTER . '://' . $DB_RBAC_USER . ':' . $DB_RBAC_PASS . '@' . $DB_RBAC_HOST . '/' . $DB_RBAC_NAME;
-        $dsnRp   = $DB_ADAPTER . '://' . $DB_REPORT_USER . ':' . $DB_REPORT_PASS . '@' . $DB_REPORT_HOST . '/' . $DB_REPORT_NAME;
+        $dsnRp = $DB_ADAPTER . '://' . $DB_REPORT_USER . ':' . $DB_REPORT_PASS . '@' . $DB_REPORT_HOST . '/' . $DB_REPORT_NAME;
 
         switch ($DB_ADAPTER) {
             case 'mysql':
@@ -212,7 +214,7 @@ try {
         //Creole::registerDriver('dbarray', 'creole.contrib.DBArrayConnection');
 
         //Enable RBAC
-        $rbac = &RBAC::getSingleton(PATH_DATA, session_id());
+        $rbac = RBAC::getSingleton(PATH_DATA, session_id());
         $rbac->sSystem = 'PROCESSMAKER';
 
         if (!defined('DB_ADAPTER')) {
@@ -228,7 +230,7 @@ try {
         }
         /*----------------------------------********---------------------------------*/
 
-        ini_set('date.timezone', ($systemUtcTimeZone)? 'UTC' : $arraySystemConfiguration['time_zone']); //Set Time Zone
+        ini_set('date.timezone', ($systemUtcTimeZone) ? 'UTC' : $arraySystemConfiguration['time_zone']); //Set Time Zone
 
         define('TIME_ZONE', ini_get('date.timezone'));
 
@@ -268,7 +270,7 @@ try {
         } catch (Exception $e) {
             $token = strtotime("now");
             PMException::registerErrorLog($e, $token);
-            G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . "\n" );
+            G::outRes(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . "\n");
 
             eprintln('Problem in workspace: ' . $workspace . ' it was omitted.', 'red');
         }
@@ -282,7 +284,7 @@ try {
 } catch (Exception $e) {
     $token = strtotime("now");
     PMException::registerErrorLog($e, $token);
-    G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . "\n" );
+    G::outRes(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . "\n");
 }
 
 //Functions
@@ -353,7 +355,7 @@ function resendEmails()
 
         if ($aSpoolWarnings !== false) {
             foreach ($aSpoolWarnings as $sWarning) {
-                print("MAIL SPOOL WARNING: " . $sWarning."\n");
+                print("MAIL SPOOL WARNING: " . $sWarning . "\n");
                 saveLog("resendEmails", "warning", "MAIL SPOOL WARNING: " . $sWarning);
             }
         }
@@ -366,7 +368,7 @@ function resendEmails()
         $c->add(ConfigurationPeer::CFG_UID, "Emails");
         $result = ConfigurationPeer::doSelectRS($c);
         $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        if($result->next()) {
+        if ($result->next()) {
             setExecutionResultMessage("WARNING", "warning");
             $message = "Emails won't be sent, but the cron will continue its execution";
             eprintln("  '-" . $message, "yellow");
@@ -398,7 +400,7 @@ function unpauseApplications()
         saveLog('unpauseApplications', 'action', 'Unpausing Applications');
     } catch (Exception $oError) {
         setExecutionResultMessage('WITH ERRORS', 'error');
-        eprintln("  '-".$oError->getMessage(), 'red');
+        eprintln("  '-" . $oError->getMessage(), 'red');
         saveLog('unpauseApplications', 'error', 'Error Unpausing Applications: ' . $oError->getMessage());
     }
 }
@@ -421,8 +423,8 @@ function executePlugins()
     if ($handle = opendir($pathCronPlugins)) {
         setExecutionMessage('Executing cron files in bin/plugins directory in Workspace: ' . config("system.workspace"));
         while (false !== ($file = readdir($handle))) {
-            if (strpos($file, '.php',1) && is_file($pathCronPlugins . $file)) {
-                $filename  = str_replace('.php' , '', $file);
+            if (strpos($file, '.php', 1) && is_file($pathCronPlugins . $file)) {
+                $filename = str_replace('.php', '', $file);
                 $className = $filename . 'ClassCron';
 
                 // Execute custom cron function
@@ -452,8 +454,8 @@ function executePlugins()
             }
         }
     }
-
 }
+
 function executeCustomCronFunction($pathFile, $className)
 {
     include_once $pathFile;
@@ -463,7 +465,7 @@ function executeCustomCronFunction($pathFile, $className)
     if (method_exists($oPlugin, 'executeCron')) {
         $arrayCron = unserialize(trim(@file_get_contents(PATH_DATA . "cron")));
         $arrayCron["processcTimeProcess"] = 60; //Minutes
-        $arrayCron["processcTimeStart"]   = time();
+        $arrayCron["processcTimeStart"] = time();
         @file_put_contents(PATH_DATA . "cron", serialize($arrayCron));
 
         //Try to execute Plugin Cron. If there is an error then continue with the next file
@@ -473,7 +475,7 @@ function executeCustomCronFunction($pathFile, $className)
             setExecutionResultMessage('DONE');
         } catch (Exception $e) {
             setExecutionResultMessage('FAILED', 'error');
-            eprintln("  '-".$e->getMessage(), 'red');
+            eprintln("  '-" . $e->getMessage(), 'red');
             saveLog('executePlugins', 'error', 'Error executing cron file: ' . $pathFile . ' - ' . $e->getMessage());
         }
     }
@@ -497,7 +499,7 @@ function calculateDuration()
         saveLog('calculateDuration', 'action', 'Calculating Duration');
     } catch (Exception $oError) {
         setExecutionResultMessage('WITH ERRORS', 'error');
-        eprintln("  '-".$oError->getMessage(), 'red');
+        eprintln("  '-" . $oError->getMessage(), 'red');
         saveLog('calculateDuration', 'error', 'Error Calculating Duration: ' . $oError->getMessage());
     }
 }
@@ -505,29 +507,30 @@ function calculateDuration()
 /*----------------------------------********---------------------------------*/
 function calculateAppDuration()
 {
-	global $argvx;
+    global $argvx;
 
-	if ($argvx != "" && strpos($argvx, "calculateapp") === false) {
-		return false;
-	}
+    if ($argvx != "" && strpos($argvx, "calculateapp") === false) {
+        return false;
+    }
 
-	setExecutionMessage("Calculating Duration by Application");
+    setExecutionMessage("Calculating Duration by Application");
 
-	try {
-		$oApplication = new Application();
-		$oApplication->calculateAppDuration(1);
+    try {
+        $oApplication = new Application();
+        $oApplication->calculateAppDuration(1);
 
-		setExecutionResultMessage('DONE');
-		saveLog('calculateDurationByApp', 'action', 'Calculating Duration by Application');
-	} catch (Exception $oError) {
-		setExecutionResultMessage('WITH ERRORS', 'error');
-		eprintln("  '-".$oError->getMessage(), 'red');
-		saveLog('calculateDurationByApp', 'error', 'Error Calculating Duration: ' . $oError->getMessage());
-	}
+        setExecutionResultMessage('DONE');
+        saveLog('calculateDurationByApp', 'action', 'Calculating Duration by Application');
+    } catch (Exception $oError) {
+        setExecutionResultMessage('WITH ERRORS', 'error');
+        eprintln("  '-" . $oError->getMessage(), 'red');
+        saveLog('calculateDurationByApp', 'error', 'Error Calculating Duration: ' . $oError->getMessage());
+    }
 }
+
 /*----------------------------------********---------------------------------*/
 
-function executeEvents($sLastExecution, $sNow=null)
+function executeEvents($sLastExecution, $sNow = null)
 {
     global $argvx;
     global $sNow;
@@ -559,12 +562,12 @@ function executeEvents($sLastExecution, $sNow=null)
         //saveLog('executeEvents', 'action', $res );
     } catch (Exception $oError) {
         setExecutionResultMessage('WITH ERRORS', 'error');
-        eprintln("  '-".$oError->getMessage(), 'red');
+        eprintln("  '-" . $oError->getMessage(), 'red');
         saveLog('calculateAlertsDueDate', 'Error', 'Error Executing Events: ' . $oError->getMessage());
     }
 }
 
-function executeScheduledCases($sNow=null)
+function executeScheduledCases($sNow = null)
 {
     try {
         global $argvx;
@@ -594,14 +597,15 @@ function executeScheduledCases($sNow=null)
         setExecutionResultMessage('DONE');
     } catch (Exception $oError) {
         setExecutionResultMessage('WITH ERRORS', 'error');
-        eprintln("  '-".$oError->getMessage(), 'red');
+        eprintln("  '-" . $oError->getMessage(), 'red');
     }
 }
 
-function runDateForScheduledCases($sNow) {
+function runDateForScheduledCases($sNow)
+{
     global $arraySystemConfiguration;
 
-    $runDate = isset($sNow)? $sNow : date('Y-m-d H:i:s');
+    $runDate = isset($sNow) ? $sNow : date('Y-m-d H:i:s');
 
     $systemUtcTimeZone = false;
     /*----------------------------------********---------------------------------*/
@@ -617,11 +621,10 @@ function runDateForScheduledCases($sNow) {
             //function to convert it
             $currentTimeZone = date_default_timezone_get();
             date_default_timezone_set($arraySystemConfiguration['time_zone']);
-            $runDate =  gmdate('Y-m-d H:i:s', strtotime($sNow));
+            $runDate = gmdate('Y-m-d H:i:s', strtotime($sNow));
             date_default_timezone_set($currentTimeZone);
-        }
-        else {
-            $runDate =  gmdate('Y-m-d H:i:s');
+        } else {
+            $runDate = gmdate('Y-m-d H:i:s');
         }
     }
     return $runDate;
@@ -652,7 +655,7 @@ function executeUpdateAppTitle()
             $row = $rsCriteriaConf->getRow();
 
             $taskUid = $row["OBJ_UID"];
-            $lang    = $row["CFG_VALUE"];
+            $lang = $row["CFG_VALUE"];
 
             //Update case labels
             $appcv = new AppCacheView();
@@ -723,15 +726,14 @@ function executeCaseSelfService()
         $calendar = new Calendar();
 
         while ($rsCriteria->next()) {
-
             $row = $rsCriteria->getRow();
-			$flag = false;
+            $flag = false;
 
-            $appcacheAppUid   = $row["APP_UID"];
+            $appcacheAppUid = $row["APP_UID"];
             $appcacheDelIndex = $row["DEL_INDEX"];
             $appcacheDelDelegateDate = $row["DEL_DELEGATE_DATE"];
             $appcacheAppNumber = $row["APP_NUMBER"];
-            $appcacheProUid    = $row["PRO_UID"];
+            $appcacheProUid = $row["PRO_UID"];
             $taskUid = $row["TAS_UID"];
             $taskSelfServiceTime = intval($row["TAS_SELFSERVICE_TIME"]);
             $taskSelfServiceTimeUnit = $row["TAS_SELFSERVICE_TIME_UNIT"];
@@ -739,32 +741,32 @@ function executeCaseSelfService()
             /*----------------------------------********---------------------------------*/
             $taskSelfServiceJustOneExecution = $row["TAS_SELFSERVICE_EXECUTION"];
 
-            if($taskSelfServiceJustOneExecution == 'ONCE'){
-            	$criteriaSelfService = new Criteria("workflow");
+            if ($taskSelfServiceJustOneExecution == 'ONCE') {
+                $criteriaSelfService = new Criteria("workflow");
 
-            	$criteriaSelfService->add(AppTimeoutActionExecutedPeer::APP_UID, $appcacheAppUid);
-            	$criteriaSelfService->add(AppTimeoutActionExecutedPeer::DEL_INDEX, $appcacheDelIndex);
+                $criteriaSelfService->add(AppTimeoutActionExecutedPeer::APP_UID, $appcacheAppUid);
+                $criteriaSelfService->add(AppTimeoutActionExecutedPeer::DEL_INDEX, $appcacheDelIndex);
 
-            	$querySelfService = AppTimeoutActionExecutedPeer::doSelectRS($criteriaSelfService);
+                $querySelfService = AppTimeoutActionExecutedPeer::doSelectRS($criteriaSelfService);
                 $querySelfService->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
-            	if ($querySelfService->next()) {
-            		$row = $querySelfService->getRow();
-					$flag = true; //already executed
-            	}
+                if ($querySelfService->next()) {
+                    $row = $querySelfService->getRow();
+                    $flag = true; //already executed
+                }
             }
             /*----------------------------------********---------------------------------*/
 
             if ($calendar->pmCalendarUid == '') {
-            	$calendar->getCalendar(null, $appcacheProUid, $taskUid);
-            	$calendar->getCalendarData();
+                $calendar->getCalendar(null, $appcacheProUid, $taskUid);
+                $calendar->getCalendarData();
             }
 
             $dueDate = $calendar->calculateDate(
                 $appcacheDelDelegateDate,
                 $taskSelfServiceTime,
                 $taskSelfServiceTimeUnit //HOURS|DAYS|MINUTES
-                //1
+            //1
             );
 
             if (time() > $dueDate["DUE_DATE_SECONDS"] && $flag == false) {
@@ -795,10 +797,9 @@ function executeCaseSelfService()
                     $row = $rsCriteriaTgr->getRow();
 
                     if (is_array($row) && $row["TRI_TYPE"] == "SCRIPT") {
-
                         $arrayCron = unserialize(trim(@file_get_contents(PATH_DATA . "cron")));
                         $arrayCron["processcTimeProcess"] = 60; //Minutes
-                        $arrayCron["processcTimeStart"]   = time();
+                        $arrayCron["processcTimeStart"] = time();
                         @file_put_contents(PATH_DATA . "cron", serialize($arrayCron));
 
                         //Trigger
@@ -812,13 +813,13 @@ function executeCaseSelfService()
 
                         /*----------------------------------********---------------------------------*/
                         //saving the case`s data if the 'Execution' is set in ONCE.
-                        if($taskSelfServiceJustOneExecution == "ONCE"){
-                        	$oAppTimeoutActionExecuted = new AppTimeoutActionExecuted();
-                        	$dataSelf = array();
-                        	$dataSelf["APP_UID"] = $appcacheAppUid;
-                        	$dataSelf["DEL_INDEX"] = $appcacheDelIndex;
-                        	$dataSelf["EXECUTION_DATE"] = time();
-                        	$oAppTimeoutActionExecuted->create($dataSelf);
+                        if ($taskSelfServiceJustOneExecution == "ONCE") {
+                            $oAppTimeoutActionExecuted = new AppTimeoutActionExecuted();
+                            $dataSelf = array();
+                            $dataSelf["APP_UID"] = $appcacheAppUid;
+                            $dataSelf["DEL_INDEX"] = $appcacheDelIndex;
+                            $dataSelf["EXECUTION_DATE"] = time();
+                            $oAppTimeoutActionExecuted->create($dataSelf);
                         }
                         /*----------------------------------********---------------------------------*/
                         $appFields["APP_DATA"] = array_merge($appFields["APP_DATA"], $oPMScript->aFields);
@@ -868,9 +869,9 @@ function saveLog($sSource, $sType, $sDescription)
 
 function setExecutionMessage($m)
 {
-    $len      = strlen($m);
+    $len = strlen($m);
     $linesize = 60;
-    $rOffset  = $linesize - $len;
+    $rOffset = $linesize - $len;
 
     eprint("* $m");
 
@@ -879,7 +880,7 @@ function setExecutionMessage($m)
     }
 }
 
-function setExecutionResultMessage($m, $t='')
+function setExecutionResultMessage($m, $t = '')
 {
     $c = 'green';
 
@@ -899,68 +900,68 @@ function setExecutionResultMessage($m, $t='')
 }
 
 /*----------------------------------********---------------------------------*/
-function fillReportByUser ()
+function fillReportByUser()
 {
-	try {
-		global $argvx;
-		global $dateInit;
-		global $dateFinish;
+    try {
+        global $argvx;
+        global $dateInit;
+        global $dateFinish;
 
-		if (strpos($argvx, "report_by_user") === false) {
-			return false;
-		}
-		if ($dateInit == null) {
-			eprintln("You must enter the starting date.", "red");
-			eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red");
-			return false;
-		}
+        if (strpos($argvx, "report_by_user") === false) {
+            return false;
+        }
+        if ($dateInit == null) {
+            eprintln("You must enter the starting date.", "red");
+            eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red");
+            return false;
+        }
 
-		$dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s");
+        $dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s");
 
-		$appcv = new AppCacheView();
-		$appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP );
-		setExecutionMessage("Calculating data to fill the 'User Reporting'...");
-		$appcv->fillReportByUser($dateInit, $dateFinish);
-		setExecutionResultMessage("DONE");
-	} catch (Exception $e) {
-		setExecutionResultMessage("WITH ERRORS", "error");
-		eprintln("  '-" . $e->getMessage(), "red");
-		saveLog("fillReportByUser", "error", "Error in fill report by user: " . $e->getMessage());
-	}
+        $appcv = new AppCacheView();
+        $appcv->setPathToAppCacheFiles(PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP);
+        setExecutionMessage("Calculating data to fill the 'User Reporting'...");
+        $appcv->fillReportByUser($dateInit, $dateFinish);
+        setExecutionResultMessage("DONE");
+    } catch (Exception $e) {
+        setExecutionResultMessage("WITH ERRORS", "error");
+        eprintln("  '-" . $e->getMessage(), "red");
+        saveLog("fillReportByUser", "error", "Error in fill report by user: " . $e->getMessage());
+    }
 }
 
-function fillReportByProcess ()
+function fillReportByProcess()
 {
-	try {
-		global $argvx;
-		global $dateInit;
-		global $dateFinish;
+    try {
+        global $argvx;
+        global $dateInit;
+        global $dateFinish;
 
-		if (strpos($argvx, "report_by_process") === false) {
-			return false;
-		}
+        if (strpos($argvx, "report_by_process") === false) {
+            return false;
+        }
 
-		if ($dateInit == null) {
-			eprintln("You must enter the starting date.", "red");
-			eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red");
-			return false;
-		}
+        if ($dateInit == null) {
+            eprintln("You must enter the starting date.", "red");
+            eprintln('Example: +init-date"YYYY-MM-DD HH:MM:SS" +finish-date"YYYY-MM-DD HH:MM:SS"', "red");
+            return false;
+        }
 
-		$dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s");
-		$appcv = new AppCacheView();
-		$appcv->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP );
+        $dateFinish = ($dateFinish != null) ? $dateFinish : date("Y-m-d H:i:s");
+        $appcv = new AppCacheView();
+        $appcv->setPathToAppCacheFiles(PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP);
 
-		setExecutionMessage("Calculating data to fill the 'Process Reporting'...");
-		$appcv->fillReportByProcess($dateInit, $dateFinish);
-		setExecutionResultMessage("DONE");
-	} catch (Exception $e) {
-		setExecutionResultMessage("WITH ERRORS", "error");
-		eprintln("  '-" . $e->getMessage(), "red");
-		saveLog("fillReportByProcess", "error", "Error in fill report by process: " . $e->getMessage());
-	}
+        setExecutionMessage("Calculating data to fill the 'Process Reporting'...");
+        $appcv->fillReportByProcess($dateInit, $dateFinish);
+        setExecutionResultMessage("DONE");
+    } catch (Exception $e) {
+        setExecutionResultMessage("WITH ERRORS", "error");
+        eprintln("  '-" . $e->getMessage(), "red");
+        saveLog("fillReportByProcess", "error", "Error in fill report by process: " . $e->getMessage());
+    }
 }
 
-function synchronizeDrive ()
+function synchronizeDrive()
 {
     try {
         global $argvx;
@@ -968,7 +969,7 @@ function synchronizeDrive ()
         if (strpos($argvx, "synchronize-documents-drive") === false) {
             return false;
         }
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
+        $licensedFeatures = PMLicensedFeatures::getSingleton();
         if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
             $drive = new AppDocumentDrive();
             if ($drive->getStatusDrive()) {
@@ -981,7 +982,6 @@ function synchronizeDrive ()
             setExecutionMessage("The Drive license is not enabled");
         }
         setExecutionResultMessage("DONE");
-
     } catch (Exception $e) {
         setExecutionResultMessage("WITH ERRORS", "error");
         eprintln("  '-" . $e->getMessage(), "red");
@@ -997,7 +997,7 @@ function synchronizeGmailLabels()
         if (strpos($argvx, "synchronize-gmail-labels") === false) {
             return false;
         }
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
+        $licensedFeatures = PMLicensedFeatures::getSingleton();
         if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
             $pmGoogle = new PmGoogleApi();
             if ($pmGoogle->getServiceGmailStatus()) {
@@ -1011,13 +1011,13 @@ function synchronizeGmailLabels()
             setExecutionMessage("The Gmail license is not enabled");
         }
         setExecutionResultMessage("DONE");
-
     } catch (Exception $e) {
         setExecutionResultMessage("WITH ERRORS", "error");
         eprintln("  '-" . $e->getMessage(), "red");
         saveLog("synchronizeGmailLabels", "error", "Error when synchronizing Gmail labels: " . $e->getMessage());
     }
 }
+
 /*----------------------------------********---------------------------------*/
 
 function sendNotifications()
@@ -1047,7 +1047,7 @@ function sendNotifications()
             setExecutionResultMessage("Processed $n");
         }
         $notificationsApple = $notQueue->loadStatusDeviceType('pending', 'apple');
-        if($notificationsApple) {
+        if ($notificationsApple) {
             setExecutionMessage("|-- Send Apple Notifications");
             $n = 0;
             foreach ($notificationsApple as $key => $item) {
diff --git a/workflow/engine/bin/tasks/cliUpgrade.php b/workflow/engine/bin/tasks/cliUpgrade.php
index 44d66259b..6f3a455f4 100644
--- a/workflow/engine/bin/tasks/cliUpgrade.php
+++ b/workflow/engine/bin/tasks/cliUpgrade.php
@@ -35,7 +35,8 @@ CLI::taskOpt('noxml', 'If this option is enabled, the XML files translation is n
 CLI::taskRun("run_upgrade");
 /*----------------------------------********---------------------------------*/
 CLI::taskName('unify-database');
-CLI::taskDescription(<<<EOT
+CLI::taskDescription(
+    <<<EOT
     Unify RBAC, Reports and Workflow database schemas to match the latest version
 
     Specify the workspaces whose databases schemas should be unified.
@@ -141,7 +142,7 @@ function run_upgrade($command, $args)
             define("PATH_DATA_SITE", PATH_DATA . "sites" . PATH_SEP . config("system.workspace") . PATH_SEP);
         }
 
-        if(!defined('DB_ADAPTER')) {
+        if (!defined('DB_ADAPTER')) {
             define('DB_ADAPTER', 'mysql');
         }
 
@@ -205,13 +206,16 @@ function run_upgrade($command, $args)
     $flag = G::isPMUnderUpdating(0);
 }
 
-function listFiles($dir) {
+function listFiles($dir)
+{
     $files = array();
     $lista = glob($dir.'/*');
-    foreach($lista as $valor) {
+    foreach ($lista as $valor) {
         if (is_dir($valor)) {
             $inner_files =  listFiles($valor);
-            if (is_array($inner_files)) $files = array_merge($files, $inner_files);
+            if (is_array($inner_files)) {
+                $files = array_merge($files, $inner_files);
+            }
         }
         if (is_file($valor)) {
             array_push($files, $valor);
@@ -224,12 +228,12 @@ function run_unify_database($args)
 {
     $workspaces = array();
 
-    if (sizeof($args) > 2) {
+    if (count($args) > 2) {
         $filename = array_pop($args);
         foreach ($args as $arg) {
             $workspaces[] = new WorkspaceTools($arg);
         }
-    } else if (sizeof($args) > 0) {
+    } elseif (count($args) > 0) {
         $workspace = new WorkspaceTools($args[0]);
         $workspaces[] = $workspace;
     }
@@ -243,7 +247,7 @@ function run_unify_database($args)
     $count = count($workspaces);
 
     if ($count > 1) {
-        if(!Bootstrap::isLinuxOs()){
+        if (!Bootstrap::isLinuxOs()) {
             CLI::error("This is not a Linux enviroment, please specify workspace.\n");
             return;
         }
@@ -264,7 +268,7 @@ function run_unify_database($args)
             }
 
             $ws = $workspace->name;
-            $sContent = file_get_contents (PATH_DB . $ws . PATH_SEP . 'db.php');
+            $sContent = file_get_contents(PATH_DB . $ws . PATH_SEP . 'db.php');
 
             if (strpos($sContent, 'rb_')) {
                 $workspace->onedb = false;
@@ -277,47 +281,47 @@ function run_unify_database($args)
             } else {
                 //create destination path
                 $parentDirectory = PATH_DATA . "upgrade";
-                if (! file_exists( $parentDirectory )) {
-                    mkdir( $parentDirectory );
+                if (! file_exists($parentDirectory)) {
+                    mkdir($parentDirectory);
                 }
                 $tempDirectory = $parentDirectory . basename(tempnam(__FILE__, ''));
-                if (is_writable( $parentDirectory )) {
-                    mkdir( $tempDirectory );
+                if (is_writable($parentDirectory)) {
+                    mkdir($tempDirectory);
                 } else {
-                    throw new Exception( "Could not create directory:" . $parentDirectory );
+                    throw new Exception("Could not create directory:" . $parentDirectory);
                 }
                 $metadata = $workspace->getMetadata();
-                CLI::logging( "Exporting rb and rp databases to a temporal location...\n" );
-                $metadata["databases"] = $workspace->exportDatabase( $tempDirectory,true );
+                CLI::logging("Exporting rb and rp databases to a temporal location...\n");
+                $metadata["databases"] = $workspace->exportDatabase($tempDirectory, true);
                 $metadata["version"] = 1;
 
-                list ($dbHost, $dbUser, $dbPass) = @explode( SYSTEM_HASH, G::decrypt( HASH_INSTALLATION, SYSTEM_HASH ) );
-                $link = mysql_connect( $dbHost, $dbUser, $dbPass );
+                list($dbHost, $dbUser, $dbPass) = @explode(SYSTEM_HASH, G::decrypt(HASH_INSTALLATION, SYSTEM_HASH));
+                $link = mysqli_connect($dbHost, $dbUser, $dbPass);
 
                 foreach ($metadata['databases'] as $db) {
                     $dbName = $metadata['DB_NAME'];
-                    CLI::logging( "+> Restoring {$db['name']} to $dbName database\n" );
+                    CLI::logging("+> Restoring {$db['name']} to $dbName database\n");
 
                     $aParameters = array('dbHost'=>$dbHost,'dbUser'=>$dbUser,'dbPass'=>$dbPass);
 
-                    $restore = $workspace->executeScript( $dbName, "$tempDirectory/{$db['name']}.sql", $aParameters);
+                    $restore = $workspace->executeScript($dbName, "$tempDirectory/{$db['name']}.sql", $aParameters, $link);
 
                     if ($restore) {
-                        CLI::logging( "+> Remove {$db['name']} database\n" );
+                        CLI::logging("+> Remove {$db['name']} database\n");
 
                         $sql = "DROP DATABASE IF EXISTS {$db['name']};";
-                        if (! @mysql_query( $sql )) {
-                            throw new Exception( mysql_error() );
+                        if (!mysqli_query($link, $sql)) {
+                            throw new Exception(mysqli_error($link));
                         }
                     }
                 }
 
-                CLI::logging( "Removing temporary files\n" );
-                G::rm_dir( $tempDirectory );
+                CLI::logging("Removing temporary files\n");
+                G::rm_dir($tempDirectory);
 
-                $newDBNames = $workspace->resetDBInfo( $dbHost, true, true, true );
+                $newDBNames = $workspace->resetDBInfo($dbHost, true, true, true);
 
-                CLI::logging( CLI::info( "Done restoring databases" ) . "\n" );
+                CLI::logging(CLI::info("Done restoring databases") . "\n");
             }
         } catch (Exception $e) {
             CLI::logging("Errors upgrading workspace " . CLI::info($workspace->name) . ": " . CLI::error($e->getMessage()) . "\n");
@@ -326,4 +330,4 @@ function run_unify_database($args)
     }
     $flag = G::isPMUnderUpdating(0);
 }
-/*----------------------------------********---------------------------------*/
\ No newline at end of file
+/*----------------------------------********---------------------------------*/
diff --git a/workflow/engine/classes/AppSolr.php b/workflow/engine/classes/AppSolr.php
index b45e8a4c3..27641a780 100644
--- a/workflow/engine/classes/AppSolr.php
+++ b/workflow/engine/classes/AppSolr.php
@@ -1704,7 +1704,9 @@ class AppSolr
             $UnSerializedCaseData = unserialize($documentData ['APP_DATA']);
 
             if ($UnSerializedCaseData === false) {
-                $UnSerializedCaseData = preg_replace('!s:(\d+):"(.*?)";!e', "'s:'.strlen('$2').':\"$2\";'", $documentData ['APP_DATA']); // utf8_encode
+                $UnSerializedCaseData = preg_replace_callback('!s:(\d+):"(.*?)";!', function ($m) {
+                    return 's:' . strlen($m[2]) . ':"' . $m[2] . '";';
+                }, $documentData ['APP_DATA']); // utf8_encode
                 $UnSerializedCaseData = unserialize($UnSerializedCaseData);
             }
 
diff --git a/workflow/engine/classes/Applications.php b/workflow/engine/classes/Applications.php
index 5919b8bad..81c794421 100644
--- a/workflow/engine/classes/Applications.php
+++ b/workflow/engine/classes/Applications.php
@@ -2,7 +2,6 @@
 
 use ProcessMaker\Plugins\PluginRegistry;
 
-
 class Applications
 {
     /**
@@ -88,7 +87,7 @@ class Applications
         $sqlData .= " LEFT JOIN USERS ON (APP_DELEGATION.USR_ID = USERS.USR_ID)";
         $sqlData .= " LEFT JOIN PROCESS ON (APP_DELEGATION.PRO_ID = PROCESS.PRO_ID)";
 
-        $sqlData .= " WHERE TASK.TAS_TYPE NOT IN ('" . implode("','",$arrayTaskTypeToExclude) . "')";
+        $sqlData .= " WHERE TASK.TAS_TYPE NOT IN ('" . implode("','", $arrayTaskTypeToExclude) . "')";
         switch ($status) {
             case 1: //DRAFT
                 $sqlData .= " AND APP_DELEGATION.DEL_THREAD_STATUS='OPEN'";
@@ -126,7 +125,7 @@ class Applications
         }
 
         if (!empty($category)) {
-            $category = mysql_real_escape_string($category);
+            $category = mysqli_real_escape_string($con->getResource(), $category);
             $sqlData .= " AND PROCESS.PRO_CATEGORY = '{$category}'";
         }
 
@@ -166,7 +165,6 @@ class Applications
             if ($columnSearch === 'TAS_TITLE') {
                 $sqlData .= " AND TASK.TAS_TITLE LIKE '%{$search}%' ";
             }
-
         }
 
         if (!empty($dateFrom)) {
@@ -199,7 +197,7 @@ class Applications
         }
 
         //Define the number of records by return
-        if(empty($limit)) {
+        if (empty($limit)) {
             $limit = 25;
         }
         if (!empty($start) && empty($search)) {
@@ -209,18 +207,18 @@ class Applications
         }
 
         $oDataset = $stmt->executeQuery($sqlData);
-        $result = array ();
+        $result = [];
         //By performance enable always the pagination
-        $result['totalCount'] = $start + $limit + 1;
-        $rows = array();
-        $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH');
+        $result['totalCount'] = intval($start) + intval($limit) + 1;
+        $rows = [];
+        $aPriorities = array('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH');
         while ($oDataset->next()) {
             $aRow = $oDataset->getRow();
-            if (isset( $aRow['APP_STATUS'] )) {
-                $aRow['APP_STATUS_LABEL'] = G::LoadTranslation( "ID_{$aRow['APP_STATUS']}" );
+            if (isset($aRow['APP_STATUS'])) {
+                $aRow['APP_STATUS_LABEL'] = G::LoadTranslation("ID_{$aRow['APP_STATUS']}");
             }
-            if (isset( $aRow['DEL_PRIORITY'] )) {
-                $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" );
+            if (isset($aRow['DEL_PRIORITY'])) {
+                $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}");
             }
             $aRow["APP_CURRENT_USER"] = $aRow["USR_LASTNAME"].' '.$aRow["USR_FIRSTNAME"];
             $aRow["APPDELCR_APP_TAS_TITLE"] = '';
@@ -347,8 +345,8 @@ class Applications
                         $Criteria = $oAppCache->getCompletedListCriteria($userUid);
                         $CriteriaCount = $oAppCache->getCompletedCountCriteria($userUid);
 
-                        $Criteria->add (AppCacheViewPeer::DEL_LAST_INDEX,"1");
-                        $CriteriaCount->add (AppCacheViewPeer::DEL_LAST_INDEX,"1");
+                        $Criteria->add(AppCacheViewPeer::DEL_LAST_INDEX, "1");
+                        $CriteriaCount->add(AppCacheViewPeer::DEL_LAST_INDEX, "1");
                         break;
                     default:
                         //All status
@@ -366,8 +364,8 @@ class Applications
                 $CriteriaCount = $oAppCache->getToReviseCountCriteria($userUid);
                 break;
             case "to_reassign":
-                GLOBAL $RBAC;
-                if($RBAC->userCanAccess('PM_REASSIGNCASE') == 1){
+                global $RBAC;
+                if ($RBAC->userCanAccess('PM_REASSIGNCASE') == 1) {
                     $Criteria = $oAppCache->getToReassignListCriteria($userUid);
                     $CriteriaCount = $oAppCache->getToReassignCountCriteria($userUid);
                 } else {
@@ -406,19 +404,19 @@ class Applications
         $CriteriaCount->addJoin(AppCacheViewPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
         $CriteriaCount->add(TaskPeer::TAS_TYPE, $arrayTaskTypeToExclude, Criteria::NOT_IN);
 
-        $Criteria->addAlias( 'CU', 'USERS' );
-        $Criteria->addJoin( AppCacheViewPeer::USR_UID, 'CU.USR_UID', Criteria::LEFT_JOIN );
-        $Criteria->addAsColumn( 'USR_UID', 'CU.USR_UID' );
-        $Criteria->addAsColumn( 'USR_FIRSTNAME', 'CU.USR_FIRSTNAME' );
-        $Criteria->addAsColumn( 'USR_LASTNAME', 'CU.USR_LASTNAME' );
-        $Criteria->addAsColumn( 'USR_USERNAME', 'CU.USR_USERNAME' );
+        $Criteria->addAlias('CU', 'USERS');
+        $Criteria->addJoin(AppCacheViewPeer::USR_UID, 'CU.USR_UID', Criteria::LEFT_JOIN);
+        $Criteria->addAsColumn('USR_UID', 'CU.USR_UID');
+        $Criteria->addAsColumn('USR_FIRSTNAME', 'CU.USR_FIRSTNAME');
+        $Criteria->addAsColumn('USR_LASTNAME', 'CU.USR_LASTNAME');
+        $Criteria->addAsColumn('USR_USERNAME', 'CU.USR_USERNAME');
 
-        $CriteriaCount->addAlias( 'CU', 'USERS' );
-        $CriteriaCount->addJoin( AppCacheViewPeer::USR_UID, 'CU.USR_UID', Criteria::LEFT_JOIN );
-        $CriteriaCount->addAsColumn( 'USR_UID', 'CU.USR_UID' );
-        $CriteriaCount->addAsColumn( 'USR_FIRSTNAME', 'CU.USR_FIRSTNAME' );
-        $CriteriaCount->addAsColumn( 'USR_LASTNAME', 'CU.USR_LASTNAME' );
-        $CriteriaCount->addAsColumn( 'USR_USERNAME', 'CU.USR_USERNAME' );
+        $CriteriaCount->addAlias('CU', 'USERS');
+        $CriteriaCount->addJoin(AppCacheViewPeer::USR_UID, 'CU.USR_UID', Criteria::LEFT_JOIN);
+        $CriteriaCount->addAsColumn('USR_UID', 'CU.USR_UID');
+        $CriteriaCount->addAsColumn('USR_FIRSTNAME', 'CU.USR_FIRSTNAME');
+        $CriteriaCount->addAsColumn('USR_LASTNAME', 'CU.USR_LASTNAME');
+        $CriteriaCount->addAsColumn('USR_USERNAME', 'CU.USR_USERNAME');
 
         //Current delegation
         $appdelcrTableName = AppCacheViewPeer::TABLE_NAME;
@@ -456,13 +454,13 @@ class Applications
         $CriteriaCount->addAlias("APPDELCR", $appdelcrTableName);
         $CriteriaCount->addAlias("USRCR", UsersPeer::TABLE_NAME);
 
-        $arrayCondition = array();
+        $arrayCondition = [];
         $arrayCondition[] = array(AppCacheViewPeer::APP_UID, "APPDELCR.APP_UID");
         $arrayCondition[] = array("APPDELCR.DEL_LAST_INDEX", 1);
         $Criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
         $CriteriaCount->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
 
-        $arrayCondition = array();
+        $arrayCondition = [];
         $arrayCondition[] = array("APPDELCR.USR_UID", "USRCR.USR_UID");
         $Criteria->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
         $CriteriaCount->addJoinMC($arrayCondition, Criteria::LEFT_JOIN);
@@ -470,17 +468,17 @@ class Applications
         //Previous user
 
         if (($action == "todo" || $action == "selfservice" || $action == "unassigned" || $action == "paused" || $action == "to_revise" || $action == "sent") || ($status == "TO_DO" || $status == "DRAFT" || $status == "PAUSED" || $status == "CANCELLED" || $status == "COMPLETED")) {
-            $Criteria->addAlias( 'PU', 'USERS' );
-            $Criteria->addJoin( AppCacheViewPeer::PREVIOUS_USR_UID, 'PU.USR_UID', Criteria::LEFT_JOIN );
-            $Criteria->addAsColumn( 'PREVIOUS_USR_FIRSTNAME', 'PU.USR_FIRSTNAME' );
-            $Criteria->addAsColumn( 'PREVIOUS_USR_LASTNAME', 'PU.USR_LASTNAME' );
-            $Criteria->addAsColumn( 'PREVIOUS_USR_USERNAME', 'PU.USR_USERNAME' );
+            $Criteria->addAlias('PU', 'USERS');
+            $Criteria->addJoin(AppCacheViewPeer::PREVIOUS_USR_UID, 'PU.USR_UID', Criteria::LEFT_JOIN);
+            $Criteria->addAsColumn('PREVIOUS_USR_FIRSTNAME', 'PU.USR_FIRSTNAME');
+            $Criteria->addAsColumn('PREVIOUS_USR_LASTNAME', 'PU.USR_LASTNAME');
+            $Criteria->addAsColumn('PREVIOUS_USR_USERNAME', 'PU.USR_USERNAME');
 
-            $CriteriaCount->addAlias( 'PU', 'USERS' );
-            $CriteriaCount->addJoin( AppCacheViewPeer::PREVIOUS_USR_UID, 'PU.USR_UID', Criteria::LEFT_JOIN );
-            $CriteriaCount->addAsColumn( 'PREVIOUS_USR_FIRSTNAME', 'PU.USR_FIRSTNAME' );
-            $CriteriaCount->addAsColumn( 'PREVIOUS_USR_LASTNAME', 'PU.USR_LASTNAME' );
-            $CriteriaCount->addAsColumn( 'PREVIOUS_USR_USERNAME', 'PU.USR_USERNAME' );
+            $CriteriaCount->addAlias('PU', 'USERS');
+            $CriteriaCount->addJoin(AppCacheViewPeer::PREVIOUS_USR_UID, 'PU.USR_UID', Criteria::LEFT_JOIN);
+            $CriteriaCount->addAsColumn('PREVIOUS_USR_FIRSTNAME', 'PU.USR_FIRSTNAME');
+            $CriteriaCount->addAsColumn('PREVIOUS_USR_LASTNAME', 'PU.USR_LASTNAME');
+            $CriteriaCount->addAsColumn('PREVIOUS_USR_USERNAME', 'PU.USR_USERNAME');
         }
 
         /*
@@ -534,34 +532,36 @@ class Applications
                     $dateTo = $dateTo . " 23:59:59";
                 }
 
-                $Criteria->add( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
-                $CriteriaCount->add( $CriteriaCount->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $CriteriaCount->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
+                $Criteria->add($Criteria->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL)->addAnd($Criteria->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL)));
+                $CriteriaCount->add($CriteriaCount->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL)->addAnd($CriteriaCount->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL)));
             } else {
                 $dateFrom = $dateFrom . " 00:00:00";
 
-                $Criteria->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
-                $CriteriaCount->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
+                $Criteria->add(AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL);
+                $CriteriaCount->add(AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL);
             }
         } elseif ($dateTo != "") {
             $dateTo = $dateTo . " 23:59:59";
 
-            $Criteria->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
-            $CriteriaCount->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
+            $Criteria->add(AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL);
+            $CriteriaCount->add(AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL);
         }
 
         if ($newerThan != '') {
             if ($oldestThan != '') {
                 $Criteria->add(
                     $Criteria->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $newerThan, Criteria::GREATER_THAN)->addAnd(
-                    $Criteria->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $oldestThan, Criteria::LESS_THAN))
+                    $Criteria->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $oldestThan, Criteria::LESS_THAN)
+                    )
                 );
                 $CriteriaCount->add(
                     $CriteriaCount->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $newerThan, Criteria::GREATER_THAN)->addAnd(
-                    $CriteriaCount->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $oldestThan, Criteria::LESS_THAN))
+                    $CriteriaCount->getNewCriterion(AppCacheViewPeer::DEL_DELEGATE_DATE, $oldestThan, Criteria::LESS_THAN)
+                    )
                 );
             } else {
                 $Criteria->add(AppCacheViewPeer::DEL_DELEGATE_DATE, $newerThan, Criteria::GREATER_THAN);
-                $CriteriaCount->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $newerThan, Criteria::GREATER_THAN);
+                $CriteriaCount->add(AppCacheViewPeer::DEL_DELEGATE_DATE, $newerThan, Criteria::GREATER_THAN);
             }
         } else {
             if ($oldestThan != '') {
@@ -574,20 +574,20 @@ class Applications
         if ($filter != '') {
             switch ($filter) {
                 case 'read':
-                    $Criteria->add( AppCacheViewPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL );
-                    $CriteriaCount->add( AppCacheViewPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL );
+                    $Criteria->add(AppCacheViewPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL);
+                    $CriteriaCount->add(AppCacheViewPeer::DEL_INIT_DATE, null, Criteria::ISNOTNULL);
                     break;
                 case 'unread':
-                    $Criteria->add( AppCacheViewPeer::DEL_INIT_DATE, null, Criteria::ISNULL );
-                    $CriteriaCount->add( AppCacheViewPeer::DEL_INIT_DATE, null, Criteria::ISNULL );
+                    $Criteria->add(AppCacheViewPeer::DEL_INIT_DATE, null, Criteria::ISNULL);
+                    $CriteriaCount->add(AppCacheViewPeer::DEL_INIT_DATE, null, Criteria::ISNULL);
                     break;
                 case 'started':
-                    $Criteria->add( AppCacheViewPeer::DEL_INDEX, 1, Criteria::EQUAL );
-                    $CriteriaCount->add( AppCacheViewPeer::DEL_INDEX, 1, Criteria::EQUAL );
+                    $Criteria->add(AppCacheViewPeer::DEL_INDEX, 1, Criteria::EQUAL);
+                    $CriteriaCount->add(AppCacheViewPeer::DEL_INDEX, 1, Criteria::EQUAL);
                     break;
                 case 'completed':
-                    $Criteria->add( AppCacheViewPeer::APP_STATUS, 'COMPLETED', Criteria::EQUAL );
-                    $CriteriaCount->add( AppCacheViewPeer::APP_STATUS, 'COMPLETED', Criteria::EQUAL );
+                    $Criteria->add(AppCacheViewPeer::APP_STATUS, 'COMPLETED', Criteria::EQUAL);
+                    $CriteriaCount->add(AppCacheViewPeer::APP_STATUS, 'COMPLETED', Criteria::EQUAL);
                     break;
             }
         }
@@ -610,7 +610,7 @@ class Applications
                 $additionalTable = new AdditionalTables();
                 $tableData = $additionalTable->load($additionalTableUid, true);
 
-                $tableField = array();
+                $tableField = [];
 
                 foreach ($tableData["FIELDS"] as $arrayField) {
                     $tableField[] = $arrayField["FLD_NAME"];
@@ -646,14 +646,21 @@ class Applications
                     $Criteria->getNewCriterion(AppCacheViewPeer::APP_UID, $search, Criteria::EQUAL)->addOr(
                     $Criteria->getNewCriterion(AppCacheViewPeer::APP_NUMBER, $search, Criteria::EQUAL)->addOr(
                     $oTmpCriteria
-                )))));
+                )
+                    )
+                    )
+                    )
+                );
             } else {
                 $Criteria->add(
                     $Criteria->getNewCriterion(AppCacheViewPeer::APP_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
                     $Criteria->getNewCriterion(AppCacheViewPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
                     $Criteria->getNewCriterion(AppCacheViewPeer::APP_UID, $search, Criteria::EQUAL)->addOr(
                     $Criteria->getNewCriterion(AppCacheViewPeer::APP_NUMBER, $search, Criteria::EQUAL)
-                ))));
+                )
+                    )
+                    )
+                );
             }
 
             // the count query needs to be the normal criteria query if there are defined PM Table Fields in the cases list
@@ -665,7 +672,10 @@ class Applications
                     $CriteriaCount->getNewCriterion(AppCacheViewPeer::APP_TAS_TITLE, '%' . $search . '%', Criteria::LIKE)->addOr(
                     $CriteriaCount->getNewCriterion(AppCacheViewPeer::APP_UID, $search, Criteria::EQUAL)->addOr(
                     $CriteriaCount->getNewCriterion(AppCacheViewPeer::APP_NUMBER, $search, Criteria::EQUAL)
-                ))));
+                )
+                    )
+                    )
+                );
             }
         }
 
@@ -692,17 +702,17 @@ class Applications
 
             // first check if there is a PMTable defined within the list,
             // the issue that brokes the normal criteria query seems to be fixed
-            if (isset( $oAppCache->confCasesList['PMTable'] ) && ! empty( $oAppCache->confCasesList['PMTable'] )) {
+            if (isset($oAppCache->confCasesList['PMTable']) && ! empty($oAppCache->confCasesList['PMTable'])) {
                 // then
-                $oAdditionalTables = AdditionalTablesPeer::retrieveByPK( $oAppCache->confCasesList['PMTable'] );
+                $oAdditionalTables = AdditionalTablesPeer::retrieveByPK($oAppCache->confCasesList['PMTable']);
                 $tableName = $oAdditionalTables->getAddTabName();
                 $tableNameAux = $tableName;
-                $tableName = strtolower( $tableName );
-                $tableNameArray = explode( '_', $tableName );
+                $tableName = strtolower($tableName);
+                $tableNameArray = explode('_', $tableName);
                 foreach ($tableNameArray as $item) {
-                    $newTableName[] = ucfirst( $item );
+                    $newTableName[] = ucfirst($item);
                 }
-                $tableName = implode( '', $newTableName );
+                $tableName = implode('', $newTableName);
                 // so the pm table class can be invoqued from the pm table model clases
                 if (! class_exists( $tableName )) {
                     require_once (PATH_DB . config("system.workspace") . PATH_SEP . "classes" . PATH_SEP . $tableName . ".php");
@@ -729,7 +739,7 @@ class Applications
                 }
             }
 
-            if (isset( $oAppCache->confCasesList['PMTable'] ) && ! empty( $oAppCache->confCasesList['PMTable'] ) && $tableNameAux != '') {
+            if (isset($oAppCache->confCasesList['PMTable']) && ! empty($oAppCache->confCasesList['PMTable']) && $tableNameAux != '') {
                 $sortTable = explode(".", $sortBk);
 
                 $additionalTableUid = $oAppCache->confCasesList["PMTable"];
@@ -780,18 +790,18 @@ class Applications
         }
 
         //limit the results according the interface
-        $Criteria->setLimit( $limit );
-        $Criteria->setOffset( $start );
+        $Criteria->setLimit($limit);
+        $Criteria->setOffset($start);
 
         //execute the query
-        $oDataset = AppCacheViewPeer::doSelectRS( $Criteria, Propel::getDbConnection('workflow_ro') );
+        $oDataset = AppCacheViewPeer::doSelectRS($Criteria, Propel::getDbConnection('workflow_ro'));
 
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
-        $result = array ();
+        $result = [];
         $result['totalCount'] = $totalCount;
-        $rows = array ();
-        $aPriorities = array ('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH');
+        $rows = [];
+        $aPriorities = array('1' => 'VL','2' => 'L','3' => 'N','4' => 'H','5' => 'VH');
         $index = $start;
 
         while ($oDataset->next()) {
@@ -813,18 +823,18 @@ class Applications
             }
 
             //Unassigned user
-            if (! isset( $aRow['APP_CURRENT_USER'] )) {
+            if (! isset($aRow['APP_CURRENT_USER'])) {
                 $aRow['APP_CURRENT_USER'] = "[" . strtoupper(G::LoadTranslation("ID_UNASSIGNED")) . "]";
             }
 
             // replacing the status data with their respective translation
-            if (isset( $aRow['APP_STATUS'] )) {
-                $aRow['APP_STATUS_LABEL'] = G::LoadTranslation( "ID_{$aRow['APP_STATUS']}" );
+            if (isset($aRow['APP_STATUS'])) {
+                $aRow['APP_STATUS_LABEL'] = G::LoadTranslation("ID_{$aRow['APP_STATUS']}");
             }
 
             // replacing the priority data with their respective translation
-            if (isset( $aRow['DEL_PRIORITY'] )) {
-                $aRow['DEL_PRIORITY'] = G::LoadTranslation( "ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}" );
+            if (isset($aRow['DEL_PRIORITY'])) {
+                $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}");
             }
 
             $rows[] = $aRow;
@@ -841,67 +851,66 @@ class Applications
      *
      * @return Array $fields
      */
-    public function setDefaultFields ()
+    public function setDefaultFields()
     {
-        $fields = array ();
-        $fields['APP_NUMBER'] = array ('name' => 'APP_NUMBER','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_APP_NUMBER' ),'width' => 40,'align' => 'left'
+        $fields = [];
+        $fields['APP_NUMBER'] = array('name' => 'APP_NUMBER','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_APP_NUMBER'),'width' => 40,'align' => 'left'
         );
-        $fields['APP_UID'] = array ('name' => 'APP_UID','fieldType' => 'key','label' => G::loadTranslation( 'ID_CASESLIST_APP_UID' ),'width' => 80,'align' => 'left'
+        $fields['APP_UID'] = array('name' => 'APP_UID','fieldType' => 'key','label' => G::loadTranslation('ID_CASESLIST_APP_UID'),'width' => 80,'align' => 'left'
         );
-        $fields['DEL_INDEX'] = array ('name' => 'DEL_INDEX','fieldType' => 'key','label' => G::loadTranslation( 'ID_CASESLIST_DEL_INDEX' ),'width' => 50,'align' => 'left'
+        $fields['DEL_INDEX'] = array('name' => 'DEL_INDEX','fieldType' => 'key','label' => G::loadTranslation('ID_CASESLIST_DEL_INDEX'),'width' => 50,'align' => 'left'
         );
-        $fields['TAS_UID'] = array ('name' => 'TAS_UID','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_TAS_UID' ),'width' => 80,'align' => 'left'
+        $fields['TAS_UID'] = array('name' => 'TAS_UID','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_TAS_UID'),'width' => 80,'align' => 'left'
         );
-        $fields['USR_UID'] = array ('name' => 'USR_UID','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_USR_UID' ),'width' => 80,'align' => 'left','hidden' => true
+        $fields['USR_UID'] = array('name' => 'USR_UID','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_USR_UID'),'width' => 80,'align' => 'left','hidden' => true
         );
-        $fields['PREVIOUS_USR_UID'] = array ('name' => 'PREVIOUS_USR_UID','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_PREVIOUS_USR_UID' ),'width' => 80,'align' => 'left','hidden' => true
+        $fields['PREVIOUS_USR_UID'] = array('name' => 'PREVIOUS_USR_UID','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_PREVIOUS_USR_UID'),'width' => 80,'align' => 'left','hidden' => true
         );
-        $fields['APP_TITLE'] = array ('name' => 'APP_TITLE','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_APP_TITLE' ),'width' => 140,'align' => 'left'
+        $fields['APP_TITLE'] = array('name' => 'APP_TITLE','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_APP_TITLE'),'width' => 140,'align' => 'left'
         );
-        $fields['APP_PRO_TITLE'] = array ('name' => 'APP_PRO_TITLE','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_APP_PRO_TITLE' ),'width' => 140,'align' => 'left'
+        $fields['APP_PRO_TITLE'] = array('name' => 'APP_PRO_TITLE','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_APP_PRO_TITLE'),'width' => 140,'align' => 'left'
         );
-        $fields['APP_TAS_TITLE'] = array ('name' => 'APP_TAS_TITLE','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_APP_TAS_TITLE' ),'width' => 140,'align' => 'left'
+        $fields['APP_TAS_TITLE'] = array('name' => 'APP_TAS_TITLE','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_APP_TAS_TITLE'),'width' => 140,'align' => 'left'
         );
-        $fields['APP_DEL_PREVIOUS_USER'] = array ('name' => 'APP_DEL_PREVIOUS_USER','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_APP_DEL_PREVIOUS_USER' ),'width' => 120,'align' => 'left'
+        $fields['APP_DEL_PREVIOUS_USER'] = array('name' => 'APP_DEL_PREVIOUS_USER','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_APP_DEL_PREVIOUS_USER'),'width' => 120,'align' => 'left'
         );
-        $fields['APP_CURRENT_USER'] = array ('name' => 'APP_CURRENT_USER','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_APP_CURRENT_USER' ),'width' => 120,'align' => 'left'
+        $fields['APP_CURRENT_USER'] = array('name' => 'APP_CURRENT_USER','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_APP_CURRENT_USER'),'width' => 120,'align' => 'left'
         );
-        $fields['USR_FIRSTNAME'] = array ('name' => 'USR_FIRSTNAME','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_APP_CURRENT_USER' ),'width' => 120,'align' => 'left'
+        $fields['USR_FIRSTNAME'] = array('name' => 'USR_FIRSTNAME','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_APP_CURRENT_USER'),'width' => 120,'align' => 'left'
         );
-        $fields['USR_LASTNAME'] = array ('name' => 'USR_LASTNAME','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_APP_CURRENT_USER' ),'width' => 120,'align' => 'left'
+        $fields['USR_LASTNAME'] = array('name' => 'USR_LASTNAME','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_APP_CURRENT_USER'),'width' => 120,'align' => 'left'
         );
-        $fields['DEL_TASK_DUE_DATE'] = array ('name' => 'DEL_TASK_DUE_DATE','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_DEL_TASK_DUE_DATE' ),'width' => 100,'align' => 'left'
+        $fields['DEL_TASK_DUE_DATE'] = array('name' => 'DEL_TASK_DUE_DATE','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_DEL_TASK_DUE_DATE'),'width' => 100,'align' => 'left'
         );
-        $fields['APP_UPDATE_DATE'] = array ('name' => 'APP_UPDATE_DATE','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_APP_UPDATE_DATE' ),'width' => 100,'align' => 'left'
+        $fields['APP_UPDATE_DATE'] = array('name' => 'APP_UPDATE_DATE','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_APP_UPDATE_DATE'),'width' => 100,'align' => 'left'
         );
-        $fields['DEL_PRIORITY'] = array ('name' => 'DEL_PRIORITY','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_DEL_PRIORITY' ),'width' => 80,'align' => 'left'
+        $fields['DEL_PRIORITY'] = array('name' => 'DEL_PRIORITY','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_DEL_PRIORITY'),'width' => 80,'align' => 'left'
         );
-        $fields['APP_STATUS'] = array ('name' => 'APP_STATUS','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_APP_STATUS' ),'width' => 80,'align' => 'left'
+        $fields['APP_STATUS'] = array('name' => 'APP_STATUS','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_APP_STATUS'),'width' => 80,'align' => 'left'
         );
-        $fields['APP_FINISH_DATE'] = array ('name' => 'APP_FINISH_DATE','fieldType' => 'case field','label' => G::loadTranslation( 'ID_CASESLIST_APP_FINISH_DATE' ),'width' => 100,'align' => 'left'
+        $fields['APP_FINISH_DATE'] = array('name' => 'APP_FINISH_DATE','fieldType' => 'case field','label' => G::loadTranslation('ID_CASESLIST_APP_FINISH_DATE'),'width' => 100,'align' => 'left'
         );
-        $fields['APP_DELAY_UID'] = array ('name' => 'APP_DELAY_UID','fieldType' => 'delay field','label' => G::loadTranslation( 'ID_CASESLIST_APP_DELAY_UID' ),'width' => 100,'align' => 'left'
+        $fields['APP_DELAY_UID'] = array('name' => 'APP_DELAY_UID','fieldType' => 'delay field','label' => G::loadTranslation('ID_CASESLIST_APP_DELAY_UID'),'width' => 100,'align' => 'left'
         );
-        $fields['APP_THREAD_INDEX'] = array ('name' => 'APP_THREAD_INDEX','fieldType' => 'delay field','label' => G::loadTranslation( 'ID_CASESLIST_APP_THREAD_INDEX' ),'width' => 100,'align' => 'left'
+        $fields['APP_THREAD_INDEX'] = array('name' => 'APP_THREAD_INDEX','fieldType' => 'delay field','label' => G::loadTranslation('ID_CASESLIST_APP_THREAD_INDEX'),'width' => 100,'align' => 'left'
         );
-        $fields['APP_DEL_INDEX'] = array ('name' => 'APP_DEL_INDEX','fieldType' => 'delay field','label' => G::loadTranslation( 'ID_CASESLIST_APP_DEL_INDEX' ),'width' => 100,'align' => 'left'
+        $fields['APP_DEL_INDEX'] = array('name' => 'APP_DEL_INDEX','fieldType' => 'delay field','label' => G::loadTranslation('ID_CASESLIST_APP_DEL_INDEX'),'width' => 100,'align' => 'left'
         );
-        $fields['APP_TYPE'] = array ('name' => 'APP_TYPE','fieldType' => 'delay field','label' => G::loadTranslation( 'ID_CASESLIST_APP_TYPE' ),'width' => 100,'align' => 'left'
+        $fields['APP_TYPE'] = array('name' => 'APP_TYPE','fieldType' => 'delay field','label' => G::loadTranslation('ID_CASESLIST_APP_TYPE'),'width' => 100,'align' => 'left'
         );
-        $fields['APP_DELEGATION_USER'] = array ('name' => 'APP_DELEGATION_USER','fieldType' => 'delay field','label' => G::loadTranslation( 'ID_CASESLIST_APP_DELEGATION_USER' ),'width' => 100,'align' => 'left'
+        $fields['APP_DELEGATION_USER'] = array('name' => 'APP_DELEGATION_USER','fieldType' => 'delay field','label' => G::loadTranslation('ID_CASESLIST_APP_DELEGATION_USER'),'width' => 100,'align' => 'left'
         );
-        $fields['APP_ENABLE_ACTION_USER'] = array ('name' => 'APP_ENABLE_ACTION_USER','fieldType' => 'delay field','label' => G::loadTranslation( 'ID_CASESLIST_APP_ENABLE_ACTION_USER' ),'width' => 100,'align' => 'left'
+        $fields['APP_ENABLE_ACTION_USER'] = array('name' => 'APP_ENABLE_ACTION_USER','fieldType' => 'delay field','label' => G::loadTranslation('ID_CASESLIST_APP_ENABLE_ACTION_USER'),'width' => 100,'align' => 'left'
         );
-        $fields['APP_ENABLE_ACTION_DATE'] = array ('name' => 'APP_ENABLE_ACTION_DATE','fieldType' => 'delay field','label' => G::loadTranslation( 'ID_CASESLIST_AAPP_ENABLE_ACTION_DATE' ),'width' => 100,'align' => 'left'
+        $fields['APP_ENABLE_ACTION_DATE'] = array('name' => 'APP_ENABLE_ACTION_DATE','fieldType' => 'delay field','label' => G::loadTranslation('ID_CASESLIST_AAPP_ENABLE_ACTION_DATE'),'width' => 100,'align' => 'left'
         );
-        $fields['APP_DISABLE_ACTION_USER'] = array ('name' => 'APP_DISABLE_ACTION_USER','fieldType' => 'delay field','label' => G::loadTranslation( 'ID_CASESLIST_APP_DISABLE_ACTION_USER' ),'width' => 100,'align' => 'left'
+        $fields['APP_DISABLE_ACTION_USER'] = array('name' => 'APP_DISABLE_ACTION_USER','fieldType' => 'delay field','label' => G::loadTranslation('ID_CASESLIST_APP_DISABLE_ACTION_USER'),'width' => 100,'align' => 'left'
         );
-        $fields['APP_DISABLE_ACTION_DATE'] = array ('name' => 'APP_DISABLE_ACTION_DATE','fieldType' => 'delay field','label' => G::loadTranslation( 'ID_CASESLIST_APP_DISABLE_ACTION_DATE' ),'width' => 100,'align' => 'left'
+        $fields['APP_DISABLE_ACTION_DATE'] = array('name' => 'APP_DISABLE_ACTION_DATE','fieldType' => 'delay field','label' => G::loadTranslation('ID_CASESLIST_APP_DISABLE_ACTION_DATE'),'width' => 100,'align' => 'left'
         );
-        $fields['APP_AUTOMATIC_DISABLED_DATE'] = array ('name' => 'APP_AUTOMATIC_DISABLED_DATE','fieldType' => 'delay field','label' => G::loadTranslation( 'ID_CASESLIST_APP_AUTOMATIC_DISABLED_DATE' ),'width' => 100,'align' => 'left'
+        $fields['APP_AUTOMATIC_DISABLED_DATE'] = array('name' => 'APP_AUTOMATIC_DISABLED_DATE','fieldType' => 'delay field','label' => G::loadTranslation('ID_CASESLIST_APP_AUTOMATIC_DISABLED_DATE'),'width' => 100,'align' => 'left'
         );
         return $fields;
-
     }
 
     /**
@@ -910,9 +919,9 @@ class Applications
      * @param $action
      * @return an array with the default fields for an specific case list (action)
      */
-    public function getDefaultFields ($action)
+    public function getDefaultFields($action)
     {
-        $rows = array ();
+        $rows = [];
         switch ($action) {
             case 'todo': // #, Case, task, process, sent by, due date, Last Modify, Priority
                 $fields = $this->setDefaultFields();
@@ -1090,34 +1099,34 @@ class Applications
      * @param array $second
      * @return $response a json string
      */
-    public function genericJsonResponse ($pmtable, $first, $second, $rowsperpage, $dateFormat)
+    public function genericJsonResponse($pmtable, $first, $second, $rowsperpage, $dateFormat)
     {
-        $firstGrid['totalCount'] = count( $first );
+        $firstGrid['totalCount'] = count($first);
         $firstGrid['data'] = $first;
-        $secondGrid['totalCount'] = count( $second );
+        $secondGrid['totalCount'] = count($second);
         $secondGrid['data'] = $second;
-        $result = array ();
+        $result = [];
         $result['first'] = $firstGrid;
         $result['second'] = $secondGrid;
-        $result['PMTable'] = isset( $pmtable ) ? $pmtable : '';
-        $result['rowsperpage'] = isset( $rowsperpage ) ? $rowsperpage : 20;
-        $result['dateformat'] = isset( $dateFormat ) && $dateFormat != '' ? $dateFormat : 'M d, Y';
+        $result['PMTable'] = isset($pmtable) ? $pmtable : '';
+        $result['rowsperpage'] = isset($rowsperpage) ? $rowsperpage : 20;
+        $result['dateformat'] = isset($dateFormat) && $dateFormat != '' ? $dateFormat : 'M d, Y';
         return $result;
     }
 
-    public function getSteps ($appUid, $index, $tasUid, $proUid)
+    public function getSteps($appUid, $index, $tasUid, $proUid)
     {
-        $steps = Array ();
+        $steps = [];
         $case = new Cases();
         $step = new Step();
         $appDocument = new AppDocument();
 
-        $caseSteps = $step->getAllCaseSteps( $proUid, $tasUid, $appUid );
+        $caseSteps = $step->getAllCaseSteps($proUid, $tasUid, $appUid);
 
         //getting externals steps
         $oPluginRegistry = PluginRegistry::loadSingleton();
         $eSteps = $oPluginRegistry->getSteps();
-        $externalSteps = array ();
+        $externalSteps = [];
         /** @var \ProcessMaker\Plugins\Interfaces\StepDetail $externalStep */
         foreach ($eSteps as $externalStep) {
             $externalSteps[$externalStep->getStepId()] = $externalStep;
@@ -1125,17 +1134,17 @@ class Applications
 
         //getting the case record
         if ($appUid) {
-            $caseData = $case->loadCase( $appUid );
+            $caseData = $case->loadCase($appUid);
             $pmScript = new PMScript();
-            $pmScript->setFields( $caseData['APP_DATA'] );
+            $pmScript->setFields($caseData['APP_DATA']);
         }
 
         $externalStepCount = 0;
 
         foreach ($caseSteps as $caseStep) {
             // if it has a condition
-            if (trim( $caseStep->getStepCondition() ) != '') {
-                $pmScript->setScript( $caseStep->getStepCondition() );
+            if (trim($caseStep->getStepCondition()) != '') {
+                $pmScript->setScript($caseStep->getStepCondition());
 
                 if (! $pmScript->evaluate()) {
                     //evaluated false, jump & continue with the others steps
@@ -1147,21 +1156,21 @@ class Applications
             $stepType = $caseStep->getStepTypeObj();
             $stepPosition = $caseStep->getStepPosition();
 
-            $stepItem = array ();
+            $stepItem = [];
             $stepItem['id'] = $stepUid;
             $stepItem['type'] = $stepType;
 
             switch ($stepType) {
                 case 'DYNAFORM':
-                    $oDocument = DynaformPeer::retrieveByPK( $stepUid );
+                    $oDocument = DynaformPeer::retrieveByPK($stepUid);
 
                     $stepItem['title'] = $oDocument->getDynTitle();
                     $stepItem['url'] = "cases/cases_Step?UID=$stepUid&TYPE=$stepType&POSITION=$stepPosition&ACTION=EDIT";
                     $stepItem['version'] = $oDocument->getDynVersion();
                     break;
                 case 'OUTPUT_DOCUMENT':
-                    $oDocument = OutputDocumentPeer::retrieveByPK( $caseStep->getStepUidObj() );
-                    $outputDoc = $appDocument->getObject( $appUid, $index, $caseStep->getStepUidObj(), 'OUTPUT' );
+                    $oDocument = OutputDocumentPeer::retrieveByPK($caseStep->getStepUidObj());
+                    $outputDoc = $appDocument->getObject($appUid, $index, $caseStep->getStepUidObj(), 'OUTPUT');
                     $stepItem['title'] = $oDocument->getOutDocTitle();
 
                     if ($outputDoc['APP_DOC_UID']) {
@@ -1171,7 +1180,7 @@ class Applications
                     }
                     break;
                 case 'INPUT_DOCUMENT':
-                    $oDocument = InputDocumentPeer::retrieveByPK( $stepUid );
+                    $oDocument = InputDocumentPeer::retrieveByPK($stepUid);
                     $stepItem['title'] = $oDocument->getInpDocTitle();
                     $stepItem['url'] = "cases/cases_Step?UID=$stepUid&TYPE=$stepType&POSITION=$stepPosition&ACTION=ATTACH";
                     break;
@@ -1189,10 +1198,10 @@ class Applications
         }
 
         //last, assign task
-        $stepItem = array ();
+        $stepItem = [];
         $stepItem['id'] = '-1';
         $stepItem['type'] = '';
-        $stepItem['title'] = G::LoadTranslation( 'ID_ASSIGN_TASK' );
+        $stepItem['title'] = G::LoadTranslation('ID_ASSIGN_TASK');
         $stepItem['url'] = "cases/cases_Step?TYPE=ASSIGN_TASK&UID=-1&POSITION=10000&ACTION=ASSIGN";
 
         $steps[] = $stepItem;
diff --git a/workflow/engine/classes/Cases.php b/workflow/engine/classes/Cases.php
index 07663e3b9..8dae33f5a 100644
--- a/workflow/engine/classes/Cases.php
+++ b/workflow/engine/classes/Cases.php
@@ -7116,7 +7116,9 @@ class Cases
 
         // BUG 8134, FIX!// for single/double quote troubles // Unserialize with utf8 content get trouble
         if ($unserializedData === false) {
-            $unserializedData = preg_replace('!s:(\d+):"(.*?)";!e', "'s:'.strlen('$2').':\"$2\";'", $data);
+            $unserializedData = preg_replace_callback('!s:(\d+):"(.*?)";!', function ($m) {
+                return 's:' . strlen($m[2]) . ':"' . $m[2] . '";';
+            }, $data);
             $unserializedData = @unserialize($unserializedData);
         }
 
diff --git a/workflow/engine/classes/DbConnections.php b/workflow/engine/classes/DbConnections.php
index 76332fe50..ec8060fd9 100644
--- a/workflow/engine/classes/DbConnections.php
+++ b/workflow/engine/classes/DbConnections.php
@@ -1,4 +1,5 @@
 <?php
+use Illuminate\Support\Facades\Cache;
 
 class DbConnections
 {
@@ -18,7 +19,7 @@ class DbConnections
      * @param string $pPRO_UID
      * @return void
      */
-    public function __construct ($pPRO_UID = null)
+    public function __construct($pPRO_UID = null)
     {
         $this->errno = 0;
         $this->errstr = "";
@@ -32,36 +33,36 @@ class DbConnections
      *
      * @return Array $connections
      */
-    public function getAllConnections ()
+    public function getAllConnections()
     {
-        if (isset( $this->PRO_UID )) {
+        if (isset($this->PRO_UID)) {
             $oDBSource = new DbSource();
             $oContent = new Content();
-            $connections = Array ();
-            $types = Array ();
+            $connections = array ();
+            $types = array ();
             $this->have_any_connectios = false;
 
             $c = new Criteria();
 
             $c->clearSelectColumns();
-            $c->addSelectColumn( DbSourcePeer::DBS_UID );
-            $c->addSelectColumn( DbSourcePeer::PRO_UID );
-            $c->addSelectColumn( DbSourcePeer::DBS_TYPE );
-            $c->addSelectColumn( DbSourcePeer::DBS_SERVER );
-            $c->addSelectColumn( DbSourcePeer::DBS_DATABASE_NAME );
-            $c->addSelectColumn( DbSourcePeer::DBS_USERNAME );
-            $c->addSelectColumn( DbSourcePeer::DBS_PASSWORD );
-            $c->addSelectColumn( DbSourcePeer::DBS_PORT );
-            $c->addSelectColumn( DbSourcePeer::DBS_ENCODE );
+            $c->addSelectColumn(DbSourcePeer::DBS_UID);
+            $c->addSelectColumn(DbSourcePeer::PRO_UID);
+            $c->addSelectColumn(DbSourcePeer::DBS_TYPE);
+            $c->addSelectColumn(DbSourcePeer::DBS_SERVER);
+            $c->addSelectColumn(DbSourcePeer::DBS_DATABASE_NAME);
+            $c->addSelectColumn(DbSourcePeer::DBS_USERNAME);
+            $c->addSelectColumn(DbSourcePeer::DBS_PASSWORD);
+            $c->addSelectColumn(DbSourcePeer::DBS_PORT);
+            $c->addSelectColumn(DbSourcePeer::DBS_ENCODE);
             $c->addSelectColumn(DbSourcePeer::DBS_CONNECTION_TYPE);
             $c->addSelectColumn(DbSourcePeer::DBS_TNS);
-            $c->addSelectColumn( ContentPeer::CON_VALUE );
+            $c->addSelectColumn(ContentPeer::CON_VALUE);
 
-            $c->add( DbSourcePeer::PRO_UID, $this->PRO_UID );
-            $c->add( ContentPeer::CON_CATEGORY, 'DBS_DESCRIPTION' );
-            $c->addJoin( DbSourcePeer::DBS_UID, ContentPeer::CON_ID );
+            $c->add(DbSourcePeer::PRO_UID, $this->PRO_UID);
+            $c->add(ContentPeer::CON_CATEGORY, 'DBS_DESCRIPTION');
+            $c->addJoin(DbSourcePeer::DBS_UID, ContentPeer::CON_ID);
 
-            $result = DbSourcePeer::doSelectRS( $c );
+            $result = DbSourcePeer::doSelectRS($c);
             $result->next();
             $row = $result->getRow();
 
@@ -82,7 +83,7 @@ class DbConnections
 
                 $result->next();
             }
-            if (! in_array( $row[2], $types )) {
+            if (! in_array($row[2], $types)) {
                 $types[] = $row[2];
             }
             $this->connections = $connections;
@@ -96,20 +97,19 @@ class DbConnections
      * @param string $pType
      * @return Array $connections
      */
-    public function getConnections ($pType)
+    public function getConnections($pType)
     {
-        $connections = Array ();
+        $connections = array ();
         foreach ($this->connections as $c) {
-            if (trim( $pType ) == trim( $c['DBS_TYPE'] )) {
+            if (trim($pType) == trim($c['DBS_TYPE'])) {
                 $connections[] = $c;
             }
         }
-        if (count( $connections ) > 0) {
+        if (count($connections) > 0) {
             return $connections;
         } else {
             return false;
         }
-
     }
 
     /**
@@ -121,27 +121,27 @@ class DbConnections
      * @param string $only
      * @return Array $connections
      */
-    public function getConnectionsProUid ($pProUid, $only = array())
+    public function getConnectionsProUid($pProUid, $only = array())
     {
-        $connections = Array ();
+        $connections = array ();
         $c = new Criteria();
         $c->clearSelectColumns();
 
-        $c->addSelectColumn( DbSourcePeer::DBS_UID );
-        $c->addSelectColumn( DbSourcePeer::PRO_UID );
-        $c->addSelectColumn( DbSourcePeer::DBS_TYPE );
-        $c->addSelectColumn( DbSourcePeer::DBS_SERVER );
-        $c->addSelectColumn( DbSourcePeer::DBS_DATABASE_NAME );
-        $c->addSelectColumn( DbSourcePeer::DBS_CONNECTION_TYPE );
-        $c->addSelectColumn( DbSourcePeer::DBS_TNS );
+        $c->addSelectColumn(DbSourcePeer::DBS_UID);
+        $c->addSelectColumn(DbSourcePeer::PRO_UID);
+        $c->addSelectColumn(DbSourcePeer::DBS_TYPE);
+        $c->addSelectColumn(DbSourcePeer::DBS_SERVER);
+        $c->addSelectColumn(DbSourcePeer::DBS_DATABASE_NAME);
+        $c->addSelectColumn(DbSourcePeer::DBS_CONNECTION_TYPE);
+        $c->addSelectColumn(DbSourcePeer::DBS_TNS);
 
-        $result = DbSourcePeer::doSelectRS( $c );
+        $result = DbSourcePeer::doSelectRS($c);
         $result->next();
         $row = $result->getRow();
 
         $sw = count($only) > 0;
         while ($row = $result->getRow()) {
-            if ((trim( $pProUid ) == trim( $row[1] )) && ( $sw ? in_array($row[2], $only) : true )) {
+            if ((trim($pProUid) == trim($row[1])) && ( $sw ? in_array($row[2], $only) : true )) {
                 $dbUid = $row[0];
 
                 $dbDescription = '';
@@ -171,22 +171,80 @@ class DbConnections
             $result->next();
         }
 
-        if (count( $connections ) > 0) {
+        if (count($connections) > 0) {
             return $connections;
         } else {
-            return Array ();
+            return array ();
         }
-
     }
 
     /**
      * loadAdditionalConnections
      *
+     * @param $force boolean Determines if we should force load additional connections, even if lastProcessId is the same as active process
      * @return void
      */
-    public function loadAdditionalConnections ()
+    public static function loadAdditionalConnections($force = false)
     {
-        PROPEL::Init( PATH_METHODS . 'dbConnections/genericDbConnections.php' );
+        // $lastProcessId determines what was the last process ID we processed.  If it was the same, we'll continue to
+        static $lastProcessId = null;
+        // We need to rebuild the Propel configuration, but this time, bring in any additional configuration for the active process
+        if ($force || (isset($_SESSION['PROCESS']) && $_SESSION['PROCESS'] != $lastProcessId)) {
+            // Get our current configuration
+            $conf = Propel::getConfiguration();
+            // Iterate through the datasources of configuration, and only care about workflow, rbac or rp. Remove anything else.
+            foreach ($conf['datasources'] as $key => $val) {
+                if (!in_array($key, ['workflow', 'rbac', 'rp'])) {
+                    unset($conf['datasources'][$key]);
+                }
+            }
+            // Now, let's fetch all external database connections for this process from cache
+            $externalDbs = Cache::get('proc-' . $_SESSION['PROCESS'] . '-extdbs', function () {
+                // Use explicit DbSource in the model namespace to ignore the global DbSource which is propel built
+                // @todo Eventually remove the global DbSource and remove explicit namespace path
+                return \ProcessMaker\Model\DbSource::where('PRO_UID', $_SESSION['PROCESS'])->get();
+            });
+            foreach ($externalDbs as $externalDb) {
+                $conf['datasources'][$externalDb->DBS_UID] = [];
+                $flagTns = ($externalDb->DBS_TYPE == "oracle" && $externalDb->DBS_CONNECTION_TYPE == "TNS")? 1 : 0;
+                // Build the appropriate items to add to our Propel configuration
+                // Let's grab the decrypted password
+                $passw = '';
+                if ($externalDb->DBS_PASSWORD != '') {
+                    $aPassw = explode('_', $externalDb->DBS_PASSWORD);
+                    $passw = $aPassw[0];
+
+                    if (sizeof($aPassw) > 1 && $flagTns === 0) {
+                        $passw = ($passw == "none")? "" : G::decrypt($passw, $externalDb->DBS_DATABASE_NAME);
+                    } else {
+                        $passw = ($passw == "none")? "" : G::decrypt($passw, $externalDb->DBS_TNS);
+                    }
+                }
+                // Check for TNS for Oracle
+                if ($flagTns == 0) {
+                    // Not TNS, build a standard configuration
+                    $dbsPort = ($externalDb->DBS_PORT == '') ? ('') : (':' . $externalDb->DBS_PORT);
+                    $encoding = (trim($externalDb->DBS_ENCODE) == '') ? '' : '?encoding=' . $externalDb->DBS_ENCODE;
+                    if (strpos($externalDb->DBS_SERVER, "\\") && $externalDb->DBS_TYPE == 'mssql') {
+                        // This is a microsoft SQL server which is using a netbios connection string
+                        $conf['datasources'][$externalDb->DBS_UID]['connection'] = $externalDb->DBS_TYPE . '://'
+                            . $externalDb->DBS_USERNAME . ':' . $passw . '@' . $externalDb->DBS_SERVER . '/'
+                            . $externalDb->DBS_DATABASE_NAME . $encoding;
+                    } else {
+                        $conf['datasources'][$externalDb->DBS_UID]['connection'] = $externalDb->DBS_TYPE . '://'
+                            . $externalDb->DBS_USERNAME . ':' . $passw . '@' . $externalDb->DBS_SERVER . $dbsPort . '/'
+                            . $externalDb->DBS_DATABASE_NAME . $encoding;
+                    }
+                } else {
+                    // Is oracle and TNS, let's provide a TNS based DSN
+                    $conf["datasources"][$externalDb->DBS_UID]["connection"] = $externalDb->DBS_TYPE . "://"
+                        . $externalDb->DBS_USERNAME . ":" . $passw . "@" . $externalDb->DBS_TNS;
+                }
+                $conf['datasources'][$externalDb->DBS_UID]['adapter'] = $externalDb->DBS_TYPE;
+            }
+            Propel::initConfiguration($conf);
+            $lastProcessId = $_SESSION['PROCESS'];
+        }
     }
 
     /**
@@ -194,14 +252,14 @@ class DbConnections
      *
      * @return array $servicesAvailables
      */
-    public function getDbServicesAvailables ()
+    public function getDbServicesAvailables()
     {
-        $servicesAvailables = Array ();
+        $servicesAvailables = array ();
 
-        $dbServices = Array ('mysql' => Array ('id' => 'mysql','command' => 'mysql_connect','name' => 'MySql'
-        ),'pgsql' => Array ('id' => 'pgsql','command' => 'pg_connect','name' => 'PostgreSql'
-        ),'mssql' => Array ('id' => 'mssql','command' => 'mssql_connect','name' => 'Microsoft SQL Server'
-        ),'oracle' => Array ('id' => 'oracle','command' => 'oci_connect','name' => 'Oracle'
+        $dbServices = array ('mysql' => array ('id' => 'mysql','command' => 'mysqli_connect','name' => 'MySql'
+        ),'pgsql' => array ('id' => 'pgsql','command' => 'pg_connect','name' => 'PostgreSql'
+        ),'mssql' => array ('id' => 'mssql','command' => 'mssql_connect','name' => 'Microsoft SQL Server'
+        ),'oracle' => array ('id' => 'oracle','command' => 'oci_connect','name' => 'Oracle'
         )
         );
         /*,
@@ -218,7 +276,7 @@ class DbConnections
     */
 
         foreach ($dbServices as $service) {
-            if (@function_exists( $service['command'] )) {
+            if (@function_exists($service['command'])) {
                 $servicesAvailables[] = $service;
             }
         }
@@ -230,7 +288,7 @@ class DbConnections
      *
      * @return void
      */
-    public function showMsg ()
+    public function showMsg()
     {
         if ($this->errno != 0) {
             $msg = "
@@ -254,91 +312,91 @@ class DbConnections
      * @param string $engine
      * @return $this->ordx($this->encodesList);
      */
-    public function getEncondeList ($engine = '')
+    public function getEncondeList($engine = '')
     {
         switch ($engine) {
             default:
             case 'mysql':
-                $encodes = Array (Array ('big5','big5 - Big5 Traditional Chinese'
-                ),Array ('dec8','dec8 - DEC West European'
-                ),Array ('cp850','cp850 - DOS West European'
-                ),Array ('hp8','hp8 - HP West European'
-                ),Array ('koi8r','koi8r - KOI8-R Relcom Russian'
-                ),Array ('latin1','latin1 - cp1252 West European'
-                ),Array ('latin2','latin2 - ISO 8859-2 Central European'
-                ),Array ('swe7','swe7 - 7bit Swedish'
-                ),Array ('ascii','ascii - US ASCII'
-                ),Array ('ujis','ujis - EUC-JP Japanese'
-                ),Array ('sjis','sjis - Shift-JIS Japanese'
-                ),Array ('hebrew','hebrew - ISO 8859-8 Hebrew'
-                ),Array ('tis620','tis620 - TIS620 Thai'
-                ),Array ('euckr','euckr - EUC-KR Korean'
-                ),Array ('koi8u','koi8u - KOI8-U Ukrainian'
-                ),Array ('gb2312','gb2312 - GB2312 Simplified Chinese'
-                ),Array ('greek','greek - ISO 8859-7 Greek'
-                ),Array ('cp1250','cp1250 - Windows Central European'
-                ),Array ('gbk','gbk - GBK Simplified Chinese'
-                ),Array ('latin5','latin5 - ISO 8859-9 Turkish'
-                ),Array ('armscii8','armscii8 - ARMSCII-8 Armenian'
-                ),Array ('utf8','utf8 - UTF-8 Unicode'
-                ),Array ('ucs2','ucs2 - UCS-2 Unicode'
-                ),Array ('cp866','cp866 - DOS Russian'
-                ),Array ('keybcs2','keybcs2 - DOS Kamenicky Czech-Slovak'
-                ),Array ('macce','macce - Mac Central European'
-                ),Array ('macroman','macroman - Mac West European'
-                ),Array ('cp852','cp852 - DOS Central European'
-                ),Array ('latin7','atin7 - ISO 8859-13 Baltic'
-                ),Array ('cp1251','cp1251 - Windows Cyrillic'
-                ),Array ('cp1256','cp1256  - Windows Arabic'
-                ),Array ('cp1257','cp1257  - Windows Baltic'
-                ),Array ('binary','binary  - Binary pseudo charset'
-                ),Array ('geostd8','geostd8 - GEOSTD8 Georgian'
-                ),Array ('cp932','cp932] - SJIS for Windows Japanese'
-                ),Array ('eucjpms','eucjpms - UJIS for Windows Japanese'
+                $encodes = array (array ('big5','big5 - Big5 Traditional Chinese'
+                ),array ('dec8','dec8 - DEC West European'
+                ),array ('cp850','cp850 - DOS West European'
+                ),array ('hp8','hp8 - HP West European'
+                ),array ('koi8r','koi8r - KOI8-R Relcom Russian'
+                ),array ('latin1','latin1 - cp1252 West European'
+                ),array ('latin2','latin2 - ISO 8859-2 Central European'
+                ),array ('swe7','swe7 - 7bit Swedish'
+                ),array ('ascii','ascii - US ASCII'
+                ),array ('ujis','ujis - EUC-JP Japanese'
+                ),array ('sjis','sjis - Shift-JIS Japanese'
+                ),array ('hebrew','hebrew - ISO 8859-8 Hebrew'
+                ),array ('tis620','tis620 - TIS620 Thai'
+                ),array ('euckr','euckr - EUC-KR Korean'
+                ),array ('koi8u','koi8u - KOI8-U Ukrainian'
+                ),array ('gb2312','gb2312 - GB2312 Simplified Chinese'
+                ),array ('greek','greek - ISO 8859-7 Greek'
+                ),array ('cp1250','cp1250 - Windows Central European'
+                ),array ('gbk','gbk - GBK Simplified Chinese'
+                ),array ('latin5','latin5 - ISO 8859-9 Turkish'
+                ),array ('armscii8','armscii8 - ARMSCII-8 Armenian'
+                ),array ('utf8','utf8 - UTF-8 Unicode'
+                ),array ('ucs2','ucs2 - UCS-2 Unicode'
+                ),array ('cp866','cp866 - DOS Russian'
+                ),array ('keybcs2','keybcs2 - DOS Kamenicky Czech-Slovak'
+                ),array ('macce','macce - Mac Central European'
+                ),array ('macroman','macroman - Mac West European'
+                ),array ('cp852','cp852 - DOS Central European'
+                ),array ('latin7','atin7 - ISO 8859-13 Baltic'
+                ),array ('cp1251','cp1251 - Windows Cyrillic'
+                ),array ('cp1256','cp1256  - Windows Arabic'
+                ),array ('cp1257','cp1257  - Windows Baltic'
+                ),array ('binary','binary  - Binary pseudo charset'
+                ),array ('geostd8','geostd8 - GEOSTD8 Georgian'
+                ),array ('cp932','cp932] - SJIS for Windows Japanese'
+                ),array ('eucjpms','eucjpms - UJIS for Windows Japanese'
                 )
                 );
 
                 break;
             case 'pgsql':
-                $encodes = Array (Array ("BIG5","BIG5"
-                ),Array ("EUC_CN","EUC_CN"
-                ),Array ("EUC_JP","EUC_JP"
-                ),Array ("EUC_KR","EUC_KR"
-                ),Array ("EUC_TW","EUC_TW"
-                ),Array ("GB18030","GB18030"
-                ),Array ("GBK","GBK"
-                ),Array ("ISO_8859_5","ISO_8859_5"
-                ),Array ("ISO_8859_6","ISO_8859_6"
-                ),Array ("ISO_8859_7","ISO_8859_7"
-                ),Array ("ISO_8859_8","ISO_8859_8"
-                ),Array ("JOHAB","JOHAB"
-                ),Array ("KOI8","KOI8"
-                ),Array ("selected","LATIN1"
-                ),Array ("LATIN2","LATIN2"
-                ),Array ("LATIN3","LATIN3"
-                ),Array ("LATIN4","LATIN4"
-                ),Array ("LATIN5","LATIN5"
-                ),Array ("LATIN6","LATIN6"
-                ),Array ("LATIN7","LATIN7"
-                ),Array ("LATIN8","LATIN8"
-                ),Array ("LATIN9","LATIN9"
-                ),Array ("LATIN10","LATIN10"
-                ),Array ("SJIS","SJIS"
-                ),Array ("SQL_ASCII","SQL_ASCII"
-                ),Array ("UHC","UHC"
-                ),Array ("UTF8","UTF8"
-                ),Array ("WIN866","WIN866"
-                ),Array ("WIN874","WIN874"
-                ),Array ("WIN1250","WIN1250"
-                ),Array ("WIN1251","WIN1251"
-                ),Array ("WIN1252","WIN1252"
-                ),Array ("WIN1256","WIN1256"
-                ),Array ("WIN1258","WIN1258"
+                $encodes = array (array ("BIG5","BIG5"
+                ),array ("EUC_CN","EUC_CN"
+                ),array ("EUC_JP","EUC_JP"
+                ),array ("EUC_KR","EUC_KR"
+                ),array ("EUC_TW","EUC_TW"
+                ),array ("GB18030","GB18030"
+                ),array ("GBK","GBK"
+                ),array ("ISO_8859_5","ISO_8859_5"
+                ),array ("ISO_8859_6","ISO_8859_6"
+                ),array ("ISO_8859_7","ISO_8859_7"
+                ),array ("ISO_8859_8","ISO_8859_8"
+                ),array ("JOHAB","JOHAB"
+                ),array ("KOI8","KOI8"
+                ),array ("selected","LATIN1"
+                ),array ("LATIN2","LATIN2"
+                ),array ("LATIN3","LATIN3"
+                ),array ("LATIN4","LATIN4"
+                ),array ("LATIN5","LATIN5"
+                ),array ("LATIN6","LATIN6"
+                ),array ("LATIN7","LATIN7"
+                ),array ("LATIN8","LATIN8"
+                ),array ("LATIN9","LATIN9"
+                ),array ("LATIN10","LATIN10"
+                ),array ("SJIS","SJIS"
+                ),array ("SQL_ASCII","SQL_ASCII"
+                ),array ("UHC","UHC"
+                ),array ("UTF8","UTF8"
+                ),array ("WIN866","WIN866"
+                ),array ("WIN874","WIN874"
+                ),array ("WIN1250","WIN1250"
+                ),array ("WIN1251","WIN1251"
+                ),array ("WIN1252","WIN1252"
+                ),array ("WIN1256","WIN1256"
+                ),array ("WIN1258","WIN1258"
                 )
                 );
                 break;
             case 'mssql':
-                $encodes = Array (Array ('utf8','utf8 - UTF-8 Unicode'
+                $encodes = array (array ('utf8','utf8 - UTF-8 Unicode'
                 )
                 );
                 break;
@@ -353,7 +411,7 @@ class DbConnections
         }
 
         $this->encodesList = $encodes;
-        return $this->ordx( $this->encodesList );
+        return $this->ordx($this->encodesList);
     }
 
     /**
@@ -361,7 +419,7 @@ class DbConnections
      *
      * @return integer $errno
      */
-    public function getErrno ()
+    public function getErrno()
     {
         return $this->errno;
     }
@@ -371,7 +429,7 @@ class DbConnections
      *
      * @return string errstr
      */
-    public function getErrmsg ()
+    public function getErrmsg()
     {
         return $this->errstr;
     }
@@ -382,19 +440,19 @@ class DbConnections
      * @param array $m
      * @return array $aRet
      */
-    public function ordx ($m)
+    public function ordx($m)
     {
-        $aTmp = Array ();
-        $aRet = Array ();
-        for ($i = 0; $i < count( $m ); $i ++) {
-            array_push( $aTmp, $m[$i][0] . '|' . $m[$i][1] );
+        $aTmp = array ();
+        $aRet = array ();
+        for ($i = 0; $i < count($m); $i ++) {
+            array_push($aTmp, $m[$i][0] . '|' . $m[$i][1]);
         }
-        usort( $aTmp, "strnatcasecmp" );
+        usort($aTmp, "strnatcasecmp");
 
-        for ($i = 0; $i < count( $aTmp ); $i ++) {
-            $x = explode( '|', $aTmp[$i] );
-            array_push( $aRet, Array ($x[0],$x[1]
-            ) );
+        for ($i = 0; $i < count($aTmp); $i ++) {
+            $x = explode('|', $aTmp[$i]);
+            array_push($aRet, array ($x[0],$x[1]
+            ));
         }
         return $aRet;
     }
@@ -407,30 +465,30 @@ class DbConnections
      * @param string proUid
      * @return void
      */
-    public function encryptThepassw ($proUid)
+    public function encryptThepassw($proUid)
     {
         $oDBSource = new DbSource();
 
         $c = new Criteria();
         $c->clearSelectColumns();
-        $c->addSelectColumn( DbSourcePeer::DBS_UID );
-        $c->addSelectColumn( DbSourcePeer::DBS_DATABASE_NAME );
-        $c->addSelectColumn( DbSourcePeer::DBS_PASSWORD );
-        $c->add( DbSourcePeer::PRO_UID, $proUid );
-        $result = DbSourcePeer::doSelectRS( $c );
+        $c->addSelectColumn(DbSourcePeer::DBS_UID);
+        $c->addSelectColumn(DbSourcePeer::DBS_DATABASE_NAME);
+        $c->addSelectColumn(DbSourcePeer::DBS_PASSWORD);
+        $c->add(DbSourcePeer::PRO_UID, $proUid);
+        $result = DbSourcePeer::doSelectRS($c);
         $result->next();
         $row = $result->getRow();
         while ($row = $result->getRow()) {
             if ($row[2] != '') {
-                $aPass = explode( '_', $row[2] );
-                if (count( $aPass ) == 1) {
-                    $passEncrypt = G::encrypt( $row[2], $row[1] );
+                $aPass = explode('_', $row[2]);
+                if (count($aPass) == 1) {
+                    $passEncrypt = G::encrypt($row[2], $row[1]);
                     $passEncrypt .= "_2NnV3ujj3w";
-                    $c2 = new Criteria( 'workflow' );
-                    $c2->add( DbSourcePeer::DBS_PASSWORD, $passEncrypt );
-                    $c3 = new Criteria( 'workflow' );
-                    $c3->add( DbSourcePeer::DBS_UID, $row[0] );
-                    BasePeer::doUpdate( $c3, $c2, Propel::getConnection( 'workflow' ) );
+                    $c2 = new Criteria('workflow');
+                    $c2->add(DbSourcePeer::DBS_PASSWORD, $passEncrypt);
+                    $c3 = new Criteria('workflow');
+                    $c3->add(DbSourcePeer::DBS_UID, $row[0]);
+                    BasePeer::doUpdate($c3, $c2, Propel::getConnection('workflow'));
                 }
             }
             $result->next();
@@ -446,11 +504,11 @@ class DbConnections
      * @param string passw
      * @return string
      */
-    public function getPassWithoutEncrypt ($aInfoCon)
+    public function getPassWithoutEncrypt($aInfoCon)
     {
         $passw = '';
         if ($aInfoCon['DBS_PASSWORD'] != '') {
-            $aPassw = explode( '_', $aInfoCon['DBS_PASSWORD'] );
+            $aPassw = explode('_', $aInfoCon['DBS_PASSWORD']);
             $passw = $aPassw[0];
 
             $flagTns = ($aInfoCon["DBS_TYPE"] == "oracle" && $aInfoCon["DBS_CONNECTION_TYPE"] == "TNS")? 1 : 0;
diff --git a/workflow/engine/classes/DynaFormField.php b/workflow/engine/classes/DynaFormField.php
index 7477dfe96..8b4984127 100644
--- a/workflow/engine/classes/DynaFormField.php
+++ b/workflow/engine/classes/DynaFormField.php
@@ -18,10 +18,13 @@ class DynaFormField extends DBTable
     /**
      * Function SetTo
      *
-     * @param string $objConnection
+     * @param object $objConnection connection string
+     * @param string $strTable Table name defaultValue=''
+     * @param array $arrKeys table keys defaultValue=UID
+     *
      * @return void
      */
-    public function SetTo($objConnection)
+    public function SetTo($objConnection, $strTable = "", $arrKeys = array('UID'))
     {
         DBTable::SetTo($objConnection, 'dynaForm', array('XMLNODE_NAME'
         ));
@@ -33,7 +36,7 @@ class DynaFormField extends DBTable
      * @param string $sUID
      * @return void
      */
-    public function Load($sUID)
+    public function Load($sUID = null)
     {
         parent::Load($sUID);
         if (is_array($this->Fields)) {
@@ -51,7 +54,7 @@ class DynaFormField extends DBTable
      * @param string $uid
      * @return void
      */
-    public function Delete($uid)
+    public function Delete($uid=null)
     {
         $this->Fields['XMLNODE_NAME'] = $uid;
         parent::Delete();
@@ -65,7 +68,7 @@ class DynaFormField extends DBTable
      * @param array $options
      * @return void
      */
-    public function Save($Fields, $labels = array(), $options = array())
+    public function Save($Fields=null, $labels = array(), $options = array())
     {
 
         if ($Fields['TYPE'] === 'javascript') {
diff --git a/workflow/engine/classes/DynaformEditor.php b/workflow/engine/classes/DynaformEditor.php
index fe07fa8d5..84a33fbb1 100644
--- a/workflow/engine/classes/DynaformEditor.php
+++ b/workflow/engine/classes/DynaformEditor.php
@@ -1,294 +1,275 @@
-<?php
-
-/**
- * Created on 21/12/2007
- * Dynaform - Dynaform 
-/**
- *
- * @package workflow.engine.classes
- */
-class DynaformEditor extends WebResource
-{
-
-    private $isOldCopy = false;
-    public $file = '';
-    public $title = 'New Dynaform';
-    public $dyn_uid = '';
-    public $dyn_type = '';
-    public $home = '';
-
-    /**
-     * Other Options for Editor:
-     * left: 'getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))',
-     * top: 'getAbsoluteTop(document.getElementById("dynaformEditor[0]"))',
-     * height: '3/4*(document.body.clientWidth-getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))*2)',
-     * left: 'getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))'
-     * left: 'getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))'
-     *
-     * Other Options for Toolbar:
-     * left: 'getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))',
-     * top: 'getAbsoluteTop(document.getElementById("dynaformEditor[0]"))',
-     */
-    public $defaultConfig = array('Editor' => array('left' => '0', 'top' => '0', 'width' => 'document.body.clientWidth-4', 'height' => 'document.body.clientHeight-4'),
-        'Toolbar' => array('left' => 'document.body.clientWidth-2-toolbar.clientWidth-24-3+7', 'top' => '52'),
-        'FieldsList' => array('left' => '4+toolbar.clientWidth+24', 'top' => 'getAbsoluteTop(document.getElementById("dynaformEditor[0]"))', 'width' => 244, 'height' => 400)
-    );
-    public $panelConf = array('style' => array('title' => array('textAlign' => 'center')),
-        'width' => 700, 'height' => 600, 'tabWidth' => 120, 'modal' => true, 'drag' => false, 'resize' => false, 'blinkToFront' => false
-    );
-
-    /**
-     * Constructor of the class dynaformEditor
-     *
-     * @param string $get
-     * @return void
-     */
-    public function __construct($get)
-    {
-        $this->panelConf = array_merge($this->panelConf, $this->defaultConfig['Editor']);
-        //'title' => G::LoadTranslation('ID_DYNAFORM_EDITOR').' - ['.$this->title.']',
-    }
-
-    /**
-     * Create the xml form default
-     *
-     * @param string $filename
-     * @return void
-     */
-    public function _createDefaultXmlForm($fileName)
-    {
-        //Create the default Dynaform
-        $sampleForm = '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
-        $sampleForm .= '<dynaForm type="' . $this->dyn_type . '" name="" width="500" enabletemplate="0" mode="edit">' . "\n";
-        switch ($this->dyn_type) {
-            case "xmlform":
-                /* $sampleForm.='<title type="title" enablehtml="0">' . "\n" .
-                  '  <en>Sample form</en>' . "\n" .
-                  '</title>'."\n";
-                  $sampleForm.='<submit type="submit" enablehtml="0" onclick="">' . "\n" .
-                  '  <en>Submit</en>' . "\n" .
-                  '</submit>'."\n"; */
-                break;
-            case "grid":
-                /* $sampleForm.='<fieldA type="text" >' . "\n" .
-                  '<en>A</en>' . "\n" .
-                  '</fieldA>'."\n";
-                  $sampleForm.='<fieldB type="text" >' . "\n" .
-                  '<en>B</en>' . "\n" .
-                  '</fieldB>'."\n"; */
-                break;
-        }
-        $sampleForm .= '</dynaForm>';
-        G::verifyPath(dirname($fileName), true);
-        $fp = fopen($fileName, 'w');
-        $sampleForm = str_replace('name=""', 'name="' . $this->_getFilename($this->file) . '"', $sampleForm);
-        fwrite($fp, $sampleForm);
-        fclose($fp);
-    }
-
-    /**
-     * Prints the DynaformEditor
-     *
-     * @return void
-     */
-    public function _render()
-    {
-        global $G_PUBLISH;
-        $script = '';
-
-        /* Start Block: Load (Create if doesn't exist) the xmlform */
-        $Parameters = array('SYS_LANG' => SYS_LANG, 'URL' => G::encrypt($this->file, URL_KEY), 'DYN_UID' => $this->dyn_uid, 'PRO_UID' => $this->pro_uid, 'DYNAFORM_NAME' => $this->dyn_title, 'FILE' => $this->file, 'DYN_EDITOR' => $this->dyn_editor
-        );
-        $_SESSION['Current_Dynafom']['Parameters'] = $Parameters;
-
-        $XmlEditor = array('URL' => G::encrypt($this->file, URL_KEY), 'XML' => ''  //$openDoc->getXml()
-        );
-        $JSEditor = array('URL' => G::encrypt($this->file, URL_KEY)
-        );
-
-        $A = G::encrypt($this->file, URL_KEY);
-
-        try {
-            $openDoc = new Xml_Document();
-            $fileName = $this->home . $this->file . '.xml';
-            if (file_exists($fileName)) {
-                $openDoc->parseXmlFile($fileName);
-            } else {
-                $this->_createDefaultXmlForm($fileName);
-                $openDoc->parseXmlFile($fileName);
-            }
-            //$form = new Form( $this->file , $this->home, SYS_LANG, true );
-            $Properties = DynaformEditorAjax::get_properties($A, $this->dyn_uid);
-            /* Start Block: Prepare the XMLDB connection */
-            define('DB_XMLDB_HOST', PATH_DYNAFORM . $this->file . '.xml');
-            define('DB_XMLDB_USER', '');
-            define('DB_XMLDB_PASS', '');
-            define('DB_XMLDB_NAME', '');
-            define('DB_XMLDB_TYPE', 'myxml');
-            /* Start Block: Prepare the dynaformEditor */
-            $G_PUBLISH = new Publisher();
-            $sName = 'dynaformEditor';
-            $G_PUBLISH->publisherId = $sName;
-            $oHeadPublisher = & headPublisher::getSingleton();
-            $oHeadPublisher->setTitle(G::LoadTranslation('ID_DYNAFORM_EDITOR') . ' - ' . $Properties['DYN_TITLE']);
-            $G_PUBLISH->AddContent('blank');
-            $this->panelConf['title'] = '';
-            $G_PUBLISH->AddContent('panel-init', 'mainPanel', $this->panelConf);
-            if ($Properties['DYN_TYPE'] == 'xmlform') {
-                $G_PUBLISH->AddContent('xmlform', 'toolbar', 'dynaforms/fields_Toolbar', 'display:none', $Parameters, '', '');
-            } else {
-                $G_PUBLISH->AddContent('xmlform', 'toolbar', 'dynaforms/fields_ToolbarGrid', 'display:none', $Parameters, '', '');
-            }
-            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_Editor', 'display:none', $Parameters, '', '');
-            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_XmlEditor', 'display:none', $XmlEditor, '', '');
-            $G_PUBLISH->AddContent('blank');
-            $i = 0;
-            $aFields = array();
-            $aFields[] = array('XMLNODE_NAME' => 'char', 'TYPE' => 'char', 'UP' => 'char', 'DOWN' => 'char'
-            );
-            $oSession = new DBSession(new DBConnection(PATH_DYNAFORM . $this->file . '.xml', '', '', '', 'myxml'));
-            $oDataset = $oSession->Execute('SELECT * FROM dynaForm WHERE NOT( XMLNODE_NAME = "" ) AND TYPE <> "pmconnection"');
-            $iMaximun = $oDataset->count();
-            while ($aRow = $oDataset->Read()) {
-                $aFields[] = array('XMLNODE_NAME' => $aRow['XMLNODE_NAME'], 'TYPE' => $aRow['TYPE'], 'UP' => ($i > 0 ? G::LoadTranslation('ID_UP') : ''), 'DOWN' => ($i < $iMaximun - 1 ? G::LoadTranslation('ID_DOWN') : ''), 'row__' => ($i + 1)
-                );
-                $i++;
-                break;
-            }
-            global $_DBArray;
-            $_DBArray['fields'] = $aFields;
-            $_SESSION['_DBArray'] = $_DBArray;
-            $oCriteria = new Criteria('dbarray');
-            $oCriteria->setDBArrayTable('fields');
-            /**
-             * *@Erik-> this is deprecated,.
-             * (unuseful) $G_PUBLISH->AddContent('propeltable', 'paged-table', 'dynaforms/fields_List', $oCriteria, $Parameters, '', SYS_URI.'dynaforms/dynaforms_PagedTableAjax');**
-             */
-            $G_PUBLISH->AddContent('blank');
-            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_JSEditor', 'display:none', $JSEditor, '', '');
-        } catch (Exception $e) {
-
-        }
-        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_Properties', 'display:none', $Properties, '', '');
-        //for showHide tab option @Neyek
-        $G_PUBLISH->AddContent('blank');
-        $G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_PREVIEW"), $sName . '[3]', 'dynaformEditor.changeToPreview', 'dynaformEditor.saveCurrentView');
-        $G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_XML"), $sName . '[4]', 'dynaformEditor.changeToXmlCode', 'dynaformEditor.saveCurrentView');
-        if ($Properties['DYN_TYPE'] != 'grid') {
-            $G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_HTML"), $sName . '[5]', 'dynaformEditor.changeToHtmlCode', 'dynaformEditor.saveCurrentView');
-        }
-        $G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_FIELDS_LIST"), $sName . '[6]', 'dynaformEditor.changeToFieldsList', 'dynaformEditor.saveCurrentView');
-        if ($Properties["DYN_TYPE"] != "grid") {
-            $G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_JAVASCRIPTS"), $sName . '[7]', 'dynaformEditor.changeToJavascripts', 'dynaformEditor.saveCurrentView');
-        }
-        $G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_PROPERTIES"), $sName . '[8]', 'dynaformEditor.changeToProperties', 'dynaformEditor.saveCurrentView');
-
-        //for showHide tab option @Neyek
-        if ($Properties["DYN_TYPE"] != "grid") {
-            $G_PUBLISH->AddContent("panel-tab", G::LoadTranslation("ID_CONDITIONS_EDITOR"), $sName . "[9]", "dynaformEditor.changeToShowHide", "dynaformEditor.saveShowHide");
-        }
-
-        $G_PUBLISH->AddContent('panel-close');
-        $oHeadPublisher->addScriptFile("/js/maborak/core/maborak.loader.js",2);
-        $oHeadPublisher->addScriptFile('/jscore/dynaformEditor/core/dynaformEditor.js');
-
-        $oHeadPublisher->addScriptFile('/js/codemirrorOld/js/codemirror.js',1);
-
-        $oHeadPublisher->addScriptFile('/js/grid/core/grid.js');
-        $oHeadPublisher->addScriptCode('
-        var DYNAFORM_URL="' . $Parameters['URL'] . '";
-        leimnud.event.add(window,"load",function(){ loadEditor(); });
-        ');
-        $oHeadPublisher->addScriptCode(' var jsMeta;var __usernameLoggedDE__ = "' . (isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '') . '";var SYS_LANG = "' . SYS_LANG . '";var __DYN_UID__ = "' . $this->dyn_uid . '";');
-
-        $arrayParameterAux = $Parameters;
-        $arrayParameterAux["DYNAFORM_NAME"] = base64_encode($arrayParameterAux["DYNAFORM_NAME"]);
-        $oHeadPublisher->addScriptCode('var dynaformEditorParams = \'' . serialize($arrayParameterAux) . '\';');
-
-        G::RenderPage("publish", 'blank');
-    }
-
-    /**
-     * Get the filename
-     *
-     * @param string $file
-     * @return string
-     */
-    public function _getFilename($file)
-    {
-        return (strcasecmp(substr($file, - 5), '_tmp0') == 0) ? substr($file, 0, strlen($file) - 5) : $file;
-    }
-
-    /**
-     * Set the temporal copy
-     *
-     * @param string $onOff
-     * @return void
-     */
-    public function _setUseTemporalCopy($onOff)
-    {
-        $file = self::_getFilename($this->file);
-        if ($onOff) {
-            $this->file = $file . '_tmp0';
-            self::_setTmpData(array('useTmpCopy' => true ));
-            if (!file_exists(PATH_DYNAFORM . $file . '.xml')) {
-                $this->_createDefaultXmlForm(PATH_DYNAFORM . $file . '.xml');
-            }
-            //Creates a copy if it doesn't exist, else, use the old copy
-            if (!file_exists(PATH_DYNAFORM . $this->file . '.xml')) {
-                self::_copyFile(PATH_DYNAFORM . $file . '.xml', PATH_DYNAFORM . $this->file . '.xml');
-            }
-            if (!file_exists(PATH_DYNAFORM . $this->file . '.html') && file_exists(PATH_DYNAFORM . $file . '.html')) {
-                self::_copyFile(PATH_DYNAFORM . $file . '.html', PATH_DYNAFORM . $this->file . '.html');
-            }
-        } else {
-            $this->file = $file;
-            self::_setTmpData(array());
-        }
-    }
-
-    /**
-     * Set temporal data
-     *
-     * @param $data
-     * @return void
-     */
-    public function _setTmpData($data)
-    {
-        G::verifyPath(PATH_C . 'dynEditor/', true);
-        $fp = fopen(PATH_C . 'dynEditor/' . session_id() . '.php', 'w');
-        fwrite($fp, '$tmpData=unserialize(\'' . addcslashes(serialize($data), '\\\'') . '\');');
-        fclose($fp);
-    }
-
-    /**
-     * Get temporal data
-     *
-     * @param string $filename
-     * @return array
-     */
-    public function _getTmpData()
-    {
-        $tmpData = array();
-        $file = PATH_C . 'dynEditor/' . session_id() . '.php';
-        if (file_exists($file)) {
-            eval(implode('', file($file)));
-        }
-        return $tmpData;
-    }
-
-    /**
-     * Copy files
-     *
-     * @param file $from
-     * @param file $to
-     * @return void
-     */
-    public function _copyFile($from, $to)
-    {
-        $copy = implode('', file($from));
-        $fcopy = fopen($to, "w");
-        fwrite($fcopy, $copy);
-        fclose($fcopy);
-    }
-}
+<?php
+
+/**
+ * Created on 21/12/2007
+ * Dynaform - Dynaform
+/**
+ *
+ * @package workflow.engine.classes
+ */
+class DynaformEditor extends WebResource
+{
+    private $isOldCopy = false;
+    public $file = '';
+    public $title = 'New Dynaform';
+    public $dyn_uid = '';
+    public $dyn_type = '';
+    public $home = '';
+
+    /**
+     * Other Options for Editor:
+     * left: 'getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))',
+     * top: 'getAbsoluteTop(document.getElementById("dynaformEditor[0]"))',
+     * height: '3/4*(document.body.clientWidth-getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))*2)',
+     * left: 'getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))'
+     * left: 'getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))'
+     *
+     * Other Options for Toolbar:
+     * left: 'getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))',
+     * top: 'getAbsoluteTop(document.getElementById("dynaformEditor[0]"))',
+     */
+    public $defaultConfig = array('Editor' => array('left' => '0', 'top' => '0', 'width' => 'document.body.clientWidth-4', 'height' => 'document.body.clientHeight-4'),
+        'Toolbar' => array('left' => 'document.body.clientWidth-2-toolbar.clientWidth-24-3+7', 'top' => '52'),
+        'FieldsList' => array('left' => '4+toolbar.clientWidth+24', 'top' => 'getAbsoluteTop(document.getElementById("dynaformEditor[0]"))', 'width' => 244, 'height' => 400)
+    );
+    public $panelConf = array('style' => array('title' => array('textAlign' => 'center')),
+        'width' => 700, 'height' => 600, 'tabWidth' => 120, 'modal' => true, 'drag' => false, 'resize' => false, 'blinkToFront' => false
+    );
+
+    /**
+     * Constructor of the class dynaformEditor
+     *
+     * @param string $get
+     * @return void
+     */
+    public function __construct($get)
+    {
+        $this->panelConf = array_merge($this->panelConf, $this->defaultConfig['Editor']);
+        //'title' => G::LoadTranslation('ID_DYNAFORM_EDITOR').' - ['.$this->title.']',
+    }
+
+    /**
+     * Create the xml form default
+     *
+     * @param string $filename
+     * @return void
+     */
+    public function _createDefaultXmlForm($fileName)
+    {
+        //Create the default Dynaform
+        $sampleForm = '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
+        $sampleForm .= '<dynaForm type="' . $this->dyn_type . '" name="" width="500" enabletemplate="0" mode="edit">' . "\n";
+
+        $sampleForm .= '</dynaForm>';
+        G::verifyPath(dirname($fileName), true);
+        $fp = fopen($fileName, 'w');
+        $sampleForm = str_replace('name=""', 'name="' . $this->_getFilename($this->file) . '"', $sampleForm);
+        fwrite($fp, $sampleForm);
+        fclose($fp);
+    }
+
+    /**
+     * Prints the DynaformEditor
+     *
+     * @return void
+     */
+    public function _render()
+    {
+        global $G_PUBLISH;
+        $script = '';
+
+        /* Start Block: Load (Create if doesn't exist) the xmlform */
+        $Parameters = array('SYS_LANG' => SYS_LANG, 'URL' => G::encrypt($this->file, URL_KEY), 'DYN_UID' => $this->dyn_uid, 'PRO_UID' => $this->pro_uid, 'DYNAFORM_NAME' => $this->dyn_title, 'FILE' => $this->file, 'DYN_EDITOR' => $this->dyn_editor
+        );
+        $_SESSION['Current_Dynafom']['Parameters'] = $Parameters;
+
+        $XmlEditor = array('URL' => G::encrypt($this->file, URL_KEY), 'XML' => ''  //$openDoc->getXml()
+        );
+        $JSEditor = array('URL' => G::encrypt($this->file, URL_KEY)
+        );
+
+        $A = G::encrypt($this->file, URL_KEY);
+
+        try {
+            $openDoc = new Xml_Document();
+            $fileName = $this->home . $this->file . '.xml';
+            if (file_exists($fileName)) {
+                $openDoc->parseXmlFile($fileName);
+            } else {
+                $this->_createDefaultXmlForm($fileName);
+                $openDoc->parseXmlFile($fileName);
+            }
+            //$form = new Form( $this->file , $this->home, SYS_LANG, true );
+            $Properties = DynaformEditorAjax::get_properties($A, $this->dyn_uid);
+            /* Start Block: Prepare the XMLDB connection */
+            define('DB_XMLDB_HOST', PATH_DYNAFORM . $this->file . '.xml');
+            define('DB_XMLDB_USER', '');
+            define('DB_XMLDB_PASS', '');
+            define('DB_XMLDB_NAME', '');
+            define('DB_XMLDB_TYPE', 'myxml');
+            /* Start Block: Prepare the dynaformEditor */
+            $G_PUBLISH = new Publisher();
+            $sName = 'dynaformEditor';
+            $G_PUBLISH->publisherId = $sName;
+            $oHeadPublisher = headPublisher::getSingleton();
+            $oHeadPublisher->setTitle(G::LoadTranslation('ID_DYNAFORM_EDITOR') . ' - ' . $Properties['DYN_TITLE']);
+            $G_PUBLISH->AddContent('blank');
+            $this->panelConf['title'] = '';
+            $G_PUBLISH->AddContent('panel-init', 'mainPanel', $this->panelConf);
+            if ($Properties['DYN_TYPE'] == 'xmlform') {
+                $G_PUBLISH->AddContent('xmlform', 'toolbar', 'dynaforms/fields_Toolbar', 'display:none', $Parameters, '', '');
+            } else {
+                $G_PUBLISH->AddContent('xmlform', 'toolbar', 'dynaforms/fields_ToolbarGrid', 'display:none', $Parameters, '', '');
+            }
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_Editor', 'display:none', $Parameters, '', '');
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_XmlEditor', 'display:none', $XmlEditor, '', '');
+            $G_PUBLISH->AddContent('blank');
+            $i = 0;
+            $aFields = array();
+            $aFields[] = array('XMLNODE_NAME' => 'char', 'TYPE' => 'char', 'UP' => 'char', 'DOWN' => 'char'
+            );
+            $oSession = new DBSession(new DBConnection(PATH_DYNAFORM . $this->file . '.xml', '', '', '', 'myxml'));
+            $oDataset = $oSession->Execute('SELECT * FROM dynaForm WHERE NOT( XMLNODE_NAME = "" ) AND TYPE <> "pmconnection"');
+            $iMaximun = $oDataset->count();
+            while ($aRow = $oDataset->Read()) {
+                $aFields[] = array('XMLNODE_NAME' => $aRow['XMLNODE_NAME'], 'TYPE' => $aRow['TYPE'], 'UP' => ($i > 0 ? G::LoadTranslation('ID_UP') : ''), 'DOWN' => ($i < $iMaximun - 1 ? G::LoadTranslation('ID_DOWN') : ''), 'row__' => ($i + 1)
+                );
+                $i++;
+                break;
+            }
+            global $_DBArray;
+            $_DBArray['fields'] = $aFields;
+            $_SESSION['_DBArray'] = $_DBArray;
+            $oCriteria = new Criteria('dbarray');
+            $oCriteria->setDBArrayTable('fields');
+            /**
+             * *@Erik-> this is deprecated,.
+             * (unuseful) $G_PUBLISH->AddContent('propeltable', 'paged-table', 'dynaforms/fields_List', $oCriteria, $Parameters, '', SYS_URI.'dynaforms/dynaforms_PagedTableAjax');**
+             */
+            $G_PUBLISH->AddContent('blank');
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_JSEditor', 'display:none', $JSEditor, '', '');
+        } catch (Exception $e) {
+        }
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_Properties', 'display:none', $Properties, '', '');
+        //for showHide tab option @Neyek
+        $G_PUBLISH->AddContent('blank');
+        $G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_PREVIEW"), $sName . '[3]', 'dynaformEditor.changeToPreview', 'dynaformEditor.saveCurrentView');
+        $G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_XML"), $sName . '[4]', 'dynaformEditor.changeToXmlCode', 'dynaformEditor.saveCurrentView');
+        if ($Properties['DYN_TYPE'] != 'grid') {
+            $G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_HTML"), $sName . '[5]', 'dynaformEditor.changeToHtmlCode', 'dynaformEditor.saveCurrentView');
+        }
+        $G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_FIELDS_LIST"), $sName . '[6]', 'dynaformEditor.changeToFieldsList', 'dynaformEditor.saveCurrentView');
+        if ($Properties["DYN_TYPE"] != "grid") {
+            $G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_JAVASCRIPTS"), $sName . '[7]', 'dynaformEditor.changeToJavascripts', 'dynaformEditor.saveCurrentView');
+        }
+        $G_PUBLISH->AddContent('panel-tab', G::LoadTranslation("ID_PROPERTIES"), $sName . '[8]', 'dynaformEditor.changeToProperties', 'dynaformEditor.saveCurrentView');
+
+        //for showHide tab option @Neyek
+        if ($Properties["DYN_TYPE"] != "grid") {
+            $G_PUBLISH->AddContent("panel-tab", G::LoadTranslation("ID_CONDITIONS_EDITOR"), $sName . "[9]", "dynaformEditor.changeToShowHide", "dynaformEditor.saveShowHide");
+        }
+
+        $G_PUBLISH->AddContent('panel-close');
+        $oHeadPublisher->addScriptFile("/js/maborak/core/maborak.loader.js", 2);
+        $oHeadPublisher->addScriptFile('/jscore/dynaformEditor/core/dynaformEditor.js');
+
+        $oHeadPublisher->addScriptFile('/js/codemirrorOld/js/codemirror.js', 1);
+
+        $oHeadPublisher->addScriptFile('/js/grid/core/grid.js');
+        $oHeadPublisher->addScriptCode('
+        var DYNAFORM_URL="' . $Parameters['URL'] . '";
+        leimnud.event.add(window,"load",function(){ loadEditor(); });
+        ');
+        $oHeadPublisher->addScriptCode(' var jsMeta;var __usernameLoggedDE__ = "' . (isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '') . '";var SYS_LANG = "' . SYS_LANG . '";var __DYN_UID__ = "' . $this->dyn_uid . '";');
+
+        $arrayParameterAux = $Parameters;
+        $arrayParameterAux["DYNAFORM_NAME"] = base64_encode($arrayParameterAux["DYNAFORM_NAME"]);
+        $oHeadPublisher->addScriptCode('var dynaformEditorParams = \'' . serialize($arrayParameterAux) . '\';');
+
+        G::RenderPage("publish", 'blank');
+    }
+
+    /**
+     * Get the filename
+     *
+     * @param string $file
+     * @return string
+     */
+    public function _getFilename($file)
+    {
+        return (strcasecmp(substr($file, - 5), '_tmp0') == 0) ? substr($file, 0, strlen($file) - 5) : $file;
+    }
+
+    /**
+     * Set the temporal copy
+     *
+     * @param string $onOff
+     * @return void
+     */
+    public function _setUseTemporalCopy($onOff)
+    {
+        $file = self::_getFilename($this->file);
+        if ($onOff) {
+            $this->file = $file . '_tmp0';
+            self::_setTmpData(array('useTmpCopy' => true ));
+            if (!file_exists(PATH_DYNAFORM . $file . '.xml')) {
+                $this->_createDefaultXmlForm(PATH_DYNAFORM . $file . '.xml');
+            }
+            //Creates a copy if it doesn't exist, else, use the old copy
+            if (!file_exists(PATH_DYNAFORM . $this->file . '.xml')) {
+                self::_copyFile(PATH_DYNAFORM . $file . '.xml', PATH_DYNAFORM . $this->file . '.xml');
+            }
+            if (!file_exists(PATH_DYNAFORM . $this->file . '.html') && file_exists(PATH_DYNAFORM . $file . '.html')) {
+                self::_copyFile(PATH_DYNAFORM . $file . '.html', PATH_DYNAFORM . $this->file . '.html');
+            }
+        } else {
+            $this->file = $file;
+            self::_setTmpData(array());
+        }
+    }
+
+    /**
+     * Set temporal data
+     *
+     * @param $data
+     * @return void
+     */
+    public function _setTmpData($data)
+    {
+        G::verifyPath(PATH_C . 'dynEditor/', true);
+        $fp = fopen(PATH_C . 'dynEditor/' . session_id() . '.php', 'w');
+        fwrite($fp, '$tmpData=unserialize(\'' . addcslashes(serialize($data), '\\\'') . '\');');
+        fclose($fp);
+    }
+
+    /**
+     * Get temporal data
+     *
+     * @param string $filename
+     * @return array
+     */
+    public function _getTmpData()
+    {
+        $tmpData = array();
+        $file = PATH_C . 'dynEditor/' . session_id() . '.php';
+        if (file_exists($file)) {
+            eval(implode('', file($file)));
+        }
+        return $tmpData;
+    }
+
+    /**
+     * Copy files
+     *
+     * @param file $from
+     * @param file $to
+     * @return void
+     */
+    public function _copyFile($from, $to)
+    {
+        $copy = implode('', file($from));
+        $fcopy = fopen($to, "w");
+        fwrite($fcopy, $copy);
+        fclose($fcopy);
+    }
+}
diff --git a/workflow/engine/classes/EnterpriseClass.php b/workflow/engine/classes/EnterpriseClass.php
index e47b22b44..8f6bbc789 100644
--- a/workflow/engine/classes/EnterpriseClass.php
+++ b/workflow/engine/classes/EnterpriseClass.php
@@ -27,7 +27,7 @@ class EnterpriseClass extends PMPlugin
         if (count(glob(PATH_DATA_SITE . 'license/*.dat')) == 0) {
             return;
         }
-        require_once ("classes/model/Users.php");
+        require_once("classes/model/Users.php");
         $user = $data;
         $criteria = new Criteria("workflow");
 
@@ -45,26 +45,9 @@ class EnterpriseClass extends PMPlugin
         $sw = 0;
 
         if (UsersPeer::doCount($criteria) > 0) {
-            //if ($rsSQLUSR->getRecordCount() > 0) {
             $sw = 1;
         }
 
-        /*
-        $cnn = Propel::getConnection("workflow");
-        $stmt = $cnn->createStatement();
-
-        $sql = "SELECT USR.USR_UID
-                FROM   USERS AS USR
-                WHERE  USR.USR_USERNAME = '" . $user->lName . "' AND USR.USR_ROLE = 'PROCESSMAKER_ADMIN'";
-        $rsSQLUSR = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
-
-        $sw = 0;
-
-        if ($rsSQLUSR->getRecordCount() > 0) {
-            $sw = 1;
-        }
-        */
-
         if ($sw == 1) {
             //Upgrade available
             $swUpgrade = 0;
@@ -78,7 +61,8 @@ class EnterpriseClass extends PMPlugin
 
                 foreach ($addon as $index => $value) {
                     if ($addon[$index]["id"] == "processmaker") {
-                        if (version_compare($pmVersion . "", (EnterpriseUtils::pmVersion($addon[$index]["version"])) . "", "<")) {
+                        if (version_compare($pmVersion . "",
+                            (EnterpriseUtils::pmVersion($addon[$index]["version"])) . "", "<")) {
                             $swUpgrade = 1;
                             break;
                         }
@@ -99,23 +83,23 @@ class EnterpriseClass extends PMPlugin
 
     public function enterpriseLimitCreateUser()
     {
-        $oServerConf = &ServerConf::getSingleton();
-        $infoLicense =$oServerConf->getProperty('LICENSE_INFO');
+        $oServerConf = ServerConf::getSingleton();
+        $infoLicense = $oServerConf->getProperty('LICENSE_INFO');
         if (isset($infoLicense[config("system.workspace")]['LIMIT_USERS'])) {
             $criteria = new Criteria('workflow');
             $criteria->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
             $count = UsersPeer::doCount($criteria);
-            if ($count >= $infoLicense[config("system.workspace")]['LIMIT_USERS'] ) {
+            if ($count >= $infoLicense[config("system.workspace")]['LIMIT_USERS']) {
                 throw new Exception("You can\'t add more users to the System, this reach the limit of allowed users by license that it has installed now");
             }
         }
     }
 
-    public function setHashPassword ($object)
+    public function setHashPassword($object)
     {
         $type = array('md5', 'sha256');
         if (!in_array($object->hash, $type)) {
-            throw new Exception( 'Type: ' . $object->hash. ' No valid.');
+            throw new Exception('Type: ' . $object->hash . ' No valid.');
             return false;
         }
 
@@ -138,7 +122,7 @@ class EnterpriseClass extends PMPlugin
         $criteria->add(RbacUsersPeer::USR_STATUS, 0, Criteria::NOT_EQUAL);
         $dataset = RbacUsersPeer::doSelectRS($criteria);
         $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        
+
         while ($dataset->next()) {
             $row = $dataset->getRow();
             $property = $userProperty->loadOrCreateIfNotExists($row['USR_UID'], array());
diff --git a/workflow/engine/classes/IndicatorsCalculator.php b/workflow/engine/classes/IndicatorsCalculator.php
index 7a366df4b..426ea1d3b 100644
--- a/workflow/engine/classes/IndicatorsCalculator.php
+++ b/workflow/engine/classes/IndicatorsCalculator.php
@@ -1,11 +1,13 @@
-<?php 
+<?php
 
 
-abstract class BasicEnum {
-    private static $constCacheArray = NULL;
+abstract class BasicEnum
+{
+    private static $constCacheArray = null;
 
-    private static function getConstants() {
-        if (self::$constCacheArray == NULL) { 
+    private static function getConstants()
+    {
+        if (self::$constCacheArray == null) {
             self::$constCacheArray = array();
         }
         $calledClass = get_called_class();
@@ -16,7 +18,8 @@ abstract class BasicEnum {
         return self::$constCacheArray[$calledClass];
     }
 
-    public static function isValidName($name, $strict = false) {
+    public static function isValidName($name, $strict = false)
+    {
         $constants = self::getConstants();
 
         if ($strict) {
@@ -27,464 +30,484 @@ abstract class BasicEnum {
         return in_array(strtolower($name), $keys);
     }
 
-    public static function isValidValue($value) {
+    public static function isValidValue($value)
+    {
         $values = array_values(self::getConstants());
         return in_array($value, $values, $strict = true);
     }
 }
 
 
-abstract class ReportingPeriodicityEnum extends BasicEnum {
-	//100s space to easy add more periods if in the future new periods are needed
+abstract class ReportingPeriodicityEnum extends BasicEnum
+{
+    //100s space to easy add more periods if in the future new periods are needed
     const NONE = 0;
     const MONTH = 100;
     const QUARTER = 200;
     const SEMESTER = 300;
     const YEAR = 400;
 
-	public static function fromValue($value) {
-		if ($value == ReportingPeriodicityEnum::NONE) return ReportingPeriodicityEnum::NONE;
-		if ($value == ReportingPeriodicityEnum::MONTH) return ReportingPeriodicityEnum::MONTH;
-		if ($value == ReportingPeriodicityEnum::QUARTER) return ReportingPeriodicityEnum::QUARTER;
-		if ($value == ReportingPeriodicityEnum::SEMESTER) return ReportingPeriodicityEnum::SEMESTER;
-		if ($value == ReportingPeriodicityEnum::YEAR) return ReportingPeriodicityEnum::YEAR;
-		return ReportingPeriodicityEnum::MONTH;
-	}
+    public static function fromValue($value)
+    {
+        if ($value == ReportingPeriodicityEnum::NONE) {
+            return ReportingPeriodicityEnum::NONE;
+        }
+        if ($value == ReportingPeriodicityEnum::MONTH) {
+            return ReportingPeriodicityEnum::MONTH;
+        }
+        if ($value == ReportingPeriodicityEnum::QUARTER) {
+            return ReportingPeriodicityEnum::QUARTER;
+        }
+        if ($value == ReportingPeriodicityEnum::SEMESTER) {
+            return ReportingPeriodicityEnum::SEMESTER;
+        }
+        if ($value == ReportingPeriodicityEnum::YEAR) {
+            return ReportingPeriodicityEnum::YEAR;
+        }
+        return ReportingPeriodicityEnum::MONTH;
+    }
 
-	public static function labelFromValue($value) {
-		if ($value == ReportingPeriodicityEnum::MONTH) return "ID_MONTH" ;
-		if ($value == ReportingPeriodicityEnum::QUARTER) return "ID_QUARTER";
-		if ($value == ReportingPeriodicityEnum::SEMESTER) return "ID_SEMESTER";
-		if ($value == ReportingPeriodicityEnum::YEAR) return "ID_YEAR";
-		return "ID_MONTH";
-	}
+    public static function labelFromValue($value)
+    {
+        if ($value == ReportingPeriodicityEnum::MONTH) {
+            return "ID_MONTH";
+        }
+        if ($value == ReportingPeriodicityEnum::QUARTER) {
+            return "ID_QUARTER";
+        }
+        if ($value == ReportingPeriodicityEnum::SEMESTER) {
+            return "ID_SEMESTER";
+        }
+        if ($value == ReportingPeriodicityEnum::YEAR) {
+            return "ID_YEAR";
+        }
+        return "ID_MONTH";
+    }
 }
 
-abstract class IndicatorDataSourcesEnum extends BasicEnum {
-	//100s space to easy add more periods if in the future new periods are needed
-	const USER = 0;
-	const PROCESS = 100;
-	const PROCESS_CATEGORY = 200;
-	const USER_GROUP = 300;
+abstract class IndicatorDataSourcesEnum extends BasicEnum
+{
+    //100s space to easy add more periods if in the future new periods are needed
+    const USER = 0;
+    const PROCESS = 100;
+    const PROCESS_CATEGORY = 200;
+    const USER_GROUP = 300;
 }
 
-abstract class ReportingIndicatorTypeEnum extends BasicEnum {
-	const PEI = 1010;
-	const UEI = 1030;
-	const INBOX_STATUS = 1050;
+abstract class ReportingIndicatorTypeEnum extends BasicEnum
+{
+    const PEI = 1010;
+    const UEI = 1030;
+    const INBOX_STATUS = 1050;
 }
 
 class IndicatorsCalculator
 {
-	private $userReportingMetadata = array("tableName" => "USR_REPORTING", "keyField" => "PRO_UID");
-	private $processReportingMetadata = array("tableName" => "PRO_REPORTING", "keyField" => "PRO_UID");
-	private $userGroupReportingMetadata = array("tableName" => "USR_REPORTING", "keyField" => "PRO_UID");
-	private $processCategoryReportingMetadata = array("tableName" => "PRO_REPORTING", "keyField" => "PRO_UID");
+    private $userReportingMetadata = array("tableName" => "USR_REPORTING", "keyField" => "PRO_UID");
+    private $processReportingMetadata = array("tableName" => "PRO_REPORTING", "keyField" => "PRO_UID");
+    private $userGroupReportingMetadata = array("tableName" => "USR_REPORTING", "keyField" => "PRO_UID");
+    private $processCategoryReportingMetadata = array("tableName" => "PRO_REPORTING", "keyField" => "PRO_UID");
 
-	private $peiCostFormula = " SUM(case when (TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK) > 0 then (TOTAL_CASES_OUT * CONFIGURED_TASK_TIME * PRO_COST - (TOTAL_TIME_BY_TASK * USER_HOUR_COST + TOTAL_QUEUE_TIME_BY_TASK * PRO_COST))  else 0 end)";
-	private $peiFormula = "SUM(TOTAL_CASES_OUT*CONFIGURED_TASK_TIME) / SUM(SDV_TIME * TOTAL_CASES_OUT + (TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK))";
+    private $peiCostFormula = " SUM(case when (TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK) > 0 then (TOTAL_CASES_OUT * CONFIGURED_TASK_TIME * PRO_COST - (TOTAL_TIME_BY_TASK * USER_HOUR_COST + TOTAL_QUEUE_TIME_BY_TASK * PRO_COST))  else 0 end)";
+    private $peiFormula = "SUM(TOTAL_CASES_OUT*CONFIGURED_TASK_TIME) / SUM(SDV_TIME * TOTAL_CASES_OUT + (TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK))";
 
-	private $ueiCostFormula = " SUM(case when (TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK) > 0 then (TOTAL_CASES_OUT * CONFIGURED_TASK_TIME * PRO_COST - (TOTAL_TIME_BY_TASK * USER_HOUR_COST + TOTAL_QUEUE_TIME_BY_TASK * PRO_COST)) else 0 end)";
-	private $ueiFormula = "SUM(TOTAL_CASES_OUT * CONFIGURED_TASK_TIME) / SUM((TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK))";
+    private $ueiCostFormula = " SUM(case when (TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK) > 0 then (TOTAL_CASES_OUT * CONFIGURED_TASK_TIME * PRO_COST - (TOTAL_TIME_BY_TASK * USER_HOUR_COST + TOTAL_QUEUE_TIME_BY_TASK * PRO_COST)) else 0 end)";
+    private $ueiFormula = "SUM(TOTAL_CASES_OUT * CONFIGURED_TASK_TIME) / SUM((TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK))";
 
-	public function getSkewOfDataDistribution($table, $field) {
-		/*$sqlString = "SET @median = (SELECT x.$field from $table x, $table y
-						GROUP BY x.$field
-						HAVING SUM(SIGN(1-SIGN(y.$field-x.$field)))/COUNT(*) > .5
-						LIMIT 1)";
-		*/
+    public function getSkewOfDataDistribution($table, $field)
+    {
+        $sqlString = "SELECT x.$field from $table x, $table y
+                        GROUP BY x.$field
+                        HAVING SUM(SIGN(1-SIGN(y.$field-x.$field)))/COUNT(*) > .5
+                        LIMIT 1";
 
-		$sqlString = "SELECT x.$field from $table x, $table y
-						GROUP BY x.$field
-						HAVING SUM(SIGN(1-SIGN(y.$field-x.$field)))/COUNT(*) > .5
-						LIMIT 1";
+        $returnValue = 0;
+        $connection = $this->pdoConnection();
+        $result = $this->pdoExecutorWithConnection($sqlString, array(), $connection);
+        $result2 = $this->pdoExecutorWithConnection("select @median", array(), $connection);
+        if (count($result) > 0) {
+            $returnValue = reset($result2);
+            $returnValue = current($returnValue);
+        }
+        return $returnValue;
+    }
 
-		$returnValue = 0;
-		$connection = $this->pdoConnection();
-		$result = $this->pdoExecutorWithConnection($sqlString, array(), $connection);
-		$result2 = $this->pdoExecutorWithConnection("select @median", array(), $connection);
-		if (sizeof($result) > 0) {
-			$returnValue = current(reset($result2));
-		}
-		return $returnValue;
-	}
+    public function peiHistoric($processId, $initDate, $endDate, $periodicity)
+    {
+        if (!is_a($initDate, 'DateTime')) {
+            throw new InvalidArgumentException('initDate parameter must be a DateTime object.', 0);
+        }
+        if (!is_a($endDate, 'DateTime')) {
+            throw new InvalidArgumentException('endDate parameter must be a DateTime object.', 0);
+        }
 
-	public function peiHistoric($processId, $initDate, $endDate, $periodicity) {
-		if (!is_a($initDate, 'DateTime')) throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0);
-		if (!is_a($endDate, 'DateTime')) throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0);
+        $qryParams = array();
+        $sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::USER, $processId, $periodicity,
+            $initDate, $endDate, $this->peiFormula . " As VALUE", $qryParams);
 
-		/*$sqlString = $this->indicatorsBasicQueryBuilder(IndicatorDataSourcesEnum::USER
-			, $processId, $periodicity, $initDate, $endDate
-			, $this->peiFormula);*/
-	
-		$qryParams = Array();
-		$sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::USER
-			, $processId, $periodicity, $initDate, $endDate
-			, $this->peiFormula." As VALUE", $qryParams);
+        $returnValue = $this->pdoExecutor($sqlString, $qryParams);
+        return $returnValue;
+    }
 
-		//$returnValue = $this->propelExecutor($sqlString);
+    public function indicatorData($indicatorId)
+    {
+        $qryParams = array();
+        $qryParams[':indicatorId'] = $indicatorId;
+        $sqlString = "select * from DASHBOARD_INDICATOR  where DAS_IND_UID= :indicatorId";
+        $returnValue = $this->pdoExecutor($sqlString, $qryParams);
 
-		$returnValue = $this->pdoExecutor($sqlString, $qryParams);
-		return $returnValue;
-	}
+        return $returnValue;
+    }
 
-	public function indicatorData($indicatorId)
-	{
-		$qryParams = Array();
-		$qryParams[':indicatorId'] = $indicatorId;
-		$sqlString = "select * from DASHBOARD_INDICATOR  where DAS_IND_UID= :indicatorId";
-		$returnValue = $this->pdoExecutor($sqlString, $qryParams);
+    public function peiProcesses($indicatorId, $initDate, $endDate, $language)
+    {
+        if (!is_a($initDate, 'DateTime')) {
+            throw new InvalidArgumentException('initDate parameter must be a DateTime object.', 0);
+        }
+        if (!is_a($endDate, 'DateTime')) {
+            throw new InvalidArgumentException('endDate parameter must be a DateTime object.', 0);
+        }
 
-		/*$sqlString = "select * from DASHBOARD_INDICATOR  where DAS_IND_UID= '$indicatorId'";
-		$retval = $this->propelExecutor($sqlString);*/
-		return $returnValue;
-	}
+        $initYear = $initDate->format("Y");
+        $initMonth = $initDate->format("m");
+        $initDay = $endDay = 1;
+        $endYear = $endDate->format("Y");
+        $endMonth = $endDate->format("m");
 
-	public function peiProcesses($indicatorId, $initDate, $endDate, $language)
-	{
-		if (!is_a($initDate, 'DateTime')) throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0);
-		if (!is_a($endDate, 'DateTime')) throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0);
+        //$params[":initYear"] = $initYear;
+        //$params[":initMonth"] = $initMonth;
+        $params[":endYear"] = $endYear;
+        $params[":endMonth"] = $endMonth;
+        $params[":language"] = $language;
 
-		$initYear = $initDate->format("Y");
-		$initMonth = $initDate->format("m");
-		$initDay = $endDay = 1;
-		$endYear = $endDate->format("Y");
-		$endMonth = $endDate->format("m");
-
-		//$params[":initYear"] = $initYear;
-		//$params[":initMonth"] = $initMonth;
-		$params[":endYear"] = $endYear;
-		$params[":endMonth"] = $endMonth;
-		$params[":language"] = $language;
-
-		$sqlString = "select
+        $sqlString = "select
                         i.PRO_UID as uid,
                         tp.CON_VALUE as name,
                         efficiencyIndex,
                         inefficiencyCost,
-						@curRow := @curRow + 1 AS rank
+                        @curRow := @curRow + 1 AS rank
                     from
-                    (	select
+                    (   select
                             PRO_UID,
                             $this->peiFormula as efficiencyIndex,
                             $this->peiCostFormula as inefficiencyCost
                         from  USR_REPORTING
                             WHERE
-							(
-								PRO_UID = (select DAS_UID_PROCESS from  DASHBOARD_INDICATOR where DAS_IND_UID = '$indicatorId')
-								or
-								(select DAS_UID_PROCESS from  DASHBOARD_INDICATOR where DAS_IND_UID = '$indicatorId')= '0'
-							)
-							AND
-								IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)
+                            (
+                                PRO_UID = (select DAS_UID_PROCESS from  DASHBOARD_INDICATOR where DAS_IND_UID = '$indicatorId')
+                                or
+                                (select DAS_UID_PROCESS from  DASHBOARD_INDICATOR where DAS_IND_UID = '$indicatorId')= '0'
+                            )
+                            AND
+                                IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)
                         group by PRO_UID
-						order by $this->peiFormula DESC
+                        order by $this->peiFormula DESC
                     ) i
                     left join (select *
-								from CONTENT
-								where CON_CATEGORY = 'PRO_TITLE'
-										and CON_LANG = :language
-									) tp on i.PRO_UID = tp.CON_ID
-					join  (SELECT @curRow := 0) order_table"; 
+                                from CONTENT
+                                where CON_CATEGORY = 'PRO_TITLE'
+                                        and CON_LANG = :language
+                                    ) tp on i.PRO_UID = tp.CON_ID
+                    join  (SELECT @curRow := 0) order_table";
 
-		//$retval = $this->propelExecutor($sqlString);
-		$retval = $this->pdoExecutor($sqlString, $params);
-		return $retval;
-	}
+        $retval = $this->pdoExecutor($sqlString, $params);
+        return $retval;
+    }
 
-	public function ueiUserGroups($indicatorId, $initDate, $endDate, $language)
-	{
-		//for the moment all the indicator summarizes ALL users, so indicatorId is not used in this function.
-		if (!is_a($initDate, 'DateTime')) throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0);
-		if (!is_a($endDate, 'DateTime')) throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0);
+    public function ueiUserGroups($indicatorId, $initDate, $endDate, $language)
+    {
+        //for the moment all the indicator summarizes ALL users, so indicatorId is not used in this function.
+        if (!is_a($initDate, 'DateTime')) {
+            throw new InvalidArgumentException('initDate parameter must be a DateTime object.', 0);
+        }
+        if (!is_a($endDate, 'DateTime')) {
+            throw new InvalidArgumentException('endDate parameter must be a DateTime object.', 0);
+        }
 
-		$initYear = $initDate->format("Y");
-		$initMonth = $initDate->format("m");
-		$initDay = $endDay = 1;
-		$endYear = $endDate->format("Y");
-		$endMonth = $endDate->format("m");
+        $initYear = $initDate->format("Y");
+        $initMonth = $initDate->format("m");
+        $initDay = $endDay = 1;
+        $endYear = $endDate->format("Y");
+        $endMonth = $endDate->format("m");
 
-		//$params[":initYear"] = $initYear;
-		//$params[":initMonth"] = $initMonth;
-		$params[":endYear"] = $endYear;
-		$params[":endMonth"] = $endMonth;
-		$params[":language"] = $language;
+        $params[":endYear"] = $endYear;
+        $params[":endMonth"] = $endMonth;
+        $params[":language"] = $language;
 
-		//TODO ADD to USR_REPORTING the user's Group to speed up the query.
-		$sqlString = "
-				select
-						 IFNULL(i.GRP_UID, '0') as uid,
-						 IFNULL(tp.CON_VALUE, 'No Group') as name,
-						 efficiencyIndex,
-						 inefficiencyCost,
-						 averageTime,
-						 deviationTime,
-						 @curRow := @curRow + 1 AS rank
-				from
-				(	select
-					   gu.GRP_UID,
-					   $this->ueiFormula as efficiencyIndex,
-					   $this->ueiCostFormula as inefficiencyCost,
-					   AVG(AVG_TIME) as averageTime,
-					   AVG(SDV_TIME) as deviationTime 
-				   from  USR_REPORTING ur
-				   left join
-				   GROUP_USER gu on gu.USR_UID = ur.USR_UID
-				   WHERE
-					IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)
-				   group by gu.GRP_UID
-					order by $this->ueiFormula DESC
-				) i
-				left join (select *
-								from CONTENT
-							where CON_CATEGORY = 'GRP_TITLE'
-									and CON_LANG = :language 
-						   ) tp on i.GRP_UID = tp.CON_ID
-				join  (SELECT @curRow := 0) order_table"; 
+        //TODO ADD to USR_REPORTING the user's Group to speed up the query.
+        $sqlString = "
+            select
+                     IFNULL(i.GRP_UID, '0') as uid,
+                     IFNULL(tp.CON_VALUE, 'No Group') as name,
+                     efficiencyIndex,
+                     inefficiencyCost,
+                     averageTime,
+                     deviationTime,
+                     @curRow := @curRow + 1 AS rank
+            from
+            (	select
+                   gu.GRP_UID,
+                   $this->ueiFormula as efficiencyIndex,
+                   $this->ueiCostFormula as inefficiencyCost,
+                   AVG(AVG_TIME) as averageTime,
+                   AVG(SDV_TIME) as deviationTime 
+               from  USR_REPORTING ur
+               left join
+               GROUP_USER gu on gu.USR_UID = ur.USR_UID
+               WHERE
+                IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)
+               group by gu.GRP_UID
+                order by $this->ueiFormula DESC
+            ) i
+            left join (select *
+                            from CONTENT
+                        where CON_CATEGORY = 'GRP_TITLE'
+                                and CON_LANG = :language 
+                       ) tp on i.GRP_UID = tp.CON_ID
+            join  (SELECT @curRow := 0) order_table";
 
-		$retval = $this->pdoExecutor($sqlString, $params);
-		//$retval = $this->propelExecutor($sqlString);
-		return $retval;
-	}
+        $retval = $this->pdoExecutor($sqlString, $params);
+        return $retval;
+    }
 
-	public function groupEmployeesData($groupId, $initDate, $endDate, $language)
-	{
-		//TODO what if we are analizing empty user group (users without group)
-		//for the moment all the indicator summarizes ALL users, so indicatorId is not used in this function.
-		if (!is_a($initDate, 'DateTime')) throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0);
-		if (!is_a($endDate, 'DateTime')) throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0);
+    public function groupEmployeesData($groupId, $initDate, $endDate, $language)
+    {
+        //TODO what if we are analizing empty user group (users without group)
+        //for the moment all the indicator summarizes ALL users, so indicatorId is not used in this function.
+        if (!is_a($initDate, 'DateTime')) {
+            throw new InvalidArgumentException('initDate parameter must be a DateTime object.', 0);
+        }
+        if (!is_a($endDate, 'DateTime')) {
+            throw new InvalidArgumentException('endDate parameter must be a DateTime object.', 0);
+        }
 
-		$initYear = $initDate->format("Y");
-		$initMonth = $initDate->format("m");
-		$initDay = $endDay = 1;
-		$endYear = $endDate->format("Y");
-		$endMonth = $endDate->format("m");
+        $initYear = $initDate->format("Y");
+        $initMonth = $initDate->format("m");
+        $initDay = $endDay = 1;
+        $endYear = $endDate->format("Y");
+        $endMonth = $endDate->format("m");
 
-		//$params[":initYear"] = $initYear;
-		//$params[":initMonth"] = $initMonth;
-		$params[":endYear"] = $endYear;
-		$params[":endMonth"] = $endMonth;
-		$params[":language"] = $language;
-		$params[":groupId"] = $groupId;
+        //$params[":initYear"] = $initYear;
+        //$params[":initMonth"] = $initMonth;
+        $params[":endYear"] = $endYear;
+        $params[":endMonth"] = $endMonth;
+        $params[":language"] = $language;
+        $params[":groupId"] = $groupId;
 
-		$sqlString = " select
-						   i.USR_UID as uid,
-						   i.name,
-						   efficiencyIndex,
-						   inefficiencyCost,
-						   averageTime,
-						   deviationTime,
-						 @curRow := @curRow + 1 AS rank
-						from
-						(	select
-							   u.USR_UID,
-							   concat(u.USR_FIRSTNAME, ' ', u.USR_LASTNAME) as name,
-							   $this->ueiFormula as efficiencyIndex,
-							   $this->ueiCostFormula as inefficiencyCost,
-							   AVG(AVG_TIME) as averageTime,
-							   AVG(SDV_TIME) as deviationTime 
-						   from  USR_REPORTING ur
-						   left join
-							   GROUP_USER gu on gu.USR_UID = ur.USR_UID
-						   LEFT JOIN USERS u on u.USR_UID = ur.USR_UID
-						   where (gu.GRP_UID = :groupId or (:groupId = '0' && gu.GRP_UID is null ))
-							   AND
-								IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)
-						   group by ur.USR_UID
-							order by $this->ueiFormula DESC
-						) i
-						join  (SELECT @curRow := 0) order_table"; 
-		$retval = $this->pdoExecutor($sqlString, $params);
-		//$returnValue = $this->propelExecutor($sqlString);
-		return $retval;
-	}
+        $sqlString = " select
+                       i.USR_UID as uid,
+                       i.name,
+                       efficiencyIndex,
+                       inefficiencyCost,
+                       averageTime,
+                       deviationTime,
+                     @curRow := @curRow + 1 AS rank
+                    from
+                    (	select
+                           u.USR_UID,
+                           concat(u.USR_FIRSTNAME, ' ', u.USR_LASTNAME) as name,
+                           $this->ueiFormula as efficiencyIndex,
+                           $this->ueiCostFormula as inefficiencyCost,
+                           AVG(AVG_TIME) as averageTime,
+                           AVG(SDV_TIME) as deviationTime 
+                       from  USR_REPORTING ur
+                       left join
+                           GROUP_USER gu on gu.USR_UID = ur.USR_UID
+                       LEFT JOIN USERS u on u.USR_UID = ur.USR_UID
+                       where (gu.GRP_UID = :groupId or (:groupId = '0' && gu.GRP_UID is null ))
+                           AND
+                            IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)
+                       group by ur.USR_UID
+                        order by $this->ueiFormula DESC
+                    ) i
+                    join  (SELECT @curRow := 0) order_table";
+        $retval = $this->pdoExecutor($sqlString, $params);
+        return $retval;
+    }
 
-	public function ueiHistoric($employeeId, $initDate, $endDate, $periodicity)
-	{
-		if (!is_a($initDate, 'DateTime')) throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0);
-		if (!is_a($endDate, 'DateTime')) throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0);
+    public function ueiHistoric($employeeId, $initDate, $endDate, $periodicity)
+    {
+        if (!is_a($initDate, 'DateTime')) {
+            throw new InvalidArgumentException('initDate parameter must be a DateTime object.', 0);
+        }
+        if (!is_a($endDate, 'DateTime')) {
+            throw new InvalidArgumentException('endDate parameter must be a DateTime object.', 0);
+        }
 
-		$qryParams = Array();
-		$sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::USER
-			, $employeeId, $periodicity, $initDate, $endDate
-			, $this->ueiFormula." as VALUE", $qryParams);
+        $qryParams = array();
+        $sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::USER, $employeeId, $periodicity,
+            $initDate, $endDate, $this->ueiFormula . " as VALUE", $qryParams);
 
-		$retval = $this->pdoExecutor($sqlString, $qryParams);
-		//$returnValue = $this->propelExecutor($sqlString);
-		return $retval;
-	}
+        $retval = $this->pdoExecutor($sqlString, $qryParams);
+        return $retval;
+    }
 
-	public function peiCostHistoric($processId, $initDate, $endDate, $periodicity)
-	{
-		if (!is_a($initDate, 'DateTime')) throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0);
-		if (!is_a($endDate, 'DateTime')) throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0);
+    public function peiCostHistoric($processId, $initDate, $endDate, $periodicity)
+    {
+        if (!is_a($initDate, 'DateTime')) {
+            throw new InvalidArgumentException('initDate parameter must be a DateTime object.', 0);
+        }
+        if (!is_a($endDate, 'DateTime')) {
+            throw new InvalidArgumentException('endDate parameter must be a DateTime object.', 0);
+        }
 
-		$periodicitySelectFields = $this->periodicityFieldsForSelect($periodicity);
-		$periodicityGroup = $this->periodicityFieldsForGrouping($periodicity);
-		$initYear = $initDate->format("Y");
-		$initMonth = $initDate->format("m");
-		$initDay = $endDay = 1;
-		$endYear = $endDate->format("Y");
-		$endMonth = $endDate->format("m");
+        $periodicitySelectFields = $this->periodicityFieldsForSelect($periodicity);
+        $periodicityGroup = $this->periodicityFieldsForGrouping($periodicity);
+        $initYear = $initDate->format("Y");
+        $initMonth = $initDate->format("m");
+        $initDay = $endDay = 1;
+        $endYear = $endDate->format("Y");
+        $endMonth = $endDate->format("m");
 
-		//$params[":initYear"] = $initYear;
-		//$params[":initMonth"] = $initMonth;
-		$params[":endYear"] = $endYear;
-		$params[":endMonth"] = $endMonth;
-		$params[":processId"] = $processId;
+        //$params[":initYear"] = $initYear;
+        //$params[":initMonth"] = $initMonth;
+        $params[":endYear"] = $endYear;
+        $params[":endMonth"] = $endMonth;
+        $params[":processId"] = $processId;
 
-		$filterCondition = "";
-		if ($processId != null && $processId > 0) {
-			$filterCondition = " AND PRO_UID =  :processId";
-		}
+        $filterCondition = "";
+        if ($processId != null && $processId > 0) {
+            $filterCondition = " AND PRO_UID =  :processId";
+        }
 
-		$sqlString = "SELECT $periodicitySelectFields " . $this->peiCostFormula . " as PEC
-						FROM  USR_REPORTING
-						WHERE
-							IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)"
-						. $filterCondition
-						. $periodicityGroup;
+        $sqlString = "SELECT $periodicitySelectFields " . $this->peiCostFormula . " as PEC
+                        FROM  USR_REPORTING
+                        WHERE
+                            IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)"
+            . $filterCondition
+            . $periodicityGroup;
 
-		$retval = $this->pdoExecutor($sqlString, $params);
-		//$retval = $this->propelExecutor($sqlString);
-		return $retval;
-	}
+        $retval = $this->pdoExecutor($sqlString, $params);
+        return $retval;
+    }
 
-	public function ueiCostHistoric($employeeId, $initDate, $endDate, $periodicity)
-	{
-		if (!is_a($initDate, 'DateTime')) throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0);
-		if (!is_a($endDate, 'DateTime')) throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0);
+    public function ueiCostHistoric($employeeId, $initDate, $endDate, $periodicity)
+    {
+        if (!is_a($initDate, 'DateTime')) {
+            throw new InvalidArgumentException('initDate parameter must be a DateTime object.', 0);
+        }
+        if (!is_a($endDate, 'DateTime')) {
+            throw new InvalidArgumentException('endDate parameter must be a DateTime object.', 0);
+        }
 
-		$periodicitySelectFields = $this->periodicityFieldsForSelect($periodicity);
-		$periodicityGroup = $this->periodicityFieldsForGrouping($periodicity);
-		$initYear = $initDate->format("Y");
-		$initMonth = $initDate->format("m");
-		$initDay = $endDay = 1;
-		$endYear = $endDate->format("Y");
-		$endMonth = $endDate->format("m");
+        $periodicitySelectFields = $this->periodicityFieldsForSelect($periodicity);
+        $periodicityGroup = $this->periodicityFieldsForGrouping($periodicity);
+        $initYear = $initDate->format("Y");
+        $initMonth = $initDate->format("m");
+        $initDay = $endDay = 1;
+        $endYear = $endDate->format("Y");
+        $endMonth = $endDate->format("m");
 
-		//$params[":initYear"] = $initYear;
-		//$params[":initMonth"] = $initMonth;
-		$params[":endYear"] = $endYear;
-		$params[":endMonth"] = $endMonth;
+        $params[":endYear"] = $endYear;
+        $params[":endMonth"] = $endMonth;
 
+        $sqlString = 'SELECT $periodicitySelectFields ' . $this->ueiCostFormula . ' as EEC
+                        FROM  USR_REPORTING
+                        WHERE
+                            IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)'
+            . $periodicityGroup;
 
-		$sqlString = "SELECT $periodicitySelectFields " . $this->ueiCostFormula . " as EEC
-						FROM  USR_REPORTING
-						WHERE
-							IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)"
-						. $periodicityGroup;
+        $retval = $this->pdoExecutor($sqlString, $params);
+        return $retval;
+    }
 
-		$retval = $this->pdoExecutor($sqlString, $params);
-		//$retval = $this->propelExecutor($sqlString);
-		return $retval;
-	}
+    //TODO: delte this function that is used nowhere
+    public function generalIndicatorData($indicatorId, $initDate, $endDate, $periodicity)
+    {
+        if (!is_a($initDate, 'DateTime')) {
+            throw new InvalidArgumentException('initDate parameter must be a DateTime object.', 0);
+        }
+        if (!is_a($endDate, 'DateTime')) {
+            throw new InvalidArgumentException('endDate parameter must be a DateTime object.', 0);
+        }
 
-	//TODO: delte this function that is used nowhere
-	public function generalIndicatorData($indicatorId, $initDate, $endDate, $periodicity) {
-		if (!is_a($initDate, 'DateTime')) throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0);
-		if (!is_a($endDate, 'DateTime')) throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0);
+        $arrayT = $this->indicatorData($indicatorId);
+        if (count($arrayT) == 0) {
+            return array();
+        }
 
-		$arrayT = $this->indicatorData($indicatorId);
-		if (sizeof($arrayT) == 0 ) {
-			return array();
-		}
-
-		$indicator = $arrayT[0];
-		$indicatorProcessId = $indicator["DAS_UID_PROCESS"];
-		$indicatorType = $indicator["DAS_IND_TYPE"];
-		if ($indicatorProcessId == "0" || strlen($indicatorProcessId) ==0) {
-			$indicatorProcessId = null;
-		}
+        $indicator = $arrayT[0];
+        $indicatorProcessId = $indicator["DAS_UID_PROCESS"];
+        $indicatorType = $indicator["DAS_IND_TYPE"];
+        if ($indicatorProcessId == "0" || strlen($indicatorProcessId) == 0) {
+            $indicatorProcessId = null;
+        }
 
         $graph1 = $indicator['DAS_IND_FIRST_FIGURE'];
         $freq1 = $indicator['DAS_IND_FIRST_FREQUENCY'];
         $graph2 = $indicator['DAS_IND_SECOND_FIGURE'];
         $freq2 = $indicator['DAS_IND_SECOND_FREQUENCY'];
 
-		$graph1XLabel = G::loadTranslation(ReportingPeriodicityEnum::labelFromValue($freq1));
-		$graph1YLabel = "Value";
+        $graph1XLabel = G::loadTranslation(ReportingPeriodicityEnum::labelFromValue($freq1));
+        $graph1YLabel = "Value";
 
-		$graph2XLabel = G::loadTranslation(ReportingPeriodicityEnum::labelFromValue($freq2));
-		$graph2YLabel = "Value";
+        $graph2XLabel = G::loadTranslation(ReportingPeriodicityEnum::labelFromValue($freq2));
+        $graph2YLabel = "Value";
 
-		$graphConfigurationString = "'$graph1XLabel' as graph1XLabel,  
-										'$graph1YLabel' as graph1YLabel, 
-										'$graph2XLabel' as graph2XLabel,  
-										'$graph2YLabel' as graph2YLabel, 
-										'$graph1' as graph1Type, 
-										'$freq1' as frequency1Type, 
-										'$graph2' as graph2Type, 
-										'$freq2' as frequency2Type,";
+        $graphConfigurationString = "'$graph1XLabel' as graph1XLabel,  
+                                        '$graph1YLabel' as graph1YLabel, 
+                                        '$graph2XLabel' as graph2XLabel,  
+                                        '$graph2YLabel' as graph2YLabel, 
+                                        '$graph1' as graph1Type, 
+                                        '$freq1' as frequency1Type, 
+                                        '$graph2' as graph2Type, 
+                                        '$freq2' as frequency2Type,";
 
-		$params = Array();
+        $params = array();
 
         switch ($indicatorType) {
-			//process inefficience
-			case "1020":
-				$calcField = "$graphConfigurationString 100 * SUM(TOTAL_TIME_BY_TASK) / SUM(CONFIGURED_TASK_TIME) as value";
-				$sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::USER
-									, $indicatorProcessId, $periodicity
-									, $initDate, $endDate
-									, $calcField, $params);
-				break;
-			//employee inefficience
-			case "1040":
-				$calcField = "$graphConfigurationString 100 * SUM(TOTAL_TIME_BY_TASK) / SUM(CONFIGURED_TASK_TIME) as value";
-				$sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::USER
-									, $indicatorProcessId, $periodicity
-									, $initDate, $endDate
-									, $calcField, $params);
-				break;
-			//overdue
-			case "1050":
-				$calcField = "$graphConfigurationString 100 * SUM(TOTAL_CASES_OVERDUE) / SUM(TOTAL_CASES_ON_TIME + TOTAL_CASES_OVERDUE) as value";
-				$sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::USER
-									, $indicatorProcessId, $periodicity
-									, $initDate, $endDate
-									, $calcField, $params);
-				break;
-			//new cases
-			case "1060":
-				$calcField = "$graphConfigurationString 100 * SUM(TOTAL_CASES_IN) / SUM(TOTAL_CASES_ON_TIME + TOTAL_CASES_OVERDUE) as value";
-				$sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::PROCESS
-									, $indicatorProcessId, $periodicity
-									, $initDate, $endDate
-									, $calcField, $params);
-				break;
-			//completed
-			case "1070":
-				$calcField = "$graphConfigurationString 100 * SUM(TOTAL_CASES_OUT) / SUM(TOTAL_CASES_ON_TIME + TOTAL_CASES_OVERDUE) as value";
-				$sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::PROCESS
-									, $indicatorProcessId, $periodicity
-									, $initDate, $endDate
-									, $calcField, $params);
-				break;
-			case "1080":
-				$calcField = "$graphConfigurationString 100 * SUM(TOTAL_CASES_OPEN) / SUM(TOTAL_CASES_ON_TIME + TOTAL_CASES_OVERDUE) as value";
-				$sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::PROCESS
-									, $indicatorProcessId, $periodicity
-									, $initDate, $endDate
-									, $calcField, $params);
-				break;
-			default:
-				throw new Exception(" The indicator id '$indicatorId' with type $indicatorType hasn't an associated operation.");
-		}
+            //process inefficience
+            case "1020":
+                $calcField = "$graphConfigurationString 100 * SUM(TOTAL_TIME_BY_TASK) / SUM(CONFIGURED_TASK_TIME) as value";
+                $sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::USER, $indicatorProcessId,
+                    $periodicity, $initDate, $endDate, $calcField, $params);
+                break;
+            //employee inefficience
+            case "1040":
+                $calcField = "$graphConfigurationString 100 * SUM(TOTAL_TIME_BY_TASK) / SUM(CONFIGURED_TASK_TIME) as value";
+                $sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::USER, $indicatorProcessId,
+                    $periodicity, $initDate, $endDate, $calcField, $params);
+                break;
+            //overdue
+            case "1050":
+                $calcField = "$graphConfigurationString 100 * SUM(TOTAL_CASES_OVERDUE) / SUM(TOTAL_CASES_ON_TIME + TOTAL_CASES_OVERDUE) as value";
+                $sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::USER, $indicatorProcessId,
+                    $periodicity, $initDate, $endDate, $calcField, $params);
+                break;
+            //new cases
+            case "1060":
+                $calcField = "$graphConfigurationString 100 * SUM(TOTAL_CASES_IN) / SUM(TOTAL_CASES_ON_TIME + TOTAL_CASES_OVERDUE) as value";
+                $sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::PROCESS, $indicatorProcessId,
+                    $periodicity, $initDate, $endDate, $calcField, $params);
+                break;
+            //completed
+            case "1070":
+                $calcField = "$graphConfigurationString 100 * SUM(TOTAL_CASES_OUT) / SUM(TOTAL_CASES_ON_TIME + TOTAL_CASES_OVERDUE) as value";
+                $sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::PROCESS, $indicatorProcessId,
+                    $periodicity, $initDate, $endDate, $calcField, $params);
+                break;
+            case "1080":
+                $calcField = "$graphConfigurationString 100 * SUM(TOTAL_CASES_OPEN) / SUM(TOTAL_CASES_ON_TIME + TOTAL_CASES_OVERDUE) as value";
+                $sqlString = $this->indicatorsParamsQueryBuilder(IndicatorDataSourcesEnum::PROCESS, $indicatorProcessId,
+                    $periodicity, $initDate, $endDate, $calcField, $params);
+                break;
+            default:
+                throw new Exception(" The indicator id '$indicatorId' with type $indicatorType hasn't an associated operation.");
+        }
 
-		$retval = $this->pdoExecutor($sqlString, $params);
-		//$returnValue = $this->propelExecutor($sqlString);
-		return $retval;
-	}
+        $retval = $this->pdoExecutor($sqlString, $params);
+        return $retval;
+    }
 
-	public function peiTasks($processList, $initDate, $endDate, $language)
-	{
-		$processCondition = "";
-		if ($processList != null && sizeof($processList) > 0) {
-			$processCondition = " WHERE PRO_UID IN " . "('" . implode("','", $processList) . "')";
-		}
-		$params[':language'] = $language;
+    public function peiTasks($processList, $initDate, $endDate, $language)
+    {
+        $processCondition = "";
+        if ($processList != null && count($processList) > 0) {
+            $processCondition = " WHERE PRO_UID IN " . "('" . implode("','", $processList) . "')";
+        }
+        $params[':language'] = $language;
 
-		$sqlString = " select
+        $sqlString = " select
                             i.TAS_UID as uid,
                             t.CON_VALUE as name,
                             i.efficiencyIndex,
@@ -493,10 +516,10 @@ class IndicatorsCalculator
                             i.deviationTime,
                             i.configuredTime
                          FROM
-                        (	select
+                        (    select
                                 TAS_UID,
                                 $this->peiFormula as efficiencyIndex,
-								$this->peiCostFormula as inefficiencyCost,
+                                $this->peiCostFormula as inefficiencyCost,
                                 AVG(AVG_TIME) as averageTime,
                                 AVG(SDV_TIME) as deviationTime,
                                 CONFIGURED_TASK_TIME as configuredTime
@@ -509,12 +532,11 @@ class IndicatorsCalculator
                                             where CON_CATEGORY = 'TAS_TITLE'
                                                     and CON_LANG = :language 
                                     ) t on i.TAS_UID = t.CON_ID";
-		$retval = $this->pdoExecutor($sqlString, $params);
-		//$retval = $this->propelExecutor($sqlString);
-		return $retval;
-	}
+        $retval = $this->pdoExecutor($sqlString, $params);
+        return $retval;
+    }
 
-    public function statusIndicatorGeneral ($usrUid)
+    public function statusIndicatorGeneral($usrUid)
     {
         $params[':usrUid'] = $usrUid;
 
@@ -530,7 +552,7 @@ class IndicatorsCalculator
         return $this->pdoExecutor($sqlString, $params);
     }
 
-    public function statusIndicatorDetail ($usrUid)
+    public function statusIndicatorDetail($usrUid)
     {
         $params[':usrUid'] = $usrUid;
 
@@ -572,9 +594,9 @@ class IndicatorsCalculator
 
             $total = $response['overdue'] + $response['atRisk'] + $response['onTime'];
             if ($total != 0) {
-                $response['percentageOverdue'] = ($response['overdue']*100)/$total;
-                $response['percentageAtRisk']  = ($response['atRisk']*100)/$total;
-                $response['percentageOnTime']  = ($response['onTime']*100)/$total;
+                $response['percentageOverdue'] = ($response['overdue'] * 100) / $total;
+                $response['percentageAtRisk'] = ($response['atRisk'] * 100) / $total;
+                $response['percentageOnTime'] = ($response['onTime'] * 100) / $total;
             }
         }
 
@@ -585,174 +607,191 @@ class IndicatorsCalculator
             $result[$key]['atRisk'] = $value['atRisk'];
             $result[$key]['onTime'] = $value['onTime'];
             $result[$key]['percentageOverdue'] = 0;
-            $result[$key]['percentageAtRisk']  = 0;
-            $result[$key]['percentageOnTime']  = 0;
+            $result[$key]['percentageAtRisk'] = 0;
+            $result[$key]['percentageOnTime'] = 0;
             $result[$key]['percentageTotalOverdue'] = 0;
-            $result[$key]['percentageTotalAtRisk']  = 0;
-            $result[$key]['percentageTotalOnTime']  = 0;
+            $result[$key]['percentageTotalAtRisk'] = 0;
+            $result[$key]['percentageTotalOnTime'] = 0;
             $total = $value['overdue'] + $value['onTime'] + $value['atRisk'];
             if ($total != 0) {
-                $result[$key]['percentageOverdue'] = ($value['overdue']*100)/$total;
-                $result[$key]['percentageAtRisk']  = ($value['atRisk']*100)/$total;
-                $result[$key]['percentageOnTime']  = ($value['onTime']*100)/$total;
-                $result[$key]['percentageTotalOverdue'] = $response['overdue'] != 0 ? ($value['overdue']*100)/$response['overdue']: 0;
-                $result[$key]['percentageTotalAtRisk']  = $response['atRisk'] != 0 ? ($value['atRisk']*100)/$response['atRisk'] : 0;
-                $result[$key]['percentageTotalOnTime']  = $response['onTime'] != 0 ? ($value['onTime']*100)/$response['onTime']: 0;
+                $result[$key]['percentageOverdue'] = ($value['overdue'] * 100) / $total;
+                $result[$key]['percentageAtRisk'] = ($value['atRisk'] * 100) / $total;
+                $result[$key]['percentageOnTime'] = ($value['onTime'] * 100) / $total;
+                $result[$key]['percentageTotalOverdue'] = $response['overdue'] != 0 ? ($value['overdue'] * 100) / $response['overdue'] : 0;
+                $result[$key]['percentageTotalAtRisk'] = $response['atRisk'] != 0 ? ($value['atRisk'] * 100) / $response['atRisk'] : 0;
+                $result[$key]['percentageTotalOnTime'] = $response['onTime'] != 0 ? ($value['onTime'] * 100) / $response['onTime'] : 0;
             }
         }
         $response['dataList'] = $result;
         return $response;
     }
 
-	private function periodicityFieldsForSelect($periodicity) {
-		$periodicityFields = $this->periodicityFieldsString($periodicity);
-		//add a comma if there are periodicity fields
-		return $periodicityFields
-		. ((strlen($periodicityFields) > 0)
-			? ", "
-			: "");
-	}
+    private function periodicityFieldsForSelect($periodicity)
+    {
+        $periodicityFields = $this->periodicityFieldsString($periodicity);
+        //add a comma if there are periodicity fields
+        return $periodicityFields
+            . ((strlen($periodicityFields) > 0)
+                ? ", "
+                : "");
+    }
 
-	private function periodicityFieldsForGrouping($periodicity) {
-		$periodicityFields = $this->periodicityFieldsString($periodicity);
+    private function periodicityFieldsForGrouping($periodicity)
+    {
+        $periodicityFields = $this->periodicityFieldsString($periodicity);
 
-		return ((strlen($periodicityFields) > 0)
-			? " GROUP BY "
-			: "") . str_replace(" AS QUARTER", "", str_replace(" AS SEMESTER", "", $periodicityFields));
-	}
+        return ((strlen($periodicityFields) > 0)
+                ? " GROUP BY "
+                : "") . str_replace(" AS QUARTER", "", str_replace(" AS SEMESTER", "", $periodicityFields));
+    }
 
-	private function periodicityFieldsString($periodicity) {
-		if (!ReportingPeriodicityEnum::isValidValue($periodicity)) throw new ArgumentException('Not supported periodicity: ', 0, 'periodicity');
+    private function periodicityFieldsString($periodicity)
+    {
+        if (!ReportingPeriodicityEnum::isValidValue($periodicity)) {
+            throw new ArgumentException('Not supported periodicity: ', 0, 'periodicity');
+        }
 
-		$retval = "";
-		switch ($periodicity) {
-			case ReportingPeriodicityEnum::MONTH;
-				$retval = "`YEAR`, `MONTH` ";
-				break;
-			case ReportingPeriodicityEnum::SEMESTER;
-				$retval = "`YEAR`, IF (`MONTH` <= 6, 1, 2) AS SEMESTER";
-				break;
-			case ReportingPeriodicityEnum::QUARTER;
-				$retval = "`YEAR`,  CASE WHEN `MONTH` BETWEEN 1 AND 3 THEN 1 WHEN `MONTH` BETWEEN 4 AND 6 THEN 2 WHEN `MONTH` BETWEEN 7 AND 9 THEN 3 WHEN `MONTH` BETWEEN 10 AND 12 THEN 4 END AS QUARTER";
-				break;
-			case ReportingPeriodicityEnum::YEAR;
-				$retval = "`YEAR`  ";
-				break;
-		}
-		return $retval;
-	}
+        $retval = "";
+        switch ($periodicity) {
+            case ReportingPeriodicityEnum::MONTH;
+                $retval = "`YEAR`, `MONTH` ";
+                break;
+            case ReportingPeriodicityEnum::SEMESTER;
+                $retval = "`YEAR`, IF (`MONTH` <= 6, 1, 2) AS SEMESTER";
+                break;
+            case ReportingPeriodicityEnum::QUARTER;
+                $retval = "`YEAR`,  CASE WHEN `MONTH` BETWEEN 1 AND 3 THEN 1 WHEN `MONTH` BETWEEN 4 AND 6 THEN 2 WHEN `MONTH` BETWEEN 7 AND 9 THEN 3 WHEN `MONTH` BETWEEN 10 AND 12 THEN 4 END AS QUARTER";
+                break;
+            case ReportingPeriodicityEnum::YEAR;
+                $retval = "`YEAR`  ";
+                break;
+        }
+        return $retval;
+    }
 
-	private function pdoExecutor($sqlString, $params) {
+    private function pdoExecutor($sqlString, $params)
+    {
 
-		$connection = $this->pdoConnection ();
-		$result = $this->pdoExecutorWithConnection($sqlString, $params, $connection);
-		return $result;
-	}
+        $connection = $this->pdoConnection();
+        $result = $this->pdoExecutorWithConnection($sqlString, $params, $connection);
+        return $result;
+    }
 
-	private function pdoConnection() {
-	    $currentWS = !empty(config("system.workspace")) ? config("system.workspace") : 'Undefined Workspace';
-		$workSpace = new WorkspaceTools($currentWS);
-  	        $arrayHost = explode(':', $workSpace->dbHost);
-		$host = "host=".$arrayHost[0];
-		$port = count($arrayHost) > 1 ? ";port=".$arrayHost[1] : "";
-		$db = ";dbname=".$workSpace->dbName;
-		$user = $workSpace->dbUser;
-		$pass = $workSpace->dbPass;
-		$connString = "mysql:$host$port$db;charset=utf8;";
+    private function pdoConnection()
+    {
+        $currentWS = !empty(config("system.workspace")) ? config("system.workspace") : 'Wokspace Undefined';
+        $workSpace = new WorkspaceTools($currentWS);
+        $arrayHost = explode(':', $workSpace->dbHost);
+        $host = "host=" . $arrayHost[0];
+        $port = count($arrayHost) > 1 ? ";port=" . $arrayHost[1] : "";
+        $db = ";dbname=" . $workSpace->dbName;
+        $user = $workSpace->dbUser;
+        $pass = $workSpace->dbPass;
+        $connString = "mysql:$host$port$db;charset=utf8;";
 
-		$dbh = new PDO($connString, $user, $pass);
-		return $dbh;
-	}
+        $dbh = new PDO($connString, $user, $pass);
+        return $dbh;
+    }
 
-	private function pdoExecutorWithConnection($sqlString, $params, $connection) {
-		$statement = $connection->prepare($sqlString);
-		$statement->execute($params);
-		$result = $statement->fetchAll(PDO::FETCH_ASSOC);
-		return $result;
-	}
+    private function pdoExecutorWithConnection($sqlString, $params, $connection)
+    {
+        $statement = $connection->prepare($sqlString);
+        $statement->execute($params);
+        $result = $statement->fetchAll(PDO::FETCH_ASSOC);
+        return $result;
+    }
 
-	private function indicatorsParamsQueryBuilder($reportingTable, $filterId, $periodicity, $initDate, $endDate, $fields, &$params) {
-		if (!is_a($initDate, 'DateTime')) throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0);
-		if (!is_a($endDate, 'DateTime')) throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0);
+    private function indicatorsParamsQueryBuilder(
+        $reportingTable,
+        $filterId,
+        $periodicity,
+        $initDate,
+        $endDate,
+        $fields,
+        &$params
+    ) {
+        if (!is_a($initDate, 'DateTime')) {
+            throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0);
+        }
+        if (!is_a($endDate, 'DateTime')) {
+            throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0);
+        }
 
-		$tableMetadata = $this->metadataForTable($reportingTable);
-		$periodicitySelectFields = $this->periodicityFieldsForSelect($periodicity);
-		$periodicityGroup = $this->periodicityFieldsForGrouping($periodicity);
-		$initYear = $initDate->format("Y");
-		$initMonth = $initDate->format("m");
-		$endYear = $endDate->format("Y");
-		$endMonth = $endDate->format("m");
+        $tableMetadata = $this->metadataForTable($reportingTable);
+        $periodicitySelectFields = $this->periodicityFieldsForSelect($periodicity);
+        $periodicityGroup = $this->periodicityFieldsForGrouping($periodicity);
+        $initYear = $initDate->format("Y");
+        $initMonth = $initDate->format("m");
+        $endYear = $endDate->format("Y");
+        $endMonth = $endDate->format("m");
 
-		$filterCondition = "";
-		if ($filterId != null && $filterId > 0) {
-			$filterCondition = " AND ".$tableMetadata["keyField"]." = '$filterId'";
-		}
+        $filterCondition = "";
+        if ($filterId != null && $filterId > 0) {
+            $filterCondition = " AND " . $tableMetadata["keyField"] . " = '$filterId'";
+        }
 
-		//$params[":initYear"] = $initYear;
-		//$params[":initMonth"] = $initMonth;
-		$params[":endYear"] = $endYear;
-		$params[":endMonth"] = $endMonth;
+        $params[":endYear"] = $endYear;
+        $params[":endMonth"] = $endMonth;
 
-		$sqlString = "SELECT $periodicitySelectFields $fields
-						FROM  ".$tableMetadata["tableName"].
-					" WHERE
-						IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)"
-					. $filterCondition
-					. $periodicityGroup;
-		return $sqlString;
-	}
-
-
-	private function metadataForTable($table)  {
-		$returnVal = null;
-		switch (strtolower($table)) {
-			case IndicatorDataSourcesEnum::USER:
-				$returnVal = $this->userReportingMetadata;
-				break;
-			case IndicatorDataSourcesEnum::PROCESS:
-				$returnVal = $this->processReportingMetadata;
-				break;
-			case IndicatorDataSourcesEnum::USER_GROUP:
-				$returnVal = $this->userGroupReportingMetadata;
-				break;
-			case IndicatorDataSourcesEnum::PROCESS_CATEGORY:
-				$returnVal = $this->processCategoryReportingMetadata;
-				break;
-		}
-		if ($returnVal == null) {
-			throw new Exception("'$table' it's not supportes. It has not associated a template.");
-		}
-		return $returnVal;
-	}
-
-    public function suggestedTimeForTask ($taskId) {
-		$qryParams = Array();
-		$qryParams[':taskId'] = $taskId;
-		$sqlString = "select 
-				ROUND(AVG(TOTAL_TIME_BY_TASK/TOTAL_CASES_OUT), 2) as average,
-				 ROUND(STDDEV(TOTAL_TIME_BY_TASK/TOTAL_CASES_OUT), 2) as sdv
-				from USR_REPORTING  where TAS_UID = :taskId";
-		$retval = $this->pdoExecutor($sqlString, $qryParams);
-		return $retval[0];
+        $sqlString = "SELECT $periodicitySelectFields $fields
+            FROM  " . $tableMetadata["tableName"] .
+            " WHERE
+            IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)"
+            . $filterCondition
+            . $periodicityGroup;
+        return $sqlString;
     }
 
 
-	
-	/* For debug only:
-	 * public function interpolateQuery($query, $params) {
-		$keys = array();
-		# build a regular expression for each parameter
-		foreach ($params as $key => $value) {
-			echo "<br>key", $key, " -- value", $value;
-			if (is_string($key)) {
-				$keys[] = '/:'.$key.'/';
-			} else {
-				$keys[] = '/[?]/';
-			}
-		}
-		$query = preg_replace($keys, $params, $query, 1, $count);
-		return $query;
-	}*/
+    private function metadataForTable($table)
+    {
+        $returnVal = null;
+        switch (strtolower($table)) {
+            case IndicatorDataSourcesEnum::USER:
+                $returnVal = $this->userReportingMetadata;
+                break;
+            case IndicatorDataSourcesEnum::PROCESS:
+                $returnVal = $this->processReportingMetadata;
+                break;
+            case IndicatorDataSourcesEnum::USER_GROUP:
+                $returnVal = $this->userGroupReportingMetadata;
+                break;
+            case IndicatorDataSourcesEnum::PROCESS_CATEGORY:
+                $returnVal = $this->processCategoryReportingMetadata;
+                break;
+        }
+        if ($returnVal == null) {
+            throw new Exception("'$table' it's not supportes. It has not associated a template.");
+        }
+        return $returnVal;
+    }
+
+    public function suggestedTimeForTask($taskId)
+    {
+        $qryParams = array();
+        $qryParams[':taskId'] = $taskId;
+        $sqlString = 'select 
+            ROUND(AVG(TOTAL_TIME_BY_TASK/TOTAL_CASES_OUT), 2) as average,
+             ROUND(STDDEV(TOTAL_TIME_BY_TASK/TOTAL_CASES_OUT), 2) as sdv
+            from USR_REPORTING  where TAS_UID = :taskId';
+        $retval = $this->pdoExecutor($sqlString, $qryParams);
+        return $retval[0];
+    }
+
+
+    /* For debug only:
+     * public function interpolateQuery($query, $params) {
+        $keys = array();
+        # build a regular expression for each parameter
+        foreach ($params as $key => $value) {
+            echo "<br>key", $key, " -- value", $value;
+            if (is_string($key)) {
+                $keys[] = '/:'.$key.'/';
+            } else {
+                $keys[] = '/[?]/';
+            }
+        }
+        $query = preg_replace($keys, $params, $query, 1, $count);
+        return $query;
+    }*/
 }
-
-
diff --git a/workflow/engine/classes/LdapAdvanced.php b/workflow/engine/classes/LdapAdvanced.php
index 5ab9f01c8..95073af3f 100644
--- a/workflow/engine/classes/LdapAdvanced.php
+++ b/workflow/engine/classes/LdapAdvanced.php
@@ -144,8 +144,8 @@ class LdapAdvanced
     /**
      * Set User to this Authentication Source
      *
-     * @param string $userUid       UID of User
-     * @param array  $arrayUserLdap User LDAP data
+     * @param string $userUid UID of User
+     * @param array $arrayUserLdap User LDAP data
      *
      * return void
      */
@@ -296,8 +296,8 @@ class LdapAdvanced
     public function progressBar($total, $count)
     {
         try {
-            $p = (int) (($count * 100) / $total);
-            $n = (int) ($p / 2);
+            $p = (int)(($count * 100) / $total);
+            $n = (int)($p / 2);
 
             return "[" . str_repeat("|", $n) . str_repeat(" ", 50 - $n) . "] $p%";
         } catch (Exception $e) {
@@ -309,7 +309,7 @@ class LdapAdvanced
      * Show front end
      *
      * @param string $option Option
-     * @param string $data   Data string
+     * @param string $data Data string
      *
      * return void
      */
@@ -587,14 +587,14 @@ class LdapAdvanced
     /**
      * Get Users from Department (Search result identifier)
      *
-     * @param resource $ldapcnn           LDAP link identifier
-     * @param resource $searchResult      Search result identifier
-     * @param string   $option            Option (GET, SYNCHRONIZE)
-     * @param string   $dn                DN
-     * @param string   $uidUserIdentifier User identifier
-     * @param int      $totalUser         Total users
-     * @param int      $countUser         User counter
-     * @param array    $arrayData         Data
+     * @param resource $ldapcnn LDAP link identifier
+     * @param resource $searchResult Search result identifier
+     * @param string $option Option (GET, SYNCHRONIZE)
+     * @param string $dn DN
+     * @param string $uidUserIdentifier User identifier
+     * @param int $totalUser Total users
+     * @param int $countUser User counter
+     * @param array $arrayData Data
      *
      * return array Return an array data
      */
@@ -663,9 +663,9 @@ class LdapAdvanced
     /**
      * Get Users from Department
      *
-     * @param string $option    Option (GET, SYNCHRONIZE)
-     * @param string $dn        DN of Department
-     * @param array  $arrayData Data
+     * @param string $option Option (GET, SYNCHRONIZE)
+     * @param string $dn DN of Department
+     * @param array $arrayData Data
      *
      * return array Return an array with data Users or array data
      */
@@ -681,7 +681,7 @@ class LdapAdvanced
 
             //Set variables
             $dn = trim($dn);
-            $rbac = &RBAC::getSingleton();
+            $rbac = RBAC::getSingleton();
 
             if (is_null($rbac->authSourcesObj)) {
                 $rbac->authSourcesObj = new AuthenticationSource();
@@ -792,12 +792,12 @@ class LdapAdvanced
     /**
      * Synchronize Group's members
      *
-     * @param resource $ldapcnn             LDAP link identifier
-     * @param array    $arrayAuthSourceData Authentication Source Data
-     * @param string   $groupUid            Unique id of Group
-     * @param array    $arrayGroupLdap      LDAP Group
-     * @param string   $memberAttribute     Member attribute
-     * @param array    $arrayData           Data
+     * @param resource $ldapcnn LDAP link identifier
+     * @param array $arrayAuthSourceData Authentication Source Data
+     * @param string $groupUid Unique id of Group
+     * @param array $arrayGroupLdap LDAP Group
+     * @param string $memberAttribute Member attribute
+     * @param array $arrayData Data
      *
      * @return array Return array data
      */
@@ -812,7 +812,7 @@ class LdapAdvanced
             }
 
             $uidUserIdentifier = (isset($arrayAuthSourceData['AUTH_SOURCE_DATA']['AUTH_SOURCE_IDENTIFIER_FOR_USER'])) ?
-                    $arrayAuthSourceData['AUTH_SOURCE_DATA']['AUTH_SOURCE_IDENTIFIER_FOR_USER'] : 'uid';
+                $arrayAuthSourceData['AUTH_SOURCE_DATA']['AUTH_SOURCE_IDENTIFIER_FOR_USER'] : 'uid';
 
             $filterUsers = trim($arrayAuthSourceData['AUTH_SOURCE_DATA']['AUTH_SOURCE_USERS_FILTER']);
 
@@ -843,18 +843,21 @@ class LdapAdvanced
 
                                 $username = (isset($arrayUserLdap[$uidUserIdentifier])) ? $arrayUserLdap[$uidUserIdentifier] : '';
 
-                                $arrayData['countUser'] ++;
+                                $arrayData['countUser']++;
 
                                 if ((is_array($username) && !empty($username)) || trim($username) != '') {
                                     $arrayData = $this->groupSynchronizeUser(
-                                            $groupUid, $this->getUserDataFromAttribute($username, $arrayUserLdap), $arrayData
+                                        $groupUid,
+                                        $this->getUserDataFromAttribute($username, $arrayUserLdap),
+                                        $arrayData
                                     );
                                 }
 
                                 //Progress bar
                                 $this->frontEndShow(
-                                        'BAR', 'Groups: ' . $arrayData['i'] . '/' . $arrayData['n'] . ' ' .
-                                        $this->progressBar($arrayData['totalUser'], $arrayData['countUser'])
+                                    'BAR',
+                                    'Groups: ' . $arrayData['i'] . '/' . $arrayData['n'] . ' ' .
+                                    $this->progressBar($arrayData['totalUser'], $arrayData['countUser'])
                                 );
                             }
                         }
@@ -872,9 +875,9 @@ class LdapAdvanced
     /**
      * Get Users from Group
      *
-     * @param string $option         Option (SYNCHRONIZE)
-     * @param array  $arrayGroupData Group data
-     * @param array  $arrayData      Data
+     * @param string $option Option (SYNCHRONIZE)
+     * @param array $arrayGroupData Group data
+     * @param array $arrayData Data
      *
      * return array Return array data
      */
@@ -889,7 +892,7 @@ class LdapAdvanced
 
             //Set variables
             $dn = trim($arrayGroupData["GRP_LDAP_DN"]);
-            $rbac = &RBAC::getSingleton();
+            $rbac = RBAC::getSingleton();
 
             if (is_null($rbac->authSourcesObj)) {
                 $rbac->authSourcesObj = new AuthenticationSource();
@@ -944,7 +947,12 @@ class LdapAdvanced
                         }
 
                         $arrayData = $this->__ldapGroupSynchronizeMembers(
-                                $ldapcnn, $arrayAuthenticationSourceData, $arrayGroupData['GRP_UID'], $arrayGroupLdap, $memberAttribute2, array_merge($arrayData, ['totalUser' => $totalUser, 'countUser' => $countUser])
+                            $ldapcnn,
+                            $arrayAuthenticationSourceData,
+                            $arrayGroupData['GRP_UID'],
+                            $arrayGroupLdap,
+                            $memberAttribute2,
+                            array_merge($arrayData, ['totalUser' => $totalUser, 'countUser' => $countUser])
                         );
 
                         $totalUser = $arrayData['totalUser'];
@@ -977,7 +985,12 @@ class LdapAdvanced
                                             }
 
                                             $arrayData = $this->__ldapGroupSynchronizeMembers(
-                                                    $ldapcnn, $arrayAuthenticationSourceData, $arrayGroupData['GRP_UID'], $arrayGroupLdap, $memberAttribute2, array_merge($arrayData, ['totalUser' => $totalUser, 'countUser' => $countUser])
+                                                $ldapcnn,
+                                                $arrayAuthenticationSourceData,
+                                                $arrayGroupData['GRP_UID'],
+                                                $arrayGroupLdap,
+                                                $memberAttribute2,
+                                                array_merge($arrayData, ['totalUser' => $totalUser, 'countUser' => $countUser])
                                             );
 
                                             $totalUser = $arrayData['totalUser'];
@@ -1008,9 +1021,8 @@ class LdapAdvanced
      *
      *
      * @access public
-
-     * @param  string $strUser    UserId  (user login)
-     * @param  string $strPass    Password
+     * @param  string $strUser UserId  (user login)
+     * @param  string $strPass Password
      * @return
      *  -1: user doesn"t exists / no existe usuario
      *  -2: wrong password / password errado
@@ -1040,7 +1052,7 @@ class LdapAdvanced
         $validUserPass = 1;
 
         try {
-            $rbac = &RBAC::getSingleton();
+            $rbac = RBAC::getSingleton();
 
             if (is_null($rbac->authSourcesObj)) {
                 $rbac->authSourcesObj = new AuthenticationSource();
@@ -1055,7 +1067,7 @@ class LdapAdvanced
             $setAttributes = 0;
 
             if (isset($arrayAuthSource['AUTH_SOURCE_DATA']['AUTH_SOURCE_SHOWGRID']) &&
-                    $arrayAuthSource['AUTH_SOURCE_DATA']['AUTH_SOURCE_SHOWGRID'] == 'on'
+                $arrayAuthSource['AUTH_SOURCE_DATA']['AUTH_SOURCE_SHOWGRID'] == 'on'
             ) {
                 $setAttributes = 1;
             }
@@ -1096,7 +1108,10 @@ class LdapAdvanced
                     $arrayUserData = $user->getUserRecordByPk($usrUid, [], false);
 
                     $result = $this->__ldapUserUpdateByDnAndData(
-                            $this->ldapcnn, $arrayAuthSource, $userDn, [$arrayUserData['USR_USERNAME'] => $arrayUserData]
+                        $this->ldapcnn,
+                        $arrayAuthSource,
+                        $userDn,
+                        [$arrayUserData['USR_USERNAME'] => $arrayUserData]
                     );
 
                     //Update DN
@@ -1125,15 +1140,17 @@ class LdapAdvanced
 
             $ldapcnn = $this->ldapConnection($arrayAuthSource);
             $flagUpdate = false;
-            switch (ldap_errno($ldapcnn)) {
-                case '0x00':
+            switch (hexdec(ldap_errno($ldapcnn))) {
+                case 0:
+                    //0x00
                     $flagUpdate = true;
                     $statusRbac = 1;
                     $statusUser = 'ACTIVE';
                     break;
-                case '0x34':
-                case '0x58':
-                case '0x5e':
+                case 52:
+                case 88:
+                case 94:
+                    //0x34, 0x58, 0x5e
                     //LDAP_UNAVAILABLE
                     //LDAP_USER_CANCELLED
                     //LDAP_NO_RESULTS_RETURNED
@@ -1192,7 +1209,7 @@ class LdapAdvanced
     /**
      * Get data of a User from attribute
      *
-     * @param mixed $username        Username
+     * @param mixed $username Username
      * @param array $arrayAttributes Attributes
      *
      * return array Return an array with data User
@@ -1231,7 +1248,7 @@ class LdapAdvanced
 
         $paged = !is_null($start) && !is_null($limit);
 
-        $rbac = &RBAC::getSingleton();
+        $rbac = RBAC::getSingleton();
 
         if (is_null($rbac->authSourcesObj)) {
             $rbac->authSourcesObj = new AuthenticationSource();
@@ -1392,7 +1409,7 @@ class LdapAdvanced
             $arrayUserData = array();
 
             //Set variables
-            $rbac = &RBAC::getSingleton();
+            $rbac = RBAC::getSingleton();
 
             if (is_null($rbac->authSourcesObj)) {
                 $rbac->authSourcesObj = new AuthenticationSource();
@@ -1499,7 +1516,7 @@ class LdapAdvanced
 
     public function automaticRegister($aAuthSource, $strUser, $strPass)
     {
-        $rbac = &RBAC::getSingleton();
+        $rbac = RBAC::getSingleton();
 
         if ($rbac->userObj == null) {
             $rbac->userObj = new RbacUsers();
@@ -1593,7 +1610,7 @@ class LdapAdvanced
             $arrayDepartment = [];
 
             //Set variables
-            $rbac = &RBAC::getSingleton();
+            $rbac = RBAC::getSingleton();
 
             if (is_null($rbac->authSourcesObj)) {
                 $rbac->authSourcesObj = new AuthenticationSource();
@@ -1698,7 +1715,7 @@ class LdapAdvanced
         $dFilter = "(&(" . $this->arrayObjectClassFilter["department"] . ")(ou=" . $departmentName . "))";
 
         $aUsers = array();
-        $rbac = &RBAC::getSingleton();
+        $rbac = RBAC::getSingleton();
 
         $rbac->authSourcesObj = new AuthenticationSource();
         $aAuthSource = $rbac->authSourcesObj->load($this->sAuthSource);
@@ -1805,6 +1822,7 @@ class LdapAdvanced
 
         return $terminated;
     }
+
     /* activate an user previously deactivated
       if user is now in another department, we need the second parameter, the depUid
 
@@ -1888,7 +1906,7 @@ class LdapAdvanced
     public function getTerminatedOu()
     {
         if (trim($this->sAuthSource) != '') {
-            $rbac = &RBAC::getSingleton();
+            $rbac = RBAC::getSingleton();
             $aAuthSource = $rbac->authSourcesObj->load($this->sAuthSource);
             $attributes = $aAuthSource['AUTH_SOURCE_DATA'];
             $this->sTerminatedOu = isset($attributes['AUTH_SOURCE_RETIRED_OU']) ? $attributes['AUTH_SOURCE_RETIRED_OU'] : '';
@@ -1898,11 +1916,11 @@ class LdapAdvanced
     }
 
     /**
-      get all authsource for this plugin ( ldapAdvanced plugin, because other authsources are not needed )
-      this function is used only by cron
-      returns only AUTH_SOURCE_PROVIDER = ldapAdvanced
-
-      @return array with authsources with type = ldap
+     * get all authsource for this plugin ( ldapAdvanced plugin, because other authsources are not needed )
+     * this function is used only by cron
+     * returns only AUTH_SOURCE_PROVIDER = ldapAdvanced
+     *
+     * @return array with authsources with type = ldap
      */
     public function getAuthSources()
     {
@@ -1930,15 +1948,15 @@ class LdapAdvanced
     }
 
     /**
-      function to get departments from the array previously obtained from LDAP
-      we are calling registered departments
-      it is a recursive function, in the first call with an array with first top level departments from PM
-      then go thru all departments and obtain a list of departments already created in PM and pass that array
-      to next function to synchronize All users for each department
-      this function is used in cron only
-
-      @param array departments obtained from LDAP/Active Directory
-      @param array of departments, first call have only top level departments
+     * function to get departments from the array previously obtained from LDAP
+     * we are calling registered departments
+     * it is a recursive function, in the first call with an array with first top level departments from PM
+     * then go thru all departments and obtain a list of departments already created in PM and pass that array
+     * to next function to synchronize All users for each department
+     * this function is used in cron only
+     *
+     * @param array departments obtained from LDAP/Active Directory
+     * @param array of departments, first call have only top level departments
      */
     public function getRegisteredDepartments(array $arrayLdapDepartment, array $arrayDbDepartment)
     {
@@ -1961,8 +1979,8 @@ class LdapAdvanced
     }
 
     /**
-      select departments but it is not recursive, only returns departments in this level
-      @param string $DepParent the DEP_UID for parent department
+     * select departments but it is not recursive, only returns departments in this level
+     * @param string $DepParent the DEP_UID for parent department
      */
     public function getDepartments($DepParent)
     {
@@ -2009,11 +2027,11 @@ class LdapAdvanced
     }
 
     /**
-      function to get users from USERS table in wf_workflow and filter by department
-      this function is used in cron only
-
-      @param string department UID ( DEP_UID value )
-      @return array of users
+     * function to get users from USERS table in wf_workflow and filter by department
+     * this function is used in cron only
+     *
+     * @param string department UID ( DEP_UID value )
+     * @return array of users
      */
     public function getUserFromPM($username)
     {
@@ -2040,11 +2058,11 @@ class LdapAdvanced
     }
 
     /**
-      get all user (UID, USERNAME) moved to Removed OU
-      this function is used in cron only
-
-      @param array authSource row, in this fuction we are validating if Removed OU is defined or not
-      @return array of users
+     * get all user (UID, USERNAME) moved to Removed OU
+     * this function is used in cron only
+     *
+     * @param array authSource row, in this fuction we are validating if Removed OU is defined or not
+     * @return array of users
      */
     public function getUsersFromRemovedOu($aAuthSource)
     {
@@ -2060,12 +2078,12 @@ class LdapAdvanced
     }
 
     /**
-      set STATUS=0 for all users in the array $aUsers
-      this functin is used to deactivate an array of users ( usually used for Removed OU )
-      this function is used in cron only
-
-      @param array authSource row, in this fuction we are validating if Removed OU is defined or not
-      @return array of users
+     * set STATUS=0 for all users in the array $aUsers
+     * this functin is used to deactivate an array of users ( usually used for Removed OU )
+     * this function is used in cron only
+     *
+     * @param array authSource row, in this fuction we are validating if Removed OU is defined or not
+     * @return array of users
      */
     public function deactiveArrayOfUsers($aUsers)
     {
@@ -2108,17 +2126,17 @@ class LdapAdvanced
     }
 
     /**
-      creates an users using the data send in the array $aUsers
-      and then add the user to specific department
-      this function is used in cron only
-
-      @param array $aUser info taken from ldap
-      @param string $depUid the department UID
-      @return boolean
+     * creates an users using the data send in the array $aUsers
+     * and then add the user to specific department
+     * this function is used in cron only
+     *
+     * @param array $aUser info taken from ldap
+     * @param string $depUid the department UID
+     * @return boolean
      */
     public function createUserAndActivate($aUser, $depUid)
     {
-        $rbac = &RBAC::getSingleton();
+        $rbac = RBAC::getSingleton();
 
         if ($rbac->userObj == null) {
             $rbac->userObj = new RbacUsers();
@@ -2218,7 +2236,7 @@ class LdapAdvanced
             $arrayGroup = [];
 
             //Set variables
-            $rbac = &RBAC::getSingleton();
+            $rbac = RBAC::getSingleton();
 
             if (is_null($rbac->authSourcesObj)) {
                 $rbac->authSourcesObj = new AuthenticationSource();
@@ -2354,7 +2372,7 @@ class LdapAdvanced
     }
 
     /**
-      select groups but it is not recursive, only returns groups in this level
+     * select groups but it is not recursive, only returns groups in this level
      */
     public function getGroups()
     {
@@ -2380,15 +2398,15 @@ class LdapAdvanced
     }
 
     /**
-      function to get groups from the array previously obtained from LDAP
-      we are calling registered groups
-      it is a recursive function, in the first call with an array with first top level groups from PM
-      then go thru all groups and obtain a list of groups already created in PM and pass that array
-      to next function to synchronize All users for each group
-      this function is used in cron only
-
-      @param array groups obtained from LDAP/Active Directory
-      @param array of groups, first call have only top level groups
+     * function to get groups from the array previously obtained from LDAP
+     * we are calling registered groups
+     * it is a recursive function, in the first call with an array with first top level groups from PM
+     * then go thru all groups and obtain a list of groups already created in PM and pass that array
+     * to next function to synchronize All users for each group
+     * this function is used in cron only
+     *
+     * @param array groups obtained from LDAP/Active Directory
+     * @param array of groups, first call have only top level groups
      */
     public function getRegisteredGroups(array $arrayLdapGroup, array $arrayDbGroup)
     {
@@ -2436,7 +2454,9 @@ class LdapAdvanced
             unset($result['count']);
 
             foreach ($result as $key => $value) {
-                $result[$key] = addcslashes(preg_replace("/\\\([0-9A-Fa-f]{2})/e", "''.chr(hexdec('\\1')).''", $value), '<>,"');
+                $result[$key] = addcslashes(preg_replace_callback("/\\\([0-9A-Fa-f]{2})/", function ($m)  {
+                    return chr(hexdec($m[1]));
+                }, $value), '<>,"');
             }
         }
 
@@ -2447,8 +2467,8 @@ class LdapAdvanced
      * Synchronize User for this Department
      *
      * @param string $departmentUid UID of Department
-     * @param array  $arrayUserLdap User LDAP data
-     * @param array  $arrayData     Data
+     * @param array $arrayUserLdap User LDAP data
+     * @param array $arrayData Data
      *
      * return array Return data
      */
@@ -2469,7 +2489,7 @@ class LdapAdvanced
                 $userUid = $arrayUserData["USR_UID"];
                 $found = true;
 
-                $arrayData["already"] ++;
+                $arrayData["already"]++;
                 $arrayData["alreadyUsers"] .= $arrayUserData["USR_USERNAME"] . " ";
             }
 
@@ -2497,7 +2517,7 @@ class LdapAdvanced
 
                         $this->activateUser($arrayUserData["USR_UID"], $arrayNewUserData["sDN"], $departmentUid);
 
-                        $arrayData["moved"] ++;
+                        $arrayData["moved"]++;
                         $arrayData["movedUsers"] .= $arrayUserData["USR_USERNAME"] . " ";
 
                         $this->setArrayAuthenticationSourceUser($userUid, $arrayNewUserData); //INITIALIZE DATA //Update User
@@ -2509,14 +2529,14 @@ class LdapAdvanced
                             //Impossible
                             $userUid = $arrayUserData["USR_UID"];
 
-                            $arrayData["impossible"] ++;
+                            $arrayData["impossible"]++;
                             $arrayData["impossibleUsers"] .= $arrayUserData["USR_USERNAME"] . " ";
                         } else {
                             //User not exists
                             //Create User
                             $userUid = $this->createUserAndActivate($arrayNewUserData, $departmentUid);
 
-                            $arrayData["created"] ++;
+                            $arrayData["created"]++;
                             $arrayData["createdUsers"] .= $arrayNewUserData["sUsername"] . " ";
 
                             $this->setArrayAuthenticationSourceUser($userUid, $arrayNewUserData); //INITIALIZE DATA //Add User
@@ -2549,9 +2569,9 @@ class LdapAdvanced
     /**
      * Synchronize User for this Group
      *
-     * @param string $groupUid      UID of Group
-     * @param array  $arrayUserLdap User LDAP data
-     * @param array  $arrayData     Data
+     * @param string $groupUid UID of Group
+     * @param array $arrayUserLdap User LDAP data
+     * @param array $arrayData Data
      *
      * return array Return data
      */
@@ -2574,7 +2594,7 @@ class LdapAdvanced
                 $userUid = $arrayUserData["USR_UID"];
                 $found = true;
 
-                $arrayData["already"] ++;
+                $arrayData["already"]++;
                 $arrayData["alreadyUsers"] .= $arrayUserData["USR_USERNAME"] . " ";
             }
 
@@ -2596,7 +2616,7 @@ class LdapAdvanced
 
                     $group->addUserToGroup($groupUid, $userUid);
 
-                    $arrayData["moved"] ++;
+                    $arrayData["moved"]++;
                     $arrayData["movedUsers"] .= $arrayUserData["USR_USERNAME"] . " ";
 
                     $this->setArrayAuthenticationSourceUser($userUid, $arrayNewUserData); //INITIALIZE DATA //Update User
@@ -2608,7 +2628,7 @@ class LdapAdvanced
                         //Impossible
                         $userUid = $arrayUserData["USR_UID"];
 
-                        $arrayData["impossible"] ++;
+                        $arrayData["impossible"]++;
                         $arrayData["impossibleUsers"] .= $arrayUserData["USR_USERNAME"] . " ";
                     } else {
                         //User not exists
@@ -2617,7 +2637,7 @@ class LdapAdvanced
 
                         $group->addUserToGroup($groupUid, $userUid);
 
-                        $arrayData["created"] ++;
+                        $arrayData["created"]++;
                         $arrayData["createdUsers"] .= $arrayNewUserData["sUsername"] . " ";
 
                         $this->setArrayAuthenticationSourceUser($userUid, $arrayNewUserData); //INITIALIZE DATA //Add User
@@ -2650,10 +2670,10 @@ class LdapAdvanced
     /**
      * Update User data based on the LDAP Server
      *
-     * @param resource $ldapcnn             LDAP link identifier
-     * @param array    $arrayAuthSourceData Authentication Source Data
-     * @param string   $userDn              User DN
-     * @param array    $arrayUser           Users
+     * @param resource $ldapcnn LDAP link identifier
+     * @param array $arrayAuthSourceData Authentication Source Data
+     * @param string $userDn User DN
+     * @param array $arrayUser Users
      *
      * @return bool
      */
@@ -2661,7 +2681,7 @@ class LdapAdvanced
     {
         try {
             //Set variables
-            $rbac = &RBAC::getSingleton();
+            $rbac = RBAC::getSingleton();
 
             if (is_null($rbac->userObj)) {
                 $rbac->userObj = new RbacUsers();
@@ -2679,7 +2699,7 @@ class LdapAdvanced
             ];
 
             if (isset($arrayAuthSourceData['AUTH_SOURCE_DATA']['AUTH_SOURCE_GRID_ATTRIBUTE']) &&
-                    !empty($arrayAuthSourceData['AUTH_SOURCE_DATA']['AUTH_SOURCE_GRID_ATTRIBUTE'])
+                !empty($arrayAuthSourceData['AUTH_SOURCE_DATA']['AUTH_SOURCE_GRID_ATTRIBUTE'])
             ) {
                 foreach ($arrayAuthSourceData['AUTH_SOURCE_DATA']['AUTH_SOURCE_GRID_ATTRIBUTE'] as $value) {
                     $arrayAttributesToSync[$value['attributeUser']] = $value['attributeLdap'];
@@ -2688,7 +2708,7 @@ class LdapAdvanced
 
             //Search User from LDAP Server
             $uidUserIdentifier = (isset($arrayAuthSourceData['AUTH_SOURCE_DATA']['AUTH_SOURCE_IDENTIFIER_FOR_USER'])) ?
-                    $arrayAuthSourceData['AUTH_SOURCE_DATA']['AUTH_SOURCE_IDENTIFIER_FOR_USER'] : 'uid';
+                $arrayAuthSourceData['AUTH_SOURCE_DATA']['AUTH_SOURCE_IDENTIFIER_FOR_USER'] : 'uid';
 
             $arrayAttribute = array_merge($this->arrayAttributesForUser, array_values($arrayAttributesToSync));
 
@@ -2750,7 +2770,8 @@ class LdapAdvanced
                                 }
                             } else {
                                 $this->log(
-                                        $ldapcnn, 'User is repeated: Username "' . $username . '", DN "' . $arrayUserLdap['dn'] . '"'
+                                    $ldapcnn,
+                                    'User is repeated: Username "' . $username . '", DN "' . $arrayUserLdap['dn'] . '"'
                                 );
                             }
 
@@ -2770,11 +2791,11 @@ class LdapAdvanced
     /**
      * Update Users data based on the LDAP Server
      *
-     * @param resource $ldapcnn             LDAP link identifier
-     * @param array    $arrayAuthSourceData Authentication Source Data
-     * @param string   $filterUsers         Filter
-     * @param array    $arrayUserUid        UID of Users
-     * @param array    $arrayData           Data
+     * @param resource $ldapcnn LDAP link identifier
+     * @param array $arrayAuthSourceData Authentication Source Data
+     * @param string $filterUsers Filter
+     * @param array $arrayUserUid UID of Users
+     * @param array $arrayData Data
      *
      * @return array
      */
@@ -2815,14 +2836,18 @@ class LdapAdvanced
 
                     do {
                         if ($this->__ldapUserUpdateByDnAndData(
-                                        $ldapcnn, $arrayAuthSourceData, ldap_get_dn($ldapcnn, $entry), $arrayUser
-                                )
+                            $ldapcnn,
+                            $arrayAuthSourceData,
+                            ldap_get_dn($ldapcnn, $entry),
+                            $arrayUser
+                        )
                         ) {
                             $countUser++;
 
                             //Progress bar
                             $this->frontEndShow(
-                                    'BAR', 'Update Users data: ' . $countUser . '/' . $totalUser . ' ' . $this->progressBar($totalUser, $countUser)
+                                'BAR',
+                                'Update Users data: ' . $countUser . '/' . $totalUser . ' ' . $this->progressBar($totalUser, $countUser)
                             );
                         }
                     } while ($entry = ldap_next_entry($ldapcnn, $entry));
@@ -2849,7 +2874,7 @@ class LdapAdvanced
             $countUser = 0;
 
             //Set variables
-            $rbac = &RBAC::getSingleton();
+            $rbac = RBAC::getSingleton();
 
             if (is_null($rbac->authSourcesObj)) {
                 $rbac->authSourcesObj = new AuthenticationSource();
@@ -2880,7 +2905,11 @@ class LdapAdvanced
 
                 if ($count == $limit) {
                     list($totalUser, $countUser) = $this->__ldapUsersUpdateData(
-                            $ldapcnn, $arrayAuthenticationSourceData, $filterUsers, $arrayUserUid, ['totalUser' => $totalUser, 'countUser' => $countUser]
+                        $ldapcnn,
+                        $arrayAuthenticationSourceData,
+                        $filterUsers,
+                        $arrayUserUid,
+                        ['totalUser' => $totalUser, 'countUser' => $countUser]
                     );
 
                     $count = 0;
@@ -2892,7 +2921,11 @@ class LdapAdvanced
 
             if ($count > 0) {
                 list($totalUser, $countUser) = $this->__ldapUsersUpdateData(
-                        $ldapcnn, $arrayAuthenticationSourceData, $filterUsers, $arrayUserUid, ['totalUser' => $totalUser, 'countUser' => $countUser]
+                    $ldapcnn,
+                    $arrayAuthenticationSourceData,
+                    $filterUsers,
+                    $arrayUserUid,
+                    ['totalUser' => $totalUser, 'countUser' => $countUser]
                 );
             }
         } catch (Exception $e) {
@@ -2920,7 +2953,7 @@ class LdapAdvanced
      * Get page size limit for a search result
      *
      * @param resource $ldapcnn LDAP link identifier
-     * @param string   $baseDn  The base DN for the directory
+     * @param string $baseDn The base DN for the directory
      *
      * @return int Returns the page size limit for a search result
      */
diff --git a/workflow/engine/classes/License_Application.php b/workflow/engine/classes/License_Application.php
index fa1dc3fec..93edf4462 100644
--- a/workflow/engine/classes/License_Application.php
+++ b/workflow/engine/classes/License_Application.php
@@ -409,7 +409,7 @@ class license_application extends Padl
                         $DATA['RESULT'] = 'TMINUS';
                     }
                     # the license has expired
-                    if ($DATA['DATE']['END'] - time() < 0 && $DATA['DATE']['SPAN'] != 'NEVER' && $DATA['DATE']['SPAN'] != '~') {
+                    if (intval($DATA['DATE']['END']) - time() < 0 && $DATA['DATE']['SPAN'] !== 'NEVER' && $DATA['DATE']['SPAN'] !== '~') {
                         $DATA['RESULT'] = 'EXPIRED';
                     }
                     $DATA['DATE']['HUMAN']['START'] = date($this->DATE_STRING, $DATA['DATE']['START']);
diff --git a/workflow/engine/classes/MultipleFilesBackup.php b/workflow/engine/classes/MultipleFilesBackup.php
index 8dc921cd4..c09a9dc48 100644
--- a/workflow/engine/classes/MultipleFilesBackup.php
+++ b/workflow/engine/classes/MultipleFilesBackup.php
@@ -196,11 +196,11 @@ class MultipleFilesBackup
             list($dbHost, $dbUser, $dbPass) = @explode(SYSTEM_HASH, G::decrypt(HASH_INSTALLATION, SYSTEM_HASH));
 
             CLI::logging("> Connecting to system database in '$dbHost'\n");
-            $link = mysql_connect($dbHost, $dbUser, $dbPass);
-            @mysql_query("SET NAMES 'utf8';");
-            @mysql_query("SET FOREIGN_KEY_CHECKS=0;");
+            $link = mysqli_connect($dbHost, $dbUser, $dbPass);
+            mysqli_query($link, "SET NAMES 'utf8';");
+            mysqli_query($link, "SET FOREIGN_KEY_CHECKS=0;");
             if (!$link) {
-                throw new Exception('Could not connect to system database: ' . mysql_error());
+                throw new Exception('Could not connect to system database: ' . mysqli_error($link));
             }
 
             if (strpos($metadata->DB_RBAC_NAME, 'rb_') === false) {
@@ -215,12 +215,12 @@ class MultipleFilesBackup
             foreach ($metadata->databases as $db) {
                 $dbName = $newDBNames[$db->name];
                 CLI::logging("+> Restoring database {$db->name} to $dbName\n");
-                $workspace->executeSQLScript($dbName, "$tempDirectory/{$db->name}.sql", $aParameters);
-                $workspace->createDBUser($dbName, $db->pass, "localhost", $dbName);
-                $workspace->createDBUser($dbName, $db->pass, "%", $dbName);
+                $workspace->executeSQLScript($dbName, "$tempDirectory/{$db->name}.sql", $aParameters, 1, $link);
+                $workspace->createDBUser($dbName, $db->pass, "localhost", $dbName, $link);
+                $workspace->createDBUser($dbName, $db->pass, "%", $dbName, $link);
             }
             $workspace->upgradeCacheView(false);
-            mysql_close($link);
+            mysqli_close($link);
         }
         CLI::logging("Removing temporary files\n");
         G::rm_dir($tempDirectory);
diff --git a/workflow/engine/classes/Net.php b/workflow/engine/classes/Net.php
index 8aac86469..d2d50c67c 100644
--- a/workflow/engine/classes/Net.php
+++ b/workflow/engine/classes/Net.php
@@ -79,7 +79,7 @@ class Net
         }
         if ($this->is_ipaddress($ipHost)) {
             $this->ip = $ipHost;
-            if (! $this->hostname = @gethostbyaddr($ipHost)) {
+            if (!$this->hostname = @gethostbyaddr($ipHost)) {
                 $this->errno = 2000;
                 $this->errstr = "NET::Host down";
                 $this->error = G::loadTranslation('ID_HOST_UNREACHABLE');
@@ -87,7 +87,7 @@ class Net
         } else {
             $ip = @gethostbyname($ipHost);
             $long = ip2long($ip);
-            if ($long == - 1 || $long === false) {
+            if ($long == -1 || $long === false) {
                 $this->errno = 2000;
                 $this->errstr = "NET::Host down";
                 $this->error = G::loadTranslation('ID_HOST_UNREACHABLE');
@@ -134,8 +134,8 @@ class Net
         #if have a ip address format
         if (count($tmp) == 4) {
             #if a correct ip address
-            for ($i = 0; $i < count($tmp); $i ++) {
-                if (! is_int($tmp[$i])) {
+            for ($i = 0; $i < count($tmp); $i++) {
+                if (!is_int($tmp[$i])) {
                     $key = false;
                     break;
                 }
@@ -157,7 +157,7 @@ class Net
         $cmd = "ping -w $pTTL $this->ip";
         $output = exec($cmd, $a, $a1);
         $this->errstr = "";
-        for ($i = 0; $i < count($a); $i ++) {
+        for ($i = 0; $i < count($a); $i++) {
             $this->errstr += $a[$i];
         }
         $this->errno = $a1;
@@ -193,7 +193,7 @@ class Net
      * This function tries to connect to server
      *
      * @param string $pDbDriver
-     * @param array  $arrayServerData
+     * @param array $arrayServerData
      *
      * @return void
      */
@@ -212,24 +212,26 @@ class Net
 
         if (array_key_exists("connectionType", $arrayServerData) || array_key_exists("DBS_TYPEORACLE", $arrayServerData)) {
             if ($arrayServerData["connectionType"] == "TNS" || $arrayServerData["DBS_TYPEORACLE"] == "TNS") {
-                $flagTns=1;
+                $flagTns = 1;
             } else {
-                $flagTns=0;
+                $flagTns = 0;
             }
         } else {
-            $flagTns=0;
+            $flagTns = 0;
         }
 
         if (isset($this->db_user) && (isset($this->db_passwd) || $this->db_passwd == "") && (isset($this->db_sourcename) || $flagTns == 1)) {
             switch ($pDbDriver) {
                 case 'mysql':
+                    // Note, we suppress warnings on the connection calls because we want to avoid displaying warning
+                    // When utilizing this code in an API call.  Otherwise it will return invalid JSON overall.
                     if ($this->db_passwd == '') {
-                        $link = @mysql_connect($this->ip . (($this->db_port != '') && ($this->db_port != 0) ? ':' . $this->db_port : ''), $this->db_user);
+                        $link = @mysqli_connect($this->ip . (($this->db_port != '') && ($this->db_port != 0) ? ':' . $this->db_port : ''), $this->db_user, $this->db_sourcename);
                     } else {
-                        $link = @mysql_connect($this->ip . (($this->db_port != '') && ($this->db_port != 0) ? ':' . $this->db_port : ''), $this->db_user, $this->db_passwd);
+                        $link = @mysqli_connect($this->ip . (($this->db_port != '') && ($this->db_port != 0) ? ':' . $this->db_port : ''), $this->db_user, $this->db_passwd, $this->db_sourcename);
                     }
                     if ($link) {
-                        if (@mysql_ping($link)) {
+                        if (mysqli_ping($link)) {
                             $stat->status = 'SUCCESS';
                             $this->errstr = "";
                             $this->errno = 0;
@@ -279,7 +281,7 @@ class Net
                 case 'oracle':
                     try {
                         if ($flagTns == 0) {
-                            $this->db_port = ($this->db_port == "" || $this->db_port == 0)? "1521" : $this->db_port;
+                            $this->db_port = ($this->db_port == "" || $this->db_port == 0) ? "1521" : $this->db_port;
 
                             $cnn = @oci_connect($this->db_user, $this->db_passwd, "(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP) (HOST=$this->ip) (PORT=$this->db_port) )) (CONNECT_DATA=(SERVICE_NAME=$this->db_sourcename)))", $dbsEncode);
                         } else {
@@ -315,7 +317,7 @@ class Net
      * This function tries to open to the DB
      *
      * @param string $pDbDriver
-     * @param array  $arrayServerData
+     * @param array $arrayServerData
      *
      * @return void
      */
@@ -336,41 +338,39 @@ class Net
 
         if (array_key_exists("connectionType", $arrayServerData) || array_key_exists("DBS_TYPEORACLE", $arrayServerData)) {
             if ($arrayServerData["connectionType"] == "TNS" || $arrayServerData["DBS_TYPEORACLE"] == "TNS") {
-                $flagTns=1;
+                $flagTns = 1;
             } else {
-                $flagTns=0;
+                $flagTns = 0;
             }
         } else {
-            $flagTns=0;
+            $flagTns = 0;
         }
 
         if (isset($this->db_user) && (isset($this->db_passwd) || $this->db_passwd == "") && (isset($this->db_sourcename) || $flagTns == 1)) {
             switch ($pDbDriver) {
                 case 'mysql':
-                    $link = @mysql_connect($this->ip . (($this->db_port != '') && ($this->db_port != 0) ? ':' . $this->db_port : ''), $this->db_user, $this->db_passwd);
-                    $db = @mysql_select_db($this->db_sourcename);
+                    $link = mysqli_connect($this->ip . (($this->db_port !== '') && ($this->db_port !== 0) ? ':' . $this->db_port : ''), $this->db_user, $this->db_passwd, $this->db_sourcename);
+                    $db = mysqli_select_db($link, $this->db_sourcename);
+                    $this->error = 'MySql connection refused!';
+                    $this->errstr = 'NET::MYSQL->The connection was refused';
+                    $this->errno = 10001;
+
                     if ($link) {
+                        $this->error = 'The $this->db_sourcename data base does\'n exist!';
+                        $this->errstr = 'NET::MYSQL->Select data base failed';
+                        $this->errno = 10011;
                         if ($db) {
-                            $result = @mysql_query("show tables;");
+                            $result = mysqli_query($link, 'show tables;');
+                            $this->error = 'the user $this->db_user doesn\'t have privileges to run queries!';
+                            $this->errstr = 'NET::MYSQL->Test query failed';
+                            $this->errno = 10100;
                             if ($result) {
                                 $stat->status = 'SUCCESS';
-                                $this->errstr = "";
+                                $this->errstr = '';
                                 $this->errno = 0;
-                                @mysql_free_result($result);
-                            } else {
-                                $this->error = "the user $this->db_user doesn't have privileges to run queries!";
-                                $this->errstr = "NET::MYSQL->Test query failed";
-                                $this->errno = 10100;
+                                mysqli_free_result($result);
                             }
-                        } else {
-                            $this->error = "The $this->db_sourcename data base does'n exist!";
-                            $this->errstr = "NET::MYSQL->Select data base failed";
-                            $this->errno = 10011;
                         }
-                    } else {
-                        $this->error = "MySql connection refused!";
-                        $this->errstr = "NET::MYSQL->The connection was refused";
-                        $this->errno = 10001;
                     }
                     break;
                 case 'pgsql':
@@ -393,8 +393,6 @@ class Net
                     }
                     break;
                 case 'mssql':
-                    //          $str_port = (($this->db_port == "")  || ($this->db_port == 0) || ($this->db_port == 1433)) ? "" : ":".$this->db_port;
-                    //          $link = @mssql_connect($this->ip . $str_port, $this->db_user, $this->db_passwd);
                     if ($this->db_instance != "") {
                         $str_port = "";
                         $link = @mssql_connect($this->ip . "\\" . $this->db_instance, $this->db_user, $this->db_passwd);
@@ -421,7 +419,7 @@ class Net
                     break;
                 case 'oracle':
                     if ($flagTns == 0) {
-                        $this->db_port = ($this->db_port == "" || $this->db_port == 0)? "1521" : $this->db_port;
+                        $this->db_port = ($this->db_port == "" || $this->db_port == 0) ? "1521" : $this->db_port;
 
                         $cnn = @oci_connect($this->db_user, $this->db_passwd, "(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP) (HOST=$this->ip) (PORT=$this->db_port) )) (CONNECT_DATA=(SERVICE_NAME=$this->db_sourcename)))", $dbsEncode);
                     } else {
@@ -466,13 +464,13 @@ class Net
      */
     public function getDbServerVersion($driver)
     {
-        if (! isset($this->ip)) {
+        if (!isset($this->ip)) {
             $this->ip = getenv('HTTP_CLIENT_IP');
         }
 
         if (isset($this->ip) && isset($this->db_user) && isset($this->db_passwd)) {
             try {
-                if (! isset($this->db_sourcename)) {
+                if (!isset($this->db_sourcename)) {
                     $this->db_sourcename = DB_NAME;
                 }
                 $value = 'none';
@@ -540,7 +538,7 @@ class Net
       </div>
     </fieldset>
     <center>";
-            print($msg) ;
+            print($msg);
         }
     }
 
diff --git a/workflow/engine/classes/PMPluginRegistry.php b/workflow/engine/classes/PMPluginRegistry.php
index b4c994244..0384c9180 100644
--- a/workflow/engine/classes/PMPluginRegistry.php
+++ b/workflow/engine/classes/PMPluginRegistry.php
@@ -200,7 +200,6 @@ class PMPluginRegistry
                 if (array_key_exists($detail->sNamespace, $this->_restServiceEnabled)
                     && $this->_restServiceEnabled[$detail->sNamespace] == true
                 ) {
-
                     $oPlugin->registerRestService();
                 }
 
@@ -372,7 +371,6 @@ class PMPluginRegistry
      */
     public function installPluginArchive($filename, $pluginName)
     {
-
         $tar = new Archive_Tar($filename);
         $files = $tar->listContent();
         $plugins = array();
@@ -399,40 +397,6 @@ class PMPluginRegistry
         //$pluginName = $plugins[0];
         $pluginFile = "$pluginName.php";
 
-        /*
-        $oldPluginStatus = $this->getStatusPlugin($pluginFile);
-
-        if ($pluginStatus != 0) {
-          $oldDetails = $this->getPluginDetails($pluginFile);
-          $oldVersion = $oldDetails->iVersion;
-        } else {
-          $oldDetails = NULL;
-          $oldVersion = NULL;
-        }
-        */
-
-        //$pluginIni = $tar->extractInString("$pluginName.ini");
-        //$pluginConfig = parse_ini_string($pluginIni);
-        /*
-        if (!empty($oClass->aDependences)) {
-          foreach ($oClass->aDependences as $aDependence) {
-            if (file_exists(PATH_PLUGINS . $aDependence['sClassName'] . '.php')) {
-              require_once PATH_PLUGINS . $aDependence['sClassName'] . '.php';
-              if (!$oPluginRegistry->getPluginDetails($aDependence['sClassName'] . '.php')) {
-                throw new Exception('This plugin needs "' . $aDependence['sClassName'] . '" plugin');
-              }
-            }
-            else {
-              throw new Exception('This plugin needs "' . $aDependence['sClassName'] . '" plugin');
-            }
-          }
-        }
-        unset($oClass);
-        if ($fVersionOld > $fVersionNew) {
-          throw new Exception('A recent version of this plugin was already installed.');
-        }
-        */
-
         $res = $tar->extract(PATH_PLUGINS);
         if (!file_exists(PATH_PLUGINS . $pluginFile)) {
             throw (new Exception("File \"$pluginFile\" doesn't exist"));
@@ -509,8 +473,7 @@ class PMPluginRegistry
             $wsPathDataSite = PATH_DATA . "sites" . PATH_SEP . $ws->name . PATH_SEP;
 
             if (file_exists($wsPathDataSite . "plugin.singleton")) {
-
-                $pluginRegistry = &PMPluginRegistry::getSingleton();
+                $pluginRegistry = PMPluginRegistry::getSingleton();
                 $pluginRegistry->unSerializeInstance(file_get_contents($wsPathDataSite . "plugin.singleton"));
 
                 ///////
@@ -551,7 +514,6 @@ class PMPluginRegistry
             G::RenderPage('publish');
             die();
         }
-
     }
 
     /**
@@ -633,7 +595,6 @@ class PMPluginRegistry
      */
     public function registerJavascript($sNamespace, $sCoreJsFile, $pluginJsFile)
     {
-
         foreach ($this->_aJavascripts as $i => $js) {
             if ($sCoreJsFile == $js->sCoreJsFile && $sNamespace == $js->sNamespace) {
                 if (is_string($pluginJsFile)) {
@@ -652,7 +613,7 @@ class PMPluginRegistry
         $js = new StdClass();
         $js->sNamespace = $sNamespace;
         $js->sCoreJsFile = $sCoreJsFile;
-        $js->pluginJsFile = Array();
+        $js->pluginJsFile = array();
 
         if (is_string($pluginJsFile)) {
             $js->pluginJsFile[] = $pluginJsFile;
@@ -930,7 +891,6 @@ class PMPluginRegistry
      */
     public function executeTriggers($triggerId, $oData)
     {
-
         foreach ($this->_aTriggers as $row => $detail) {
             if ($triggerId == $detail->sTriggerId) {
                 //review all folders registered for this namespace
@@ -979,7 +939,6 @@ class PMPluginRegistry
                         $found = true;
                     }
                 }
-
             }
         }
         return $found;
@@ -1051,8 +1010,8 @@ class PMPluginRegistry
             require_once($sFilename);
         }
         $sClassName = $aDetails[0];
-        $oPlugin =& new $sClassName($sFilename);
-        $this->_aPlugins[$sNamespace] =& $oPlugin;
+        $oPlugin = new $sClassName($sFilename);
+        $this->_aPlugins[$sNamespace] = $oPlugin;
         return $oPlugin;
         */
         return $oPlugin;
@@ -1102,9 +1061,9 @@ class PMPluginRegistry
     {
         try {
             $iPlugins = 0;
+            $oServerConf = ServerConf::getSingleton();
+            $oServerConf->addPlugin(config("system.workspace"), $this->_aPluginDetails);
 
-            $oServerConf = & ServerConf::getSingleton();
-            $oServerConf->addPlugin( config("system.workspace"), $this->_aPluginDetails );
             foreach ($this->_aPluginDetails as $namespace => $detail) {
                 if (isset($detail->enabled) && $detail->enabled) {
                     if (!empty($detail->sFilename) && file_exists($detail->sFilename)) {
@@ -1210,7 +1169,7 @@ class PMPluginRegistry
             //Found a License
             if (class_exists('pmLicenseManager')) {
                 $sSerializedFile = PATH_DATA_SITE . 'lmn.singleton';
-                $pmLicenseManagerO = &PmLicenseManager::getSingleton();
+                $pmLicenseManagerO = PmLicenseManager::getSingleton();
                 if (file_exists($sSerializedFile)) {
                     $pmLicenseManagerO->unSerializeInstance(file_get_contents($sSerializedFile));
                 }
@@ -1504,7 +1463,7 @@ class PMPluginRegistry
      * @param string $sNamespace
      * @param bool $enable
      */
-    function enableRestService($sNamespace, $enable)
+    public function enableRestService($sNamespace, $enable)
     {
         $this->_restServiceEnabled[$sNamespace] = $enable;
     }
@@ -1541,7 +1500,7 @@ class PMPluginRegistry
             //Update plugin attributes
             require_once(PATH_PLUGINS . $pluginFileName);
 
-            $pmPluginRegistry = &PMPluginRegistry::getSingleton();
+            $pmPluginRegistry = PMPluginRegistry::getSingleton();
 
             $pluginDetails = $pmPluginRegistry->getPluginDetails($pluginFileName);
 
diff --git a/workflow/engine/classes/PmDynaform.php b/workflow/engine/classes/PmDynaform.php
index 28b063a4e..1f99ab173 100644
--- a/workflow/engine/classes/PmDynaform.php
+++ b/workflow/engine/classes/PmDynaform.php
@@ -40,7 +40,7 @@ class PmDynaform
         $this->context = \Bootstrap::getDefaultContextLog();
         $this->dataSources = array("database", "dataVariable");
         $this->pathRTLCss = '/lib/pmdynaform/build/css/PMDynaform-rtl.css';
-        $this->serverConf = &ServerConf::getSingleton();
+        $this->serverConf = ServerConf::getSingleton();
         $this->isRTL = ($this->serverConf->isRtl(SYS_LANG)) ? 'true' : 'false';
         $this->fields = $fields;
         $this->propertiesToExclude = array('dataVariable');
@@ -541,7 +541,7 @@ class PmDynaform
                                 $json->data->label = $io->label;
                             }
                         }
-                        $_SESSION["TRIGGER_DEBUG"]["DATA"][] = Array("key" => $json->name . "_label", "value" => $json->data->label);
+                        $_SESSION["TRIGGER_DEBUG"]["DATA"][] = array("key" => $json->name . "_label", "value" => $json->data->label);
                     }
                 }
                 if ($key === "type" && ($value === "checkgroup")) {
@@ -549,8 +549,9 @@ class PmDynaform
                         $dataValue = array();
                         $dataLabel = array();
                         $dv = array();
-                        if (isset($this->fields["APP_DATA"][$json->name]))
+                        if (isset($this->fields["APP_DATA"][$json->name])) {
                             $dv = $this->fields["APP_DATA"][$json->name];
+                        }
                         if (!is_array($dv)) {
                             $dv = explode(",", $dv);
                         }
@@ -570,13 +571,13 @@ class PmDynaform
                         }
                         $json->data->value = $dataValue;
                         $json->data->label = G::json_encode($dataLabel);
-                        $_SESSION["TRIGGER_DEBUG"]["DATA"][] = Array("key" => $json->name . "_label", "value" => $json->data->label);
+                        $_SESSION["TRIGGER_DEBUG"]["DATA"][] = array("key" => $json->name . "_label", "value" => $json->data->label);
                     }
                 }
                 if ($key === "type" && ($value === "datetime")) {
                     if (isset($this->fields["APP_DATA"]["__VAR_CHANGED__"]) && in_array($json->name, explode(",", $this->fields["APP_DATA"]["__VAR_CHANGED__"]))) {
                         $json->data->label = $json->data->value;
-                        $_SESSION["TRIGGER_DEBUG"]["DATA"][] = Array("key" => $json->name . "_label", "value" => $json->data->label);
+                        $_SESSION["TRIGGER_DEBUG"]["DATA"][] = array("key" => $json->name . "_label", "value" => $json->data->label);
                     }
                 }
                 //clear optionsSql
@@ -1127,12 +1128,15 @@ class PmDynaform
         $msg = "";
         if (isset($_SESSION['G_MESSAGE_TYPE']) && isset($_SESSION['G_MESSAGE'])) {
             $color = "green";
-            if ($_SESSION['G_MESSAGE_TYPE'] === "ERROR")
+            if ($_SESSION['G_MESSAGE_TYPE'] === "ERROR") {
                 $color = "red";
-            if ($_SESSION['G_MESSAGE_TYPE'] === "WARNING")
+            }
+            if ($_SESSION['G_MESSAGE_TYPE'] === "WARNING") {
                 $color = "#C3C380";
-            if ($_SESSION['G_MESSAGE_TYPE'] === "INFO")
+            }
+            if ($_SESSION['G_MESSAGE_TYPE'] === "INFO") {
                 $color = "green";
+            }
             $msg = "<div style='background-color:" . $color . ";color: white;padding: 1px 2px 1px 5px;' class='userGroupTitle'>" . $_SESSION['G_MESSAGE_TYPE'] . ": " . $_SESSION['G_MESSAGE'] . "</div>";
             unset($_SESSION['G_MESSAGE_TYPE']);
             unset($_SESSION['G_MESSAGE']);
@@ -1166,7 +1170,7 @@ class PmDynaform
                 "</script>\n" .
                 "<script type='text/javascript' src='/jscore/cases/core/cases_Step.js'></script>\n" .
                 "<script type='text/javascript' src='/jscore/cases/core/pmDynaform.js'></script>\n" .
-                ($this->fields["PRO_SHOW_MESSAGE"] === 1 ? '' : $title ) .
+                ($this->fields["PRO_SHOW_MESSAGE"] === 1 ? '' : $title) .
                 "<div style='width:100%;padding:0px 10px 0px 10px;margin:15px 0px 0px 0px;'>\n" .
                 "    <img src='/images/bulletButtonLeft.gif' style='float:left;'>&nbsp;\n" .
                 "    <a id='dyn_backward' href='" . $this->fields["APP_DATA"]["__DYNAFORM_OPTIONS"]["PREVIOUS_STEP"] . "' style='float:left;font-size:12px;line-height:1;margin:0px 0px 1px 5px;'>\n" .
@@ -1451,16 +1455,21 @@ class PmDynaform
             if (!$sw1 && !$sw2) {
                 if ($key === "variable" && $json->variable === $oldVariable["VAR_NAME"]) {
                     $json->variable = $newVariable["VAR_NAME"];
-                    if (isset($json->dataType))
+                    if (isset($json->dataType)) {
                         $json->dataType = $newVariable["VAR_FIELD_TYPE"];
-                    if (isset($json->name))
+                    }
+                    if (isset($json->name)) {
                         $json->name = $newVariable["VAR_NAME"];
-                    if (isset($json->dbConnection) && $json->dbConnection === $oldVariable["VAR_DBCONNECTION"])
+                    }
+                    if (isset($json->dbConnection) && $json->dbConnection === $oldVariable["VAR_DBCONNECTION"]) {
                         $json->dbConnection = $newVariable["VAR_DBCONNECTION"];
-                    if (isset($json->dbConnectionLabel) && $json->dbConnectionLabel === $oldVariable["VAR_DBCONNECTION_LABEL"])
+                    }
+                    if (isset($json->dbConnectionLabel) && $json->dbConnectionLabel === $oldVariable["VAR_DBCONNECTION_LABEL"]) {
                         $json->dbConnectionLabel = $newVariable["VAR_DBCONNECTION_LABEL"];
-                    if (isset($json->sql) && $json->sql === $oldVariable["VAR_SQL"])
+                    }
+                    if (isset($json->sql) && $json->sql === $oldVariable["VAR_SQL"]) {
                         $json->sql = $newVariable["VAR_SQL"];
+                    }
                     if (isset($json->options) && G::json_encode($json->options) === $oldVariable["VAR_ACCEPTED_VALUES"]) {
                         $json->options = G::json_decode($newVariable["VAR_ACCEPTED_VALUES"]);
                     }
@@ -1651,8 +1660,9 @@ class PmDynaform
             $sw2 = is_object($value);
             if ($sw1 || $sw2) {
                 $val = $this->jsonsf($value, $id, $for);
-                if ($val !== null)
+                if ($val !== null) {
                     return $val;
+                }
             }
             if (!$sw1 && !$sw2) {
                 if ($key === $for && $id === $value) {
@@ -1787,7 +1797,7 @@ class PmDynaform
         if ($oPro->getDynLabel() !== null && $oPro->getDynLabel() !== "") {
             $dyn_labels = G::json_decode($oPro->getDynLabel());
         }
-        $dyn_labels->$name[count($name) - 2] = $content;
+        $dyn_labels->{$name[count($name) - 2]} = $content;
 
         $oPro->setDynLabel(G::json_encode($dyn_labels));
         $oPro->save();
@@ -1892,7 +1902,7 @@ class PmDynaform
     {
         $result = array();
         $previusFunction = $this->onPropertyRead;
-        $this->onPropertyRead = function($json, $key, $value) use (&$post) {
+        $this->onPropertyRead = function ($json, $key, $value) use (&$post) {
             if ($key === "type" && isset($json->variable) && !empty($json->variable)) {
                 //clears the data in the appData for grids
                 $isThereIdIntoPost = array_key_exists($json->id, $post);
@@ -2042,7 +2052,8 @@ class PmDynaform
                                 break;
                             case 'form':
                                 $arrayGrid = array_merge(
-                                    $arrayGrid, self::getGridsAndFields($field, $flagGridAssocToVar)
+                                    $arrayGrid,
+                                    self::getGridsAndFields($field, $flagGridAssocToVar)
                                 );
                                 break;
                         }
@@ -2138,7 +2149,8 @@ class PmDynaform
                         $value === "suggest" ||
                         $value === "hidden" ||
                         $value === "file" ||
-                        $value === "grid")) {
+                        $value === "grid"
+                )) {
                     if ($value === "grid" && $property === "data") {
                         $json->{$property} = [];
                     } else {
diff --git a/workflow/engine/classes/PmGoogleApi.php b/workflow/engine/classes/PmGoogleApi.php
index b5c018ef2..7bcf19205 100644
--- a/workflow/engine/classes/PmGoogleApi.php
+++ b/workflow/engine/classes/PmGoogleApi.php
@@ -29,7 +29,7 @@ class PmGoogleApi
 
     public function __construct()
     {
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
+        $licensedFeatures = PMLicensedFeatures::getSingleton();
         if (!($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09') || $licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M='))) {
             G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
             G::header('location: ../login/login');
@@ -64,7 +64,7 @@ class PmGoogleApi
         $this->configuration->loadConfig($gmail, 'GOOGLE_API_SETTINGS', '');
     }
 
-    public function setConfigGmail ($id, $value)
+    public function setConfigGmail($id, $value)
     {
         $this->configuration->aConfig[$id] = $value;
         $this->configuration->saveConfig('GOOGLE_API_SETTINGS', '', '', '');
@@ -81,7 +81,7 @@ class PmGoogleApi
         return $this->serviceAccountEmail;
     }
 
-    public function setServiceAccountCertificate ($serviceAccountCertificate)
+    public function setServiceAccountCertificate($serviceAccountCertificate)
     {
         $this->setConfigGmail('serviceAccountCertificate', $serviceAccountCertificate);
         $this->serviceAccountCertificate = $serviceAccountCertificate;
@@ -94,7 +94,7 @@ class PmGoogleApi
 
     public function setServiceGmailStatus($status)
     {
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
+        $licensedFeatures = PMLicensedFeatures::getSingleton();
         if (!$licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
             $status = false;
         }
@@ -109,7 +109,7 @@ class PmGoogleApi
 
     public function setServiceDriveStatus($status)
     {
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
+        $licensedFeatures = PMLicensedFeatures::getSingleton();
         if (!$licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
             $status = false;
         }
@@ -183,7 +183,6 @@ class PmGoogleApi
      */
     public function testService($credentials)
     {
-
         $scope = array(
             static::DRIVE,
             static::DRIVE_FILE,
diff --git a/workflow/engine/classes/PmLicenseManager.php b/workflow/engine/classes/PmLicenseManager.php
index 9e09571a0..b03b128c1 100644
--- a/workflow/engine/classes/PmLicenseManager.php
+++ b/workflow/engine/classes/PmLicenseManager.php
@@ -15,7 +15,7 @@ class PmLicenseManager
 
     public function __construct($flagActivatePlugins = true)
     {
-        $oServerConf = &ServerConf::getSingleton();
+        $oServerConf = ServerConf::getSingleton();
 
         if ($oServerConf->getProperty('LOGIN_NO_WS') === null || $oServerConf->getProperty('LOGIN_NO_WS') === false) {
             $oServerConf->setProperty('LOGIN_NO_WS', true);
@@ -65,7 +65,7 @@ class PmLicenseManager
             $this->licensedfeaturesList = isset($results ['DATA']['LICENSED_FEATURES_LIST']) ? $results ['DATA']['LICENSED_FEATURES_LIST'] : null;
             $this->status = $this->getCurrentLicenseStatus();
 
-            if (isset ($results ['LIC'])) {
+            if (isset($results ['LIC'])) {
                 $resultsRegister = $results['LIC'];
                 $this->server = $results['LIC']['SRV'];
                 $this->file = $results['LIC']['FILE'];
@@ -183,8 +183,10 @@ class PmLicenseManager
                     }
                     if (!(empty($aDenied))) {
                         if ((SYS_COLLECTION == "enterprise") && (SYS_TARGET == "pluginsList")) {
-                            G::SendMessageText("The following plugins were restricted due to your enterprise license: " . implode(", ",
-                                    $aDenied), "INFO");
+                            G::SendMessageText("The following plugins were restricted due to your enterprise license: " . implode(
+                                    ", ",
+                                    $aDenied
+                                ), "INFO");
                         }
                     }
                 }
@@ -353,7 +355,7 @@ class PmLicenseManager
 
     public function validateLicense($path)
     {
-        $application = new license_application ($path, false, true, false, true, true);
+        $application = new license_application($path, false, true, false, true, true);
         $results = $application->validate(false, false, "", "", "80", true);
 
         if ($results ['RESULT'] != 'OK') {
@@ -365,7 +367,7 @@ class PmLicenseManager
 
     public function installLicense($path, $redirect = true, $includeExpired = true)
     {
-        $application = new license_application ($path, false, true, false, true, true);
+        $application = new license_application($path, false, true, false, true, true);
 
         $results = $application->validate(false, false, "", "", "80", true);
 
@@ -383,8 +385,7 @@ class PmLicenseManager
             G::SendTemporalMessage('ID_ISNT_LICENSE', 'tmp-info', 'labels');
             return false;
         } else {
-
-            $oServerConf = &ServerConf::getSingleton();
+            $oServerConf = ServerConf::getSingleton();
             $oServerConf->setProperty('ACTIVE_LICENSE', [config("system.workspace") => $path]);
             $this->saveDataLicense($results, $path, $redirect);
             if ($redirect) {
@@ -424,16 +425,16 @@ class PmLicenseManager
     {
         require_once("classes/model/LicenseManager.php");
         //obtening info in a row that has ACTIVE status
-        $oCtia = new Criteria ('workflow');
+        $oCtia = new Criteria('workflow');
         $oCtia->add(LicenseManagerPeer::LICENSE_STATUS, 'ACTIVE');
         $oDataset = LicenseManagerPeer::doSelectRS($oCtia);
         $oDataset->next();
         $aRow = $oDataset->getRow();
 
-        $oCtiaA = new Criteria ('workflow');
+        $oCtiaA = new Criteria('workflow');
         $oCtiaA->add(LicenseManagerPeer::LICENSE_UID, $aRow [0]);
 
-        $oCtiaB = new Criteria ('workflow');
+        $oCtiaB = new Criteria('workflow');
         $oCtiaB->add(LicenseManagerPeer::LICENSE_STATUS, 'INACTIVE');
         BasePeer::doUpdate($oCtiaA, $oCtiaB, Propel::getConnection('workflow'));
         return 'ACTIVE';
@@ -468,7 +469,7 @@ class PmLicenseManager
             //if exists the row in the database propel will update it, otherwise will insert.
             $tr = LicenseManagerPeer::retrieveByPK($LicenseUid);
             if (!(is_object($tr) && get_class($tr) == 'LicenseManager')) {
-                $tr = new LicenseManager ();
+                $tr = new LicenseManager();
             }
             $tr->setLicenseUid($LicenseUid);
             $tr->setLicenseUser($LicenseUser);
@@ -492,7 +493,7 @@ class PmLicenseManager
     {
         try {
             require_once("classes/model/LicenseManager.php");
-            $oCriteria = new Criteria ('workflow');
+            $oCriteria = new Criteria('workflow');
             $oCriteria->addSelectColumn(LicenseManagerPeer::LICENSE_USER);
             $oCriteria->addSelectColumn(LicenseManagerPeer::LICENSE_START);
             $oCriteria->addSelectColumn(LicenseManagerPeer::LICENSE_PATH);
diff --git a/workflow/engine/classes/PmTable.php b/workflow/engine/classes/PmTable.php
index 3b614266e..b6e7eb075 100644
--- a/workflow/engine/classes/PmTable.php
+++ b/workflow/engine/classes/PmTable.php
@@ -452,7 +452,8 @@ class PmTable
         $previous = null;
         $queryStack = array();
         $aDNS = $con->getDSN();
-        $dbEngine = $aDNS["phptype"];
+        $dbEngine = $aDNS['phptype'] === 'mysqli' ? 'mysql' : $aDNS['phptype'];
+
 
         foreach ($lines as $j => $line) {
             switch ($dbEngine) {
diff --git a/workflow/engine/classes/ProcessMap.php b/workflow/engine/classes/ProcessMap.php
index 1de1a9084..9746caae0 100644
--- a/workflow/engine/classes/ProcessMap.php
+++ b/workflow/engine/classes/ProcessMap.php
@@ -433,7 +433,6 @@ class ProcessMap
             $oProcess = new Process();
 
             if (!is_null($oProcess)) {
-
                 $calendar = new Calendar();
                 $files = Processes::getProcessFiles($sProcessUID, 'mail');
 
@@ -820,7 +819,7 @@ class ProcessMap
             }
 
             global $_DBArray;
-            $_DBArray = (isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : '');
+            $_DBArray = isset($_SESSION['_DBArray']) ? $_SESSION['_DBArray'] : [];
             $_DBArray['steps'] = $aSteps;
             $_SESSION['_DBArray'] = $_DBArray;
             $oCriteria = new Criteria('dbarray');
@@ -910,7 +909,6 @@ class ProcessMap
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
             while ($aRow = $oDataset->getRow()) {
-
                 if (($aRow['INP_DOC_TITLE'] == null) || ($aRow['INP_DOC_TITLE'] == "")) {
                     // There is no transaltion for this Document name, try to get/regenerate the label
                     $oInputDocument = new InputDocument;
@@ -1191,7 +1189,8 @@ class ProcessMap
             $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
             $oCriteria->add(
                     $oCriteria->getNewCriterion(UsersPeer::USR_STATUS, "ACTIVE", Criteria::EQUAL)->addOr(
-                    $oCriteria->getNewCriterion(UsersPeer::USR_STATUS, "VACATION", Criteria::EQUAL))
+                    $oCriteria->getNewCriterion(UsersPeer::USR_STATUS, "VACATION", Criteria::EQUAL)
+                    )
             );
             $oCriteria->add(UsersPeer::USR_UID, $aUIDS2, Criteria::NOT_IN);
             $oDataset = UsersPeer::doSelectRS($oCriteria);
@@ -1398,7 +1397,6 @@ class ProcessMap
              * Task Notifications *
              */
             if ($iForm == 7 || $iForm == 1) {
-
                 $files = Processes::getProcessFiles($aFields['PRO_UID'], 'mail');
 
                 $templates = array();
@@ -1453,7 +1451,7 @@ class ProcessMap
             if ($iForm == 8) {
                 $oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($_SESSION["cDhTajE2T2lxSkhqMzZUTXVacWYyNcKwV3A4eWYybDdyb1p3"]["TAS_UID"]);
                 if ((is_object($oCaseConsolidated)) && get_class($oCaseConsolidated) == "CaseConsolidatedCore") {
-                    require_once ("classes/model/ReportTable.php");
+                    require_once("classes/model/ReportTable.php");
 
                     $aFields["CON_STATUS"]  = $oCaseConsolidated->getConStatus();
                     $aFields["DYN_UID"]     = $oCaseConsolidated->getDynUid();
@@ -2076,7 +2074,6 @@ class ProcessMap
         $triggersArray = "";
         $triggersArray[] = array('TRI_UID' => 'char', 'PRO_UID' => 'char', 'TRI_TITLE' => 'char', 'TRI_DESCRIPTION' => 'char');
         while ($aRow = $oDataset->getRow()) {
-
             if (($aRow['TRI_TITLE'] == null) || ($aRow['TRI_TITLE'] == "")) {
                 // There is no transaltion for this Trigger name, try to get/regenerate the label
                 $triggerO = new Triggers();
@@ -2099,7 +2096,7 @@ class ProcessMap
 
     public function getTriggers($sProcessUID = '')
     {
-        $aTriggers = Array();
+        $aTriggers = array();
         $oCriteria = $this->getTriggersCriteria($sProcessUID);
 
         $oDataset = RoutePeer::doSelectRS($oCriteria);
@@ -2144,9 +2141,9 @@ class ProcessMap
             $oLogCaseScheduler = new LogCasesScheduler();
             $aRows = $oLogCaseScheduler->getAll();
 
-            $fieldNames = Array('PRO_UID' => 'char', 'TAS_UID' => 'char', 'USR_NAME' => 'char', 'EXEC_DATE' => 'char', 'EXEC_HOUR' => 'char', 'RESULT' => 'char', 'SCH_UID' => 'char', 'WS_CREATE_CASE_STATUS' => 'char', 'WS_ROUTE_CASE_STATUS' => 'char' );
+            $fieldNames = array('PRO_UID' => 'char', 'TAS_UID' => 'char', 'USR_NAME' => 'char', 'EXEC_DATE' => 'char', 'EXEC_HOUR' => 'char', 'RESULT' => 'char', 'SCH_UID' => 'char', 'WS_CREATE_CASE_STATUS' => 'char', 'WS_ROUTE_CASE_STATUS' => 'char' );
 
-            $aRows = array_merge(Array($fieldNames), $aRows);
+            $aRows = array_merge(array($fieldNames), $aRows);
 
             $_DBArray['log_cases_scheduler'] = $aRows;
             $_SESSION['_DBArray'] = $_DBArray;
@@ -2339,7 +2336,6 @@ class ProcessMap
                         throw new Exception(G::loadTranslation('ID_INVALID_ROU_TYPE_DEFINITION_ON_ROUTE_TABLE'));
                         break;
                 }
-
             } else {
                 throw new Exception(G::loadTranslation('ID_NO_DERIVATIONS_DEFINED'));
             }
@@ -2455,7 +2451,6 @@ class ProcessMap
                             break;
                     }
                 } else {
-
                 }
             }
             switch ($sType) {
@@ -3114,8 +3109,7 @@ class ProcessMap
      */
     public function listNoProcessesUser($sProcessUID)
     {
-
-        $memcache = & PMmemcached::getSingleton(config("system.workspace"));
+        $memcache = PMmemcached::getSingleton(config("system.workspace"));
 
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(ProcessUserPeer::USR_UID);
@@ -3228,7 +3222,7 @@ class ProcessMap
      */
     public function assignProcessUser($sProcessUID, $sUsrUID, $sTypeUID)
     {
-        $oProcessUser = new ProcessUser ( );
+        $oProcessUser = new ProcessUser();
         $puType = 'SUPERVISOR';
         if ($sTypeUID == 'Group') {
             $puType = 'GROUP_SUPERVISOR';
@@ -3256,7 +3250,6 @@ class ProcessMap
      */
     public function getObjectsPermissionsCriteria($sProcessUID)
     {
-
         $aObjectsPermissions = array();
         $aObjectsPermissions[] = array('OP_UID' => 'char', 'TASK_TARGET' => 'char', 'GROUP_USER' => 'char', 'TASK_SOURCE' => 'char', 'OBJECT_TYPE' => 'char', 'OBJECT' => 'char', 'PARTICIPATED' => 'char', 'ACTION' => 'char', 'OP_CASE_STATUS' => 'char');
         $oCriteria = new Criteria('workflow');
@@ -3434,7 +3427,6 @@ class ProcessMap
 
     public function getExtObjectsPermissions($start, $limit, $sProcessUID)
     {
-
         $aObjectsPermissions = array();
         //$aObjectsPermissions [] = array('OP_UID' => 'char', 'TASK_TARGET' => 'char', 'GROUP_USER' => 'char', 'TASK_SOURCE' => 'char', 'OBJECT_TYPE' => 'char', 'OBJECT' => 'char', 'PARTICIPATED' => 'char', 'ACTION' => 'char', 'OP_CASE_STATUS' => 'char');
         $oCriteria = new Criteria('workflow');
@@ -3663,13 +3655,19 @@ class ProcessMap
         $_SESSION['_DBArray'] = $_DBArray;
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'processes/processes_NewObjectPermission', '',
+        $G_PUBLISH->AddContent(
+            'xmlform',
+            'xmlform',
+            'processes/processes_NewObjectPermission',
+            '',
             array('GROUP_USER' => $usersGroups,
                   'LANG' => SYS_LANG,
                   'PRO_UID' => $sProcessUID,
                   'ID_DELETE' => G::LoadTranslation('ID_DELETE'),
                   'ID_RESEND' => G::LoadTranslation('ID_RESEND')
-            ), 'processes_SaveObjectPermission');
+            ),
+            'processes_SaveObjectPermission'
+        );
         G::RenderPage('publish', 'raw');
         return true;
     }
@@ -3683,7 +3681,6 @@ class ProcessMap
      */
     public function editObjectPermission($sOP_UID, $sProcessUID)
     {
-
         $user = '';
         $oCriteria = new Criteria();
         $oCriteria->add(ObjectPermissionPeer::OP_UID, $sOP_UID);
@@ -4111,7 +4108,6 @@ class ProcessMap
      */
     public function processFilesManager($sProcessUID)
     {
-
         global $_DBArray;
         global $G_PUBLISH;
 
@@ -4462,7 +4458,7 @@ class ProcessMap
         try {
             global $G_PUBLISH;
             $G_PUBLISH = new Publisher();
-            $oHeadPublisher = & headPublisher::getSingleton();
+            $oHeadPublisher = headPublisher::getSingleton();
             $oHeadPublisher->addScriptFile('/jscore/events/events.js');
 
             switch ($type) {
@@ -4579,7 +4575,7 @@ class ProcessMap
     public function loadProcessCategory()
     {
         $aProcessCategory = '';
-        require_once ("classes/model/ProcessCategory.php");
+        require_once("classes/model/ProcessCategory.php");
         $Criteria = new Criteria('workflow');
         $Criteria->clearSelectColumns();
 
@@ -4679,7 +4675,6 @@ class ProcessMap
      */
     public function getAllProcesses()
     {
-
         $aProcesses = array();
         //$aProcesses [] = array ('PRO_UID' => 'char', 'PRO_TITLE' => 'char');
         $oCriteria = new Criteria('workflow');
@@ -5773,7 +5768,6 @@ class ProcessMap
      */
     public function listExtProcessesSupervisors($start, $limit, $sProcessUID)
     {
-
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(ProcessUserPeer::PU_UID);
         $oCriteria->addSelectColumn(ProcessUserPeer::USR_UID);
@@ -5811,8 +5805,7 @@ class ProcessMap
      */
     public function listExtNoProcessesUser($sProcessUID)
     {
-
-        $memcache = & PMmemcached::getSingleton(config("system.workspace"));
+        $memcache = PMmemcached::getSingleton(config("system.workspace"));
 
         $oCriteria = new Criteria('workflow');
         $oCriteria->addSelectColumn(ProcessUserPeer::USR_UID);
@@ -6819,7 +6812,6 @@ class ProcessMap
         $triggersArray = "";
         $triggersArray[] = array('TRI_UID' => 'char', 'PRO_UID' => 'char', 'TRI_TITLE' => 'char', 'TRI_DESCRIPTION' => 'char' );
         while ($aRow = $oDataset->getRow()) {
-
             if (($aRow['TRI_TITLE'] == null) || ($aRow['TRI_TITLE'] == "")) {
                 // There is no translation for this Trigger name, try to get/regenerate the label
                 $triggerO = new Triggers();
@@ -6867,4 +6859,3 @@ class ProcessMap
         return (int) $row['MAX_X'];
     }
 }
-
diff --git a/workflow/engine/classes/PropelTable.php b/workflow/engine/classes/PropelTable.php
index 39fa1c209..9d2c270f8 100644
--- a/workflow/engine/classes/PropelTable.php
+++ b/workflow/engine/classes/PropelTable.php
@@ -1,892 +1,848 @@
-<?php
-
-use ProcessMaker\Plugins\PluginRegistry;
-
-/**
- * Class pagedTable
- * @package workflow.gulliver.system
- * dependencies TemplatePower Form XmlForm
- */
-
-
-/**
- * Class pagedTable
- *
- * @access public
- * @package workflow.gulliver.system
- * dependencies TemplatePower Form XmlForm
- */
-class PropelTable
-{
-    public $xmlFormFile;
-    public $currentPage;
-    public $orderBy = '';
-    public $filter = array ();
-    public $filterType = array ();
-    public $searchBy = '';
-    public $fastSearch = '';
-    public $order = '';
-    public $template = 'templates/paged-table.html';
-    public $tpl;
-    public $style = array ();
-    public $rowsPerPage = 25;
-    public $ownerPage;
-    public $popupPage;
-    public $popupSubmit;
-    public $popupWidth = 450;
-    public $popupHeight = 200;
-    public $ajaxServer;
-    public $fields;
-    public $query;
-    public $totPages;
-    public $totRows;
-    public $sortable = '1';
-
-    //SQL QUERIES
-    public $criteria;
-    public $sql = '';
-    public $sqlWhere = '';
-    public $sqlGroupBy = '';
-    public $sqlSelect = 'SELECT 1';
-    public $sqlDelete = '';
-    public $sqlInsert = '';
-    public $sqlUpdate = '';
-    public $fieldDataList = '';
-
-    //Configuration
-    public $xmlPopup = '';
-    public $addRow = false;
-    public $deleteRow = false;
-    public $editRow = false;
-    public $notFields = '  title button linknew begingrid2 endgrid2 '; // These are not considered to build the sql queries (update,insert,delete)
-
-
-    //JavaScript Object attributes
-    public $onUpdateField = "";
-    public $onDeleteField = "";
-    public $afterDeleteField = "";
-    public $onInsertField = "";
-
-    //New gulliver
-    public $xmlForm;
-    public $menu = '';
-    public $filterForm = '';
-    public $filterForm_Id = '';
-    public $name = 'pagedTable';
-    public $id = 'A1';
-    public $disableFooter = false;
-    //This attribute is used to set STYLES to groups of TD, using the field type "cellMark" (see XmlFormFieldCellMark)
-    public $tdStyle = '';
-    public $tdClass = '';
-    //Config Save definition
-    public $__Configuration = 'orderBy,filter,fastSearch,style/*/showInTable'; //order,rowsPerPage,disableFooter';
-
-
-    //Variable for MasterDetail feature
-    public $masterdetail = '';
-    public $title;
-
-    /**
-     * Function prepareQuery
-     *
-     * @author David S. Callizaya S. <davidsantos@colosa.com>
-     * @access public
-     * @param string $limitPage
-     * @return string
-     */
-    public function prepareQuery ($limitPage = false)
-    {
-        // process the QuickSearch string and add the fields and expression needed to run the search
-        if ($this->searchBy !== '') {
-            $aSB = explode( '|', $this->searchBy ); //fields are separated by pipes
-            //subfilter
-            $subFilter = '';
-            foreach ($aSB as $sBy) {
-                $subFilter .= ($subFilter !== '') ? ' OR ' : '';
-                //TODO: Get DATABASE type from Criteria, I think sql delimeter is needed too
-                $subFilter .= $sBy . ' LIKE "%' . G::sqlEscape( $this->fastSearch ) . '%"';
-            }
-            if ($subFilter !== '') {
-                //Get the first defined table in Criteria.
-                $aCurrentTables = $this->criteria->getTables();
-                if (isset( $aCurrentTables[0] )) {
-                    $this->criteria->add( $aCurrentTables[0] . ".*", '(' . $subFilter . ')', Criteria::CUSTOM );
-                }
-            }
-        }
-
-        //Merge sort array defined by USER with the array defined by SQL
-        parse_str( $this->order, $orderFields );
-        parse_str( $this->orderBy, $orderFields2 );
-        //User sort is more important (first in merge).
-        $orderFields3 = array_merge( $orderFields2, $orderFields );
-        //User sort is overwrites XMLs definition.
-        $orderFields = array_merge( $orderFields3, $orderFields2 );
-        //Order (BY SQL DEFINITION AND USER'S DEFINITION)
-        $this->aOrder = array ();
-        $order = '';
-        foreach ($orderFields as $field => $fieldOrder) {
-            $field = G::getUIDName( $field, '' );
-            $fieldOrder = strtoupper( $fieldOrder );
-            if ($fieldOrder === 'A') {
-                $fieldOrder = 'ASC';
-            }
-            if ($fieldOrder === 'D') {
-                $fieldOrder = 'DESC';
-            }
-            switch ($fieldOrder) {
-                case 'ASC':
-                case 'DESC':
-                    if ($order !== '') {
-                        $order .= ', ';
-                    }
-                    $order .= $field . ' ' . $fieldOrder;
-                    $this->aOrder[$field] = $fieldOrder;
-            }
-        }
-        //master detail :O
-        if (count( $this->masterdetail ) > 0) {
-            $this->criteria->clearOrderByColumns();
-            foreach ($this->masterdetail as $idMasterDetail => $fieldMasterDetail) {
-                $this->criteria->addAscendingOrderByColumn( $fieldMasterDetail );
-            }
-        }
-        if (! empty( $this->aOrder )) {
-            if (count( $this->masterdetail ) <= 0) {
-                $this->criteria->clearOrderByColumns();
-            }
-            foreach ($this->aOrder as $field => $ascending) {
-                if ($ascending == 'ASC') {
-                    $this->criteria->addAscendingOrderByColumn( $field );
-                } else {
-                    $this->criteria->addDescendingOrderByColumn( $field );
-                }
-            }
-        }
-        /**
-         * Add limits
-         */
-        $this->criteria->setLimit( 0 );
-        $this->criteria->setOffset( 0 );
-        if ($this->criteria->getDbName() == 'dbarray') {
-            $this->totRows = ArrayBasePeer::doCount( $this->criteria );
-        } else {
-            $this->totRows = GulliverBasePeer::doCount( $this->criteria );
-        }
-        $this->totPages = ceil( $this->totRows / $this->rowsPerPage );
-        if ($limitPage) {
-            $this->criteria->setLimit( $this->rowsPerPage );
-            $this->criteria->setOffset( ($this->currentPage - 1) * $this->rowsPerPage );
-        }
-        return;
-    }
-
-    /**
-     * Function setupFromXmlform
-     *
-     * @author David S. Callizaya S. <davidsantos@colosa.com>
-     * editedby Hugo Loza <hugo@colosa.com>
-     * @access public
-     * @param eter string xmlForm
-     * @return string
-     */
-    public function setupFromXmlform ($xmlForm)
-    {
-        $this->xmlForm = $xmlForm;
-        //Config
-        $this->name = $xmlForm->name;
-        $this->id = $xmlForm->id;
-        //$this->sqlConnection=((isset($this->xmlForm->sqlConnection))?$this->xmlForm->sqlConnection:'');
-        if (isset( $_GET['page'] )) {
-            $this->currentPage = $_GET['page'];
-        } else {
-            $this->currentPage = 1;
-        }
-        if (isset( $_GET['order'] )) {
-            $this->orderBy = urldecode( $_GET['order'] );
-        } else {
-            $this->orderBy = "";
-        }
-        if (isset( $_GET['filter'] )) {
-            $this->filter = urldecode( $_GET['filter'] );
-        } else {
-            $this->filter = "";
-        }
-        if ($xmlForm->ajaxServer != '') {
-            $this->ajaxServer = G::encryptLink( $xmlForm->ajaxServer );
-        } else {
-            $this->ajaxServer = G::encryptLink( '../gulliver/propelTableAjax' );
-        }
-        $this->ownerPage = G::encryptLink( SYS_CURRENT_URI );
-        // Config attributes from XMLFORM file
-        $myAttributes = get_class_vars( get_class( $this ) );
-        foreach ($this->xmlForm->xmlform->tree->attribute as $atrib => $value) {
-            if (array_key_exists( $atrib, $myAttributes )) {
-                eval( 'settype($value, gettype($this->' . $atrib . '));' );
-                if ($value !== '') {
-                    eval( '$this->' . $atrib . '=$value;' );
-                }
-            }
-        }
-        if ($this->masterdetail != "") {
-            $this->masterdetail = explode( ",", $this->masterdetail );
-            foreach ($this->masterdetail as $keyMasterDetail => $valueMasterDetail) {
-                $this->masterdetail[$keyMasterDetail] = trim( $valueMasterDetail );
-            }
-        } else {
-            $this->masterdetail = array ();
-        }
-        //Prepare the fields
-        $this->style = array ();
-        $this->gridWidth = "";
-        $this->gridFields = "";
-        $this->fieldsType = array ();
-        foreach ($this->xmlForm->fields as $f => $v) {
-            $r = $f;
-            $this->fields[$r]['Name'] = $this->xmlForm->fields[$f]->name;
-            $this->fields[$r]['Type'] = $this->xmlForm->fields[$f]->type;
-            if (isset( $this->xmlForm->fields[$f]->size )) {
-                $this->fields[$r]['Size'] = $this->xmlForm->fields[$f]->size;
-            }
-            $this->fields[$r]['Label'] = $this->xmlForm->fields[$f]->label;
-        }
-        //Set the default settings
-        $this->defaultStyle();
-        //continue with the setup
-        $this->gridWidth = '';
-        $this->gridFields = '';
-        foreach ($this->xmlForm->fields as $f => $v) {
-            $r = $f;
-            //Parse the column properties
-            foreach ($this->xmlForm->fields[$f] as $attribute => $value) {
-                if (! is_object( $value )) {
-                    $this->style[$r][$attribute] = $value;
-                }
-            }
-            //Needed for javascript
-            //only the visible columns's width and name are stored
-            if ($this->style[$r]['showInTable'] != '0') {
-                $this->gridWidth .= ',' . $this->style[$r]['colWidth'];
-                $this->gridFields .= ',"form[' . $this->fields[$r]['Name'] . ']"';
-            }
-        }
-        $totalWidth = 0;
-        foreach ($this->fields as $r => $rval) {
-            if ($this->style[$r]['showInTable'] != '0') {
-                $totalWidth += $this->style[$r]['colWidth'];
-            }
-        }
-        $this->totalWidth = $totalWidth;
-    }
-
-    /**
-     * Function count
-     *
-     * @author David S. Callizaya S. <davidsantos@colosa.com>
-     * @access public
-     * @return string
-     */
-    public function count ()
-    {
-        $this->prepareQuery();
-        return $this->totRows;
-    }
-
-    /**
-     * Function renderTitle
-     *
-     * @author David S. Callizaya S. <davidsantos@colosa.com>
-     * @access public
-     * @return string
-     */
-    public function renderTitle ()
-    {
-        //fix the bug about showing hidden fields in propel table.
-        foreach ($this->fields as $r => $rval) {
-            if ($this->style[$r]['type'] == 'hidden') {
-                $this->style[$r]['showInTable'] = '0';
-            }
-        }
-
-        //Render headers
-        $this->colCount = 0;
-        $this->shownFields = '[';
-        foreach ($this->fields as $r => $rval) {
-            if (($this->style[$r]['showInTable'] != '0') && (! (in_array( $this->fields[$r]['Name'], $this->masterdetail )))) {
-                //if (($this->style[$r]['showInTable'] != '0' ))
-                $this->tpl->newBlock( "headers" );
-
-                $sortDir = "ASC";
-
-                if (isset($this->aOrder[$this->fields[$r]["Name"]])) {
-                    $sortDir = ($this->aOrder[$this->fields[$r]["Name"]] == "ASC")? "DESC" : "ASC";
-                }
-
-                if ($this->style[$r]['titleVisibility'] != '0') {
-                    $this->style[$r]["href"] = "javascript:;";
-                    $this->style[$r]["onsort"] = $this->id . ".doSort(\"" . G::createUID("", $this->fields[$r]["Name"]) . "\", \"" . (($this->sortable == "0")? "" : $sortDir) . "\"); return false;";
-                } else {
-                    $this->style[$r]["href"] = "javascript:;";
-                    $this->style[$r]['onsort'] = 'return false;';
-                }
-                if (isset( $this->style[$r]['href'] )) {
-                    $this->tpl->assign( "href", $this->style[$r]['href'] );
-                }
-                if (isset( $this->style[$r]['onsort'] )) {
-                    $this->tpl->assign( "onsort", htmlentities( $this->style[$r]['onsort'], ENT_QUOTES, 'UTF-8' ) );
-                }
-
-                    /* BUG 8080 - erik: don't setup onclick on page table header, doesn't have sense and causing problems
-                       if (isset($this->style[$r]['onclick']))
-                       $this->tpl->assign( "onclick" , htmlentities( $this->style[$r]['onclick'] , ENT_QUOTES, 'UTF-8' ) );
-                     */
-
-                if (isset( $this->style[$r]['colWidth'] )) {
-                    $this->tpl->assign( "width", $this->style[$r]['colWidth'] );
-                }
-                if (isset( $this->style[$r]['colWidth'] )) {
-                    $this->tpl->assign( "widthPercent", ($this->style[$r]['colWidth'] * 100 / $this->totalWidth) . "%" );
-                    //Hook for special skin with RTL languajes
-                }
-                if (defined( 'SYS_LANG_DIRECTION' ) && SYS_LANG_DIRECTION == 'R') {
-                    $this->style[$r]['titleAlign'] = 'right';
-                }
-                if (isset( $this->style[$r]['titleAlign'] )) {
-                    $this->tpl->assign( "align", 'text-align:' . $this->style[$r]['titleAlign'] . ';' );
-                }
-                if ($this->style[$r]['titleVisibility'] != '0') {
-                    $sortDirImg = "";
-
-                    if (isset($this->aOrder[$this->fields[$r]["Name"]])) {
-                        $sortDirImg = ($this->aOrder[$this->fields[$r]["Name"]] == "ASC")? "<img src=\"/images/arrow-up.gif\" />" : "<img src=\"/images/arrow-down.gif\" />";
-                    }
-
-                    $this->tpl->assign("header", $this->fields[$r]["Label"] . $sortDirImg);
-                    $this->tpl->assign("displaySeparator", ($this->colCount == 0 || !isset($this->fields[$r]["Label"]) || $this->fields[$r]["Label"] == "")? "display: none;" : "");
-                } else {
-                    $this->tpl->assign( 'displaySeparator', 'display:none;' );
-                }
-                $this->colCount += 2;
-                $this->shownFields .= ($this->shownFields !== '[') ? ',' : '';
-                $this->shownFields .= '"' . $r . '"';
-            }
-        }
-        $this->shownFields .= ']';
-    }
-
-    /**
-     * Function renderField
-     *
-     * @author David S. Callizaya S. <davidsantos@colosa.com>
-     * @access public
-     * @param eter string row
-     * @param eter string r
-     * @param eter string result
-     * @return string
-     */
-    public function renderField ($row, $r, $result)
-    {
-        global $G_DATE_FORMAT;
-        //to do: special content??
-        //$result['row__']            = $row;   //Special content:
-        $styleData = $this->style[$r];
-        $fielDataName = $styleData['data'];
-        $fieldClassName = isset( $styleData['colClassName'] ) && ($styleData['colClassName']) ? $styleData['colClassName'] : $this->tdClass;
-        if ($fielDataName != '') {
-            $value = ((isset( $result[$fielDataName] )) ? $result[$fielDataName] : '');
-        } else {
-            $value = $this->fields[$r]['Label'];
-        }
-        $this->tpl->newBlock( "field" );
-        $this->tpl->assign( 'width', $this->style[$r]['colWidth'] );
-        $classAttr = (trim( $fieldClassName ) != '') ? " class=\"$fieldClassName\"" : '';
-        $this->tpl->assign( 'classAttr', $classAttr );
-        //to do: style is needed or not?
-        //$this->tpl->assign('style', $this->tdStyle);
-        $alignAttr = (isset( $this->style[$r]['align'] ) && strlen( $this->style[$r]['align'] > 0 )) ? " align=\"" . $this->style[$r]['align'] . "\"" : '';
-        $this->tpl->assign( "alignAttr", $alignAttr );
-        $fieldName = $this->fields[$r]['Name'];
-        $fieldClass = get_class( $this->xmlForm->fields[$fieldName] );
-        /**
-         * * BEGIN : Reeplace of @@, @%,...
-         * in field's attributes like onclick, link,
-         */
-        if (isset( $this->xmlForm->fields[$this->fields[$r]['Name']]->link )) {
-            $this->xmlForm->fields[$this->fields[$r]['Name']]->link = G::replaceDataField( $this->style[$r]['link'], $result );
-        }
-        if (isset( $this->xmlForm->fields[$fieldName]->value )) {
-            $this->xmlForm->fields[$fieldName]->value = G::replaceDataField( $styleData['value'], $result );
-        }
-        /**
-         * * END : Reeplace of @@, @%,...
-         */
-        /**
-         * * Rendering of the field
-         */
-        $this->xmlForm->fields[$fieldName]->mode = 'view';
-        $this->xmlForm->setDefaultValues();
-        $this->xmlForm->setValues( $result );
-        //var_dump($fieldName, $fieldClass );echo '<br /><br />';
-        if (array_search( 'renderTable', get_class_methods( $fieldClass ) ) !== false) {
-            if ($value == '-') {
-                $htmlField = $value;
-            } else {
-                $htmlField = $this->xmlForm->fields[$fieldName]->renderTable( $value, $this->xmlForm, true );
-            }
-            if (is_object( $value )) {
-                $value = '';
-            }
-            // checking if the value variable is a html field, a html tag content can't contain &nbsp; as white spaces
-            $testValue = preg_match( "/<a ?.*>(.*)<\/a>/i", $htmlField, $value );
-            $this->tpl->assign( "value", $htmlField );
-            if ($testValue > 0 && (isset( $value[1] ) && strlen( trim( $value[1] ) ) == 0)) {
-                if ((trim( $value[0] )) == '') {
-                    $this->tpl->assign( "value", "&nbsp;" );
-                }
-                // $this->tpl->assign( "value" , (preg_match('^[[:space:]]^', $value) && (substr($fieldName,0,3)!="PRO"))? str_ireplace(" ","&nbsp;",$htmlField):$htmlField );
-            } else {
-                $this->tpl->assign( "value", $htmlField );
-            }
-
-            /* $testValue = preg_match( "/<\/?\w+((\s+(\w|\w[\w-]*\w)(\s*=\s*(?:\".*?\"|'.*?'|[^'\">\s]+))?)+\s*|\s*)\/?>/i", $value, $matches );  */
-            //      if (empty($matches)){
-                //        $this->tpl->assign( "value" , (preg_match('^[[:space:]]^', $value) && (substr($fieldName,0,3)!="PRO"))? str_ireplace(" ","&nbsp;",$htmlField):$htmlField );
-                //      } else {
-                //        $this->tpl->assign( "value" , $htmlField );
-                //      }
-        }
-        return $this->fields[$r]['Type'];
-    }
-
-    /**
-     * Function defaultStyle
-     *
-     * @author David S. Callizaya S. <davidsantos@colosa.com>
-     * @access public
-     * @return string
-     */
-    public function defaultStyle ()
-    {
-        foreach ($this->fields as $r => $rval) {
-            $this->style[$r] = array ('showInTable' => '1','titleVisibility' => '1','colWidth' => '150','onclick' => '','event' => ''
-            );
-            //Some widths
-            if (! (strpos( '  date linknew ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
-                $this->style[$r]['colWidth'] = '70';
-            }
-                //Data source:
-            if (! (strpos( '  title button linknew image-text jslink ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
-                $this->style[$r]['data'] = ''; //If the control is a link it shows the label
-            } else {
-                $this->style[$r]['data'] = $this->fields[$r]['Name']; //ELSE: The data value for that field
-                //Hidden fields
-            }
-            if (! isset( $this->style[$r]['showInTable'] )) {
-                if (! (strpos( '  title button endgrid2 submit password ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
-                    $this->style[$r]['showInTable'] = '0';
-                } else {
-                    $this->style[$r]['showInTable'] = '1';
-                }
-            }
-            //Hidden titles
-            if (! (strpos( '  linknew button link endgrid2 ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
-                $this->style[$r]['titleVisibility'] = '0';
-            }
-            //Align titles
-            $this->style[$r]['titleAlign'] = 'center';
-            //Align fields
-            if (defined( 'SYS_LANG_DIRECTION' ) && SYS_LANG_DIRECTION == 'R') {
-                $this->style[$r]['align'] = 'right';
-            } else {
-                $this->style[$r]['align'] = 'left';
-            }
-            if (! (strpos( ' linknew date ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
-                $this->style[$r]['align'] = 'center';
-            }
-        }
-        // Adjust the columns width to prevent overflow the page width
-            //Render headers
-        $totalWidth = 0;
-        foreach ($this->fields as $r => $rval) {
-            if ($this->style[$r]['showInTable'] != '0') {
-                $totalWidth += $this->style[$r]['colWidth'];
-            }
-        }
-        $this->totalWidth = $totalWidth;
-        $maxWidth = 1800;
-        $proportion = $totalWidth / $maxWidth;
-        if ($proportion > 1) {
-            $this->totalWidth = 1800;
-        }
-        if ($proportion > 1) {
-            foreach ($this->fields as $r => $rval) {
-                if ($this->style[$r]['showInTable'] != '0') {
-                    $this->style[$r]['colWidth'] = $this->style[$r]['colWidth'] / $proportion;
-                }
-            }
-        }
-    }
-
-    /**
-     * Function renderTable
-     *
-     * @author David S. Callizaya S. <davidsantos@colosa.com>
-     * @param eter $block : = 'content'(Prints contentBlock only)
-     * @access public
-     * @return string
-     */
-    public function renderTable ($block = '', $fields = '')
-    { 
-
-        $filter = new InputFilter();
-        $fields = $filter->xssFilterHard($fields);
-        $this->orderBy = $filter->xssFilterHard($this->orderBy);
-        $this->currentPage = $filter->xssFilterHard($this->currentPage);
-        
-        //Render Title
-        $thereisnotitle = true;
-        foreach ($this->fields as $r => $rval) {
-            if ($this->fields[$r]['Type'] === 'title') {
-                $this->title = $this->fields[$r]['Label'];
-                unset( $this->fields[$r] );
-                $thereisnotitle = false;
-            }
-        }
-        if ($thereisnotitle) {
-            $this->title = '';
-        }
-        $oHeadPublisher = & headPublisher::getSingleton();
-        $oHeadPublisher->addInstanceModule( 'leimnud', 'panel' );
-        $time_start = microtime( true );
-        $this->prepareQuery( true );
-        $time_end = microtime( true );
-        $time = $time_end - $time_start;
-        // verify if there are templates folders registered, template and method folders are the same
-        $folderTemplate = explode( '/', $this->template );
-        $oPluginRegistry = PluginRegistry::loadSingleton();
-        if ($oPluginRegistry->isRegisteredFolder( $folderTemplate[0] )) {
-            $templateFile = PATH_PLUGINS . $this->template . '.html';
-        } else {
-            $templateFile = PATH_TPL . $this->template . '.html';
-            // Prepare the template
-        }
-        $this->tpl = new TemplatePower( $templateFile );
-        $this->tpl->prepare();
-        if (is_array( $fields )) {
-            foreach ($fields as $key => $val) {
-                $this->tpl->assignGlobal( $key, $val ); //Changed to Global by JHL on Dec 14,2009.. then thes fields are available for all Blocks
-            }
-        }
-        /**
-         * ******** HEAD BLOCK **************
-         */
-        if (($block === '') || ($block === 'head')) {
-            $this->tpl->newBlock( 'headBlock' );
-            $this->tpl->assign( 'pagedTable_Id', $this->id );
-            $this->tpl->assign( 'pagedTable_Name', $this->name );
-            $this->tpl->assign( 'pagedTable_Height', $this->xmlForm->height );
-            $this->tpl->assign( "title", $this->title );
-            
-            $this->xmlForm->home = $filter->xssFilterHard($this->xmlForm->home);
-            $this->filterForm = $filter->xssFilterHard($this->filterForm);
-            $this->menu = $filter->xssFilterHard($this->menu);
-            
-            if (file_exists( $this->xmlForm->home . $this->filterForm . '.xml' )) {
-                $filterForm = new filterForm( $this->filterForm, $this->xmlForm->home );
-                if ($this->menu === '') {
-                    $this->menu = 'gulliver/pagedTable_Options';
-                }
-            }
-            if (file_exists( $this->xmlForm->home . $this->menu . '.xml' )) {
-                $menu = new xmlMenu( $this->menu, $this->xmlForm->home );
-                $this->tpl->newBlock( 'headerBlock' );
-                $template = PATH_CORE . 'templates' . PATH_SEP . $menu->type . '.html';
-                $menu->setValues( $this->xmlForm->values );
-                $menu->setValues( array ('PAGED_TABLE_ID' => $this->id
-                ) );
-                if (isset( $filterForm->name )) {
-                    $menu->setValues( array ('SEARCH_FILTER_FORM' => $filterForm->name
-                    ) );
-                }
-                $this->tpl->assign( 'content', $menu->render( $template, $scriptCode ) );
-                $oHeadPublisher->addScriptFile( $menu->scriptURL );
-                $oHeadPublisher->addScriptCode( $scriptCode );
-            }
-            if (file_exists( $this->xmlForm->home . $this->filterForm . '.xml' )) {
-                $this->tpl->newBlock( 'headerBlock' );
-                $this->filterForm_Id = $filterForm->id;
-                $filterForm->type = 'filterform';
-                $filterForm->ajaxServer = '../gulliver/defaultAjax';
-                $template = PATH_CORE . 'templates/' . $filterForm->type . '.html';
-                $filterForm->setValues( $this->xmlForm->values );
-                $filterForm->setValues( array ('PAGED_TABLE_ID' => $this->id
-                ) );
-                $filterForm->setValues( array ('PAGED_TABLE_FAST_SEARCH' => $this->fastSearch
-                ) );
-                $this->tpl->assign( 'content', $filterForm->render( $template, $scriptCode ) );
-                $oHeadPublisher->addScriptFile( $filterForm->scriptURL );
-                $oHeadPublisher->addScriptCode( $scriptCode );
-                if (isset( $_SESSION )) {
-                    $_SESSION[$filterForm->id] = $filterForm->values;
-                }
-            }
-
-        }
-
-        /**
-         * ******** CONTENT BLOCK **************
-         */
-        if (($block === '') || ($block === 'content')) {
-            $this->tpl->newBlock( 'contentBlock' );
-            $this->tpl->assign( 'gridWidth', '=[' . substr( $this->gridWidth, 1 ) . ']' );
-            $this->tpl->assign( 'fieldNames', '=[' . substr( $this->gridFields, 1 ) . ']' );
-            $this->tpl->assign( 'ajaxUri', '="' . addslashes( $this->ajaxServer ) . '"' );
-            $this->tpl->assign( 'currentUri', '="' . addslashes( $this->ownerPage ) . '"' );
-            $this->tpl->assign( 'currentOrder', '="' . addslashes( $this->orderBy ) . '"' );
-            $this->tpl->assign( 'currentPage', '=' . $this->currentPage );
-            $this->tpl->assign( 'currentFilter', '="' . '"' );
-            $this->tpl->assign( 'totalRows', '=' . $this->totRows );
-            $this->tpl->assign( 'rowsPerPage', '=' . $this->rowsPerPage );
-            $this->tpl->assign( 'popupPage', '="' . addslashes( $this->popupPage ) . '"' );
-            $this->tpl->assign( 'popupWidth', '=' . $this->popupWidth );
-            $this->tpl->assign( 'popupHeight', '=' . $this->popupHeight );
-            $this->tpl->assign( 'pagedTable_Id', $this->id );
-            $this->tpl->assign( 'pagedTable_Name', $this->name );
-            $this->tpl->assign( "pagedTable_JS", "{$this->id}.element=document.getElementById('pagedtable[{$this->id}]');" );
-            $this->renderTitle();
-            //Render rows
-            if ($this->criteria->getDbName() == 'dbarray') {
-                $rs = ArrayBasePeer::doSelectRs( $this->criteria );
-            } else {
-                $rs = GulliverBasePeer::doSelectRs( $this->criteria );
-            }
-            $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-            /*
-             print "<div class='pagedTableDefault'><table  class='default'>";
-             $rs->next();
-             $row = $rs->getRow();
-             while ( is_array ( $row ) ) {
-             print "<tr  class='Row1'>";
-             foreach ( $row as $k=>$v ) print "<td>$v</td>";
-             print "</tr>";
-             $rs->next();
-             $row = $rs->getRow();
-             }
-             print "</table></div>";  die;*/
-            $gridRows = 0;
-            $rs->next();
-            //Initialize the array of breakFields for Master Detail View
-            foreach ($this->masterdetail as $keyMasterDetail => $fieldMasterDetail) {
-                $breakField[$fieldMasterDetail] = "novaluehere";
-            }
-            $breakFieldKeys = array_flip( $this->masterdetail );
-            for ($j = 0; $j < $rs->getRecordCount(); $j ++) {
-                $result = $rs->getRow();
-                $rs->next();
-                $gridRows ++;
-                $this->tpl->newBlock( "row" );
-                $this->tpl->assign( "class", "Row" . (($j % 2) + 1) );
-                $this->tdStyle = '';
-                $this->tdClass = '';
-                //Start Master Detail: This enable the MasterDEtail view. By JHL November 2008
-                if (count( $this->masterdetail ) > 0) {
-                    //TODO: Validate if there is a Field that doesn't exist
-                    //TODO: Style
-                    //TODO: Improve Collapse function....
-                    foreach ($this->masterdetail as $keyMasterDetail => $fieldMasterDetail) {
-                        if ($breakField[$fieldMasterDetail] != $result[$fieldMasterDetail]) {
-                            $this->tpl->newBlock( "rowMaster" );
-                            $this->tpl->newBlock( "fieldMaster" );
-                            $this->tpl->assign( "alignAttr", " colspan=" . (count( $this->fields ) * 2) );
-                            $this->tpl->assign( "value", $this->fields[$fieldMasterDetail]['Label'] == "" ? "" : $this->fields[$fieldMasterDetail]['Label'] . ": " . $this->xmlForm->fields[$fieldMasterDetail]->renderTable( $result[$fieldMasterDetail], $this->xmlForm, true ) );
-                            $breakField[$fieldMasterDetail] = $result[$fieldMasterDetail];
-                            for ($i = $breakFieldKeys[$fieldMasterDetail] + 1; $i < count( $breakField ); $i ++) {
-                                $breakField[$this->masterdetail[$i]] = "novaluehere";
-                            }
-                            $rowName = array ();
-                            foreach ($breakField as $key => $value) {
-                                if ($value != "novaluehere") {
-                                    $rowName[$key] = $key . "_" . $value;
-                                }
-                            }
-                            $this->tpl->assign( "masterRowName", implode( ",", $rowName ) );
-                            $this->tpl->assign( 'pagedTable_Name', $this->name );
-                            $many = "";
-                            $this->tpl->assign( "value1", str_pad( $many, count( $rowName ) - 1, "-" ) );
-                            $this->tpl->gotoblock( "rowMaster" );
-                            $this->tpl->assign( "masterRowName", "_MD_" . implode( ",", $rowName ) );
-                            $this->tpl->assign( "masterRowClass", $keyMasterDetail == 0 ? "masterDetailMain" : "masterDetailOther" );
-                        }
-                    }
-                    $this->tpl->gotoblock( "row" );
-                    if (! isset( $rowName )) {
-                        $rowName = array ();
-                    }
-                    $this->tpl->assign( "rowName", implode( ",", $rowName ) );
-                }
-                //End Master Detail: This enable the MasterDEtail view
-                //Merge $result with $xmlForm values (for default valuesSettings)
-                if (is_array( $this->xmlForm->values )) {
-                    $result = array_merge( $this->xmlForm->values, $result );
-                }
-                foreach ($this->fields as $r => $rval) {
-                    if (strcasecmp( $this->fields[$r]['Type'], 'cellMark' ) == 0) {
-                        $result1 = $result;
-                        $result1['row__'] = $j + 1;
-                        $result1 = array_merge( $this->xmlForm->values, $result1 );
-                        $this->xmlForm->setDefaultValues();
-                        $this->xmlForm->setValues( $result1 );
-                        $this->tdStyle = $this->xmlForm->fields[$this->fields[$r]['Name']]->tdStyle( $result1, $this->xmlForm );
-                        $this->tdClass = $this->xmlForm->fields[$this->fields[$r]['Name']]->tdClass( $result1, $this->xmlForm );
-                    } elseif ($this->style[$r]['showInTable'] != '0') {
-                        if (($this->style[$r]['showInTable'] != '0') && (! (in_array( $this->fields[$r]['Name'], $this->masterdetail )))) {
-                            $this->renderField( $j + 1, $r, $result );
-                        }
-                    }
-                }
-            }
-
-            $strjsCurrentOrder = $this->id . ".currentOrder = '" . addslashes($this->orderBy) . "';";
-
-            $this->tpl->assign( '_ROOT.gridRows', '=' . $gridRows ); //number of rows in the current page
-            $this->tpl->newBlock( 'rowTag' );
-            $this->tpl->assign( 'rowId', 'insertAtLast' );
-            if ($this->currentPage > 1) {
-                $prevpage = $this->currentPage - 1;
-
-                $firstAjax = $strjsCurrentOrder . $this->id . ".doGoToPage(1); return false;";
-                $prevAjax  = $strjsCurrentOrder . $this->id . ".doGoToPage(" . $prevpage . "); return false;";
-                $first = "<a href=\"javascript:;\" onclick=\"" . $firstAjax . "\" class=\"firstPage\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
-                $prev  = "<a href=\"javascript:;\" onclick=\"" . $prevAjax . "\" class=\"previousPage\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
-            } else {
-                $first = "<a class='noFirstPage'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
-                $prev = "<a class='noPreviousPage'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
-            }
-            if ($this->currentPage < $this->totPages) {
-                $nextpage = $this->currentPage + 1;
-
-                $nextAjax = $strjsCurrentOrder . $this->id . ".doGoToPage(" . $nextpage . "); return false;";
-                $lastAjax = $strjsCurrentOrder . $this->id . ".doGoToPage(" . $this->totPages . "); return false;";
-                $next = "<a href=\"javascript:;\" onclick=\"" . $nextAjax . "\" class=\"nextPage\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
-                $last = "<a href=\"javascript:;\" onclick=\"" . $lastAjax . "\" class=\"lastPage\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
-            } else {
-                $next = "<a class='noNextPage'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
-                $last = "<a class='noLastPage'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
-            }
-            $pagesEnum = '';
-            for ($r = 1; $r <= $this->totPages; $r ++) {
-                if (($r >= ($this->currentPage - 5)) && ($r <= ($this->currentPage + 5))) {
-                    $pageAjax = $strjsCurrentOrder . $this->id . ".doGoToPage(" . $r . "); return false;";
-
-                    if ($r != $this->currentPage) {
-                        $pagesEnum .= "&nbsp;<a href=\"javascript:;\" onclick=\"" . $pageAjax . "\">" . $r . "</a>";
-                    } else {
-                        $pagesEnum .= "&nbsp;<a>" . $r . "</a>";
-                    }
-                }
-            }
-            if ($this->totRows === 0) {
-                $this->tpl->newBlock( 'norecords' );
-                $this->tpl->assign( "columnCount", $this->colCount );
-                $noRecordsFound = 'ID_NO_RECORDS_FOUND';
-                if (G::LoadTranslation( $noRecordsFound )) {
-                    $noRecordsFound = G::LoadTranslation( $noRecordsFound );
-                }
-                $this->tpl->assign( "noRecordsFound", $noRecordsFound );
-            }
-            if (! $this->disableFooter) {
-                $this->tpl->newBlock( "bottomFooter" );
-                $this->tpl->assign( "columnCount", $this->colCount );
-                $this->tpl->assign( "pagedTableId", $this->id );
-                if (($this->totRows !== 0)) {
-                    if ($this->totPages > 1) {
-                        $this->tpl->assign( "first", $first );
-                        $this->tpl->assign( "prev", $prev );
-                        $this->tpl->assign( "next", $next );
-                        $this->tpl->assign( "last", $last );
-                    }
-                    $this->tpl->assign( "currentPage", $this->currentPage );
-                    $this->tpl->assign( "totalPages", $this->totPages );
-                    $firstRow = ($this->currentPage - 1) * $this->rowsPerPage + 1;
-                    $lastRow = $firstRow + $rs->getRecordCount() - 1;
-                    $this->tpl->assign( "firstRow", $firstRow );
-                    $this->tpl->assign( "lastRow", $lastRow );
-                    $this->tpl->assign( "totalRows", $this->totRows );
-                } else {
-                    $this->tpl->assign( "indexStyle", 'visibility:hidden;' );
-                }
-                if ($this->searchBy) {
-                    $this->tpl->assign( "fastSearchValue", $this->fastSearch );
-                } else {
-                    $this->tpl->assign( "fastSearchStyle", 'visibility:hidden;' );
-                }
-                if ($this->addRow) {
-                    if ($this->sqlInsert != '') {
-                        $this->tpl->assign( "insert", '<a href="#" onclick="pagedTable.event=\'Insert\';popup(\'' . $this->popupPage . '\');return false;">'./*G::LoadXml('labels','ID_ADD_NEW')*/ 'ID_ADD_NEW' . '</a>' );
-                    }
-                }
-                $this->tpl->assign( "pagesEnum", $pagesEnum );
-            }
-            
-            $this->name = $filter->xssFilterHard($this->name);
-            $this->orderBy = $filter->xssFilterHard($this->orderBy);
-            $this->currentPage = $filter->xssFilterHard($this->currentPage);
-            $this->id = $filter->xssFilterHard($this->id);
-            
-            ?>
-
-            <script language='JavaScript'>
-            var <?php echo $this->id?><?php echo ($this->name != '' ? '='.$this->name : '')?>=new G_PagedTable();
-            <?php echo $this->id?>.id<?php echo '="'. addslashes($this->id) . '"'?>;
-            <?php echo $this->id?>.name<?php echo '="'. addslashes($this->name) . '"'?>;
-            <?php echo $this->id?>.ajaxUri<?php echo '="'. addslashes($this->ajaxServer) . '?ptID='.$this->id.'"'?>;
-            <?php echo $this->id?>.currentOrder<?php echo '="'. addslashes($this->orderBy) . '"'?>;
-            <?php echo $this->id?>.currentFilter;
-            <?php echo $this->id?>.currentPage<?php echo '='. $this->currentPage?>;
-            <?php echo $this->id?>.totalRows<?php echo '='.$this->totRows ?>;
-            <?php echo $this->id?>.rowsPerPage<?php echo '='.$this->rowsPerPage?>;
-            <?php echo $this->id?>.popupPage<?php echo '="'. addslashes($this->popupPage) . '?ptID='.$this->id.'"'?>;
-            <?php echo $this->id?>.onUpdateField<?php echo '="'. addslashes($this->onUpdateField) . '"'?>;
-            <?php echo $this->id?>.shownFields<?php echo '='.$this->shownFields ?>;
-
-            var panelPopup;
-            var popupWidth<?php echo '='.$this->popupWidth?>;
-            var popupHeight<?php echo '='.$this->popupHeight?>;
-            </script>
-            <?php
-        }
-        /**
-         * ******** CLOSE BLOCK **************
-         */
-        if (($block === '') || ($block === 'close')) {
-            $this->tpl->newBlock( "closeBlock" );
-        }
-        //By JHL
-        //Put the content of the table in a variable to be used for other puposes
-        //Like rendering as PDF
-        global $_TABLE_CONTENT_;
-        $_TABLE_CONTENT_ = $this->tpl->getOutputContent();
-        $this->tpl->printToScreen();
-        unset( $this->tpl );
-        //unset($this->dbc);
-        //unset($this->ses);
-        $_SESSION['pagedTable[' . $this->id . ']'] = base64_encode(serialize($this));
-        $this->fastSearch = '';
-        return;
-    }
-
-    /**
-     * Function printForm
-     *
-     * @param string $filename
-     * @param array $data
-     * @return void
-     */
-    public function printForm ($filename, $data = array())
-    {
-        global $G_PUBLISH;
-        $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', $filename, '', $data, $this->popupSubmit );
-        G::RenderPage( "publish", "blank" );
-    }
-}
+<?php
+
+use ProcessMaker\Plugins\PluginRegistry;
+
+/**
+ * Class pagedTable
+ *
+ * @access public
+ * @package workflow.gulliver.system
+ * dependencies TemplatePower Form XmlForm
+ */
+class PropelTable
+{
+    public $xmlFormFile;
+    public $currentPage;
+    public $orderBy = '';
+    public $filter = [];
+    public $filterType = [];
+    public $searchBy = '';
+    public $fastSearch = '';
+    public $order = '';
+    public $template = 'templates/paged-table.html';
+    public $tpl;
+    public $style = [];
+    public $rowsPerPage = 25;
+    public $ownerPage;
+    public $popupPage;
+    public $popupSubmit;
+    public $popupWidth = 450;
+    public $popupHeight = 200;
+    public $ajaxServer;
+    public $fields;
+    public $query;
+    public $totPages;
+    public $totRows;
+    public $sortable = '1';
+
+    //SQL QUERIES
+    public $criteria;
+    public $sql = '';
+    public $sqlWhere = '';
+    public $sqlGroupBy = '';
+    public $sqlSelect = 'SELECT 1';
+    public $sqlDelete = '';
+    public $sqlInsert = '';
+    public $sqlUpdate = '';
+    public $fieldDataList = '';
+
+    //Configuration
+    public $xmlPopup = '';
+    public $addRow = false;
+    public $deleteRow = false;
+    public $editRow = false;
+    public $notFields = '  title button linknew begingrid2 endgrid2 '; // These are not considered to build the sql queries (update,insert,delete)
+
+
+    //JavaScript Object attributes
+    public $onUpdateField = "";
+    public $onDeleteField = "";
+    public $afterDeleteField = "";
+    public $onInsertField = "";
+
+    //New gulliver
+    public $xmlForm;
+    public $menu = '';
+    public $filterForm = '';
+    public $filterForm_Id = '';
+    public $name = 'pagedTable';
+    public $id = 'A1';
+    public $disableFooter = false;
+    //This attribute is used to set STYLES to groups of TD, using the field type "cellMark" (see XmlFormFieldCellMark)
+    public $tdStyle = '';
+    public $tdClass = '';
+    //Config Save definition
+    public $__Configuration = 'orderBy,filter,fastSearch,style/*/showInTable'; //order,rowsPerPage,disableFooter';
+
+
+    //Variable for MasterDetail feature
+    public $masterdetail = '';
+    public $title;
+
+    /**
+     * Function prepareQuery
+     *
+     * @author David S. Callizaya S. <davidsantos@colosa.com>
+     * @access public
+     * @param string $limitPage
+     * @return string
+     */
+    public function prepareQuery($limitPage = false)
+    {
+        // process the QuickSearch string and add the fields and expression needed to run the search
+        if ($this->searchBy !== '') {
+            $aSB = explode('|', $this->searchBy); //fields are separated by pipes
+            //subfilter
+            $subFilter = '';
+            foreach ($aSB as $sBy) {
+                $subFilter .= ($subFilter !== '') ? ' OR ' : '';
+                //TODO: Get DATABASE type from Criteria, I think sql delimeter is needed too
+                $subFilter .= $sBy . ' LIKE "%' . G::sqlEscape($this->fastSearch) . '%"';
+            }
+            if ($subFilter !== '') {
+                //Get the first defined table in Criteria.
+                $aCurrentTables = $this->criteria->getTables();
+                if (isset($aCurrentTables[0])) {
+                    $this->criteria->add($aCurrentTables[0] . ".*", '(' . $subFilter . ')', Criteria::CUSTOM);
+                }
+            }
+        }
+
+        //Merge sort array defined by USER with the array defined by SQL
+        parse_str($this->order, $orderFields);
+        parse_str($this->orderBy, $orderFields2);
+        //User sort is more important (first in merge).
+        $orderFields3 = array_merge($orderFields2, $orderFields);
+        //User sort is overwrites XMLs definition.
+        $orderFields = array_merge($orderFields3, $orderFields2);
+        //Order (BY SQL DEFINITION AND USER'S DEFINITION)
+        $this->aOrder = [];
+        $order = '';
+        foreach ($orderFields as $field => $fieldOrder) {
+            $field = G::getUIDName($field, '');
+            $fieldOrder = strtoupper($fieldOrder);
+            if ($fieldOrder === 'A') {
+                $fieldOrder = 'ASC';
+            }
+            if ($fieldOrder === 'D') {
+                $fieldOrder = 'DESC';
+            }
+            switch ($fieldOrder) {
+                case 'ASC':
+                case 'DESC':
+                    if ($order !== '') {
+                        $order .= ', ';
+                    }
+                    $order .= $field . ' ' . $fieldOrder;
+                    $this->aOrder[$field] = $fieldOrder;
+            }
+        }
+        //master detail :O
+        if (count($this->masterdetail) > 0) {
+            $this->criteria->clearOrderByColumns();
+            foreach ($this->masterdetail as $idMasterDetail => $fieldMasterDetail) {
+                $this->criteria->addAscendingOrderByColumn($fieldMasterDetail);
+            }
+        }
+        if (!empty($this->aOrder)) {
+            if (count($this->masterdetail) <= 0) {
+                $this->criteria->clearOrderByColumns();
+            }
+            foreach ($this->aOrder as $field => $ascending) {
+                if ($ascending == 'ASC') {
+                    $this->criteria->addAscendingOrderByColumn($field);
+                } else {
+                    $this->criteria->addDescendingOrderByColumn($field);
+                }
+            }
+        }
+        /**
+         * Add limits
+         */
+        $this->criteria->setLimit(0);
+        $this->criteria->setOffset(0);
+        if ($this->criteria->getDbName() == 'dbarray') {
+            $this->totRows = ArrayBasePeer::doCount($this->criteria);
+        } else {
+            $this->totRows = GulliverBasePeer::doCount($this->criteria);
+        }
+        $this->totPages = ceil($this->totRows / $this->rowsPerPage);
+        if ($limitPage) {
+            $this->criteria->setLimit($this->rowsPerPage);
+            $this->criteria->setOffset(($this->currentPage - 1) * $this->rowsPerPage);
+        }
+        return;
+    }
+
+    /**
+     * Function setupFromXmlform
+     *
+     * @author David S. Callizaya S. <davidsantos@colosa.com>
+     * editedby Hugo Loza <hugo@colosa.com>
+     * @access public
+     * @param eter string xmlForm
+     * @return string
+     */
+    public function setupFromXmlform($xmlForm)
+    {
+        $this->xmlForm = $xmlForm;
+        //Config
+        $this->name = $xmlForm->name;
+        $this->id = $xmlForm->id;
+        $this->currentPage = 1;
+        if (isset($_GET['page'])) {
+            $this->currentPage = $_GET['page'];
+        }
+        $this->orderBy = '';
+        if (isset($_GET['order'])) {
+            $this->orderBy = urldecode($_GET['order']);
+        }
+        $this->filter = '';
+        if (isset($_GET['filter'])) {
+            $this->filter = urldecode($_GET['filter']);
+        }
+        if ($xmlForm->ajaxServer != '') {
+            $this->ajaxServer = G::encryptLink($xmlForm->ajaxServer);
+        } else {
+            $this->ajaxServer = G::encryptLink('../gulliver/propelTableAjax');
+        }
+        $this->ownerPage = G::encryptLink(SYS_CURRENT_URI);
+        // Config attributes from XMLFORM file
+        $myAttributes = get_class_vars(get_class($this));
+        foreach ($this->xmlForm->xmlform->tree->attribute as $atrib => $value) {
+            if (array_key_exists($atrib, $myAttributes)) {
+                eval('settype($value, gettype($this->' . $atrib . '));');
+                if ($value !== '') {
+                    eval('$this->' . $atrib . '=$value;');
+                }
+            }
+        }
+        $this->masterdetail = [];
+        if (!empty($this->masterdetail)) {
+            $this->masterdetail = explode(",", $this->masterdetail);
+            foreach ($this->masterdetail as $keyMasterDetail => $valueMasterDetail) {
+                $this->masterdetail[$keyMasterDetail] = trim($valueMasterDetail);
+            }
+        }
+        //Prepare the fields
+        $this->style = [];
+        $this->gridWidth = '';
+        $this->gridFields = '';
+        $this->fieldsType = [];
+        foreach ($this->xmlForm->fields as $f => $v) {
+            $r = $f;
+            $this->fields[$r]['Name'] = $this->xmlForm->fields[$f]->name;
+            $this->fields[$r]['Type'] = $this->xmlForm->fields[$f]->type;
+            if (isset($this->xmlForm->fields[$f]->size)) {
+                $this->fields[$r]['Size'] = $this->xmlForm->fields[$f]->size;
+            }
+            $this->fields[$r]['Label'] = $this->xmlForm->fields[$f]->label;
+        }
+        //Set the default settings
+        $this->defaultStyle();
+        //continue with the setup
+        $this->gridWidth = '';
+        $this->gridFields = '';
+        foreach ($this->xmlForm->fields as $f => $v) {
+            $r = $f;
+            //Parse the column properties
+            foreach ($this->xmlForm->fields[$f] as $attribute => $value) {
+                if (!is_object($value)) {
+                    $this->style[$r][$attribute] = $value;
+                }
+            }
+            //Needed for javascript
+            //only the visible columns's width and name are stored
+            if ($this->style[$r]['showInTable'] != '0') {
+                $this->gridWidth .= ',' . $this->style[$r]['colWidth'];
+                $this->gridFields .= ',"form[' . $this->fields[$r]['Name'] . ']"';
+            }
+        }
+        $totalWidth = 0;
+        foreach ($this->fields as $r => $rval) {
+            if ($this->style[$r]['showInTable'] != '0') {
+                $totalWidth += $this->style[$r]['colWidth'];
+            }
+        }
+        $this->totalWidth = $totalWidth;
+    }
+
+    /**
+     * Function count
+     *
+     * @author David S. Callizaya S. <davidsantos@colosa.com>
+     * @access public
+     * @return string
+     */
+    public function count()
+    {
+        $this->prepareQuery();
+        return $this->totRows;
+    }
+
+    /**
+     * Function renderTitle
+     *
+     * @author David S. Callizaya S. <davidsantos@colosa.com>
+     * @access public
+     * @return string
+     */
+    public function renderTitle()
+    {
+        //fix the bug about showing hidden fields in propel table.
+        foreach ($this->fields as $r => $rval) {
+            if ($this->style[$r]['type'] == 'hidden') {
+                $this->style[$r]['showInTable'] = '0';
+            }
+        }
+
+        //Render headers
+        $this->colCount = 0;
+        $this->shownFields = '[';
+        foreach ($this->fields as $r => $rval) {
+            if (($this->style[$r]['showInTable'] != '0') && (!(in_array($this->fields[$r]['Name'], $this->masterdetail)))) {
+                $this->tpl->newBlock("headers");
+
+                $sortDir = "ASC";
+
+                if (isset($this->aOrder[$this->fields[$r]["Name"]])) {
+                    $sortDir = ($this->aOrder[$this->fields[$r]["Name"]] == "ASC") ? "DESC" : "ASC";
+                }
+
+                if ($this->style[$r]['titleVisibility'] != '0') {
+                    $this->style[$r]["href"] = "javascript:;";
+                    $this->style[$r]["onsort"] = $this->id . ".doSort(\"" . G::createUID("", $this->fields[$r]["Name"]) . "\", \"" . (($this->sortable == "0") ? "" : $sortDir) . "\"); return false;";
+                } else {
+                    $this->style[$r]["href"] = "javascript:;";
+                    $this->style[$r]['onsort'] = 'return false;';
+                }
+                if (isset($this->style[$r]['href'])) {
+                    $this->tpl->assign("href", $this->style[$r]['href']);
+                }
+                if (isset($this->style[$r]['onsort'])) {
+                    $this->tpl->assign("onsort", htmlentities($this->style[$r]['onsort'], ENT_QUOTES, 'UTF-8'));
+                }
+
+                if (isset($this->style[$r]['colWidth'])) {
+                    $this->tpl->assign("width", $this->style[$r]['colWidth']);
+                }
+                if (isset($this->style[$r]['colWidth'])) {
+                    $this->tpl->assign("widthPercent", ($this->style[$r]['colWidth'] * 100 / $this->totalWidth) . "%");
+                    //Hook for special skin with RTL languajes
+                }
+                if (defined('SYS_LANG_DIRECTION') && SYS_LANG_DIRECTION == 'R') {
+                    $this->style[$r]['titleAlign'] = 'right';
+                }
+                if (isset($this->style[$r]['titleAlign'])) {
+                    $this->tpl->assign("align", 'text-align:' . $this->style[$r]['titleAlign'] . ';');
+                }
+                if ($this->style[$r]['titleVisibility'] != '0') {
+                    $sortDirImg = "";
+
+                    if (isset($this->aOrder[$this->fields[$r]["Name"]])) {
+                        $sortDirImg = ($this->aOrder[$this->fields[$r]["Name"]] == "ASC") ? "<img src=\"/images/arrow-up.gif\" />" : "<img src=\"/images/arrow-down.gif\" />";
+                    }
+
+                    $this->tpl->assign("header", $this->fields[$r]["Label"] . $sortDirImg);
+                    $this->tpl->assign("displaySeparator", ($this->colCount == 0 || !isset($this->fields[$r]["Label"]) || $this->fields[$r]["Label"] == "") ? "display: none;" : "");
+                } else {
+                    $this->tpl->assign('displaySeparator', 'display:none;');
+                }
+                $this->colCount += 2;
+                $this->shownFields .= ($this->shownFields !== '[') ? ',' : '';
+                $this->shownFields .= '"' . $r . '"';
+            }
+        }
+        $this->shownFields .= ']';
+    }
+
+    /**
+     * Function renderField
+     *
+     * @author David S. Callizaya S. <davidsantos@colosa.com>
+     * @access public
+     * @param eter string row
+     * @param eter string r
+     * @param eter string result
+     * @return string
+     */
+    public function renderField($row, $r, $result)
+    {
+        global $G_DATE_FORMAT;
+        //to do: special content??
+        $styleData = $this->style[$r];
+        $fielDataName = $styleData['data'];
+        $fieldClassName = isset($styleData['colClassName']) && ($styleData['colClassName']) ? $styleData['colClassName'] : $this->tdClass;
+        if ($fielDataName != '') {
+            $value = ((isset($result[$fielDataName])) ? $result[$fielDataName] : '');
+        } else {
+            $value = $this->fields[$r]['Label'];
+        }
+        $this->tpl->newBlock("field");
+        $this->tpl->assign('width', $this->style[$r]['colWidth']);
+        $classAttr = (trim($fieldClassName) != '') ? " class=\"$fieldClassName\"" : '';
+        $this->tpl->assign('classAttr', $classAttr);
+        //to do: style is needed or not?
+        $alignAttr = (isset($this->style[$r]['align']) && strlen($this->style[$r]['align'] > 0)) ? " align=\"" . $this->style[$r]['align'] . "\"" : '';
+        $this->tpl->assign("alignAttr", $alignAttr);
+        $fieldName = $this->fields[$r]['Name'];
+        $fieldClass = get_class($this->xmlForm->fields[$fieldName]);
+        /**
+         * * BEGIN : Reeplace of @@, @%,...
+         * in field's attributes like onclick, link,
+         */
+        if (isset($this->xmlForm->fields[$this->fields[$r]['Name']]->link)) {
+            $this->xmlForm->fields[$this->fields[$r]['Name']]->link = G::replaceDataField($this->style[$r]['link'], $result);
+        }
+        if (isset($this->xmlForm->fields[$fieldName]->value)) {
+            $this->xmlForm->fields[$fieldName]->value = G::replaceDataField($styleData['value'], $result);
+        }
+        /**
+         * * END : Reeplace of @@, @%,...
+         */
+        /**
+         * * Rendering of the field
+         */
+        $this->xmlForm->fields[$fieldName]->mode = 'view';
+        $this->xmlForm->setDefaultValues();
+        $this->xmlForm->setValues($result);
+        if (array_search('renderTable', get_class_methods($fieldClass)) !== false) {
+            if ($value == '-') {
+                $htmlField = $value;
+            } else {
+                $htmlField = $this->xmlForm->fields[$fieldName]->renderTable($value, $this->xmlForm, true);
+            }
+            if (is_object($value)) {
+                $value = '';
+            }
+            // checking if the value variable is a html field, a html tag content can't contain &nbsp; as white spaces
+            $testValue = preg_match("/<a ?.*>(.*)<\/a>/i", $htmlField, $value);
+            $this->tpl->assign("value", $htmlField);
+            if ($testValue > 0 && (isset($value[1]) && strlen(trim($value[1])) == 0)) {
+                if ((trim($value[0])) == '') {
+                    $this->tpl->assign("value", "&nbsp;");
+                }
+            } else {
+                $this->tpl->assign("value", $htmlField);
+            }
+        }
+        return $this->fields[$r]['Type'];
+    }
+
+    /**
+     * Function defaultStyle
+     *
+     * @author David S. Callizaya S. <davidsantos@colosa.com>
+     * @access public
+     * @return string
+     */
+    public function defaultStyle()
+    {
+        foreach ($this->fields as $r => $rval) {
+            $this->style[$r] = array('showInTable' => '1', 'titleVisibility' => '1', 'colWidth' => '150', 'onclick' => '', 'event' => ''
+            );
+            //Some widths
+            if (!(strpos('  date linknew ', ' ' . $this->fields[$r]['Type'] . ' ') === false)) {
+                $this->style[$r]['colWidth'] = '70';
+            }
+            //Data source:
+            if (!(strpos('  title button linknew image-text jslink ', ' ' . $this->fields[$r]['Type'] . ' ') === false)) {
+                $this->style[$r]['data'] = ''; //If the control is a link it shows the label
+            } else {
+                $this->style[$r]['data'] = $this->fields[$r]['Name']; //ELSE: The data value for that field
+                //Hidden fields
+            }
+            if (!isset($this->style[$r]['showInTable'])) {
+                if (!(strpos('  title button endgrid2 submit password ', ' ' . $this->fields[$r]['Type'] . ' ') === false)) {
+                    $this->style[$r]['showInTable'] = '0';
+                } else {
+                    $this->style[$r]['showInTable'] = '1';
+                }
+            }
+            //Hidden titles
+            if (!(strpos('  linknew button link endgrid2 ', ' ' . $this->fields[$r]['Type'] . ' ') === false)) {
+                $this->style[$r]['titleVisibility'] = '0';
+            }
+            //Align titles
+            $this->style[$r]['titleAlign'] = 'center';
+            //Align fields
+            if (defined('SYS_LANG_DIRECTION') && SYS_LANG_DIRECTION == 'R') {
+                $this->style[$r]['align'] = 'right';
+            } else {
+                $this->style[$r]['align'] = 'left';
+            }
+            if (!(strpos(' linknew date ', ' ' . $this->fields[$r]['Type'] . ' ') === false)) {
+                $this->style[$r]['align'] = 'center';
+            }
+        }
+        // Adjust the columns width to prevent overflow the page width
+        //Render headers
+        $totalWidth = 0;
+        foreach ($this->fields as $r => $rval) {
+            if ($this->style[$r]['showInTable'] != '0') {
+                $totalWidth += $this->style[$r]['colWidth'];
+            }
+        }
+        $this->totalWidth = $totalWidth;
+        $maxWidth = 1800;
+        $proportion = $totalWidth / $maxWidth;
+        if ($proportion > 1) {
+            $this->totalWidth = 1800;
+        }
+        if ($proportion > 1) {
+            foreach ($this->fields as $r => $rval) {
+                if ($this->style[$r]['showInTable'] != '0') {
+                    $this->style[$r]['colWidth'] = $this->style[$r]['colWidth'] / $proportion;
+                }
+            }
+        }
+    }
+
+    /**
+     * Function renderTable
+     *
+     * @author David S. Callizaya S. <davidsantos@colosa.com>
+     * @param eter $block : = 'content'(Prints contentBlock only)
+     * @access public
+     * @return string
+     */
+    public function renderTable($block = '', $fields = '')
+    {
+        $filter = new InputFilter();
+        $fields = $filter->xssFilterHard($fields);
+        $this->orderBy = $filter->xssFilterHard($this->orderBy);
+        $this->currentPage = $filter->xssFilterHard($this->currentPage);
+
+        //Render Title
+        $thereisnotitle = true;
+        foreach ($this->fields as $r => $rval) {
+            if ($this->fields[$r]['Type'] === 'title') {
+                $this->title = $this->fields[$r]['Label'];
+                unset($this->fields[$r]);
+                $thereisnotitle = false;
+            }
+        }
+        if ($thereisnotitle) {
+            $this->title = '';
+        }
+        $oHeadPublisher = headPublisher::getSingleton();
+        $oHeadPublisher->addInstanceModule('leimnud', 'panel');
+        $time_start = microtime(true);
+        $this->prepareQuery(true);
+        $time_end = microtime(true);
+        $time = $time_end - $time_start;
+        // verify if there are templates folders registered, template and method folders are the same
+        $folderTemplate = explode('/', $this->template);
+        $oPluginRegistry = PluginRegistry::loadSingleton();
+        if ($oPluginRegistry->isRegisteredFolder($folderTemplate[0])) {
+            $templateFile = PATH_PLUGINS . $this->template . '.html';
+        } else {
+            $templateFile = PATH_TPL . $this->template . '.html';
+            // Prepare the template
+        }
+        $this->tpl = new TemplatePower($templateFile);
+        $this->tpl->prepare();
+        if (is_array($fields)) {
+            foreach ($fields as $key => $val) {
+                $this->tpl->assignGlobal($key, $val); //Changed to Global by JHL on Dec 14,2009.. then thes fields are available for all Blocks
+            }
+        }
+        /**
+         * ******** HEAD BLOCK **************
+         */
+        if (($block === '') || ($block === 'head')) {
+            $this->tpl->newBlock('headBlock');
+            $this->tpl->assign('pagedTable_Id', $this->id);
+            $this->tpl->assign('pagedTable_Name', $this->name);
+            $this->tpl->assign('pagedTable_Height', $this->xmlForm->height);
+            $this->tpl->assign("title", $this->title);
+
+            $this->xmlForm->home = $filter->xssFilterHard($this->xmlForm->home);
+            $this->filterForm = $filter->xssFilterHard($this->filterForm);
+            $this->menu = $filter->xssFilterHard($this->menu);
+
+            if (file_exists($this->xmlForm->home . $this->filterForm . '.xml')) {
+                $filterForm = new filterForm($this->filterForm, $this->xmlForm->home);
+                if ($this->menu === '') {
+                    $this->menu = 'gulliver/pagedTable_Options';
+                }
+            }
+            if (file_exists($this->xmlForm->home . $this->menu . '.xml')) {
+                $menu = new xmlMenu($this->menu, $this->xmlForm->home);
+                $this->tpl->newBlock('headerBlock');
+                $template = PATH_CORE . 'templates' . PATH_SEP . $menu->type . '.html';
+                $menu->setValues($this->xmlForm->values);
+                $menu->setValues(array('PAGED_TABLE_ID' => $this->id
+                ));
+                if (isset($filterForm->name)) {
+                    $menu->setValues(array('SEARCH_FILTER_FORM' => $filterForm->name
+                    ));
+                }
+                $this->tpl->assign('content', $menu->render($template, $scriptCode));
+                $oHeadPublisher->addScriptFile($menu->scriptURL);
+                $oHeadPublisher->addScriptCode($scriptCode);
+            }
+            if (file_exists($this->xmlForm->home . $this->filterForm . '.xml')) {
+                $this->tpl->newBlock('headerBlock');
+                $this->filterForm_Id = $filterForm->id;
+                $filterForm->type = 'filterform';
+                $filterForm->ajaxServer = '../gulliver/defaultAjax';
+                $template = PATH_CORE . 'templates/' . $filterForm->type . '.html';
+                $filterForm->setValues($this->xmlForm->values);
+                $filterForm->setValues(array('PAGED_TABLE_ID' => $this->id
+                ));
+                $filterForm->setValues(array('PAGED_TABLE_FAST_SEARCH' => $this->fastSearch
+                ));
+                $this->tpl->assign('content', $filterForm->render($template, $scriptCode));
+                $oHeadPublisher->addScriptFile($filterForm->scriptURL);
+                $oHeadPublisher->addScriptCode($scriptCode);
+                if (isset($_SESSION)) {
+                    $_SESSION[$filterForm->id] = $filterForm->values;
+                }
+            }
+        }
+
+        /**
+         * ******** CONTENT BLOCK **************
+         */
+        if (($block === '') || ($block === 'content')) {
+            $this->tpl->newBlock('contentBlock');
+            $this->tpl->assign('gridWidth', '=[' . substr($this->gridWidth, 1) . ']');
+            $this->tpl->assign('fieldNames', '=[' . substr($this->gridFields, 1) . ']');
+            $this->tpl->assign('ajaxUri', '="' . addslashes($this->ajaxServer) . '"');
+            $this->tpl->assign('currentUri', '="' . addslashes($this->ownerPage) . '"');
+            $this->tpl->assign('currentOrder', '="' . addslashes($this->orderBy) . '"');
+            $this->tpl->assign('currentPage', '=' . $this->currentPage);
+            $this->tpl->assign('currentFilter', '="' . '"');
+            $this->tpl->assign('totalRows', '=' . $this->totRows);
+            $this->tpl->assign('rowsPerPage', '=' . $this->rowsPerPage);
+            $this->tpl->assign('popupPage', '="' . addslashes($this->popupPage) . '"');
+            $this->tpl->assign('popupWidth', '=' . $this->popupWidth);
+            $this->tpl->assign('popupHeight', '=' . $this->popupHeight);
+            $this->tpl->assign('pagedTable_Id', $this->id);
+            $this->tpl->assign('pagedTable_Name', $this->name);
+            $this->tpl->assign("pagedTable_JS", "{$this->id}.element=document.getElementById('pagedtable[{$this->id}]');");
+            $this->renderTitle();
+            //Render rows
+            if ($this->criteria->getDbName() == 'dbarray') {
+                $rs = ArrayBasePeer::doSelectRs($this->criteria);
+            } else {
+                $rs = GulliverBasePeer::doSelectRs($this->criteria);
+            }
+            $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+
+            $gridRows = 0;
+            $rs->next();
+            //Initialize the array of breakFields for Master Detail View
+            foreach ($this->masterdetail as $keyMasterDetail => $fieldMasterDetail) {
+                $breakField[$fieldMasterDetail] = "novaluehere";
+            }
+            $breakFieldKeys = array_flip($this->masterdetail);
+            for ($j = 0; $j < $rs->getRecordCount(); $j++) {
+                $result = $rs->getRow();
+                $rs->next();
+                $gridRows++;
+                $this->tpl->newBlock("row");
+                $this->tpl->assign("class", "Row" . (($j % 2) + 1));
+                $this->tdStyle = '';
+                $this->tdClass = '';
+                //Start Master Detail: This enable the MasterDEtail view. By JHL November 2008
+                if (count($this->masterdetail) > 0) {
+                    //TODO: Validate if there is a Field that doesn't exist
+                    //TODO: Style
+                    //TODO: Improve Collapse function....
+                    foreach ($this->masterdetail as $keyMasterDetail => $fieldMasterDetail) {
+                        if ($breakField[$fieldMasterDetail] != $result[$fieldMasterDetail]) {
+                            $this->tpl->newBlock("rowMaster");
+                            $this->tpl->newBlock("fieldMaster");
+                            $this->tpl->assign("alignAttr", " colspan=" . (count($this->fields) * 2));
+                            $this->tpl->assign("value", $this->fields[$fieldMasterDetail]['Label'] == "" ? "" : $this->fields[$fieldMasterDetail]['Label'] . ": " . $this->xmlForm->fields[$fieldMasterDetail]->renderTable($result[$fieldMasterDetail], $this->xmlForm, true));
+                            $breakField[$fieldMasterDetail] = $result[$fieldMasterDetail];
+                            for ($i = $breakFieldKeys[$fieldMasterDetail] + 1; $i < count($breakField); $i++) {
+                                $breakField[$this->masterdetail[$i]] = "novaluehere";
+                            }
+                            $rowName = [];
+                            foreach ($breakField as $key => $value) {
+                                if ($value != "novaluehere") {
+                                    $rowName[$key] = $key . "_" . $value;
+                                }
+                            }
+                            $this->tpl->assign("masterRowName", implode(",", $rowName));
+                            $this->tpl->assign('pagedTable_Name', $this->name);
+                            $many = "";
+                            $this->tpl->assign("value1", str_pad($many, count($rowName) - 1, "-"));
+                            $this->tpl->gotoblock("rowMaster");
+                            $this->tpl->assign("masterRowName", "_MD_" . implode(",", $rowName));
+                            $this->tpl->assign("masterRowClass", $keyMasterDetail == 0 ? "masterDetailMain" : "masterDetailOther");
+                        }
+                    }
+                    $this->tpl->gotoblock("row");
+                    if (!isset($rowName)) {
+                        $rowName = [];
+                    }
+                    $this->tpl->assign("rowName", implode(",", $rowName));
+                }
+                //End Master Detail: This enable the MasterDEtail view
+                //Merge $result with $xmlForm values (for default valuesSettings)
+                if (is_array($this->xmlForm->values)) {
+                    $result = array_merge($this->xmlForm->values, $result);
+                }
+                foreach ($this->fields as $r => $rval) {
+                    if (strcasecmp($this->fields[$r]['Type'], 'cellMark') == 0) {
+                        $result1 = $result;
+                        $result1['row__'] = $j + 1;
+                        $result1 = array_merge($this->xmlForm->values, $result1);
+                        $this->xmlForm->setDefaultValues();
+                        $this->xmlForm->setValues($result1);
+                        $this->tdStyle = $this->xmlForm->fields[$this->fields[$r]['Name']]->tdStyle($result1, $this->xmlForm);
+                        $this->tdClass = $this->xmlForm->fields[$this->fields[$r]['Name']]->tdClass($result1, $this->xmlForm);
+                    } elseif ($this->style[$r]['showInTable'] != '0') {
+                        if (($this->style[$r]['showInTable'] != '0') && (!(in_array($this->fields[$r]['Name'], $this->masterdetail)))) {
+                            $this->renderField($j + 1, $r, $result);
+                        }
+                    }
+                }
+            }
+
+            $strjsCurrentOrder = $this->id . ".currentOrder = '" . addslashes($this->orderBy) . "';";
+
+            $this->tpl->assign('_ROOT.gridRows', '=' . $gridRows); //number of rows in the current page
+            $this->tpl->newBlock('rowTag');
+            $this->tpl->assign('rowId', 'insertAtLast');
+            if ($this->currentPage > 1) {
+                $prevpage = $this->currentPage - 1;
+
+                $firstAjax = $strjsCurrentOrder . $this->id . ".doGoToPage(1); return false;";
+                $prevAjax = $strjsCurrentOrder . $this->id . ".doGoToPage(" . $prevpage . "); return false;";
+                $first = "<a href=\"javascript:;\" onclick=\"" . $firstAjax . "\" class=\"firstPage\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
+                $prev = "<a href=\"javascript:;\" onclick=\"" . $prevAjax . "\" class=\"previousPage\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
+            } else {
+                $first = "<a class='noFirstPage'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
+                $prev = "<a class='noPreviousPage'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
+            }
+            if ($this->currentPage < $this->totPages) {
+                $nextpage = $this->currentPage + 1;
+
+                $nextAjax = $strjsCurrentOrder . $this->id . ".doGoToPage(" . $nextpage . "); return false;";
+                $lastAjax = $strjsCurrentOrder . $this->id . ".doGoToPage(" . $this->totPages . "); return false;";
+                $next = "<a href=\"javascript:;\" onclick=\"" . $nextAjax . "\" class=\"nextPage\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
+                $last = "<a href=\"javascript:;\" onclick=\"" . $lastAjax . "\" class=\"lastPage\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
+            } else {
+                $next = "<a class='noNextPage'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
+                $last = "<a class='noLastPage'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>";
+            }
+            $pagesEnum = '';
+            for ($r = 1; $r <= $this->totPages; $r++) {
+                if (($r >= ($this->currentPage - 5)) && ($r <= ($this->currentPage + 5))) {
+                    $pageAjax = $strjsCurrentOrder . $this->id . ".doGoToPage(" . $r . "); return false;";
+
+                    if ($r != $this->currentPage) {
+                        $pagesEnum .= "&nbsp;<a href=\"javascript:;\" onclick=\"" . $pageAjax . "\">" . $r . "</a>";
+                    } else {
+                        $pagesEnum .= "&nbsp;<a>" . $r . "</a>";
+                    }
+                }
+            }
+            if ($this->totRows === 0) {
+                $this->tpl->newBlock('norecords');
+                $this->tpl->assign("columnCount", $this->colCount);
+                $noRecordsFound = 'ID_NO_RECORDS_FOUND';
+                if (G::LoadTranslation($noRecordsFound)) {
+                    $noRecordsFound = G::LoadTranslation($noRecordsFound);
+                }
+                $this->tpl->assign("noRecordsFound", $noRecordsFound);
+            }
+            if (!$this->disableFooter) {
+                $this->tpl->newBlock("bottomFooter");
+                $this->tpl->assign("columnCount", $this->colCount);
+                $this->tpl->assign("pagedTableId", $this->id);
+                if (($this->totRows !== 0)) {
+                    if ($this->totPages > 1) {
+                        $this->tpl->assign("first", $first);
+                        $this->tpl->assign("prev", $prev);
+                        $this->tpl->assign("next", $next);
+                        $this->tpl->assign("last", $last);
+                    }
+                    $this->tpl->assign("currentPage", $this->currentPage);
+                    $this->tpl->assign("totalPages", $this->totPages);
+                    $firstRow = ($this->currentPage - 1) * $this->rowsPerPage + 1;
+                    $lastRow = $firstRow + $rs->getRecordCount() - 1;
+                    $this->tpl->assign("firstRow", $firstRow);
+                    $this->tpl->assign("lastRow", $lastRow);
+                    $this->tpl->assign("totalRows", $this->totRows);
+                } else {
+                    $this->tpl->assign("indexStyle", 'visibility:hidden;');
+                }
+                if ($this->searchBy) {
+                    $this->tpl->assign("fastSearchValue", $this->fastSearch);
+                } else {
+                    $this->tpl->assign("fastSearchStyle", 'visibility:hidden;');
+                }
+                if ($this->addRow) {
+                    if ($this->sqlInsert != '') {
+                        $this->tpl->assign("insert", '<a href="#" onclick="pagedTable.event=\'Insert\';popup(\'' . $this->popupPage . '\');return false;">' .
+                            'ID_ADD_NEW' . '</a>');
+                    }
+                }
+                $this->tpl->assign("pagesEnum", $pagesEnum);
+            }
+
+            $this->name = $filter->xssFilterHard($this->name);
+            $this->orderBy = $filter->xssFilterHard($this->orderBy);
+            $this->currentPage = $filter->xssFilterHard($this->currentPage);
+            $this->id = $filter->xssFilterHard($this->id); ?>
+
+            <script language='JavaScript'>
+                var <?php echo $this->id?><?php echo($this->name != '' ? '=' . $this->name : '')?>=
+                new G_PagedTable();
+                <?php echo $this->id?>.id<?php echo '="' . addslashes($this->id) . '"'?>;
+                <?php echo $this->id?>.name<?php echo '="' . addslashes($this->name) . '"'?>;
+                <?php echo $this->id?>.ajaxUri<?php echo '="' . addslashes($this->ajaxServer) . '?ptID=' . $this->id . '"'?>;
+                <?php echo $this->id?>.currentOrder<?php echo '="' . addslashes($this->orderBy) . '"'?>;
+                <?php echo $this->id?>.currentFilter;
+                <?php echo $this->id?>.currentPage<?php echo '=' . $this->currentPage?>;
+                <?php echo $this->id?>.totalRows<?php echo '=' . $this->totRows ?>;
+                <?php echo $this->id?>.rowsPerPage<?php echo '=' . $this->rowsPerPage?>;
+                <?php echo $this->id?>.popupPage<?php echo '="' . addslashes($this->popupPage) . '?ptID=' . $this->id . '"'?>;
+                <?php echo $this->id?>.onUpdateField<?php echo '="' . addslashes($this->onUpdateField) . '"'?>;
+                <?php echo $this->id?>.shownFields<?php echo '=' . $this->shownFields ?>;
+
+                var panelPopup;
+                var popupWidth<?php echo '=' . $this->popupWidth?>;
+                var popupHeight<?php echo '=' . $this->popupHeight?>;
+            </script>
+            <?php
+        }
+        /**
+         * ******** CLOSE BLOCK **************
+         */
+        if (($block === '') || ($block === 'close')) {
+            $this->tpl->newBlock("closeBlock");
+        }
+        //By JHL
+        //Put the content of the table in a variable to be used for other puposes
+        //Like rendering as PDF
+        global $_TABLE_CONTENT_;
+        $_TABLE_CONTENT_ = $this->tpl->getOutputContent();
+        $this->tpl->printToScreen();
+        unset($this->tpl);
+        $_SESSION['pagedTable[' . $this->id . ']'] = base64_encode(serialize($this));
+        $this->fastSearch = '';
+        return;
+    }
+
+    /**
+     * Function printForm
+     *
+     * @param string $filename
+     * @param array $data
+     * @return void
+     */
+    public function printForm($filename, $data = array())
+    {
+        global $G_PUBLISH;
+        $G_PUBLISH = new Publisher();
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', $filename, '', $data, $this->popupSubmit);
+        G::RenderPage("publish", "blank");
+    }
+}
diff --git a/workflow/engine/classes/ReportTables.php b/workflow/engine/classes/ReportTables.php
index 528f58197..1f4e419cd 100644
--- a/workflow/engine/classes/ReportTables.php
+++ b/workflow/engine/classes/ReportTables.php
@@ -5,11 +5,26 @@
  */
 class ReportTables
 {
-    private $aDef = array('mysql' => array('number' => 'DOUBLE', 'char' => 'VARCHAR(255)', 'text' => 'TEXT', 'date' => 'DATETIME'
-    ), 'pgsql' => array('number' => 'DOUBLE', 'char' => 'VARCHAR(255)', 'text' => 'TEXT', 'date' => 'DATETIME'
-    ), 'mssql' => array('number' => 'FLOAT', 'char' => 'NVARCHAR(255)', 'text' => 'TEXT', 'date' => 'CHAR(19)'
-    ) /* Changed DATETIME CHAR(19) for compatibility issues. */);
-    //private $sPrefix = 'REP_';
+    private $aDef = array(
+        'mysql' => array(
+            'number' => 'DOUBLE',
+            'char' => 'VARCHAR(255)',
+            'text' => 'TEXT',
+            'date' => 'DATETIME'
+        ),
+        'pgsql' => array(
+            'number' => 'DOUBLE',
+            'char' => 'VARCHAR(255)',
+            'text' => 'TEXT',
+            'date' => 'DATETIME'
+        ),
+        'mssql' => array(
+            'number' => 'FLOAT',
+            'char' => 'NVARCHAR(255)',
+            'text' => 'TEXT',
+            'date' => 'CHAR(19)'
+        ) /* Changed DATETIME CHAR(19) for compatibility issues. */
+    );
     private $sPrefix = '';
 
     /**
@@ -17,7 +32,9 @@ class ReportTables
      * This function delete all reports
      *
      * @access public
+     *
      * @param string $$sRepTabUid
+     *
      * @return void
      */
     public function deleteAllReportVars($sRepTabUid = '')
@@ -36,8 +53,10 @@ class ReportTables
      * This function removes the table
      *
      * @access public
+     *
      * @param string $sTableName Table name
      * @param string $sConnection Conexion
+     *
      * @return void
      */
     public function dropTable($sTableName, $sConnection = 'report')
@@ -54,7 +73,7 @@ class ReportTables
                     break;
                 case 'mssql':
                     $rs = $stmt->executeQuery("IF OBJECT_ID (N'" . $sTableName . "', N'U') IS NOT NULL
-																		  DROP TABLE [" . $sTableName . "]");
+                        DROP TABLE [" . $sTableName . "]");
                     break;
             }
         } catch (Exception $oError) {
@@ -67,14 +86,22 @@ class ReportTables
      * This Function creates the table
      *
      * @access public
+     *
      * @param string $sTableName Table name
      * @param string $sConnection Connection name
      * @param string $sType
      * @param array $aFields
      * @param string $bDefaultFields
+     *
      * @return void
      */
-    public function createTable($sTableName, $sConnection = 'report', $sType = 'NORMAL', $aFields = array(), $bDefaultFields = true)
+    public function createTable(
+        $sTableName,
+        $sConnection = 'report',
+        $sType = 'NORMAL',
+        $aFields = array(),
+        $bDefaultFields = true
+    )
     {
         $sTableName = $this->sPrefix . $sTableName;
         //we have to do the propel connection
@@ -108,7 +135,7 @@ class ReportTables
                         }
                     }
                     if ($bDefaultFields) {
-                        $sQuery .= 'PRIMARY KEY (APP_UID' . ($sType == 'GRID' ? ',ROW' : '') . ')) ';
+                        $sQuery .= 'PRIMARY KEY (APP_UID' . ($sType === 'GRID' ? ',ROW' : '') . ')) ';
                     }
                     $sQuery .= ' DEFAULT CHARSET=utf8;';
                     $rs = $stmt->executeQuery($sQuery);
@@ -157,15 +184,24 @@ class ReportTables
      * This Function fills the table
      *
      * @access public
+     *
      * @param string $sTableName Table name
      * @param string $sConnection Connection name
      * @param string $sType
      * @param array $aFields
      * @param string $sProcessUid
      * @param string $sGrid
+     *
      * @return void
      */
-    public function populateTable($sTableName, $sConnection = 'report', $sType = 'NORMAL', $aFields = array(), $sProcessUid = '', $sGrid = '')
+    public function populateTable(
+        $sTableName,
+        $sConnection = 'report',
+        $sType = 'NORMAL',
+        $aFields = array(),
+        $sProcessUid = '',
+        $sGrid = ''
+    )
     {
         $sTableName = $this->sPrefix . $sTableName;
         //we have to do the propel connection
@@ -201,14 +237,21 @@ class ReportTables
                             foreach ($aFields as $aField) {
                                 switch ($aField['sType']) {
                                     case 'number':
-                                        $sQuery .= ',' . (isset($aData[$aField['sFieldName']]) ? (float)str_replace(',', '', $aData[$aField['sFieldName']]) : '0');
+                                        $sQuery .= ',' . (isset($aData[$aField['sFieldName']]) ? (float)str_replace(
+                                                ',',
+                                                '',
+                                                $aData[$aField['sFieldName']]
+                                            ) : '0');
                                         break;
                                     case 'char':
                                     case 'text':
                                         if (!isset($aData[$aField['sFieldName']])) {
                                             $aData[$aField['sFieldName']] = '';
                                         }
-                                        $sQuery .= ",'" . (isset($aData[$aField['sFieldName']]) ? @mysql_real_escape_string($aData[$aField['sFieldName']]) : '') . "'";
+                                        $sQuery .= ",'" . (isset($aData[$aField['sFieldName']]) ? mysqli_real_escape_string(
+                                                $con->getResource(),
+                                                $aData[$aField['sFieldName']]
+                                            ) : '') . "'";
                                         break;
                                     case 'date':
                                         $value = (isset($aData[$aField['sFieldName']]) && trim($aData[$aField['sFieldName']])) != '' ? "'" . $aData[$aField['sFieldName']] . "'" : 'NULL';
@@ -230,14 +273,21 @@ class ReportTables
                                     foreach ($aFields as $aField) {
                                         switch ($aField['sType']) {
                                             case 'number':
-                                                $sQuery .= ',' . (isset($aGridRow[$aField['sFieldName']]) ? (float)str_replace(',', '', $aGridRow[$aField['sFieldName']]) : '0');
+                                                $sQuery .= ',' . (isset($aGridRow[$aField['sFieldName']]) ? (float)str_replace(
+                                                        ',',
+                                                        '',
+                                                        $aGridRow[$aField['sFieldName']]
+                                                    ) : '0');
                                                 break;
                                             case 'char':
                                             case 'text':
                                                 if (!isset($aGridRow[$aField['sFieldName']])) {
                                                     $aGridRow[$aField['sFieldName']] = '';
                                                 }
-                                                $sQuery .= ",'" . (isset($aGridRow[$aField['sFieldName']]) ? mysql_real_escape_string($aGridRow[$aField['sFieldName']]) : '') . "'";
+                                                $sQuery .= ",'" . (isset($aGridRow[$aField['sFieldName']]) ? mysqli_real_escape_string(
+                                                        $con->getResource(),
+                                                        $aGridRow[$aField['sFieldName']]
+                                                    ) : '') . "'";
                                                 break;
                                             case 'date':
                                                 $value = (isset($aGridRow[$aField['sFieldName']]) && trim($aGridRow[$aField['sFieldName']])) != '' ? "'" . $aGridRow[$aField['sFieldName']] . "'" : 'NULL';
@@ -266,7 +316,11 @@ class ReportTables
                     $oDataset->next();
                     while ($aRow = $oDataset->getRow()) {
                         $aData = unserialize($aRow['APP_DATA']);
-                        mysql_query('DELETE FROM [' . $sTableName . "] WHERE APP_UID = '" . $aRow['APP_UID'] . "'");
+                        //verify use mssql
+                        mysqli_query(
+                            $con->getResource(),
+                            'DELETE FROM [' . $sTableName . "] WHERE APP_UID = '" . $aRow['APP_UID'] . "'"
+                        );
                         if ($sType == 'NORMAL') {
                             $sQuery = 'INSERT INTO [' . $sTableName . '] (';
                             $sQuery .= '[APP_UID],[APP_NUMBER]';
@@ -277,14 +331,21 @@ class ReportTables
                             foreach ($aFields as $aField) {
                                 switch ($aField['sType']) {
                                     case 'number':
-                                        $sQuery .= ',' . (isset($aData[$aField['sFieldName']]) ? (float)str_replace(',', '', $aData[$aField['sFieldName']]) : '0');
+                                        $sQuery .= ',' . (isset($aData[$aField['sFieldName']]) ? (float)str_replace(
+                                                ',',
+                                                '',
+                                                $aData[$aField['sFieldName']]
+                                            ) : '0');
                                         break;
                                     case 'char':
                                     case 'text':
                                         if (!isset($aData[$aField['sFieldName']])) {
                                             $aData[$aField['sFieldName']] = '';
                                         }
-                                        $sQuery .= ",'" . (isset($aData[$aField['sFieldName']]) ? mysql_real_escape_string($aData[$aField['sFieldName']]) : '') . "'";
+                                        $sQuery .= ",'" . (isset($aData[$aField['sFieldName']]) ? mysqli_real_escape_string(
+                                                $con->getResource(),
+                                                $aData[$aField['sFieldName']]
+                                            ) : '') . "'";
                                         break;
                                     case 'date':
                                         $sQuery .= ",'" . (isset($aData[$aField['sFieldName']]) ? $aData[$aField['sFieldName']] : '') . "'";
@@ -305,14 +366,21 @@ class ReportTables
                                     foreach ($aFields as $aField) {
                                         switch ($aField['sType']) {
                                             case 'number':
-                                                $sQuery .= ',' . (isset($aGridRow[$aField['sFieldName']]) ? (float)str_replace(',', '', $aGridRow[$aField['sFieldName']]) : '0');
+                                                $sQuery .= ',' . (isset($aGridRow[$aField['sFieldName']]) ? (float)str_replace(
+                                                        ',',
+                                                        '',
+                                                        $aGridRow[$aField['sFieldName']]
+                                                    ) : '0');
                                                 break;
                                             case 'char':
                                             case 'text':
                                                 if (!isset($aGridRow[$aField['sFieldName']])) {
                                                     $aGridRow[$aField['sFieldName']] = '';
                                                 }
-                                                $sQuery .= ",'" . (isset($aGridRow[$aField['sFieldName']]) ? mysql_real_escape_string($aGridRow[$aField['sFieldName']]) : '') . "'";
+                                                $sQuery .= ",'" . (isset($aGridRow[$aField['sFieldName']]) ? mysqli_real_escape_string(
+                                                        $con->getResource(),
+                                                        $aGridRow[$aField['sFieldName']]
+                                                    ) : '') . "'";
                                                 break;
                                             case 'date':
                                                 $sQuery .= ",'" . (isset($aGridRow[$aField['sFieldName']]) ? $aGridRow[$aField['sFieldName']] : '') . "'";
@@ -338,8 +406,10 @@ class ReportTables
      * Function getTableVars
      *
      * @access public
+     *
      * @param string $sRepTabUid
      * @param boolean $bWhitType
+     *
      * @return void
      */
     public function getTableVars($sRepTabUid, $bWhitType = false)
@@ -356,7 +426,9 @@ class ReportTables
                 if ($bWhitType) {
                     if (!in_array($aRow['REP_VAR_NAME'], $aImportedVars)) {
                         $aImportedVars[] = $aRow['REP_VAR_NAME'];
-                        $aVars[] = array('sFieldName' => $aRow['REP_VAR_NAME'], 'sType' => $aRow['REP_VAR_TYPE']
+                        $aVars[] = array(
+                            'sFieldName' => $aRow['REP_VAR_NAME'],
+                            'sType' => $aRow['REP_VAR_TYPE']
                         );
                     }
                 } else {
@@ -375,7 +447,9 @@ class ReportTables
      * This Function deletes report table
      *
      * @access public
+     *
      * @param string $sRepTabUid
+     *
      * @return void
      */
     public function deleteReportTable($sRepTabUid)
@@ -400,8 +474,10 @@ class ReportTables
      * This function gets the split date
      *
      * @access public
+     *
      * @param date $date
      * @param string $mask
+     *
      * @return array
      */
     public function getSplitDate($date, $mask)
@@ -465,7 +541,10 @@ class ReportTables
                     break;
             }
         }
-        return Array(isset($d1) ? $d1 : '', isset($d2) ? $d2 : '', isset($d3) ? $d3 : ''
+        return array(
+            isset($d1) ? $d1 : '',
+            isset($d2) ? $d2 : '',
+            isset($d3) ? $d3 : ''
         );
     }
 
@@ -474,13 +553,14 @@ class ReportTables
      * This function returns the date formated
      *
      * @access public
+     *
      * @param date $sDate
      * @param date $sMask
+     *
      * @return date
      */
     public function getFormatDate($sDate, $sMask)
     {
-        //print $sDate." *** ". $sMask."<BR>";
         $dateTime = explode(" ", $sDate); //To accept the Hour part
         $aDate = explode('-', str_replace("/", "-", $dateTime[0]));
         $bResult = true;
@@ -512,10 +592,12 @@ class ReportTables
      * This function updated the Report Tables
      *
      * @access public
+     *
      * @param string $sProcessUid
      * @param string $sApplicationUid
      * @param string $iApplicationNumber
      * @param string $aFields
+     *
      * @return void
      */
     public function updateTables($sProcessUid, $sApplicationUid, $iApplicationNumber, $aFields)
@@ -545,6 +627,7 @@ class ReportTables
                 $aRow['REP_TAB_NAME'] = $this->sPrefix . $aRow['REP_TAB_NAME'];
                 $PropelDatabase = $this->chooseDB($aRow['REP_TAB_CONNECTION']);
                 $con = Propel::getConnection($PropelDatabase);
+                $con->getResource();
                 $stmt = $con->createStatement();
                 switch (DB_ADAPTER) {
                     case 'mysql':
@@ -570,7 +653,11 @@ class ReportTables
 
                                     switch ($aField['sType']) {
                                         case 'number':
-                                            $sQuery .= (isset($aFields[$aField['sFieldName']]) ? (float)str_replace(',', '', $aFields[$aField['sFieldName']]) : '0') . ',';
+                                            $sQuery .= (isset($aFields[$aField['sFieldName']]) ? (float)str_replace(
+                                                    ',',
+                                                    '',
+                                                    $aFields[$aField['sFieldName']]
+                                                ) : '0') . ',';
                                             break;
                                         case 'char':
                                         case 'text':
@@ -583,7 +670,10 @@ class ReportTables
                                             if (is_array($aFields[$aField['sFieldName']])) {
                                                 $sQuery .= "'" . (isset($aFields[$aField['sFieldName']]) ? $aFields[$aField['sFieldName']][0] : '') . "',";
                                             } else {
-                                                $sQuery .= '\'' . ((isset($aFields[$aField['sFieldName']])) ? @mysql_real_escape_string($aFields[$aField['sFieldName']]) : '') . '\',';
+                                                $sQuery .= '\'' . ((isset($aFields[$aField['sFieldName']])) ? mysqli_real_escape_string(
+                                                        $con->getResource(),
+                                                        $aFields[$aField['sFieldName']]
+                                                    ) : '') . '\',';
                                             }
                                             break;
                                         case 'date':
@@ -605,9 +695,15 @@ class ReportTables
                                     try {
                                         $rs = $stmt->executeQuery($sQuery);
                                     } catch (Exception $e) {
-                                        Bootstrap::registerMonolog('sqlExecution', 400, 'Sql Execution', ['sql' => $sQuery,'error' => $e->getMessage()], config("system.workspace"), 'processmaker.log');
+                                        Bootstrap::registerMonolog(
+                                            'sqlExecution',
+                                            400,
+                                            'Sql Execution',
+                                            ['sql' => $sQuery, 'error' => $e->getMessage()],
+                                            config("system.workspace"),
+                                            'processmaker.log'
+                                        );
                                     }
-
                                 }
                             } else {
                                 $sQuery = 'INSERT INTO `' . $aRow['REP_TAB_NAME'] . '` (';
@@ -619,14 +715,21 @@ class ReportTables
                                 foreach ($aTableFields as $aField) {
                                     switch ($aField['sType']) {
                                         case 'number':
-                                            $sQuery .= ',' . (isset($aFields[$aField['sFieldName']]) ? (float)str_replace(',', '', $aFields[$aField['sFieldName']]) : '0');
+                                            $sQuery .= ',' . (isset($aFields[$aField['sFieldName']]) ? (float)str_replace(
+                                                    ',',
+                                                    '',
+                                                    $aFields[$aField['sFieldName']]
+                                                ) : '0');
                                             break;
                                         case 'char':
                                         case 'text':
                                             if (!isset($aFields[$aField['sFieldName']])) {
                                                 $aFields[$aField['sFieldName']] = '';
                                             }
-                                            $sQuery .= ",'" . (isset($aFields[$aField['sFieldName']]) ? mysql_real_escape_string($aFields[$aField['sFieldName']]) : '') . "'";
+                                            $sQuery .= ",'" . (isset($aFields[$aField['sFieldName']]) ? mysqli_real_escape_string(
+                                                    $con->getResource(),
+                                                    $aFields[$aField['sFieldName']]
+                                                ) : '') . "'";
                                             break;
                                         case 'date':
                                             $mysqlDate = (isset($aFields[$aField['sFieldName']]) ? $aFields[$aField['sFieldName']] : '');
@@ -644,7 +747,14 @@ class ReportTables
                                 try {
                                     $rs = $stmt->executeQuery($sQuery);
                                 } catch (Exception $e) {
-                                    Bootstrap::registerMonolog('sqlExecution', 400, 'Sql Execution', ['sql' => $sQuery,'error' => $e->getMessage()], config("system.workspace"), 'processmaker.log');
+                                    Bootstrap::registerMonolog(
+                                        'sqlExecution',
+                                        400,
+                                        'Sql Execution',
+                                        ['sql' => $sQuery, 'error' => $e->getMessage()],
+                                        config("system.workspace"),
+                                        'processmaker.log'
+                                    );
                                 }
                             }
                         } else {
@@ -665,14 +775,21 @@ class ReportTables
                                         foreach ($aTableFields as $aField) {
                                             switch ($aField['sType']) {
                                                 case 'number':
-                                                    $sQuery .= ',' . (isset($aGridRow[$aField['sFieldName']]) ? (float)str_replace(',', '', $aGridRow[$aField['sFieldName']]) : '0');
+                                                    $sQuery .= ',' . (isset($aGridRow[$aField['sFieldName']]) ? (float)str_replace(
+                                                            ',',
+                                                            '',
+                                                            $aGridRow[$aField['sFieldName']]
+                                                        ) : '0');
                                                     break;
                                                 case 'char':
                                                 case 'text':
                                                     if (!isset($aGridRow[$aField['sFieldName']])) {
                                                         $aGridRow[$aField['sFieldName']] = '';
                                                     }
-                                                    $sQuery .= ",'" . (isset($aGridRow[$aField['sFieldName']]) ? mysql_real_escape_string($aGridRow[$aField['sFieldName']]) : '') . "'";
+                                                    $sQuery .= ",'" . (isset($aGridRow[$aField['sFieldName']]) ? mysqli_real_escape_string(
+                                                            $con->getResource(),
+                                                            $aGridRow[$aField['sFieldName']]
+                                                        ) : '') . "'";
                                                     break;
                                                 case 'date':
                                                     $sQuery .= ",'" . (isset($aGridRow[$aField['sFieldName']]) ? $aGridRow[$aField['sFieldName']] : '') . "'";
@@ -700,14 +817,21 @@ class ReportTables
                                     $sQuery .= '[' . $aField['sFieldName'] . '] = ';
                                     switch ($aField['sType']) {
                                         case 'number':
-                                            $sQuery .= (isset($aFields[$aField['sFieldName']]) ? (float)str_replace(',', '', $aFields[$aField['sFieldName']]) : '0') . ',';
+                                            $sQuery .= (isset($aFields[$aField['sFieldName']]) ? (float)str_replace(
+                                                    ',',
+                                                    '',
+                                                    $aFields[$aField['sFieldName']]
+                                                ) : '0') . ',';
                                             break;
                                         case 'char':
                                         case 'text':
                                             if (!isset($aFields[$aField['sFieldName']])) {
                                                 $aFields[$aField['sFieldName']] = '';
                                             }
-                                            $sQuery .= "'" . (isset($aFields[$aField['sFieldName']]) ? mysql_real_escape_string($aFields[$aField['sFieldName']]) : '') . "',";
+                                            $sQuery .= "'" . (isset($aFields[$aField['sFieldName']]) ? mysqli_real_escape_string(
+                                                    $con->getResource(),
+                                                    $aFields[$aField['sFieldName']]
+                                                ) : '') . "',";
                                             break;
                                         case 'date':
                                             $sQuery .= "'" . (isset($aFields[$aField['sFieldName']]) ? $aFields[$aField['sFieldName']] : '') . "',";
@@ -726,14 +850,21 @@ class ReportTables
                                 foreach ($aTableFields as $aField) {
                                     switch ($aField['sType']) {
                                         case 'number':
-                                            $sQuery .= ',' . (isset($aFields[$aField['sFieldName']]) ? (float)str_replace(',', '', $aFields[$aField['sFieldName']]) : '0');
+                                            $sQuery .= ',' . (isset($aFields[$aField['sFieldName']]) ? (float)str_replace(
+                                                    ',',
+                                                    '',
+                                                    $aFields[$aField['sFieldName']]
+                                                ) : '0');
                                             break;
                                         case 'char':
                                         case 'text':
                                             if (!isset($aFields[$aField['sFieldName']])) {
                                                 $aFields[$aField['sFieldName']] = '';
                                             }
-                                            $sQuery .= ",'" . (isset($aFields[$aField['sFieldName']]) ? mysql_real_escape_string($aFields[$aField['sFieldName']]) : '') . "'";
+                                            $sQuery .= ",'" . (isset($aFields[$aField['sFieldName']]) ? mysqli_real_escape_string(
+                                                    $con->getResource(),
+                                                    $aFields[$aField['sFieldName']]
+                                                ) : '') . "'";
                                             break;
                                         case 'date':
                                             $sQuery .= ",'" . (isset($aFields[$aField['sFieldName']]) ? $aFields[$aField['sFieldName']] : '') . "'";
@@ -744,7 +875,11 @@ class ReportTables
                             }
                             $rs = $stmt->executeQuery($sQuery);
                         } else {
-                            mysql_query('DELETE FROM [' . $aRow['REP_TAB_NAME'] . "] WHERE APP_UID = '" . $sApplicationUid . "'");
+                            //Verify use in mssql
+                            mysqli_query(
+                                $con->getResource(),
+                                'DELETE FROM [' . $aRow['REP_TAB_NAME'] . "] WHERE APP_UID = '" . $sApplicationUid . "'"
+                            );
                             $aAux = explode('-', $aRow['REP_TAB_GRID']);
                             if (isset($aFields[$aAux[0]])) {
                                 foreach ($aFields[$aAux[0]] as $iRow => $aGridRow) {
@@ -757,14 +892,21 @@ class ReportTables
                                     foreach ($aTableFields as $aField) {
                                         switch ($aField['sType']) {
                                             case 'number':
-                                                $sQuery .= ',' . (isset($aGridRow[$aField['sFieldName']]) ? (float)str_replace(',', '', $aGridRow[$aField['sFieldName']]) : '0');
+                                                $sQuery .= ',' . (isset($aGridRow[$aField['sFieldName']]) ? (float)str_replace(
+                                                        ',',
+                                                        '',
+                                                        $aGridRow[$aField['sFieldName']]
+                                                    ) : '0');
                                                 break;
                                             case 'char':
                                             case 'text':
                                                 if (!isset($aGridRow[$aField['sFieldName']])) {
                                                     $aGridRow[$aField['sFieldName']] = '';
                                                 }
-                                                $sQuery .= ",'" . (isset($aGridRow[$aField['sFieldName']]) ? mysql_real_escape_string($aGridRow[$aField['sFieldName']]) : '') . "'";
+                                                $sQuery .= ",'" . (isset($aGridRow[$aField['sFieldName']]) ? mysqli_real_escape_string(
+                                                        $con->getResource(),
+                                                        $aGridRow[$aField['sFieldName']]
+                                                    ) : '') . "'";
                                                 break;
                                             case 'date':
                                                 $sQuery .= ",'" . (isset($aGridRow[$aField['sFieldName']]) ? $aGridRow[$aField['sFieldName']] : '') . "'";
@@ -809,7 +951,9 @@ class ReportTables
      * Choose the database to connect
      *
      * @access public
+     *
      * @param string $TabConnectionk
+     *
      * @return string
      */
     public function chooseDB($TabConnectionk)
diff --git a/workflow/engine/classes/WorkspaceTools.php b/workflow/engine/classes/WorkspaceTools.php
index f11a869aa..6ae26cd1e 100644
--- a/workflow/engine/classes/WorkspaceTools.php
+++ b/workflow/engine/classes/WorkspaceTools.php
@@ -211,11 +211,11 @@ class WorkspaceTools
     /**
      * Upgrade this workspace to the latest system version
      *
-     * @param bool   $buildCacheView
+     * @param bool $buildCacheView
      * @param string $workSpace
-     * @param bool   $onedb
+     * @param bool $onedb
      * @param string $lang
-     * @param array  $arrayOptTranslation
+     * @param array $arrayOptTranslation
      *
      * @return void
      */
@@ -319,7 +319,7 @@ class WorkspaceTools
         $this->migratePopulateIndexingACV($workSpace);
         $stop = microtime(true);
         CLI::logging("<*>   Migrating an populating indexing for avoiding the use of table APP_CACHE_VIEW process took " . ($stop - $start) . " seconds.\n");
-        
+
         $start = microtime(true);
         CLI::logging("> Updating rows in Web Entry table for classic processes...\n");
         $this->updatingWebEntryClassicModel($workSpace);
@@ -392,7 +392,7 @@ class WorkspaceTools
          * ((define('(<key>)2', ')1 (<value>)3 (');)4 )0
          */
         preg_match_all($this->dbInfoRegExp, $sDbFile, $matches, PREG_SET_ORDER);
-        $values = array();
+        $values = [];
         foreach ($matches as $match) {
             $values[$match['key']] = $match['value'];
         }
@@ -487,7 +487,7 @@ class WorkspaceTools
         }
         $this->newHost = $newHost;
         $this->resetDBNames = $resetDBNames;
-        $this->resetDBDiff = array();
+        $this->resetDBDiff = [];
         $this->onedb = $onedb;
         $this->unify = $unify;
         if ($resetDBNames) {
@@ -645,13 +645,12 @@ class WorkspaceTools
             $regenerateContent = new Content();
             $regenerateContent->regenerateContent($arrayLang, $workspace);
         }
-
     }
 
     /**
      * Upgrade this workspace translations from all avaliable languages.
      *
-     * @param bool $flagXml  Update XML
+     * @param bool $flagXml Update XML
      * @param bool $flagMafe Update MAFE
      *
      * @return void
@@ -693,7 +692,9 @@ class WorkspaceTools
         $criteriaSelect = new Criteria("workflow");
         $criteriaSelect->add(
             $criteriaSelect->getNewCriterion(ContentPeer::CON_ID, '%' . "'" . '%', Criteria::LIKE)->addOr(
-                $criteriaSelect->getNewCriterion(ContentPeer::CON_ID, '%' . '"' . '%', Criteria::LIKE)));
+                $criteriaSelect->getNewCriterion(ContentPeer::CON_ID, '%' . '"' . '%', Criteria::LIKE)
+            )
+        );
 
         BasePeer::doDelete($criteriaSelect, Propel::getConnection("workflow"));
     }
@@ -752,10 +753,10 @@ class WorkspaceTools
     {
         $oDataBase = $this->getDatabase($rbac);
 
-        $aOldSchema = array();
+        $aOldSchema = [];
 
         try {
-            $oDataBase->iFetchType = MYSQL_NUM;
+            $oDataBase->iFetchType = MYSQLI_NUM;
             $oDataset1 = $oDataBase->executeQuery($oDataBase->generateShowTablesSQL());
         } catch (Exception $e) {
             $oDataBase->logQuery($e->getmessage());
@@ -764,14 +765,14 @@ class WorkspaceTools
 
         //going thru all tables in current WF_ database
         while ($aRow1 = $oDataBase->getRegistry($oDataset1)) {
-            $aPrimaryKeys = array();
+            $aPrimaryKeys = [];
             $sTable = strtoupper($aRow1[0]);
 
             //get description of each table, ( column and primary keys )
             //$oDataset2 = $oDataBase->executeQuery( $oDataBase->generateDescTableSQL($aRow1[0]) );
             $oDataset2 = $oDataBase->executeQuery($oDataBase->generateDescTableSQL($sTable));
-            $aOldSchema[$sTable] = array();
-            $oDataBase->iFetchType = MYSQL_ASSOC;
+            $aOldSchema[$sTable] = [];
+            $oDataBase->iFetchType = MYSQLI_ASSOC;
             while ($aRow2 = $oDataBase->getRegistry($oDataset2)) {
                 $aOldSchema[$sTable][$aRow2['Field']]['Field'] = $aRow2['Field'];
                 $aOldSchema[$sTable][$aRow2['Field']]['Type'] = $aRow2['Type'];
@@ -781,21 +782,21 @@ class WorkspaceTools
 
             //get indexes of each table  SHOW INDEX FROM `ADDITIONAL_TABLES`;   -- WHERE Key_name <> 'PRIMARY'
             $oDataset2 = $oDataBase->executeQuery($oDataBase->generateTableIndexSQL($aRow1[0]));
-            $oDataBase->iFetchType = MYSQL_ASSOC;
+            $oDataBase->iFetchType = MYSQLI_ASSOC;
             while ($aRow2 = $oDataBase->getRegistry($oDataset2)) {
                 if (!isset($aOldSchema[$sTable]['INDEXES'])) {
-                    $aOldSchema[$sTable]['INDEXES'] = array();
+                    $aOldSchema[$sTable]['INDEXES'] = [];
                 }
                 if (!isset($aOldSchema[$sTable]['INDEXES'][$aRow2['Key_name']])) {
-                    $aOldSchema[$sTable]['INDEXES'][$aRow2['Key_name']] = array();
+                    $aOldSchema[$sTable]['INDEXES'][$aRow2['Key_name']] = [];
                 }
                 $aOldSchema[$sTable]['INDEXES'][$aRow2['Key_name']][] = $aRow2['Column_name'];
             }
 
-            $oDataBase->iFetchType = MYSQL_NUM; //this line is neccesary because the next fetch needs to be with MYSQL_NUM
+            $oDataBase->iFetchType = MYSQLI_NUM; //this line is neccesary because the next fetch needs to be with MYSQLI_NUM
         }
         //finally return the array with old schema obtained from the Database
-        if (count($aOldSchema) == 0) {
+        if (count($aOldSchema) === 0) {
             $aOldSchema = null;
         }
         return $aOldSchema;
@@ -868,7 +869,6 @@ class WorkspaceTools
         $res = $appCache->updateAppDelegationDelLastIndex($lang, $flagRecreate);
 
 
-
         CLI::logging("-> Creating triggers\n");
 
         //now check if we have the triggers installed
@@ -929,10 +929,10 @@ class WorkspaceTools
             return;
         }
 
-        $directory = array();
+        $directory = [];
         $blackHoleDir = G::getBlackHoleDir();
         $directory = glob(PATH_DOCUMENT . "*", GLOB_ONLYDIR);
-        $dirslength = sizeof($directory);
+        $dirslength = count($directory);
 
         if (!@chdir(PATH_DOCUMENT)) {
             CLI::logging(CLI::error("Cannot use Document directory. The upgrade must be done as root.\n"));
@@ -942,7 +942,7 @@ class WorkspaceTools
         //Start migration
         for ($index = 0; $index < $dirslength; $index++) {
             $depthdirlevel = explode(DIRECTORY_SEPARATOR, $directory[$index]);
-            $lastlength = sizeof($depthdirlevel);
+            $lastlength = count($depthdirlevel);
             $UIdDir = $depthdirlevel[$lastlength - 1];
             $lenDir = strlen($UIdDir);
 
@@ -972,13 +972,13 @@ class WorkspaceTools
         //Start '0' directory migration
         $black = PATH_DOCUMENT . $blackHoleDir . DIRECTORY_SEPARATOR;
         if (is_dir($black)) {
-            $newpattern = array();
+            $newpattern = [];
             $file = glob($black . '*.*'); //files only
             $dirlen = count($file);
 
             for ($index = 0; $index < $dirlen; $index++) {
                 $levelfile = explode(DIRECTORY_SEPARATOR, $file[$index]);
-                $lastlevel = sizeof($levelfile);
+                $lastlevel = count($levelfile);
                 $goalFile = $levelfile[$lastlevel - 1];
                 $newpattern = G::getPathFromFileUIDPlain($blackHoleDir, $goalFile);
                 CLI::logging("Migrating $blackHoleDir file: $goalFile\n");
@@ -1059,7 +1059,7 @@ class WorkspaceTools
 
         if (!$rsCriteria->next()) {
             //Insert the first record
-            $arrayData = array();
+            $arrayData = [];
 
             $emailSever = new \ProcessMaker\BusinessModel\EmailServer();
 
@@ -1070,38 +1070,38 @@ class WorkspaceTools
 
                 switch ($emailConfiguration["MESS_ENGINE"]) {
                     case "PHPMAILER":
-                        $arrayData["MESS_SERVER"]              = $emailConfiguration["MESS_SERVER"];
-                        $arrayData["MESS_PORT"]                = (int)($emailConfiguration["MESS_PORT"]);
-                        $arrayData["MESS_RAUTH"]               = (is_numeric($emailConfiguration["MESS_RAUTH"]))? (int)($emailConfiguration["MESS_RAUTH"]) : (($emailConfiguration["MESS_RAUTH"] . "" == "true")? 1 : 0);
-                        $arrayData["MESS_ACCOUNT"]             = $emailConfiguration["MESS_ACCOUNT"];
-                        $arrayData["MESS_PASSWORD"]            = $emailConfiguration["MESS_PASSWORD"];
-                        $arrayData["MESS_FROM_MAIL"]           = (isset($emailConfiguration["MESS_FROM_MAIL"]))? $emailConfiguration["MESS_FROM_MAIL"] : "";
-                        $arrayData["MESS_FROM_NAME"]           = (isset($emailConfiguration["MESS_FROM_NAME"]))? $emailConfiguration["MESS_FROM_NAME"] : "";
-                        $arrayData["SMTPSECURE"]               = $emailConfiguration["SMTPSecure"];
-                        $arrayData["MESS_TRY_SEND_INMEDIATLY"] = (isset($emailConfiguration["MESS_TRY_SEND_INMEDIATLY"]) && ($emailConfiguration["MESS_TRY_SEND_INMEDIATLY"] . "" == "true" || $emailConfiguration["MESS_TRY_SEND_INMEDIATLY"] . "" == "1"))? 1 : 0;
-                        $arrayData["MAIL_TO"]                  = isset($emailConfiguration["MAIL_TO"]) ? $emailConfiguration["MAIL_TO"] : '';
-                        $arrayData["MESS_DEFAULT"]             = (isset($emailConfiguration["MESS_ENABLED"]) && $emailConfiguration["MESS_ENABLED"] . "" == "1")? 1 : 0;
+                        $arrayData["MESS_SERVER"] = $emailConfiguration["MESS_SERVER"];
+                        $arrayData["MESS_PORT"] = (int)($emailConfiguration["MESS_PORT"]);
+                        $arrayData["MESS_RAUTH"] = (is_numeric($emailConfiguration["MESS_RAUTH"])) ? (int)($emailConfiguration["MESS_RAUTH"]) : (($emailConfiguration["MESS_RAUTH"] . "" == "true") ? 1 : 0);
+                        $arrayData["MESS_ACCOUNT"] = $emailConfiguration["MESS_ACCOUNT"];
+                        $arrayData["MESS_PASSWORD"] = $emailConfiguration["MESS_PASSWORD"];
+                        $arrayData["MESS_FROM_MAIL"] = (isset($emailConfiguration["MESS_FROM_MAIL"])) ? $emailConfiguration["MESS_FROM_MAIL"] : "";
+                        $arrayData["MESS_FROM_NAME"] = (isset($emailConfiguration["MESS_FROM_NAME"])) ? $emailConfiguration["MESS_FROM_NAME"] : "";
+                        $arrayData["SMTPSECURE"] = $emailConfiguration["SMTPSecure"];
+                        $arrayData["MESS_TRY_SEND_INMEDIATLY"] = (isset($emailConfiguration["MESS_TRY_SEND_INMEDIATLY"]) && ($emailConfiguration["MESS_TRY_SEND_INMEDIATLY"] . "" == "true" || $emailConfiguration["MESS_TRY_SEND_INMEDIATLY"] . "" == "1")) ? 1 : 0;
+                        $arrayData["MAIL_TO"] = isset($emailConfiguration["MAIL_TO"]) ? $emailConfiguration["MAIL_TO"] : '';
+                        $arrayData["MESS_DEFAULT"] = (isset($emailConfiguration["MESS_ENABLED"]) && $emailConfiguration["MESS_ENABLED"] . "" == "1") ? 1 : 0;
                         break;
                     case "MAIL":
-                        $arrayData["MESS_SERVER"]              = "";
-                        $arrayData["MESS_FROM_MAIL"]           = (isset($emailConfiguration["MESS_FROM_MAIL"]))? $emailConfiguration["MESS_FROM_MAIL"] : "";
-                        $arrayData["MESS_FROM_NAME"]           = (isset($emailConfiguration["MESS_FROM_NAME"]))? $emailConfiguration["MESS_FROM_NAME"] : "";
-                        $arrayData["MESS_TRY_SEND_INMEDIATLY"] = (isset($emailConfiguration["MESS_TRY_SEND_INMEDIATLY"]) && ($emailConfiguration["MESS_TRY_SEND_INMEDIATLY"] . "" == "true" || $emailConfiguration["MESS_TRY_SEND_INMEDIATLY"] . "" == "1"))? 1 : 0;
-                        $arrayData["MESS_ACCOUNT"]             = "";
-                        $arrayData["MESS_PASSWORD"]            = "";
-                        $arrayData["MAIL_TO"]                  = (isset($emailConfiguration["MAIL_TO"]))? $emailConfiguration["MAIL_TO"] : "";
-                        $arrayData["MESS_DEFAULT"]             = (isset($emailConfiguration["MESS_ENABLED"]) && $emailConfiguration["MESS_ENABLED"] . "" == "1")? 1 : 0;
+                        $arrayData["MESS_SERVER"] = "";
+                        $arrayData["MESS_FROM_MAIL"] = (isset($emailConfiguration["MESS_FROM_MAIL"])) ? $emailConfiguration["MESS_FROM_MAIL"] : "";
+                        $arrayData["MESS_FROM_NAME"] = (isset($emailConfiguration["MESS_FROM_NAME"])) ? $emailConfiguration["MESS_FROM_NAME"] : "";
+                        $arrayData["MESS_TRY_SEND_INMEDIATLY"] = (isset($emailConfiguration["MESS_TRY_SEND_INMEDIATLY"]) && ($emailConfiguration["MESS_TRY_SEND_INMEDIATLY"] . "" == "true" || $emailConfiguration["MESS_TRY_SEND_INMEDIATLY"] . "" == "1")) ? 1 : 0;
+                        $arrayData["MESS_ACCOUNT"] = "";
+                        $arrayData["MESS_PASSWORD"] = "";
+                        $arrayData["MAIL_TO"] = (isset($emailConfiguration["MAIL_TO"])) ? $emailConfiguration["MAIL_TO"] : "";
+                        $arrayData["MESS_DEFAULT"] = (isset($emailConfiguration["MESS_ENABLED"]) && $emailConfiguration["MESS_ENABLED"] . "" == "1") ? 1 : 0;
                         break;
                 }
 
                 $arrayData = $emailSever->create($arrayData);
             } else {
-                $arrayData["MESS_ENGINE"]   = "MAIL";
-                $arrayData["MESS_SERVER"]   = "";
-                $arrayData["MESS_ACCOUNT"]  = "";
+                $arrayData["MESS_ENGINE"] = "MAIL";
+                $arrayData["MESS_SERVER"] = "";
+                $arrayData["MESS_ACCOUNT"] = "";
                 $arrayData["MESS_PASSWORD"] = "";
-                $arrayData["MAIL_TO"]       = "";
-                $arrayData["MESS_DEFAULT"]  = 1;
+                $arrayData["MAIL_TO"] = "";
+                $arrayData["MESS_DEFAULT"] = 1;
 
                 $arrayData = $emailSever->create2($arrayData);
             }
@@ -1116,8 +1116,8 @@ class WorkspaceTools
     {
         switch ($this->dbAdapter) {
             case 'mysql':
-                $this->assoc = MYSQL_ASSOC;
-                $this->num = MYSQL_NUM;
+                $this->assoc = MYSQLI_ASSOC;
+                $this->num = MYSQLI_NUM;
                 break;
             case 'sqlsrv':
                 $this->assoc = SQLSRV_FETCH_ASSOC;
@@ -1179,7 +1179,7 @@ class WorkspaceTools
             if ($changed) {
                 return $changes;
             } else {
-                CLI::logging("-> Nothing to change in the data base structure of " . (($rbac == true)?"RBAC":"WORKFLOW") . "\n");
+                CLI::logging("-> Nothing to change in the data base structure of " . (($rbac == true) ? "RBAC" : "WORKFLOW") . "\n");
                 return $changed;
             }
         }
@@ -1255,7 +1255,7 @@ class WorkspaceTools
             $checkData = unserialize(file_get_contents(PATH_CORE . 'data' . PATH_SEP . 'check.data'));
             if (is_array($checkData)) {
                 /*----------------------------------********---------------------------------*/
-                $licensedFeatures = & PMLicensedFeatures::getSingleton();
+                $licensedFeatures = PMLicensedFeatures::getSingleton();
                 $checkData = $licensedFeatures->addNewFeatures($checkData);
 
                 $catalog = new Catalog();
@@ -1383,9 +1383,9 @@ class WorkspaceTools
             $info = array('Workspace Name' => $fields['WORKSPACE_NAME'], 'Workflow Database' => sprintf("%s://%s:%s@%s/%s", $fields['DB_ADAPTER'], $fields['DB_USER'], $fields['DB_PASS'], $fields['DB_HOST'], $fields['DB_NAME']), 'MySql Version' => $fields['DATABASE']);
         } else {
             $info = array('Workspace Name' => $fields['WORKSPACE_NAME'],
-            //'Available Databases'  => $fields['AVAILABLE_DB'],
-            'Workflow Database' => sprintf("%s://%s:%s@%s/%s", $fields['DB_ADAPTER'], $fields['DB_USER'], $fields['DB_PASS'], $fields['DB_HOST'], $fields['DB_NAME']), 'RBAC Database' => sprintf("%s://%s:%s@%s/%s", $fields['DB_ADAPTER'], $fields['DB_RBAC_USER'], $fields['DB_RBAC_PASS'], $fields['DB_RBAC_HOST'], $fields['DB_RBAC_NAME']), 'Report Database' => sprintf("%s://%s:%s@%s/%s", $fields['DB_ADAPTER'], $fields['DB_REPORT_USER'], $fields['DB_REPORT_PASS'], $fields['DB_REPORT_HOST'], $fields['DB_REPORT_NAME']), 'MySql Version' => $fields['DATABASE']
-        );
+                //'Available Databases'  => $fields['AVAILABLE_DB'],
+                'Workflow Database' => sprintf("%s://%s:%s@%s/%s", $fields['DB_ADAPTER'], $fields['DB_USER'], $fields['DB_PASS'], $fields['DB_HOST'], $fields['DB_NAME']), 'RBAC Database' => sprintf("%s://%s:%s@%s/%s", $fields['DB_ADAPTER'], $fields['DB_RBAC_USER'], $fields['DB_RBAC_PASS'], $fields['DB_RBAC_HOST'], $fields['DB_RBAC_NAME']), 'Report Database' => sprintf("%s://%s:%s@%s/%s", $fields['DB_ADAPTER'], $fields['DB_REPORT_USER'], $fields['DB_REPORT_PASS'], $fields['DB_REPORT_HOST'], $fields['DB_REPORT_NAME']), 'MySql Version' => $fields['DATABASE']
+            );
         }
 
         foreach ($info as $k => $v) {
@@ -1430,7 +1430,7 @@ class WorkspaceTools
             $databases = array("wf", "rp", "rb");
         }
 
-        $dbNames = array();
+        $dbNames = [];
 
         foreach ($databases as $db) {
             $dbInfo = $this->getDBCredentials($db);
@@ -1508,7 +1508,7 @@ class WorkspaceTools
         if (!file_exists(PATH_DATA . "upgrade/")) {
             mkdir(PATH_DATA . "upgrade/");
         }
-        $tempDirectory = PATH_DATA . "upgrade/" . basename(tempnam(__FILE__, ''));
+        $tempDirectory = PATH_DATA . "upgrade/" . basename(uniqid(__FILE__, ''));
         mkdir($tempDirectory);
         $metadata = $this->getMetadata();
         CLI::logging("Backing up database...\n");
@@ -1521,8 +1521,8 @@ class WorkspaceTools
          * a JSON codified array.
          */
         if (!file_put_contents($metaFilename, str_replace(array(",", "{", "}"
-                                ), array(",\n  ", "{\n  ", "\n}\n"
-                                ), G::json_encode($metadata)))) {
+        ), array(",\n  ", "{\n  ", "\n}\n"
+        ), G::json_encode($metadata)))) {
             throw new Exception("Could not create backup metadata");
         }
         CLI::logging("Copying database to backup...\n");
@@ -1535,6 +1535,7 @@ class WorkspaceTools
     }
 
     //TODO: Move to class.dbMaintenance.php
+
     /**
      * create a user in the database
      *
@@ -1548,26 +1549,28 @@ class WorkspaceTools
      * @param string $hostname the hostname the user will be connecting from
      * @param string $database the database to grant permissions
      */
-    public function createDBUser($username, $password, $hostname, $database)
+    public function createDBUser($username, $password, $hostname, $database, $connection = null)
     {
-        mysql_select_db("mysql");
-        $hostname = array_shift(explode(":", $hostname));
+        mysqli_select_db($connection, 'mysql');
+        $hosts = explode(':', $hostname);
+        $hostname = array_shift($hosts);
+
         $sqlstmt = "SELECT * FROM user WHERE user = '$username' AND host = '$hostname'";
-        $result = mysql_query($sqlstmt);
+        $result = mysqli_query($connection, $sqlstmt);
         if ($result === false) {
-            throw new Exception("Unable to retrieve users: " . mysql_error());
+            throw new Exception('Unable to retrieve users: ' . mysqli_error($connection));
         }
-        $users = mysql_num_rows($result);
+        $users = mysqli_num_rows($result);
         if ($users === 0) {
             CLI::logging("Creating user $username for $hostname\n");
-            $result = mysql_query("CREATE USER '$username'@'$hostname' IDENTIFIED BY '$password'");
+            $result = mysqli_query($connection, "CREATE USER '$username'@'$hostname' IDENTIFIED BY '$password'");
             if ($result === false) {
-                throw new Exception("Unable to create user $username: " . mysql_error());
+                throw new Exception("Unable to create user $username: " . mysqli_error($connection));
             }
         }
-        $result = mysql_query("GRANT ALL ON $database.* TO '$username'@'$hostname'");
+        $result = mysqli_query($connection, "GRANT ALL ON $database.* TO '$username'@'$hostname'");
         if ($result === false) {
-            throw new Exception("Unable to grant priviledges to user $username: " . mysql_error());
+            throw new Exception("Unable to grant priviledges to user $username: " . mysqli_error($connection));
         }
     }
 
@@ -1582,9 +1585,22 @@ class WorkspaceTools
      * @param string $filename the script filename
      * @param string $database the database to execute this script into
      */
-    public function executeSQLScript($database, $filename, $parameters, $versionBackupEngine = 1)
+    /**
+     * executes a mysql script
+     *
+     * This function supports scripts with -- comments in the beginning of a line
+     * and multi-line statements.
+     * It does not support other forms of comments (such as /*... or {{...}}).
+     *
+     * @param string $filename the script filename
+     * @param string $database the database to execute this script into
+     * @param $parameters
+     * @param int $versionBackupEngine
+     * @param object $connection
+     */
+    public function executeSQLScript($database, $filename, $parameters, $versionBackupEngine = 1, $connection = null)
     {
-        mysql_query("CREATE DATABASE IF NOT EXISTS " . mysql_real_escape_string($database));
+        mysqli_query($connection, 'CREATE DATABASE IF NOT EXISTS ' . mysqli_real_escape_string($connection, $database));
 
         //check function shell_exec
         $disabled_functions = ini_get('disable_functions');
@@ -1603,18 +1619,18 @@ class WorkspaceTools
             $flagFunction = shell_exec('mysql --version');
         }
 
-        $arrayRegExpEngineSearch = array("/\)\s*TYPE\s*=\s*(InnoDB)/i", "/\)\s*TYPE\s*=\s*(MyISAM)/i","/SET\s*FOREIGN_KEY_CHECKS\s*=\s*0\s*;/");
-        $arrayRegExpEngineReplace = array(") ENGINE=\\1 DEFAULT CHARSET=utf8", ") ENGINE=\\1","SET FOREIGN_KEY_CHECKS=0;\nSET unique_checks=0;\nSET AUTOCOMMIT=0;");
+        $arrayRegExpEngineSearch = array("/\)\s*TYPE\s*=\s*(InnoDB)/i", "/\)\s*TYPE\s*=\s*(MyISAM)/i", "/SET\s*FOREIGN_KEY_CHECKS\s*=\s*0\s*;/");
+        $arrayRegExpEngineReplace = array(") ENGINE=\\1 DEFAULT CHARSET=utf8", ") ENGINE=\\1", "SET FOREIGN_KEY_CHECKS=0;\nSET unique_checks=0;\nSET AUTOCOMMIT=0;");
 
         //replace DEFINER
         $script = preg_replace('/DEFINER=[^*]*/', '', file_get_contents($filename));
         file_put_contents($filename, $script);
-        
+
         if (!$flag && !is_null($flagFunction)) {
             //Replace TYPE by ENGINE
             if ($versionBackupEngine == 1) {
                 $script = preg_replace($arrayRegExpEngineSearch, $arrayRegExpEngineReplace, file_get_contents($filename));
-                file_put_contents($filename, $script."\nCOMMIT;");
+                file_put_contents($filename, $script . "\nCOMMIT;");
             } else {
                 $arrayRegExpEngineSearch = array("/\)\s*TYPE\s*=\s*(InnoDB)/i", "/\)\s*TYPE\s*=\s*(MyISAM)/i");
                 $arrayRegExpEngineReplace = array(") ENGINE=\\1 DEFAULT CHARSET=utf8", ") ENGINE=\\1");
@@ -1631,7 +1647,7 @@ class WorkspaceTools
                     . ' --port=' . $dbPort
                     . ' --user=' . $parameters['dbUser']
                     . ' --password=' . escapeshellarg($parameters['dbPass'])
-                    . ' --database=' . mysql_real_escape_string($database)
+                    . ' --database=' . mysqli_real_escape_string($connection, $database)
                     . ' --default_character_set utf8'
                     . ' --execute="SOURCE ' . $filename . '"';
             } else {
@@ -1639,7 +1655,7 @@ class WorkspaceTools
                     . ' --host=' . $dbHost
                     . ' --user=' . $parameters['dbUser']
                     . ' --password=' . escapeshellarg($parameters['dbPass'])
-                    . ' --database=' . mysql_real_escape_string($database)
+                    . ' --database=' . mysqli_real_escape_string($connection, $database)
                     . ' --default_character_set utf8'
                     . ' --execute="SOURCE ' . $filename . '"';
             }
@@ -1647,12 +1663,12 @@ class WorkspaceTools
         } else {
             //If the safe mode of the server is actived
             try {
-                mysql_select_db($database);
+                mysqli_select_db($connection, $database);
 
                 //Replace TYPE by ENGINE
                 $script = preg_replace($arrayRegExpEngineSearch, $arrayRegExpEngineReplace, file_get_contents($filename));
                 if ($versionBackupEngine == 1) {
-                    $script = $script."\nCOMMIT;";
+                    $script = $script . "\nCOMMIT;";
                 }
 
                 $lines = explode("\n", $script);
@@ -1684,25 +1700,25 @@ class WorkspaceTools
                     if (strrpos($line, "INSERT INTO") !== false) {
                         $insert = true;
                         if ($insert) {
-                            $result = mysql_query("START TRANSACTION");
+                            $result = mysqli_query($connection, "START TRANSACTION");
                             $insert = false;
                         }
-                        $result = mysql_query($line);
+                        $result = mysqli_query($connection, $line);
                         continue;
                     } else {
                         if (!$insert) {
-                            $result = mysql_query("COMMIT");
+                            $result = mysqli_query($connection, "COMMIT");
                             $insert = true;
                         }
                     }
 
-                    $result = mysql_query($line);
+                    $result = mysqli_query($connection, $line);
                     if ($result === false) {
-                        throw new Exception("Error when running script '$filename', line $j, query '$line': " . mysql_error());
+                        throw new Exception("Error when running script '$filename', line $j, query '$line': " . mysqli_error($connection));
                     }
                 }
                 if (!$insert) {
-                    $result = mysql_query("COMMIT");
+                    $result = mysqli_query($connection, "COMMIT");
                 }
             } catch (Exception $e) {
                 CLI::logging(CLI::error("Error:" . "There are problems running script '$filename': " . $e));
@@ -1710,9 +1726,9 @@ class WorkspaceTools
         }
     }
 
-    public function executeScript($database, $filename, $parameters)
+    public function executeScript($database, $filename, $parameters, $connection = null)
     {
-        $this->executeSQLScript($database, $filename, $parameters);
+        $this->executeSQLScript($database, $filename, $parameters, 1, $connection);
         return true;
     }
 
@@ -1725,9 +1741,9 @@ class WorkspaceTools
     {
         $backup = new Archive_Tar($filename);
         //Get a temporary directory in the upgrade directory
-        $tempDirectory = PATH_DATA . "upgrade/" . basename(tempnam(__FILE__, ''));
+        $tempDirectory = PATH_DATA . "upgrade/" . basename(uniqid(__FILE__, ''));
         mkdir($tempDirectory);
-        $metafiles = array();
+        $metafiles = [];
         foreach ($backup->listContent() as $backupFile) {
             $filename = $backupFile["filename"];
             if (strpos($filename, "/") === false && substr_compare($filename, ".meta", -5, 5, true) === 0) {
@@ -1790,7 +1806,7 @@ class WorkspaceTools
     {
         $backup = new Archive_Tar($filename);
         //Get a temporary directory in the upgrade directory
-        $tempDirectory = PATH_DATA . "upgrade/" . basename(tempnam(__FILE__, ''));
+        $tempDirectory = PATH_DATA . "upgrade/" . basename(uniqid(__FILE__, ''));
         $parentDirectory = PATH_DATA . "upgrade";
         if (is_writable($parentDirectory)) {
             mkdir($tempDirectory);
@@ -1918,13 +1934,13 @@ class WorkspaceTools
             $pmVersionWorkspaceToRestore = (preg_match("/^([\d\.]+).*$/", $metadata->PM_VERSION, $arrayMatch)) ? $arrayMatch[1] : "";
 
             CLI::logging("> Connecting to system database in '$dbHost'\n");
-            $link = mysql_connect($dbHost, $dbUser, $dbPass);
-            @mysql_query("SET NAMES 'utf8';");
-            @mysql_query("SET FOREIGN_KEY_CHECKS=0;");
-            @mysql_query("SET GLOBAL log_bin_trust_routine_creators = 1;");
+            $link = mysqli_connect($dbHost, $dbUser, $dbPass);
+            mysqli_query($link, "SET NAMES 'utf8';");
+            mysqli_query($link, "SET FOREIGN_KEY_CHECKS=0;");
+            mysqli_query($link, "SET GLOBAL log_bin_trust_routine_creators = 1;");
 
             if (!$link) {
-                throw new Exception('Could not connect to system database: ' . mysql_error());
+                throw new Exception('Could not connect to system database: ' . mysqli_error($link));
             }
 
             $dbName = '';
@@ -1936,7 +1952,7 @@ class WorkspaceTools
                     if (isset($newDBNames['DB_USER'])) {
                         $dbUser = $newDBNames['DB_USER'];
                     }
-                    if (mysql_select_db($dbName, $link)) {
+                    if (mysqli_select_db($link, $dbName)) {
                         if (!$overwrite) {
                             throw new Exception("Destination Database already exist (use -o to overwrite)");
                         }
@@ -1944,14 +1960,17 @@ class WorkspaceTools
 
                     CLI::logging("+> Restoring database {$db->name} to $dbName\n");
                     $versionBackupEngine = (isset($metadata->backupEngineVersion)) ? $metadata->backupEngineVersion : 1;
-                    $workspace->executeSQLScript($dbName, "$tempDirectory/{$db->name}.sql", $aParameters, $versionBackupEngine);
-                    $workspace->createDBUser($dbUser, ($workspace->dbGrantUserPassword != '' ? $workspace->dbGrantUserPassword : $db->pass), "localhost", $dbName);
-                    $workspace->createDBUser($dbUser, ($workspace->dbGrantUserPassword != '' ? $workspace->dbGrantUserPassword : $db->pass), "%", $dbName);
+                    $workspace->executeSQLScript($dbName, "$tempDirectory/{$db->name}.sql", $aParameters, $versionBackupEngine, $link);
+                    $workspace->createDBUser($dbUser, ($workspace->dbGrantUserPassword != '' ? $workspace->dbGrantUserPassword : $db->pass), "localhost", $dbName, $link);
+                    $workspace->createDBUser($dbUser, ($workspace->dbGrantUserPassword != '' ? $workspace->dbGrantUserPassword : $db->pass), "%", $dbName, $link);
                 }
             }
 
-            if (($pmVersionWorkspaceToRestore != '') && (version_compare($pmVersionWorkspaceToRestore . "",
-                        $pmVersion . "", "<") || $pmVersion == "")
+            if (($pmVersionWorkspaceToRestore != '') && (version_compare(
+                        $pmVersionWorkspaceToRestore . "",
+                        $pmVersion . "",
+                        "<"
+                    ) || $pmVersion == "")
             ) {
                 $start = microtime(true);
                 CLI::logging("> Updating database...\n");
@@ -1978,8 +1997,11 @@ class WorkspaceTools
             $stop = microtime(true);
             CLI::logging("<*>   Check Mafe Requirements Process took " . ($stop - $start) . " seconds.\n");
 
-            if (($pmVersionWorkspaceToRestore != '') && (version_compare($pmVersionWorkspaceToRestore . "",
-                        $pmVersion . "", "<") || $pmVersion == "")
+            if (($pmVersionWorkspaceToRestore != '') && (version_compare(
+                        $pmVersionWorkspaceToRestore . "",
+                        $pmVersion . "",
+                        "<"
+                    ) || $pmVersion == "")
             ) {
                 $start = microtime(true);
                 CLI::logging("> Updating cache view...\n");
@@ -2026,7 +2048,7 @@ class WorkspaceTools
             //Updating generated class files for PM Tables
             passthru(PHP_BINARY . ' processmaker regenerate-pmtable-classes ' . $workspace->name);
 
-            mysql_close($link);
+            mysqli_close($link);
         }
 
         CLI::logging("Removing temporary files\n");
@@ -2038,7 +2060,7 @@ class WorkspaceTools
 
     public static function hotfixInstall($file)
     {
-        $result = array();
+        $result = [];
 
         $dirHotfix = PATH_DATA . "hotfixes";
 
@@ -2113,11 +2135,11 @@ class WorkspaceTools
                 file_put_contents(PATH_DATA . 'sites/' . $workspace . '/' . '.server_info', $cput);
             }
             if (is_file(PATH_DATA . 'sites/' . $workspace . '/' . '.server_info')) {
-                $SERVER_INFO = file_get_contents(PATH_DATA . 'sites/' . $workspace . '/'.'.server_info');
+                $SERVER_INFO = file_get_contents(PATH_DATA . 'sites/' . $workspace . '/' . '.server_info');
                 $SERVER_INFO = unserialize($SERVER_INFO);
 
                 $envFile = PATH_CONFIG . 'env.ini';
-                $skin ='neoclassic';
+                $skin = 'neoclassic';
                 if (file_exists($envFile)) {
                     $sysConf = System::getSystemConfiguration($envFile);
                     $lang = $sysConf['default_lang'];
@@ -2149,7 +2171,7 @@ class WorkspaceTools
     public function changeHashPassword($workspace, $response)
     {
         $this->initPropel(true);
-        $licensedFeatures = & PMLicensedFeatures::getSingleton();
+        $licensedFeatures = PMLicensedFeatures::getSingleton();
         /*----------------------------------********---------------------------------*/
         if ($licensedFeatures->verifyfeature('95OY24wcXpEMzIyRmlNSnF0STNFSHJzMG9wYTJKekpLNmY2ZmRCeGtuZk5oUDloaUNhUGVjTDJBPT0=')) {
             EnterpriseClass::setHashPassword($response);
@@ -2189,7 +2211,7 @@ class WorkspaceTools
             } else {
                 CLI::logging(CLI::error("Could not get shared folder permissions, workspace permissions couldn't be changed") . "\n");
             }
-            if (G::recursive_copy($pathDirectoryEnterprise, $pathNewFile . PATH_SEP. 'enterprise')) {
+            if (G::recursive_copy($pathDirectoryEnterprise, $pathNewFile . PATH_SEP . 'enterprise')) {
                 CLI::logging("    Removing $pathDirectoryEnterprise...\n");
                 G::rm_dir($pathDirectoryEnterprise);
             } else {
@@ -2207,7 +2229,7 @@ class WorkspaceTools
                 CLI::logging(CLI::error("Could not get shared folder permissions, workspace permissions couldn't be changed") . "\n");
             }
             CLI::logging("    Removing $pathFileEnterprise...\n");
-            copy($pathFileEnterprise, $pathNewFile. PATH_SEP . 'enterprise.php');
+            copy($pathFileEnterprise, $pathNewFile . PATH_SEP . 'enterprise.php');
             G::rm_dir($pathFileEnterprise);
             if (file_exists($pathFileEnterprise)) {
                 CLI::logging(CLI::info("    Remove manually $pathFileEnterprise...\n"));
@@ -2273,16 +2295,16 @@ class WorkspaceTools
     /**
      * Migrate all cases to New list
      *
-     * @param string $workSpace    Workspace
-     * @param bool   $flagReinsert Flag that specifies the re-insertion
+     * @param string $workSpace Workspace
+     * @param bool $flagReinsert Flag that specifies the re-insertion
      *
      * @return void
      */
-    public function migrateList($workSpace, $flagReinsert = false, $lang='en')
+    public function migrateList($workSpace, $flagReinsert = false, $lang = 'en')
     {
         $this->initPropel(true);
 
-        $flagListAll        = $this->listFirstExecution('check');
+        $flagListAll = $this->listFirstExecution('check');
         $flagListUnassigned = $this->listFirstExecution('check', 'unassigned');
 
         if (!$flagReinsert && $flagListAll && $flagListUnassigned) {
@@ -2335,7 +2357,7 @@ class WorkspaceTools
     public function regenerateListCanceled($lang = 'en')
     {
         $this->initPropel(true);
-        $query = 'INSERT INTO '.$this->dbName.'.LIST_CANCELED
+        $query = 'INSERT INTO ' . $this->dbName . '.LIST_CANCELED
                     (APP_UID,
                     USR_UID,
                     TAS_UID,
@@ -2374,23 +2396,23 @@ class WorkspaceTools
                         AD.DEL_TASK_DUE_DATE AS DEL_DUE_DATE,
                         ACV.DEL_PRIORITY
                     FROM
-                        ('.$this->dbName.'.APP_CACHE_VIEW ACV
-                        LEFT JOIN '.$this->dbName.'.CONTENT C_APP ON ACV.APP_UID = C_APP.CON_ID
+                        (' . $this->dbName . '.APP_CACHE_VIEW ACV
+                        LEFT JOIN ' . $this->dbName . '.CONTENT C_APP ON ACV.APP_UID = C_APP.CON_ID
                             AND C_APP.CON_CATEGORY = \'APP_TITLE\'
-                            AND C_APP.CON_LANG = \''.$lang.'\'
-                        LEFT JOIN '.$this->dbName.'.CONTENT C_PRO ON ACV.PRO_UID = C_PRO.CON_ID
+                            AND C_APP.CON_LANG = \'' . $lang . '\'
+                        LEFT JOIN ' . $this->dbName . '.CONTENT C_PRO ON ACV.PRO_UID = C_PRO.CON_ID
                             AND C_PRO.CON_CATEGORY = \'PRO_TITLE\'
-                            AND C_PRO.CON_LANG = \''.$lang.'\'
-                        LEFT JOIN '.$this->dbName.'.CONTENT C_TAS ON ACV.TAS_UID = C_TAS.CON_ID
+                            AND C_PRO.CON_LANG = \'' . $lang . '\'
+                        LEFT JOIN ' . $this->dbName . '.CONTENT C_TAS ON ACV.TAS_UID = C_TAS.CON_ID
                             AND C_TAS.CON_CATEGORY = \'TAS_TITLE\'
-                            AND C_TAS.CON_LANG = \''.$lang.'\')
+                            AND C_TAS.CON_LANG = \'' . $lang . '\')
                             LEFT JOIN
-                        ('.$this->dbName.'.APP_DELEGATION AD
-                        INNER JOIN '.$this->dbName.'.APP_DELEGATION PREV_AD ON AD.APP_UID = PREV_AD.APP_UID
+                        (' . $this->dbName . '.APP_DELEGATION AD
+                        INNER JOIN ' . $this->dbName . '.APP_DELEGATION PREV_AD ON AD.APP_UID = PREV_AD.APP_UID
                             AND AD.DEL_PREVIOUS = PREV_AD.DEL_INDEX) ON ACV.APP_UID = AD.APP_UID
                             AND ACV.DEL_INDEX = AD.DEL_INDEX
                             LEFT JOIN
-                        '.$this->dbName.'.USERS USR ON ACV.USR_UID = USR.USR_UID
+                        ' . $this->dbName . '.USERS USR ON ACV.USR_UID = USR.USR_UID
                     WHERE
                         ACV.APP_STATUS = \'CANCELLED\'
                             AND ACV.DEL_LAST_INDEX = 1';
@@ -2403,7 +2425,7 @@ class WorkspaceTools
     public function regenerateListCompleted($lang = 'en')
     {
         $this->initPropel(true);
-        $query = 'INSERT INTO '.$this->dbName.'.LIST_COMPLETED
+        $query = 'INSERT INTO ' . $this->dbName . '.LIST_COMPLETED
                     (APP_UID,
                     USR_UID,
                     TAS_UID,
@@ -2437,23 +2459,23 @@ class WorkspaceTools
                         USR.USR_FIRSTNAME AS DEL_CURRENT_USR_FIRSTNAME,
                         USR.USR_LASTNAME AS DEL_CURRENT_USR_LASTNAME
                     FROM
-                        ('.$this->dbName.'.APP_CACHE_VIEW ACV
-                        LEFT JOIN '.$this->dbName.'.CONTENT C_APP ON ACV.APP_UID = C_APP.CON_ID
+                        (' . $this->dbName . '.APP_CACHE_VIEW ACV
+                        LEFT JOIN ' . $this->dbName . '.CONTENT C_APP ON ACV.APP_UID = C_APP.CON_ID
                             AND C_APP.CON_CATEGORY = \'APP_TITLE\'
-                            AND C_APP.CON_LANG = \''.$lang.'\'
-                        LEFT JOIN '.$this->dbName.'.CONTENT C_PRO ON ACV.PRO_UID = C_PRO.CON_ID
+                            AND C_APP.CON_LANG = \'' . $lang . '\'
+                        LEFT JOIN ' . $this->dbName . '.CONTENT C_PRO ON ACV.PRO_UID = C_PRO.CON_ID
                             AND C_PRO.CON_CATEGORY = \'PRO_TITLE\'
-                            AND C_PRO.CON_LANG = \''.$lang.'\'
-                        LEFT JOIN '.$this->dbName.'.CONTENT C_TAS ON ACV.TAS_UID = C_TAS.CON_ID
+                            AND C_PRO.CON_LANG = \'' . $lang . '\'
+                        LEFT JOIN ' . $this->dbName . '.CONTENT C_TAS ON ACV.TAS_UID = C_TAS.CON_ID
                             AND C_TAS.CON_CATEGORY = \'TAS_TITLE\'
-                            AND C_TAS.CON_LANG = \''.$lang.'\')
+                            AND C_TAS.CON_LANG = \'' . $lang . '\')
                             LEFT JOIN
-                        ('.$this->dbName.'.APP_DELEGATION AD
-                        INNER JOIN '.$this->dbName.'.APP_DELEGATION PREV_AD ON AD.APP_UID = PREV_AD.APP_UID
+                        (' . $this->dbName . '.APP_DELEGATION AD
+                        INNER JOIN ' . $this->dbName . '.APP_DELEGATION PREV_AD ON AD.APP_UID = PREV_AD.APP_UID
                             AND AD.DEL_PREVIOUS = PREV_AD.DEL_INDEX) ON ACV.APP_UID = AD.APP_UID
                             AND ACV.DEL_INDEX = AD.DEL_INDEX
                             LEFT JOIN
-                        '.$this->dbName.'.USERS USR ON ACV.USR_UID = USR.USR_UID
+                        ' . $this->dbName . '.USERS USR ON ACV.USR_UID = USR.USR_UID
                     WHERE
                         ACV.APP_STATUS = \'COMPLETED\'
                             AND ACV.DEL_LAST_INDEX = 1';
@@ -2466,7 +2488,7 @@ class WorkspaceTools
     public function regenerateListMyInbox()
     {
         $this->initPropel(true);
-        $query = 'INSERT INTO '.$this->dbName.'.LIST_MY_INBOX
+        $query = 'INSERT INTO ' . $this->dbName . '.LIST_MY_INBOX
                     (APP_UID,
                     USR_UID,
                     TAS_UID,
@@ -2520,11 +2542,11 @@ class WorkspaceTools
                         ACV.DEL_TASK_DUE_DATE AS DEL_DUE_DATE,
                         ACV.DEL_PRIORITY
                     FROM
-                        '.$this->dbName.'.APP_CACHE_VIEW ACV
+                        ' . $this->dbName . '.APP_CACHE_VIEW ACV
                             LEFT JOIN
-                        '.$this->dbName.'.USERS CUR_USR ON ACV.USR_UID = CUR_USR.USR_UID
+                        ' . $this->dbName . '.USERS CUR_USR ON ACV.USR_UID = CUR_USR.USR_UID
                             LEFT JOIN
-                        '.$this->dbName.'.USERS PRE_USR ON ACV.PREVIOUS_USR_UID = PRE_USR.USR_UID
+                        ' . $this->dbName . '.USERS PRE_USR ON ACV.PREVIOUS_USR_UID = PRE_USR.USR_UID
                     WHERE ACV.DEL_INDEX=1';
 
         $con = Propel::getConnection("workflow");
@@ -2536,7 +2558,7 @@ class WorkspaceTools
     public function regenerateListInbox()
     {
         $this->initPropel(true);
-        $query = 'INSERT INTO '.$this->dbName.'.LIST_INBOX
+        $query = 'INSERT INTO ' . $this->dbName . '.LIST_INBOX
                     (APP_UID,
                     DEL_INDEX,
                     USR_UID,
@@ -2580,9 +2602,9 @@ class WorkspaceTools
                         ACV.DEL_RISK_DATE AS DEL_RISK_DATE,
                         ACV.DEL_PRIORITY
                     FROM
-                        '.$this->dbName.'.APP_CACHE_VIEW ACV
+                        ' . $this->dbName . '.APP_CACHE_VIEW ACV
                             LEFT JOIN
-                        '.$this->dbName.'.USERS USR ON ACV.PREVIOUS_USR_UID = USR.USR_UID
+                        ' . $this->dbName . '.USERS USR ON ACV.PREVIOUS_USR_UID = USR.USR_UID
                     WHERE
                         ACV.DEL_THREAD_STATUS = \'OPEN\'';
         $con = Propel::getConnection("workflow");
@@ -2594,7 +2616,7 @@ class WorkspaceTools
     public function regenerateListParticipatedHistory()
     {
         $this->initPropel(true);
-        $query = 'INSERT INTO '.$this->dbName.'.LIST_PARTICIPATED_HISTORY
+        $query = 'INSERT INTO ' . $this->dbName . '.LIST_PARTICIPATED_HISTORY
                     (APP_UID,
                     DEL_INDEX,
                     USR_UID,
@@ -2638,11 +2660,11 @@ class WorkspaceTools
                         ACV.DEL_TASK_DUE_DATE AS DEL_DUE_DATE,
                         ACV.DEL_PRIORITY
                     FROM
-                        '.$this->dbName.'.APP_CACHE_VIEW ACV
+                        ' . $this->dbName . '.APP_CACHE_VIEW ACV
                             LEFT JOIN
-                        '.$this->dbName.'.USERS CUR_USR ON ACV.USR_UID = CUR_USR.USR_UID
+                        ' . $this->dbName . '.USERS CUR_USR ON ACV.USR_UID = CUR_USR.USR_UID
                             LEFT JOIN
-                        '.$this->dbName.'.USERS PRE_USR ON ACV.PREVIOUS_USR_UID = PRE_USR.USR_UID';
+                        ' . $this->dbName . '.USERS PRE_USR ON ACV.PREVIOUS_USR_UID = PRE_USR.USR_UID';
         $con = Propel::getConnection("workflow");
         $stmt = $con->createStatement();
         $stmt->executeQuery($query);
@@ -2769,7 +2791,7 @@ class WorkspaceTools
     public function regenerateListPaused()
     {
         $this->initPropel(true);
-        $query =  'INSERT INTO '.$this->dbName.'.LIST_PAUSED
+        $query = 'INSERT INTO ' . $this->dbName . '.LIST_PAUSED
                   (
                   APP_UID,
                   DEL_INDEX,
@@ -2824,21 +2846,21 @@ class WorkspaceTools
                       USERS.USR_ID,
                       TASK.TAS_ID
                   FROM
-                        '.$this->dbName.'.APP_DELAY
+                        ' . $this->dbName . '.APP_DELAY
                   LEFT JOIN
-                        '.$this->dbName.'.APP_DELEGATION AS AD1 ON (APP_DELAY.APP_NUMBER = AD1.APP_NUMBER AND AD1.DEL_INDEX = APP_DELAY.APP_DEL_INDEX)
+                        ' . $this->dbName . '.APP_DELEGATION AS AD1 ON (APP_DELAY.APP_NUMBER = AD1.APP_NUMBER AND AD1.DEL_INDEX = APP_DELAY.APP_DEL_INDEX)
                   LEFT JOIN
-                        '.$this->dbName.'.APP_DELEGATION AS AD2 ON (AD1.APP_NUMBER = AD2.APP_NUMBER AND AD1.DEL_PREVIOUS = AD2.DEL_INDEX)
+                        ' . $this->dbName . '.APP_DELEGATION AS AD2 ON (AD1.APP_NUMBER = AD2.APP_NUMBER AND AD1.DEL_PREVIOUS = AD2.DEL_INDEX)
                   LEFT JOIN
-                        '.$this->dbName.'.USERS ON (APP_DELAY.APP_DELEGATION_USER_ID = USERS.USR_ID)
+                        ' . $this->dbName . '.USERS ON (APP_DELAY.APP_DELEGATION_USER_ID = USERS.USR_ID)
                   LEFT JOIN
-                        '.$this->dbName.'.USERS PREVIOUS ON (AD2.USR_ID = PREVIOUS.USR_ID)
+                        ' . $this->dbName . '.USERS PREVIOUS ON (AD2.USR_ID = PREVIOUS.USR_ID)
                   LEFT JOIN
-                        '.$this->dbName.'.APPLICATION ON (AD1.APP_NUMBER = APPLICATION.APP_NUMBER)
+                        ' . $this->dbName . '.APPLICATION ON (AD1.APP_NUMBER = APPLICATION.APP_NUMBER)
                   LEFT JOIN
-                        '.$this->dbName.'.PROCESS ON (AD1.PRO_ID = PROCESS.PRO_ID)
+                        ' . $this->dbName . '.PROCESS ON (AD1.PRO_ID = PROCESS.PRO_ID)
                   LEFT JOIN
-                        '.$this->dbName.'.TASK ON (AD1.TAS_ID = TASK.TAS_ID)
+                        ' . $this->dbName . '.TASK ON (AD1.TAS_ID = TASK.TAS_ID)
                   WHERE
                        APP_DELAY.APP_DISABLE_ACTION_USER = "0" AND
                        APP_DELAY.APP_TYPE = "PAUSE"
@@ -2853,9 +2875,9 @@ class WorkspaceTools
     public function regenerateListUnassigned()
     {
         $this->initPropel(true);
-        $truncate = 'TRUNCATE '.$this->dbName.'.LIST_UNASSIGNED';
+        $truncate = 'TRUNCATE ' . $this->dbName . '.LIST_UNASSIGNED';
         //This executeQuery is very fast than Propel
-        $query = 'INSERT INTO '.$this->dbName.'.LIST_UNASSIGNED
+        $query = 'INSERT INTO ' . $this->dbName . '.LIST_UNASSIGNED
                     (APP_UID,
                     DEL_INDEX,
                     TAS_UID,
@@ -2891,9 +2913,9 @@ class WorkspaceTools
                         ACV.DEL_TASK_DUE_DATE AS DEL_DUE_DATE,
                         ACV.DEL_PRIORITY
                     FROM
-                        '.$this->dbName.'.APP_CACHE_VIEW ACV
+                        ' . $this->dbName . '.APP_CACHE_VIEW ACV
                             LEFT JOIN
-                        '.$this->dbName.'.USERS USR ON ACV.PREVIOUS_USR_UID = USR.USR_UID
+                        ' . $this->dbName . '.USERS USR ON ACV.PREVIOUS_USR_UID = USR.USR_UID
                     WHERE
                         ACV.DEL_THREAD_STATUS = \'OPEN\'
                         AND ACV.USR_UID = \'\' ';
@@ -2910,31 +2932,31 @@ class WorkspaceTools
      *
      * return boolean value
      */
-    public function listFirstExecution($action, $list='all')
+    public function listFirstExecution($action, $list = 'all')
     {
         $this->initPropel(true);
         switch ($action) {
             case 'insert':
-                $conf  = new Configuration();
-                if ($list==='all') {
+                $conf = new Configuration();
+                if ($list === 'all') {
                     if (!($conf->exists('MIGRATED_LIST', 'list', 'list', 'list', 'list'))) {
-                        $data["CFG_UID"]  ='MIGRATED_LIST';
-                        $data["OBJ_UID"]  ='list';
-                        $data["CFG_VALUE"]='true';
-                        $data["PRO_UID"]  ='list';
-                        $data["USR_UID"]  ='list';
-                        $data["APP_UID"]  ='list';
+                        $data["CFG_UID"] = 'MIGRATED_LIST';
+                        $data["OBJ_UID"] = 'list';
+                        $data["CFG_VALUE"] = 'true';
+                        $data["PRO_UID"] = 'list';
+                        $data["USR_UID"] = 'list';
+                        $data["APP_UID"] = 'list';
                         $conf->create($data);
                     }
                 }
-                if ($list==='unassigned') {
+                if ($list === 'unassigned') {
                     if (!($conf->exists('MIGRATED_LIST_UNASSIGNED', 'list', 'list', 'list', 'list'))) {
-                        $data["CFG_UID"]  ='MIGRATED_LIST_UNASSIGNED';
-                        $data["OBJ_UID"]  ='list';
-                        $data["CFG_VALUE"]='true';
-                        $data["PRO_UID"]  ='list';
-                        $data["USR_UID"]  ='list';
-                        $data["APP_UID"]  ='list';
+                        $data["CFG_UID"] = 'MIGRATED_LIST_UNASSIGNED';
+                        $data["OBJ_UID"] = 'list';
+                        $data["CFG_VALUE"] = 'true';
+                        $data["PRO_UID"] = 'list';
+                        $data["USR_UID"] = 'list';
+                        $data["APP_UID"] = 'list';
                         $conf->create($data);
                     }
                 }
@@ -2943,15 +2965,15 @@ class WorkspaceTools
             case 'check':
                 $criteria = new Criteria("workflow");
                 $criteria->addSelectColumn(ConfigurationPeer::CFG_UID);
-                if ($list==='all') {
+                if ($list === 'all') {
                     $criteria->add(ConfigurationPeer::CFG_UID, "MIGRATED_LIST", CRITERIA::EQUAL);
                 }
-                if ($list==='unassigned') {
+                if ($list === 'unassigned') {
                     $criteria->add(ConfigurationPeer::CFG_UID, "MIGRATED_LIST_UNASSIGNED", CRITERIA::EQUAL);
                 }
                 $rsCriteria = AppCacheViewPeer::doSelectRS($criteria);
                 $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-                $aRows = array();
+                $aRows = [];
                 while ($rsCriteria->next()) {
                     $aRows[] = $rsCriteria->getRow();
                 }
@@ -3025,10 +3047,10 @@ class WorkspaceTools
         //Register all tables
         $sListTables = '';
         foreach ($aSquema as $key => $value) {
-            $sListTables .= $key .'|';
+            $sListTables .= $key . '|';
         }
 
-        $sysTablesIniFile= PATH_CONFIG . 'system-tables.ini';
+        $sysTablesIniFile = PATH_CONFIG . 'system-tables.ini';
         $contents = file_put_contents($sysTablesIniFile, sprintf("%s '%s'\n", "tables = ", $sListTables));
         if ($contents === null) {
             throw (new Exception(G::LoadTranslation('ID_FILE_NOT_WRITEABLE', SYS_LANG, array($sysTablesIniFile))));
@@ -3042,7 +3064,7 @@ class WorkspaceTools
     {
         CLI::logging("-> Verifying roles permissions in RBAC \n");
         //Update table RBAC permissions
-        $RBAC = &RBAC::getSingleton();
+        $RBAC = RBAC::getSingleton();
         $RBAC->initRBAC();
         $result = $RBAC->verifyPermissions();
         if (count($result) > 1) {
@@ -3077,7 +3099,7 @@ class WorkspaceTools
     {
         $this->initPropel(true);
         file_put_contents(
-            PATH_DATA."/missing-users-".$this->name.".txt",
+            PATH_DATA . "/missing-users-" . $this->name . ".txt",
             "Missing Processes List.\n"
         );
 
@@ -3085,8 +3107,10 @@ class WorkspaceTools
         $criteria->addSelectColumn(AppCacheViewPeer::APP_UID);
         $criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
         $criteria->addSelectColumn(AppCacheViewPeer::USR_UID);
-        $criteria->addJoinMC(array(
-            array(AppCacheViewPeer::USR_UID, UsersPeer::USR_UID)),
+        $criteria->addJoinMC(
+            array(
+                array(AppCacheViewPeer::USR_UID, UsersPeer::USR_UID)
+            ),
             Criteria::LEFT_JOIN
         );
         $criteria->add(UsersPeer::USR_UID, null, Criteria::ISNULL);
@@ -3097,10 +3121,10 @@ class WorkspaceTools
             $item = $rsCriteria->getRow();
             $counter++;
             file_put_contents(
-                PATH_DATA."/missing-users-".$this->name.".txt",
-                "APP_UID:[".$item['APP_UID']."] - DEL_INDEX[".$item['DEL_INDEX']."] have relation " .
-                "with invalid or non-existent user user with ".
-                "id [".$item['USR_UID']."]"
+                PATH_DATA . "/missing-users-" . $this->name . ".txt",
+                "APP_UID:[" . $item['APP_UID'] . "] - DEL_INDEX[" . $item['DEL_INDEX'] . "] have relation " .
+                "with invalid or non-existent user user with " .
+                "id [" . $item['USR_UID'] . "]"
             );
         }
         CLI::logging("> Number of user related inconsistencies for workspace " . CLI::info($this->name) . ": " . CLI::info($counter) . "\n");
@@ -3111,7 +3135,7 @@ class WorkspaceTools
     {
         $this->initPropel(true);
         file_put_contents(
-            PATH_DATA."/missing-tasks-".$this->name.".txt",
+            PATH_DATA . "/missing-tasks-" . $this->name . ".txt",
             "Missing Processes List\n"
         );
 
@@ -3119,8 +3143,10 @@ class WorkspaceTools
         $criteria->addSelectColumn(AppCacheViewPeer::APP_UID);
         $criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
         $criteria->addSelectColumn(AppCacheViewPeer::TAS_UID);
-        $criteria->addJoinMC(array(
-            array(AppCacheViewPeer::USR_UID, TaskPeer::TAS_UID)),
+        $criteria->addJoinMC(
+            array(
+                array(AppCacheViewPeer::USR_UID, TaskPeer::TAS_UID)
+            ),
             Criteria::LEFT_JOIN
         );
 
@@ -3131,10 +3157,10 @@ class WorkspaceTools
         while ($rsCriteria->next()) {
             $item = $rsCriteria->getRow();
             file_put_contents(
-                PATH_DATA."/missing-tasks-".$this->name.".txt",
-                "APP_UID:[".$item['APP_UID']."] - DEL_INDEX[".$item['DEL_INDEX']."] have relation " .
-                "with invalid or non-existent task with ".
-                "id [".$item['TAS_UID']."]"
+                PATH_DATA . "/missing-tasks-" . $this->name . ".txt",
+                "APP_UID:[" . $item['APP_UID'] . "] - DEL_INDEX[" . $item['DEL_INDEX'] . "] have relation " .
+                "with invalid or non-existent task with " .
+                "id [" . $item['TAS_UID'] . "]"
             );
         }
 
@@ -3146,7 +3172,7 @@ class WorkspaceTools
     {
         $this->initPropel(true);
         file_put_contents(
-            PATH_DATA."/missing-processes-".$this->name.".txt",
+            PATH_DATA . "/missing-processes-" . $this->name . ".txt",
             "Missing Processes List\n"
         );
 
@@ -3154,8 +3180,10 @@ class WorkspaceTools
         $criteria->addSelectColumn(AppCacheViewPeer::APP_UID);
         $criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
         $criteria->addSelectColumn(AppCacheViewPeer::PRO_UID);
-        $criteria->addJoinMC(array(
-            array(AppCacheViewPeer::USR_UID, ProcessPeer::PRO_UID)),
+        $criteria->addJoinMC(
+            array(
+                array(AppCacheViewPeer::USR_UID, ProcessPeer::PRO_UID)
+            ),
             Criteria::LEFT_JOIN
         );
 
@@ -3166,10 +3194,10 @@ class WorkspaceTools
         while ($rsCriteria->next()) {
             $item = $rsCriteria->getRow();
             file_put_contents(
-                PATH_DATA."/missing-processes-".$this->name.".txt",
-                "APP_UID:[".$item['APP_UID']."] - DEL_INDEX[".$item['DEL_INDEX']."] have relation " .
-                "with invalid or non-existent process with ".
-                "id [".$item['PRO_UID']."]"
+                PATH_DATA . "/missing-processes-" . $this->name . ".txt",
+                "APP_UID:[" . $item['APP_UID'] . "] - DEL_INDEX[" . $item['DEL_INDEX'] . "] have relation " .
+                "with invalid or non-existent process with " .
+                "id [" . $item['PRO_UID'] . "]"
             );
         }
         CLI::logging("> Number of processes related data inconsistencies for workspace " . CLI::info($this->name) . ": " . CLI::info($counter) . "\n");
@@ -3180,16 +3208,18 @@ class WorkspaceTools
     {
         $this->initPropel(true);
         file_put_contents(
-            PATH_DATA."/missing-app-delegation-".$this->name.".txt",
+            PATH_DATA . "/missing-app-delegation-" . $this->name . ".txt",
             "Missing AppDelegation List.\n"
         );
 
         $criteria = new Criteria("workflow");
         $criteria->addSelectColumn(AppCacheViewPeer::APP_UID);
         $criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
-        $criteria->addJoinMC(array(
-            array(AppCacheViewPeer::APP_UID, AppCacheViewPeer::DEL_INDEX),
-            array(AppDelegationPeer::APP_UID, AppDelegationPeer::DEL_INDEX)),
+        $criteria->addJoinMC(
+            array(
+                array(AppCacheViewPeer::APP_UID, AppCacheViewPeer::DEL_INDEX),
+                array(AppDelegationPeer::APP_UID, AppDelegationPeer::DEL_INDEX)
+            ),
             Criteria::LEFT_JOIN
         );
         $criteria->add(AppDelegationPeer::APP_UID, null, Criteria::ISNULL);
@@ -3200,10 +3230,10 @@ class WorkspaceTools
             $item = $rsCriteria->getRow();
             $counter++;
             file_put_contents(
-                PATH_DATA."/missing-app-delegation-".$this->name.".txt",
-                "APP_UID:[".$item['APP_UID']."] - DEL_INDEX[".$item['DEL_INDEX']."] have relation " .
-                "with invalid or non-existent process with ".
-                "id [".$item['PRO_UID']."]"
+                PATH_DATA . "/missing-app-delegation-" . $this->name . ".txt",
+                "APP_UID:[" . $item['APP_UID'] . "] - DEL_INDEX[" . $item['DEL_INDEX'] . "] have relation " .
+                "with invalid or non-existent process with " .
+                "id [" . $item['PRO_UID'] . "]"
             );
         }
         CLI::logging("> Number of delegations related data inconsistencies for workspace " . CLI::info($this->name) . ": " . CLI::info($counter) . "\n");
@@ -3215,15 +3245,17 @@ class WorkspaceTools
     {
         $this->initPropel(true);
         file_put_contents(
-            PATH_DATA."/post-missing-cancelled-".$this->name.".txt",
+            PATH_DATA . "/post-missing-cancelled-" . $this->name . ".txt",
             "Missing Cancelled List.\n"
         );
         $criteria = new Criteria("workflow");
         $criteria->addSelectColumn(AppCacheViewPeer::APP_UID);
         $criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
-        $criteria->addJoinMC(array(
-            array(AppCacheViewPeer::APP_UID, ListCanceledPeer::APP_UID),
-            array(AppCacheViewPeer::DEL_INDEX, ListCanceledPeer::DEL_INDEX)),
+        $criteria->addJoinMC(
+            array(
+                array(AppCacheViewPeer::APP_UID, ListCanceledPeer::APP_UID),
+                array(AppCacheViewPeer::DEL_INDEX, ListCanceledPeer::DEL_INDEX)
+            ),
             Criteria::LEFT_JOIN
         );
 
@@ -3239,8 +3271,8 @@ class WorkspaceTools
             $counter++;
 
             file_put_contents(
-                PATH_DATA."/post-missing-cancelled-".$this->name.".txt",
-                "[".$item['APP_UID']."] has not been found"
+                PATH_DATA . "/post-missing-cancelled-" . $this->name . ".txt",
+                "[" . $item['APP_UID'] . "] has not been found"
             );
         }
 
@@ -3251,15 +3283,17 @@ class WorkspaceTools
     {
         $this->initPropel(true);
         file_put_contents(
-            PATH_DATA."/post-missing-completed-".$this->name.".txt",
+            PATH_DATA . "/post-missing-completed-" . $this->name . ".txt",
             "Missing Completed List.\n"
         );
         $criteria = new Criteria("workflow");
         $criteria->addSelectColumn(AppCacheViewPeer::APP_UID);
         $criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
-        $criteria->addJoinMC(array(
-            array(AppCacheViewPeer::APP_UID, ListCompletedPeer::APP_UID),
-            array(AppCacheViewPeer::DEL_INDEX, ListCompletedPeer::DEL_INDEX)),
+        $criteria->addJoinMC(
+            array(
+                array(AppCacheViewPeer::APP_UID, ListCompletedPeer::APP_UID),
+                array(AppCacheViewPeer::DEL_INDEX, ListCompletedPeer::DEL_INDEX)
+            ),
             Criteria::LEFT_JOIN
         );
 
@@ -3274,8 +3308,8 @@ class WorkspaceTools
             $item = $rsCriteria->getRow();
             $counter++;
             file_put_contents(
-                PATH_DATA."/post-missing-completed-".$this->name.".txt",
-                "[".$item['APP_UID']."] has not been found"
+                PATH_DATA . "/post-missing-completed-" . $this->name . ".txt",
+                "[" . $item['APP_UID'] . "] has not been found"
             );
         }
 
@@ -3286,15 +3320,17 @@ class WorkspaceTools
     {
         $this->initPropel(true);
         file_put_contents(
-            PATH_DATA."/post-missing-inbox-".$this->name.".txt",
+            PATH_DATA . "/post-missing-inbox-" . $this->name . ".txt",
             "Missing Inbox List.\n"
         );
         $criteria = new Criteria("workflow");
         $criteria->addSelectColumn(AppCacheViewPeer::APP_UID);
         $criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
-        $criteria->addJoinMC(array(
-            array(AppCacheViewPeer::APP_UID, ListInboxPeer::APP_UID),
-            array(AppCacheViewPeer::DEL_INDEX, ListInboxPeer::DEL_INDEX)),
+        $criteria->addJoinMC(
+            array(
+                array(AppCacheViewPeer::APP_UID, ListInboxPeer::APP_UID),
+                array(AppCacheViewPeer::DEL_INDEX, ListInboxPeer::DEL_INDEX)
+            ),
             Criteria::LEFT_JOIN
         );
 
@@ -3308,8 +3344,8 @@ class WorkspaceTools
             $item = $rsCriteria->getRow();
             $counter++;
             file_put_contents(
-                PATH_DATA."/post-missing-inbox-".$this->name.".txt",
-                "[".$item['APP_UID']."] has not been found"
+                PATH_DATA . "/post-missing-inbox-" . $this->name . ".txt",
+                "[" . $item['APP_UID'] . "] has not been found"
             );
         }
 
@@ -3320,16 +3356,17 @@ class WorkspaceTools
     {
         $this->initPropel(true);
         file_put_contents(
-            PATH_DATA."/post-missing-participated-history-".$this->name.".txt",
+            PATH_DATA . "/post-missing-participated-history-" . $this->name . ".txt",
             "Missing ParticipatedHistory List.\n"
         );
         $criteria = new Criteria("workflow");
         $criteria->addSelectColumn(AppCacheViewPeer::APP_UID);
         $criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
-        $criteria->addJoinMC(array(
-            array(AppCacheViewPeer::APP_UID, ListParticipatedHistoryPeer::APP_UID),
-            array(AppCacheViewPeer::DEL_INDEX, ListParticipatedHistoryPeer::DEL_INDEX)
-        ),
+        $criteria->addJoinMC(
+            array(
+                array(AppCacheViewPeer::APP_UID, ListParticipatedHistoryPeer::APP_UID),
+                array(AppCacheViewPeer::DEL_INDEX, ListParticipatedHistoryPeer::DEL_INDEX)
+            ),
             Criteria::LEFT_JOIN
         );
 
@@ -3343,8 +3380,8 @@ class WorkspaceTools
             $item = $rsCriteria->getRow();
             $counter++;
             file_put_contents(
-                PATH_DATA."/post-missing-participated-history-".$this->name.".txt",
-                "[".$item['APP_UID']."] has not been found"
+                PATH_DATA . "/post-missing-participated-history-" . $this->name . ".txt",
+                "[" . $item['APP_UID'] . "] has not been found"
             );
         }
 
@@ -3355,16 +3392,17 @@ class WorkspaceTools
     {
         $this->initPropel(true);
         file_put_contents(
-            PATH_DATA."/post-missing-participated-last-".$this->name.".txt",
+            PATH_DATA . "/post-missing-participated-last-" . $this->name . ".txt",
             "Missing ParticipatedLast List.\n"
         );
         $criteria = new Criteria("workflow");
         $criteria->addSelectColumn(AppCacheViewPeer::APP_UID);
         $criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
-        $criteria->addJoinMC(array(
-            array(AppCacheViewPeer::APP_UID, ListParticipatedLastPeer::APP_UID),
-            array(AppCacheViewPeer::DEL_INDEX, ListParticipatedLastPeer::DEL_INDEX)
-        ),
+        $criteria->addJoinMC(
+            array(
+                array(AppCacheViewPeer::APP_UID, ListParticipatedLastPeer::APP_UID),
+                array(AppCacheViewPeer::DEL_INDEX, ListParticipatedLastPeer::DEL_INDEX)
+            ),
             Criteria::LEFT_JOIN
         );
 
@@ -3378,8 +3416,8 @@ class WorkspaceTools
             $item = $rsCriteria->getRow();
             $counter++;
             file_put_contents(
-                PATH_DATA."/post-missing-participated-last-".$this->name.".txt",
-                "[".$item['APP_UID']."] has not been found"
+                PATH_DATA . "/post-missing-participated-last-" . $this->name . ".txt",
+                "[" . $item['APP_UID'] . "] has not been found"
             );
         }
 
@@ -3390,16 +3428,17 @@ class WorkspaceTools
     {
         $this->initPropel(true);
         file_put_contents(
-            PATH_DATA."/post-missing-my-inbox-".$this->name.".txt",
+            PATH_DATA . "/post-missing-my-inbox-" . $this->name . ".txt",
             "Missing MyInbox List.\n"
         );
         $criteria = new Criteria("workflow");
         $criteria->addSelectColumn(AppCacheViewPeer::APP_UID);
         $criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
-        $criteria->addJoinMC(array(
-            array(AppCacheViewPeer::APP_UID, ListMyInboxPeer::APP_UID),
-            array(AppCacheViewPeer::DEL_INDEX, ListMyInboxPeer::DEL_INDEX)
-        ),
+        $criteria->addJoinMC(
+            array(
+                array(AppCacheViewPeer::APP_UID, ListMyInboxPeer::APP_UID),
+                array(AppCacheViewPeer::DEL_INDEX, ListMyInboxPeer::DEL_INDEX)
+            ),
             Criteria::LEFT_JOIN
         );
 
@@ -3413,8 +3452,8 @@ class WorkspaceTools
             $item = $rsCriteria->getRow();
             $counter++;
             file_put_contents(
-                PATH_DATA."/post-missing-my-inbox-".$this->name.".txt",
-                "[".$item['APP_UID']."] has not been found"
+                PATH_DATA . "/post-missing-my-inbox-" . $this->name . ".txt",
+                "[" . $item['APP_UID'] . "] has not been found"
             );
         }
 
@@ -3425,16 +3464,17 @@ class WorkspaceTools
     {
         $this->initPropel(true);
         file_put_contents(
-            PATH_DATA."/post-missing-unassigned-".$this->name.".txt",
+            PATH_DATA . "/post-missing-unassigned-" . $this->name . ".txt",
             "Missing MissingUnassigned List.\n"
         );
         $criteria = new Criteria("workflow");
         $criteria->addSelectColumn(AppCacheViewPeer::APP_UID);
         $criteria->addSelectColumn(AppCacheViewPeer::DEL_INDEX);
-        $criteria->addJoinMC(array(
-            array(AppCacheViewPeer::APP_UID, ListUnassignedPeer::APP_UID),
-            array(AppCacheViewPeer::DEL_INDEX, ListUnassignedPeer::DEL_INDEX)
-        ),
+        $criteria->addJoinMC(
+            array(
+                array(AppCacheViewPeer::APP_UID, ListUnassignedPeer::APP_UID),
+                array(AppCacheViewPeer::DEL_INDEX, ListUnassignedPeer::DEL_INDEX)
+            ),
             Criteria::LEFT_JOIN
         );
 
@@ -3448,8 +3488,8 @@ class WorkspaceTools
             $item = $rsCriteria->getRow();
             $counter++;
             file_put_contents(
-                PATH_DATA."/post-missing-unassigned-".$this->name.".txt",
-                "[".$item['APP_UID']."] has not been found"
+                PATH_DATA . "/post-missing-unassigned-" . $this->name . ".txt",
+                "[" . $item['APP_UID'] . "] has not been found"
             );
         }
         CLI::logging("> Number of unassigned cases for workspace " . CLI::info($this->name) . ": " . CLI::info($counter) . "\n");
@@ -3504,8 +3544,8 @@ class WorkspaceTools
             define('MEMCACHED_ENABLED', false);
         }
         $this->initPropel(true);
-        $conf  = new Configuration();
-        $blackList = array();
+        $conf = new Configuration();
+        $blackList = [];
         if ($bExist = $conf->exists('MIGRATED_CONTENT', 'content')) {
             $oConfig = $conf->load('MIGRATED_CONTENT', 'content');
             $blackList = $oConfig['CFG_VALUE'] == 'true' ? array('Groupwf', 'Process', 'Department', 'Task', 'InputDocument', 'Application') : unserialize($oConfig['CFG_VALUE']);
@@ -3606,11 +3646,11 @@ class WorkspaceTools
         $oCriteria = new Criteria();
         $oCriteria->add(OauthAccessTokensPeer::ACCESS_TOKEN, 0, Criteria::NOT_EQUAL);
         $accessToken = OauthAccessTokensPeer::doDelete($oCriteria);
-        CLI::logging("|--> Clean data in table " . OauthAccessTokensPeer::TABLE_NAME . " rows ".$accessToken."\n");
+        CLI::logging("|--> Clean data in table " . OauthAccessTokensPeer::TABLE_NAME . " rows " . $accessToken . "\n");
         $oCriteria = new Criteria();
         $oCriteria->add(OauthRefreshTokensPeer::REFRESH_TOKEN, 0, Criteria::NOT_EQUAL);
         $refreshToken = OauthRefreshTokensPeer::doDelete($oCriteria);
-        CLI::logging("|--> Clean data in table " . OauthRefreshTokensPeer::TABLE_NAME . " rows ".$refreshToken."\n");
+        CLI::logging("|--> Clean data in table " . OauthRefreshTokensPeer::TABLE_NAME . " rows " . $refreshToken . "\n");
     }
 
     public function migrateIteeToDummytask($workspaceName)
@@ -3659,7 +3699,7 @@ class WorkspaceTools
                 if ($oProcess->processExists($prj_uid)) {
                     $oProcess->update($aProcess);
                 }
-                $message = "    Process updated ".$bpmnProcess->getProTitle(). "\n";
+                $message = "    Process updated " . $bpmnProcess->getProTitle() . "\n";
                 CLI::logging($message);
             }
         }
@@ -3679,7 +3719,7 @@ class WorkspaceTools
         $conf = new Configurations();
         if (!$conf->exists('AUDIT_LOG', 'log')) {
             CLI::logging("> Updating Auditlog Config \n");
-            $oServerConf = &ServerConf::getSingleton();
+            $oServerConf = ServerConf::getSingleton();
             $sAudit = $oServerConf->getAuditLogProperty('AL_OPTION', $workspace);
             $conf->aConfig = ($sAudit == 1) ? 'true' : 'false';
             $conf->saveConfig('AUDIT_LOG', 'log');
@@ -3721,7 +3761,7 @@ class WorkspaceTools
                     $appAssignSelfServiceValueGroup->save();
                 }
             }
-            CLI::logging("    Migrating Record ".$row['ID']. "\n");
+            CLI::logging("    Migrating Record " . $row['ID'] . "\n");
         }
 
         // Updating processed records to empty
@@ -3943,7 +3983,7 @@ class WorkspaceTools
 
         CLI::logging("-> Populating PRO_ID, USR_ID at LIST_*  Done \n");
     }
-    
+
     /**
      * It populates the WEB_ENTRY table for the classic processes, this procedure
      * is done to verify the execution of php files generated when the WebEntry
@@ -4064,7 +4104,7 @@ class WorkspaceTools
             define('MEMCACHED_ENABLED', false);
         }
         $this->initPropel(true);
-        $conf  = new Configuration();
+        $conf = new Configuration();
         $pathSingleton = PATH_DATA . 'sites' . PATH_SEP . $workspace . PATH_SEP . 'plugin.singleton';
         if ((!$bExist = $conf->exists('MIGRATED_PLUGIN', 'singleton')) && file_exists($pathSingleton)) {
             $oPluginRegistry = unserialize(file_get_contents($pathSingleton));
@@ -4110,8 +4150,8 @@ class WorkspaceTools
             $workSpace = config("system.workspace");
         }
         $paths = [
-            PATH_DATA.'framework' => 0770,
-            PATH_DATA.'framework' . DIRECTORY_SEPARATOR . 'cache' => 0770,
+            PATH_DATA . 'framework' => 0770,
+            PATH_DATA . 'framework' . DIRECTORY_SEPARATOR . 'cache' => 0770,
         ];
         foreach ($paths as $path => $permission) {
             if (!file_exists($path)) {
@@ -4123,11 +4163,13 @@ class WorkspaceTools
 
     /**
      * This function get the last table migrated for the labels
-     * @param array $workspaceSchema, the current schema in the database
+     * @param array $workspaceSchema , the current schema in the database
      * @return void
-    */
-    private function checkLastContentMigrate(array $workspaceSchema){
-        $content = end($this->getListContentMigrateTable());
+     */
+    private function checkLastContentMigrate(array $workspaceSchema)
+    {
+        $listContent = $this->getListContentMigrateTable();
+        $content = end($listContent);
         $lastContent = isset($content['peer']) ? $content['peer'] : null;
         if (!is_null($lastContent) && isset($workspaceSchema[$lastContent::TABLE_NAME][$content['fields'][0]])) {
             $this->setLastContentMigrateTable(true);
diff --git a/workflow/engine/classes/WsBase.php b/workflow/engine/classes/WsBase.php
index ba869bc24..e8bfade79 100644
--- a/workflow/engine/classes/WsBase.php
+++ b/workflow/engine/classes/WsBase.php
@@ -34,6 +34,7 @@ class WsBase
      *
      * @param string $userid
      * @param string $password
+     *
      * @return $wsResponse will return an object
      */
     public function login($userid, $password)
@@ -51,16 +52,16 @@ class WsBase
 
             switch ($uid) {
                 case '':
-                case - 1: //The user doesn't exist
+                case -1: //The user doesn't exist
                     $wsResponse = new WsResponse(3, G::loadTranslation('ID_USER_NOT_REGISTERED'));
                     break;
-                case - 2: //The password is incorrect
+                case -2: //The password is incorrect
                     $wsResponse = new WsResponse(4, G::loadTranslation('ID_WRONG_PASS'));
                     break;
-                case - 3: //The user is inactive
+                case -3: //The user is inactive
                     $wsResponse = new WsResponse(5, G::loadTranslation('ID_USER_INACTIVE'));
                     break;
-                case - 4: //The Due date is finished
+                case -4: //The Due date is finished
                     $wsResponse = new WsResponse(5, G::loadTranslation('ID_USER_INACTIVE'));
                     break;
             }
@@ -87,7 +88,10 @@ class WsBase
             $session->setUsrUid($uid);
             $session->setSesRemoteIp($_SERVER['REMOTE_ADDR']);
             $session->setSesInitDate(date('Y-m-d H:i:s'));
-            $session->setSesDueDate(date('Y-m-d H:i:s', mktime(date('H'), date('i') + 15, date('s'), date('m'), date('d'), date('Y'))));
+            $session->setSesDueDate(date(
+                'Y-m-d H:i:s',
+                mktime(date('H'), date('i') + 15, date('s'), date('m'), date('d'), date('Y'))
+            ));
             $session->setSesEndDate('');
             $session->Save();
 
@@ -105,6 +109,7 @@ class WsBase
      * get all groups
      *
      * @param none
+     *
      * @return $result will return an object
      */
     public function processList()
@@ -120,14 +125,18 @@ class WsBase
             while ($aRow = $oDataset->getRow()) {
                 $oProcess = new Process();
                 $arrayProcess = $oProcess->load($aRow['PRO_UID']);
-                $result[] = array('guid' => $aRow['PRO_UID'], 'name' => $arrayProcess['PRO_TITLE']
+                $result[] = array(
+                    'guid' => $aRow['PRO_UID'],
+                    'name' => $arrayProcess['PRO_TITLE']
                 );
                 $oDataset->next();
             }
 
             return $result;
         } catch (Exception $e) {
-            $result[] = array('guid' => $e->getMessage(), 'name' => $e->getMessage()
+            $result[] = array(
+                'guid' => $e->getMessage(),
+                'name' => $e->getMessage()
             );
 
             return $result;
@@ -138,6 +147,7 @@ class WsBase
      * get all roles, to see all roles
      *
      * @param none
+     *
      * @return $result will return an object
      */
     public function roleList()
@@ -145,7 +155,7 @@ class WsBase
         try {
             $result = [];
 
-            $RBAC = & RBAC::getSingleton();
+            $RBAC = RBAC::getSingleton();
             $RBAC->initRBAC();
             $oCriteria = $RBAC->listAllRoles();
             $oDataset = GulliverBasePeer::doSelectRs($oCriteria);
@@ -153,14 +163,18 @@ class WsBase
             $oDataset->next();
 
             while ($aRow = $oDataset->getRow()) {
-                $result[] = array('guid' => $aRow['ROL_UID'], 'name' => $aRow['ROL_CODE']
+                $result[] = array(
+                    'guid' => $aRow['ROL_UID'],
+                    'name' => $aRow['ROL_CODE']
                 );
                 $oDataset->next();
             }
 
             return $result;
         } catch (Exception $e) {
-            $result[] = array('guid' => $e->getMessage(), 'name' => $e->getMessage()
+            $result[] = array(
+                'guid' => $e->getMessage(),
+                'name' => $e->getMessage()
             );
 
             return $result;
@@ -174,6 +188,7 @@ class WsBase
      * @param null $regex
      * @param null $start
      * @param null $limit
+     *
      * @return array|stdClass
      */
     public function groupList($regex = null, $start = null, $limit = null)
@@ -212,6 +227,7 @@ class WsBase
      * get all department
      *
      * @param none
+     *
      * @return $result will return an object
      */
     public function departmentList()
@@ -249,7 +265,9 @@ class WsBase
 
             return $result;
         } catch (Exception $e) {
-            $result[] = array('guid' => $e->getMessage(), 'name' => $e->getMessage()
+            $result[] = array(
+                'guid' => $e->getMessage(),
+                'name' => $e->getMessage()
             );
 
             return $result;
@@ -260,6 +278,7 @@ class WsBase
      * Get case list
      *
      * @param string $userId
+     *
      * @return $result will return an object
      */
     public function caseList($userUid)
@@ -269,9 +288,9 @@ class WsBase
 
             if (($solrEnv = System::solrEnv()) !== false) {
                 $appSolr = new AppSolr(
-                        $solrEnv["solr_enabled"], 
-                        $solrEnv["solr_host"], 
-                        $solrEnv["solr_instance"]
+                    $solrEnv["solr_enabled"],
+                    $solrEnv["solr_host"],
+                    $solrEnv["solr_instance"]
                 );
 
                 if ($appSolr->isSolrEnabled() && $solrEnv["solr_enabled"] == true) {
@@ -304,17 +323,17 @@ class WsBase
                     $columsToIncludeFinal = array_merge($columsToInclude, $delegationIndexes);
 
                     $solrRequestData = EntitySolrRequestData::createForRequestPagination(
-                                    array(
-                                        "workspace" => $solrEnv["solr_instance"],
-                                        "startAfter" => 0,
-                                        "pageSize" => 1000,
-                                        "searchText" => $solrSearchText,
-                                        "numSortingCols" => 1,
-                                        "sortCols" => array("APP_NUMBER"),
-                                        "sortDir" => array(strtolower("DESC")),
-                                        "includeCols" => $columsToIncludeFinal,
-                                        "resultFormat" => "json"
-                                    )
+                        array(
+                            "workspace" => $solrEnv["solr_instance"],
+                            "startAfter" => 0,
+                            "pageSize" => 1000,
+                            "searchText" => $solrSearchText,
+                            "numSortingCols" => 1,
+                            "sortCols" => array("APP_NUMBER"),
+                            "sortDir" => array(strtolower("DESC")),
+                            "includeCols" => $columsToIncludeFinal,
+                            "resultFormat" => "json"
+                        )
                     );
 
                     //Use search index to return list of cases
@@ -421,16 +440,21 @@ class WsBase
                 $criteria->add(AppCacheViewPeer::USR_UID, $userUid);
 
                 $criteria->add(
-                        //ToDo - getToDo()
-                        $criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "TO_DO", CRITERIA::EQUAL)->addAnd(
-                                $criteria->getNewCriterion(AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL))->addAnd(
-                                $criteria->getNewCriterion(AppCacheViewPeer::APP_THREAD_STATUS, "OPEN"))->addAnd(
-                                $criteria->getNewCriterion(AppCacheViewPeer::DEL_THREAD_STATUS, "OPEN"))
+                //ToDo - getToDo()
+                    $criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "TO_DO", CRITERIA::EQUAL)->addAnd(
+                        $criteria->getNewCriterion(AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL)
+                    )->addAnd(
+                        $criteria->getNewCriterion(AppCacheViewPeer::APP_THREAD_STATUS, "OPEN")
+                    )->addAnd(
+                        $criteria->getNewCriterion(AppCacheViewPeer::DEL_THREAD_STATUS, "OPEN")
+                    )
                 )->addOr(
-                        //Draft - getDraft()
-                        $criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "DRAFT", CRITERIA::EQUAL)->addAnd(
-                                $criteria->getNewCriterion(AppCacheViewPeer::APP_THREAD_STATUS, "OPEN"))->addAnd(
-                                $criteria->getNewCriterion(AppCacheViewPeer::DEL_THREAD_STATUS, "OPEN"))
+                //Draft - getDraft()
+                    $criteria->getNewCriterion(AppCacheViewPeer::APP_STATUS, "DRAFT", CRITERIA::EQUAL)->addAnd(
+                        $criteria->getNewCriterion(AppCacheViewPeer::APP_THREAD_STATUS, "OPEN")
+                    )->addAnd(
+                        $criteria->getNewCriterion(AppCacheViewPeer::DEL_THREAD_STATUS, "OPEN")
+                    )
                 );
 
                 $criteria->addDescendingOrderByColumn(AppCacheViewPeer::APP_NUMBER);
@@ -471,6 +495,7 @@ class WsBase
      * Get unassigned case list
      *
      * @param string $userId
+     *
      * @return $result will return an object
      */
     public function unassignedCaseList($userId)
@@ -484,21 +509,25 @@ class WsBase
             $oDataset->next();
 
             while ($aRow = $oDataset->getRow()) {
-                $result[] = array('guid' => $aRow['APP_UID'],
+                $result[] = array(
+                    'guid' => $aRow['APP_UID'],
                     'name' => $aRow['APP_NUMBER'],
                     'delIndex' => $aRow['DEL_INDEX'],
-                    'processId' => $aRow['PRO_UID']);
+                    'processId' => $aRow['PRO_UID']
+                );
 
                 $oDataset->next();
             }
 
             return $result;
         } catch (Exception $e) {
-            $result[] = array('guid' => $e->getMessage(),
+            $result[] = array(
+                'guid' => $e->getMessage(),
                 'name' => $e->getMessage(),
                 'status' => $e->getMessage(),
                 'status' => $e->getMessage(),
-                'processId' => $e->getMessage());
+                'processId' => $e->getMessage()
+            );
 
             return $result;
         }
@@ -542,6 +571,7 @@ class WsBase
      * get list of all the available triggers in a workspace
      *
      * @param none
+     *
      * @return $result will return an object
      */
     public function triggerList()
@@ -557,7 +587,10 @@ class WsBase
             $oDataset->next();
 
             while ($aRow = $oDataset->getRow()) {
-                $result[] = array('guid' => $aRow['TRI_UID'], 'name' => $aRow['TITLE'], 'processId' => $aRow['PRO_UID']
+                $result[] = array(
+                    'guid' => $aRow['TRI_UID'],
+                    'name' => $aRow['TITLE'],
+                    'processId' => $aRow['PRO_UID']
                 );
 
                 $oDataset->next();
@@ -565,7 +598,9 @@ class WsBase
 
             return $result;
         } catch (Exception $e) {
-            $result[] = array('guid' => $e->getMessage(), 'name' => $e->getMessage()
+            $result[] = array(
+                'guid' => $e->getMessage(),
+                'name' => $e->getMessage()
             );
 
             return $result;
@@ -577,6 +612,7 @@ class WsBase
      *
      * @param string $sApplicationUID
      * @param string $sUserUID
+     *
      * @return $result
      */
     public function inputDocumentList($sApplicationUID, $sUserUID)
@@ -609,7 +645,8 @@ class WsBase
 
             return $result;
         } catch (Exception $e) {
-            $result[] = array('guid' => $e->getMessage()
+            $result[] = array(
+                'guid' => $e->getMessage()
             );
 
             return $result;
@@ -620,6 +657,7 @@ class WsBase
      * input document process list
      *
      * @param string $sProcessUID
+     *
      * @return $result will return an object
      */
     public function inputDocumentProcessList($sProcessUID)
@@ -656,7 +694,8 @@ class WsBase
 
             return $result;
         } catch (Exception $e) {
-            $result[] = array('guid' => $e->getMessage()
+            $result[] = array(
+                'guid' => $e->getMessage()
             );
 
             return $result;
@@ -668,6 +707,7 @@ class WsBase
      *
      * @param string $sApplicationUID
      * @param string $sUserUID
+     *
      * @return $result will return an object
      */
     public function outputDocumentList($sApplicationUID, $sUserUID)
@@ -701,7 +741,8 @@ class WsBase
 
             return $result;
         } catch (Exception $e) {
-            $result[] = array('guid' => $e->getMessage()
+            $result[] = array(
+                'guid' => $e->getMessage()
             );
 
             return $result;
@@ -712,6 +753,7 @@ class WsBase
      * remove document
      *
      * @param string $appDocUid
+     *
      * @return $result will return an object
      */
     public function removeDocument($appDocUid)
@@ -733,6 +775,7 @@ class WsBase
      * get task list
      *
      * @param string $userId
+     *
      * @return $result will return an object
      */
     public function taskList($userId)
@@ -758,16 +801,20 @@ class WsBase
             $oDataset->next();
 
             while ($aRow = $oDataset->getRow()) {
-                $result[] = array('guid' => $aRow['TAS_UID'],
+                $result[] = array(
+                    'guid' => $aRow['TAS_UID'],
                     'name' => $aRow['TAS_TITLE'],
                     'processId' => $aRow['PRO_UID'],
-                    'initialTask' => $aRow['TAS_START'] == 'TRUE' ? '1' : '0');
+                    'initialTask' => $aRow['TAS_START'] == 'TRUE' ? '1' : '0'
+                );
                 $oDataset->next();
             }
 
             return $result;
         } catch (Exception $e) {
-            $result[] = array('guid' => $e->getMessage(), 'name' => $e->getMessage()
+            $result[] = array(
+                'guid' => $e->getMessage(),
+                'name' => $e->getMessage()
             );
 
             return $result;
@@ -788,7 +835,8 @@ class WsBase
      * @param $attachment = null
      * @param boolean $showMessage = true
      * @param int $delIndex = 0
-     * @param $config = array
+     * @param array $config
+     *
      * @return $result will return an object
      */
     public function sendMessage(
@@ -805,7 +853,8 @@ class WsBase
         $delIndex = 0,
         $config = [],
         $gmail = 0
-    ) {
+    )
+    {
         try {
 
             /*----------------------------------********---------------------------------*/
@@ -922,7 +971,7 @@ class WsBase
      *
      * @param string $caseId
      * @param string $iDelIndex
-     * @param bool   $flagUseDelIndex
+     * @param bool $flagUseDelIndex
      *
      * @return $result will return an object
      */
@@ -1059,12 +1108,22 @@ class WsBase
      * @param string email : The user's email address.
      * @param string role : The user's role, such as "PROCESSMAKER_ADMIN" or "PROCESSMAKER_OPERATOR".
      * @param string password : The user's password such as "Be@gle2" (It will be automatically encrypted
-     * with an MD5 hash).
+     *               with an MD5 hash).
      * @param string dueDate : Optional parameter. The expiration date must be a string in the format "yyyy-mm-dd".
      * @param string status : Optional parameter. The user's status, such as "ACTIVE", "INACTIVE" or "VACATION".
+     *
      * @return $result will return an object
      */
-    public function createUser($userName, $firstName, $lastName, $email, $role, $password, $dueDate = null, $status = null)
+    public function createUser(
+        $userName,
+        $firstName,
+        $lastName,
+        $email,
+        $role,
+        $password,
+        $dueDate = null,
+        $status = null
+    )
     {
         try {
             global $RBAC;
@@ -1093,11 +1152,18 @@ class WsBase
 
             if (!empty($dueDate) && $dueDate != 'null' && $dueDate) {
                 if (!preg_match("/^(\d{4})-(\d{2})-(\d{2})$/", $dueDate, $arrayMatch)) {
-                    $result = new WsCreateUserResponse(- 1, G::loadTranslation("ID_INVALID_DATA") . " $dueDate", null);
+                    $result = new WsCreateUserResponse(-1, G::loadTranslation("ID_INVALID_DATA") . " $dueDate", null);
 
                     return $result;
                 } else {
-                    $mktimeDueDate = mktime(0, 0, 0, intval($arrayMatch[2]), intval($arrayMatch[3]), intval($arrayMatch[1]));
+                    $mktimeDueDate = mktime(
+                        0,
+                        0,
+                        0,
+                        intval($arrayMatch[2]),
+                        intval($arrayMatch[3]),
+                        intval($arrayMatch[1])
+                    );
                 }
             } else {
                 $mktimeDueDate = mktime(0, 0, 0, date("m"), date("d"), date("Y") + 1);
@@ -1105,7 +1171,7 @@ class WsBase
 
             if (!empty($status) && $status != 'null' && $status) {
                 if ($status != "ACTIVE" && $status != "INACTIVE" && $status != "VACATION") {
-                    $result = new WsCreateUserResponse(- 1, G::loadTranslation("ID_INVALID_DATA") . " $status", null);
+                    $result = new WsCreateUserResponse(-1, G::loadTranslation("ID_INVALID_DATA") . " $status", null);
 
                     return $result;
                 }
@@ -1132,7 +1198,7 @@ class WsBase
             }
 
             if (strlen($password) > 20) {
-                $result = new WsCreateUserResponse(- 1, G::loadTranslation("ID_PASSWORD_SURPRASES"), null);
+                $result = new WsCreateUserResponse(-1, G::loadTranslation("ID_PASSWORD_SURPRASES"), null);
 
                 return $result;
             }
@@ -1141,7 +1207,11 @@ class WsBase
                 $data = [];
                 $data["USER_ID"] = $userName;
 
-                $result = new WsCreateUserResponse(7, G::loadTranslation("ID_USERNAME_ALREADY_EXISTS", SYS_LANG, $data), null);
+                $result = new WsCreateUserResponse(
+                    7,
+                    G::loadTranslation("ID_USERNAME_ALREADY_EXISTS", SYS_LANG, $data),
+                    null
+                );
 
                 return $result;
             }
@@ -1190,7 +1260,11 @@ class WsBase
 
             $res = new WsResponse(0, G::loadTranslation("ID_USER_CREATED_SUCCESSFULLY", SYS_LANG, $data));
 
-            $result = array("status_code" => $res->status_code, "message" => $res->message, "userUID" => $userUid, "timestamp" => $res->timestamp
+            $result = array(
+                "status_code" => $res->status_code,
+                "message" => $res->message,
+                "userUID" => $userUid,
+                "timestamp" => $res->timestamp
             );
 
             return $result;
@@ -1212,12 +1286,23 @@ class WsBase
      * @param string dueDate : Optional parameter. The expiration date must be a string in the format "yyyy-mm-dd".
      * @param string status : Optional parameter. The user's status, such as "ACTIVE", "INACTIVE" or "VACATION".
      * @param string role : Optional parameter. The user's role, such
-     * as "PROCESSMAKER_ADMIN" or "PROCESSMAKER_OPERATOR".
+     *               as "PROCESSMAKER_ADMIN" or "PROCESSMAKER_OPERATOR".
      * @param string password : Optional parameter. The user's password such as "Be@gle2" (It will be automatically
-     * encrypted with an MD5 hash).
+     *               encrypted with an MD5 hash).
+     *
      * @return $result will return an object
      */
-    public function updateUser($userUid, $userName, $firstName = null, $lastName = null, $email = null, $dueDate = null, $status = null, $role = null, $password = null)
+    public function updateUser(
+        $userUid,
+        $userName,
+        $firstName = null,
+        $lastName = null,
+        $email = null,
+        $dueDate = null,
+        $status = null,
+        $role = null,
+        $password = null
+    )
     {
         try {
             global $RBAC;
@@ -1246,17 +1331,24 @@ class WsBase
 
             if (!empty($dueDate)) {
                 if (!preg_match("/^(\d{4})-(\d{2})-(\d{2})$/", $dueDate, $arrayMatch)) {
-                    $result = new WsResponse(- 1, G::LoadTranslation("ID_INVALID_DATA") . " $dueDate");
+                    $result = new WsResponse(-1, G::LoadTranslation("ID_INVALID_DATA") . " $dueDate");
 
                     return $result;
                 } else {
-                    $mktimeDueDate = mktime(0, 0, 0, intval($arrayMatch[2]), intval($arrayMatch[3]), intval($arrayMatch[1]));
+                    $mktimeDueDate = mktime(
+                        0,
+                        0,
+                        0,
+                        intval($arrayMatch[2]),
+                        intval($arrayMatch[3]),
+                        intval($arrayMatch[1])
+                    );
                 }
             }
 
             if (!empty($status)) {
                 if ($status != "ACTIVE" && $status != "INACTIVE" && $status != "VACATION") {
-                    $result = new WsResponse(- 1, G::LoadTranslation("ID_INVALID_DATA") . " $status");
+                    $result = new WsResponse(-1, G::LoadTranslation("ID_INVALID_DATA") . " $status");
 
                     return $result;
                 }
@@ -1284,7 +1376,7 @@ class WsBase
             }
 
             if (!empty($password) && strlen($password) > 20) {
-                $result = new WsResponse(- 1, G::LoadTranslation("ID_PASSWORD_SURPRASES"));
+                $result = new WsResponse(-1, G::LoadTranslation("ID_PASSWORD_SURPRASES"));
 
                 return $result;
             }
@@ -1353,7 +1445,10 @@ class WsBase
             //Response
             $res = new WsResponse(0, G::LoadTranslation("ID_UPDATED_SUCCESSFULLY"));
 
-            $result = array("status_code" => $res->status_code, "message" => $res->message, "timestamp" => $res->timestamp
+            $result = array(
+                "status_code" => $res->status_code,
+                "message" => $res->message,
+                "timestamp" => $res->timestamp
             );
 
             return $result;
@@ -1366,7 +1461,9 @@ class WsBase
 
     /**
      * Information User
+     *
      * @param string userUid : The user UID.
+     *
      * @return $result will return an object
      */
     public function informationUser($userUid)
@@ -1402,6 +1499,7 @@ class WsBase
      * create Group
      *
      * @param string $groupName
+     *
      * @return $result will return an object
      */
     public function createGroup($groupName)
@@ -1418,7 +1516,11 @@ class WsBase
 
             $data['GROUP_NAME'] = $groupName;
 
-            $result = new WsCreateGroupResponse(0, G::loadTranslation('ID_GROUP_CREATED_SUCCESSFULLY', SYS_LANG, $data), $groupId);
+            $result = new WsCreateGroupResponse(
+                0,
+                G::loadTranslation('ID_GROUP_CREATED_SUCCESSFULLY', SYS_LANG, $data),
+                $groupId
+            );
 
             return $result;
         } catch (Exception $e) {
@@ -1433,6 +1535,7 @@ class WsBase
      *
      * @param string $departmentName
      * @param string $parentUID
+     *
      * @return $result will return an object
      */
     public function createDepartment($departmentName, $parentUID)
@@ -1447,7 +1550,11 @@ class WsBase
             $department = new Department();
 
             if (($parentUID != '') && !($department->existsDepartment($parentUID))) {
-                $result = new WsCreateDepartmentResponse(26, G::loadTranslation('ID_PARENT_DEPARTMENT_NOT_EXIST'), $parentUID);
+                $result = new WsCreateDepartmentResponse(
+                    26,
+                    G::loadTranslation('ID_PARENT_DEPARTMENT_NOT_EXIST'),
+                    $parentUID
+                );
 
                 return $result;
             }
@@ -1467,7 +1574,11 @@ class WsBase
             $data['PARENT_UID'] = $parentUID;
             $data['DEPARTMENT_NAME'] = $departmentName;
 
-            $result = new WsCreateDepartmentResponse(0, G::loadTranslation('ID_DEPARTMENT_CREATED_SUCCESSFULLY', SYS_LANG, $data), $departmentId);
+            $result = new WsCreateDepartmentResponse(
+                0,
+                G::loadTranslation('ID_DEPARTMENT_CREATED_SUCCESSFULLY', SYS_LANG, $data),
+                $departmentId
+            );
 
             return $result;
         } catch (Exception $e) {
@@ -1481,6 +1592,7 @@ class WsBase
      * remove user from group
      *
      * @param string $appDocUid
+     *
      * @return $result will return an object
      */
     public function removeUserFromGroup($userId, $groupId)
@@ -1531,6 +1643,7 @@ class WsBase
      *
      * @param string $userId
      * @param string $groupId
+     *
      * @return $result will return an object
      */
     public function assignUserToGroup($userId, $groupId)
@@ -1579,6 +1692,7 @@ class WsBase
      * @param string $userId
      * @param string $depId
      * @param string $manager
+     *
      * @return $result will return an object
      */
     public function assignUserToDepartment($userId, $depId, $manager)
@@ -1599,7 +1713,10 @@ class WsBase
             if (!$deps->existsDepartment($depId)) {
                 $data['DEP_ID'] = $depId;
 
-                $result = new WsResponse(100, G::loadTranslation('ID_DEPARTMENT_NOT_REGISTERED_SYSTEM', SYS_LANG, $data));
+                $result = new WsResponse(
+                    100,
+                    G::loadTranslation('ID_DEPARTMENT_NOT_REGISTERED_SYSTEM', SYS_LANG, $data)
+                );
 
                 return $result;
             }
@@ -1623,6 +1740,7 @@ class WsBase
      *
      * @param string $caseId
      * @param string $variables
+     *
      * @return $result will return an object
      */
     public function sendVariables($caseId, $variables)
@@ -1643,7 +1761,7 @@ class WsBase
 
             while ($oDataset->next()) {
                 $aRow = $oDataset->getRow();
-                $cnt ++;
+                $cnt++;
             }
 
             if ($cnt == 0) {
@@ -1665,7 +1783,14 @@ class WsBase
                     ob_end_clean();
                     $up_case = $oCase->updateCase($caseId, $oldFields);
 
-                    $result = new WsResponse(0, $cant . " " . G::loadTranslation('ID_VARIABLES_RECEIVED') . ": \n" . trim(str_replace('Array', '', $cdata)));
+                    $result = new WsResponse(
+                        0,
+                        $cant . " " . G::loadTranslation('ID_VARIABLES_RECEIVED') . ": \n" . trim(str_replace(
+                            'Array',
+                            '',
+                            $cdata
+                        ))
+                    );
 
                     return $result;
                 } else {
@@ -1690,6 +1815,7 @@ class WsBase
      *
      * @param string $caseId
      * @param string $variables
+     *
      * @return $result will return an object
      */
     public function getVariables($caseId, $variables)
@@ -1737,7 +1863,11 @@ class WsBase
                         }
                     }
 
-                    $result = new WsGetVariableResponse(0, count($resFields) . G::loadTranslation('ID_VARIABLES_SENT'), $resFields);
+                    $result = new WsGetVariableResponse(
+                        0,
+                        count($resFields) . G::loadTranslation('ID_VARIABLES_SENT'),
+                        $resFields
+                    );
 
                     return $result;
                 } else {
@@ -1779,7 +1909,11 @@ class WsBase
                 $resFields[] = $node;
             }
 
-            $result = new WsGetVariableResponse(0, count($resFields) . G::loadTranslation('ID_VARIABLES_SENT'), $resFields);
+            $result = new WsGetVariableResponse(
+                0,
+                count($resFields) . G::loadTranslation('ID_VARIABLES_SENT'),
+                $resFields
+            );
 
             return $result;
         } catch (Exception $e) {
@@ -1796,8 +1930,10 @@ class WsBase
      * @param string $userId
      * @param string $taskId
      * @param string $variables
-     * @param int $executeTriggers : Optional parameter. The execution all triggers of the task, according to your steps, 1 yes 0 no.
+     * @param int $executeTriggers : Optional parameter. The execution all triggers of the task, according to your
+     *                                steps, 1 yes 0 no.
      * @param string $status
+     *
      * @return $result will return an object
      */
     public function newCase($processId, $userId, $taskId, $variables, $executeTriggers = 0, $status = 'DRAFT')
@@ -1839,7 +1975,7 @@ class WsBase
 
             foreach ($startingTasks as $key => $val) {
                 if ($val['pro_uid'] == $processId) {
-                    $tasksInThisProcess ++;
+                    $tasksInThisProcess++;
                     $validTaskId = $val['uid'];
                 }
 
@@ -1910,8 +2046,20 @@ class WsBase
                 foreach ($arrayStep as $step) {
                     $arrayField = $oCase->loadCase($caseId);
 
-                    $arrayField["APP_DATA"] = $oCase->executeTriggers($taskId, $step["STEP_TYPE_OBJ"], $step["STEP_UID_OBJ"], "BEFORE", $arrayField["APP_DATA"]);
-                    $arrayField["APP_DATA"] = $oCase->executeTriggers($taskId, $step["STEP_TYPE_OBJ"], $step["STEP_UID_OBJ"], "AFTER", $arrayField["APP_DATA"]);
+                    $arrayField["APP_DATA"] = $oCase->executeTriggers(
+                        $taskId,
+                        $step["STEP_TYPE_OBJ"],
+                        $step["STEP_UID_OBJ"],
+                        "BEFORE",
+                        $arrayField["APP_DATA"]
+                    );
+                    $arrayField["APP_DATA"] = $oCase->executeTriggers(
+                        $taskId,
+                        $step["STEP_TYPE_OBJ"],
+                        $step["STEP_UID_OBJ"],
+                        "AFTER",
+                        $arrayField["APP_DATA"]
+                    );
 
                     unset($arrayField['APP_STATUS']);
                     unset($arrayField['APP_PROC_STATUS']);
@@ -1944,7 +2092,8 @@ class WsBase
      * @param string $processId
      * @param string $userId
      * @param string $variables
-     * @param string $taskId, must be in the starting group.
+     * @param string $taskId , must be in the starting group.
+     *
      * @return $result will return an object
      */
     public function newCaseImpersonate($processId, $userId, $variables, $taskId = '')
@@ -2040,13 +2189,13 @@ class WsBase
      * Execute the trigger defined in the steps
      * This function is used when the case is derived from abe, Soap, PMFDerivateCase
      *
-     * @param string $caseId, Uid related to the case
-     * @param array $appData, contain all the information about the case related to the index [APP_DATA]
-     * @param string $tasUid, Uid related to the task
-     * @param string $stepType, before or after step
-     * @param string $stepUidObj, can be -1, -2
-     * @param string $triggerType, can be BEFORE, AFTER
-     * @param string $labelAssignment, label related to the triggerType
+     * @param string $caseId , Uid related to the case
+     * @param array $appData , contain all the information about the case related to the index [APP_DATA]
+     * @param string $tasUid , Uid related to the task
+     * @param string $stepType , before or after step
+     * @param string $stepUidObj , can be -1, -2
+     * @param string $triggerType , can be BEFORE, AFTER
+     * @param string $labelAssignment , label related to the triggerType
      *
      * @return string $varTriggers updated
      */
@@ -2058,7 +2207,8 @@ class WsBase
         $stepUidObj,
         $triggerType,
         $labelAssignment = ''
-    ) {
+    )
+    {
         $varTriggers = "";
         $oCase = new Cases();
 
@@ -2098,7 +2248,10 @@ class WsBase
                     $oPMScript->execute();
 
                     $trigger = TriggersPeer::retrieveByPk($aTrigger["TRI_UID"]);
-                    $varTriggers = $varTriggers . "&nbsp;- " . nl2br(htmlentities($trigger->getTriTitle(), ENT_QUOTES)) . "<br />";
+                    $varTriggers = $varTriggers . "&nbsp;- " . nl2br(htmlentities(
+                            $trigger->getTriTitle(),
+                            ENT_QUOTES
+                        )) . "<br />";
 
                     $appFields['APP_DATA'] = $oPMScript->aFields;
                     unset($appFields['APP_STATUS']);
@@ -2118,11 +2271,12 @@ class WsBase
     /**
      * Derivate Case moves the case to the next task in the process according to the routing rules
      * This function is used from: action by email, web entry, PMFDerivateCase, Mobile
+     *
      * @param string $userId
      * @param string $caseId
      * @param string $delIndex
      * @param array $tasks
-     * @param bool   $bExecuteTriggersBeforeAssignment
+     * @param bool $bExecuteTriggersBeforeAssignment
      * @return $result will return an object
      */
     public function derivateCase($userId, $caseId, $delIndex, $bExecuteTriggersBeforeAssignment = false, $tasks = [])
@@ -2215,11 +2369,27 @@ class WsBase
             $varTriggers = "\n";
             //Execute triggers before assignment
             if ($bExecuteTriggersBeforeAssignment) {
-                $varTriggers .= $this->executeTriggerFromDerivate($caseId, $appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -1, 'BEFORE', "-= Before Assignment =-");
+                $varTriggers .= $this->executeTriggerFromDerivate(
+                    $caseId,
+                    $appFields["APP_DATA"],
+                    $appdel['TAS_UID'],
+                    'ASSIGN_TASK',
+                    -1,
+                    'BEFORE',
+                    "-= Before Assignment =-"
+                );
             }
 
             //Execute triggers before routing
-            $varTriggers .= $this->executeTriggerFromDerivate($caseId, $appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'BEFORE', "-= Before Derivation =-");
+            $varTriggers .= $this->executeTriggerFromDerivate(
+                $caseId,
+                $appFields["APP_DATA"],
+                $appdel['TAS_UID'],
+                'ASSIGN_TASK',
+                -2,
+                'BEFORE',
+                "-= Before Derivation =-"
+            );
 
             $oDerivation = new Derivation();
             if (!empty($tasks)) {
@@ -2300,11 +2470,22 @@ class WsBase
             //We define some parameters in the before the derivation
             //Then this function will be route the case
             $oDerivation->beforeDerivate(
-                    $aData, $nextDelegations, $nextRouteType, $aCurrentDerivation
+                $aData,
+                $nextDelegations,
+                $nextRouteType,
+                $aCurrentDerivation
             );
 
             //Execute triggers after routing
-            $varTriggers .= $this->executeTriggerFromDerivate($caseId, $appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'AFTER', "-= After Derivation =-");
+            $varTriggers .= $this->executeTriggerFromDerivate(
+                $caseId,
+                $appFields["APP_DATA"],
+                $appdel['TAS_UID'],
+                'ASSIGN_TASK',
+                -2,
+                'AFTER',
+                "-= After Derivation =-"
+            );
 
             $sFromName = "";
 
@@ -2427,6 +2608,7 @@ class WsBase
      * @param string $userId
      * @param string $caseId
      * @param string $delIndex
+     *
      * @return $result will return an object
      */
     public function executeTrigger($userId, $caseId, $triggerIndex, $delIndex)
@@ -2466,7 +2648,10 @@ class WsBase
             $oCriteria->addSelectColumn(AppDelayPeer::APP_DISABLE_ACTION_USER);
             $oCriteria->addSelectColumn(AppDelayPeer::APP_DISABLE_ACTION_DATE);
             $oCriteria->add(AppDelayPeer::APP_UID, $caseId);
-            $oCriteria->add($oCriteria->getNewCriterion(AppDelayPeer::APP_TYPE, 'PAUSE')->addOr($oCriteria->getNewCriterion(AppDelayPeer::APP_TYPE, 'CANCEL')));
+            $oCriteria->add($oCriteria->getNewCriterion(
+                AppDelayPeer::APP_TYPE,
+                'PAUSE'
+            )->addOr($oCriteria->getNewCriterion(AppDelayPeer::APP_TYPE, 'CANCEL')));
             $oCriteria->addAscendingOrderByColumn(AppDelayPeer::APP_ENABLE_ACTION_DATE);
             $oDataset = AppDelayPeer::doSelectRS($oCriteria);
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -2551,6 +2736,7 @@ class WsBase
      *
      * @param string sessionId : The session ID which is obtained when logging in
      * @param string caseId : The case ID. The caseList() function can be used to find the ID number for cases
+     *
      * @return $result returns the current task for a given case. Note that the logged-in user must have privileges
      * to access the task
      */
@@ -2592,6 +2778,7 @@ class WsBase
      *
      * @param string sessionId : The session ID which is obtained when logging in
      * @param string userId :
+     *
      * @return $result will return an object
      */
     public function processListVerified($userId)
@@ -2603,14 +2790,18 @@ class WsBase
 
             foreach ($rows as $key => $val) {
                 if ($key != 0) {
-                    $result[] = array('guid' => $val['pro_uid'], 'name' => $val['value']
+                    $result[] = array(
+                        'guid' => $val['pro_uid'],
+                        'name' => $val['value']
                     );
                 }
             }
 
             return $result;
         } catch (Exception $e) {
-            $result[] = array('guid' => $e->getMessage(), 'name' => $e->getMessage()
+            $result[] = array(
+                'guid' => $e->getMessage(),
+                'name' => $e->getMessage()
             );
 
             return $result;
@@ -2623,9 +2814,10 @@ class WsBase
      * @param string sessionId : The session ID (which was obtained during login)
      * @param string caseId : The case ID (which can be obtained with the caseList() function)
      * @param string delIndex : The delegation index number of the case (which can be obtained with the caseList()
-     * function).
+     *               function).
      * @param string userIdSource : The user who is currently assigned the case.
      * @param string userIdTarget : The target user who will be newly assigned to the case.
+     *
      * @return $result will return an object
      */
     public function reassignCase($sessionId, $caseId, $delIndex, $userIdSource, $userIdTarget)
@@ -2752,7 +2944,9 @@ class WsBase
 
             return $result;
         } catch (Exception $e) {
-            $result[] = array('guid' => $e->getMessage(), 'name' => $e->getMessage()
+            $result[] = array(
+                'guid' => $e->getMessage(),
+                'name' => $e->getMessage()
             );
 
             $g->sessionVarRestore();
@@ -2765,6 +2959,7 @@ class WsBase
      * get system information
      *
      * @param string sessionId : The session ID (which was obtained at login)
+     *
      * @return $eturns information about the WAMP/LAMP stack, the workspace database, the IP number and version
      * of ProcessMaker, and the IP number and version of web browser of the user
      */
@@ -2808,12 +3003,17 @@ class WsBase
      * @param string importOption :
      * @param string usernameLibrary : The username to obtain access to the ProcessMaker library.
      * @param string passwordLibrary : The password to obtain access to the ProcessMaker library.
+     *
      * @return $eturns will return an object
      */
     public function getCaseNotes($applicationID, $userUid = '')
     {
         try {
-            $result = new WsGetCaseNotesResponse(0, G::loadTranslation('ID_SUCCESS'), Cases::getCaseNotes($applicationID, 'array', $userUid));
+            $result = new WsGetCaseNotesResponse(
+                0,
+                G::loadTranslation('ID_SUCCESS'),
+                Cases::getCaseNotes($applicationID, 'array', $userUid)
+            );
 
             $var = [];
 
@@ -2842,6 +3042,7 @@ class WsBase
      * Delete case
      *
      * @param string caseUid : ID of the case.
+     *
      * @return $result will return an object
      */
     public function deleteCase($caseUid)
@@ -2867,7 +3068,10 @@ class WsBase
             //Response
             $res = new WsResponse(0, G::LoadTranslation("ID_COMMAND_EXECUTED_SUCCESSFULLY"));
 
-            $result = array("status_code" => $res->status_code, "message" => $res->message, "timestamp" => $res->timestamp
+            $result = array(
+                "status_code" => $res->status_code,
+                "message" => $res->message,
+                "timestamp" => $res->timestamp
             );
 
             $g->sessionVarRestore();
@@ -2886,8 +3090,9 @@ class WsBase
      * Cancel case
      *
      * @param string caseUid : ID of the case.
-     * @param int delIndex : Delegation index of the case.
+     * @param int    delIndex : Delegation index of the case.
      * @param string userUid : The unique ID of the user who will cancel the case.
+     *
      * @return $result will return an object
      */
     public function cancelCase($caseUid, $delIndex, $userUid)
@@ -2946,7 +3151,10 @@ class WsBase
             //Response
             $res = new WsResponse(0, G::LoadTranslation("ID_COMMAND_EXECUTED_SUCCESSFULLY"));
 
-            $result = array("status_code" => $res->status_code, "message" => $res->message, "timestamp" => $res->timestamp
+            $result = array(
+                "status_code" => $res->status_code,
+                "message" => $res->message,
+                "timestamp" => $res->timestamp
             );
 
             $g->sessionVarRestore();
@@ -2965,10 +3173,11 @@ class WsBase
      * Pause case
      *
      * @param string caseUid : ID of the case.
-     * @param int delIndex : Delegation index of the case.
+     * @param int    delIndex : Delegation index of the case.
      * @param string userUid : The unique ID of the user who will pause the case.
      * @param string unpauseDate : Optional parameter. The date in the format "yyyy-mm-dd" indicating when to unpause
-     * the case.
+     *               the case.
+     *
      * @return $result will return an object
      */
     public function pauseCase($caseUid, $delIndex, $userUid, $unpauseDate = null)
@@ -3021,7 +3230,10 @@ class WsBase
             //Response
             $res = new WsResponse(0, G::LoadTranslation("ID_COMMAND_EXECUTED_SUCCESSFULLY"));
 
-            $result = array("status_code" => $res->status_code, "message" => $res->message, "timestamp" => $res->timestamp
+            $result = array(
+                "status_code" => $res->status_code,
+                "message" => $res->message,
+                "timestamp" => $res->timestamp
             );
 
             $g->sessionVarRestore();
@@ -3039,8 +3251,9 @@ class WsBase
      * Unpause case
      *
      * @param string caseUid : ID of the case.
-     * @param int delIndex : Delegation index of the case.
+     * @param int    delIndex : Delegation index of the case.
      * @param string userUid : The unique ID of the user who will unpause the case.
+     *
      * @return $result will return an object
      */
     public function unpauseCase($caseUid, $delIndex, $userUid)
@@ -3084,7 +3297,10 @@ class WsBase
             //Response
             $res = new WsResponse(0, G::LoadTranslation("ID_COMMAND_EXECUTED_SUCCESSFULLY"));
 
-            $result = array("status_code" => $res->status_code, "message" => $res->message, "timestamp" => $res->timestamp
+            $result = array(
+                "status_code" => $res->status_code,
+                "message" => $res->message,
+                "timestamp" => $res->timestamp
             );
 
             $g->sessionVarRestore();
@@ -3107,7 +3323,8 @@ class WsBase
      * @param string taskUid : ID of the task.
      * @param string userUid : The unique ID of the user who will add note case.
      * @param string note : Note of the case.
-     * @param int sendMail : Optional parameter. If set to 1, will send an email to all participants in the case.
+     * @param int    sendMail : Optional parameter. If set to 1, will send an email to all participants in the case.
+     *
      * @return $result will return an object
      */
     public function addCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendMail = 1)
@@ -3175,6 +3392,7 @@ class WsBase
      * @param string $userId
      * @param string $guid
      * @param string $delIndex
+     *
      * @return $result will return an object
      */
     public function claimCase($userId, $guid, $delIndex)
diff --git a/workflow/engine/classes/XMLConnection.php b/workflow/engine/classes/XMLConnection.php
index 3bb13096f..ac3d937b2 100644
--- a/workflow/engine/classes/XMLConnection.php
+++ b/workflow/engine/classes/XMLConnection.php
@@ -2,10 +2,10 @@
 
 class XMLConnection
 {
-    var $phptype = 'myxml';
-    var $caseFolding = true;
-    var $xmldoc = null;
-    var $xmlFile = '';
+    public $phptype = 'myxml';
+    public $caseFolding = true;
+    public $xmldoc = null;
+    public $xmlFile = '';
 
     /**
      * XMLConnection
@@ -13,10 +13,10 @@ class XMLConnection
      * @param string $file
      * @return void
      */
-    public function XMLConnection ($file)
+    public function XMLConnection($file)
     {
         $this->xmldoc = new Xml_Document();
-        $this->xmldoc->parseXmlFile( $file );
+        $this->xmldoc->parseXmlFile($file);
         $this->xmlFile = $file;
     }
 
@@ -27,74 +27,74 @@ class XMLConnection
      * @param string $sql
      * @return object(XMLResult) $result
      */
-    public function &query ($sql)
+    public function &query($sql)
     {
-        if (! isset( $this->xmldoc )) {
-            $err = new DB_Error( "Error: Closed xmlConnection." );
+        if (! isset($this->xmldoc)) {
+            $err = new DB_Error("Error: Closed xmlConnection.");
             return $err;
         }
-        if (1 === preg_match( '/^\s*SELECT\s+([\w\W]+?)(?:\s+FROM\s+`?([^`]+?)`?)(?:\s+WHERE\s+([\w\W]+?))?(?:\s+GROUP\s+BY\s+([\w\W]+?))?(?:\s+ORDER\s+BY\s+([\w\W]+?))?(?:\s+BETWEEN\s+([\w\W]+?)\s+AND\s+([\w\W]+?))?(?:\s+LIMIT\s+(\d+)\s*,\s*(\d+))?\s*$/im', $sql, $matches )) {
+        if (1 === preg_match('/^\s*SELECT\s+([\w\W]+?)(?:\s+FROM\s+`?([^`]+?)`?)(?:\s+WHERE\s+([\w\W]+?))?(?:\s+GROUP\s+BY\s+([\w\W]+?))?(?:\s+ORDER\s+BY\s+([\w\W]+?))?(?:\s+BETWEEN\s+([\w\W]+?)\s+AND\s+([\w\W]+?))?(?:\s+LIMIT\s+(\d+)\s*,\s*(\d+))?\s*$/im', $sql, $matches)) {
             $sqlColumns = $matches[1];
-            $sqlFrom = isset( $matches[2] ) ? $matches[2] : '';
-            $sqlWhere = isset( $matches[3] ) ? $matches[3] : '';
-            $sqlGroupBy = isset( $matches[4] ) ? $matches[4] : '';
-            $sqlOrderBy = isset( $matches[5] ) ? $matches[5] : '';
-            $sqlLowLimit = isset( $matches[8] ) ? $matches[8] : '';
-            $sqlHighLimit = isset( $matches[9] ) ? $matches[9] : '';
+            $sqlFrom = isset($matches[2]) ? $matches[2] : '';
+            $sqlWhere = isset($matches[3]) ? $matches[3] : '';
+            $sqlGroupBy = isset($matches[4]) ? $matches[4] : '';
+            $sqlOrderBy = isset($matches[5]) ? $matches[5] : '';
+            $sqlLowLimit = isset($matches[8]) ? $matches[8] : '';
+            $sqlHighLimit = isset($matches[9]) ? $matches[9] : '';
             /* Start Block: Fields list */
-            $count = preg_match_all( '/\s*(\*|[\w\.]+)(?:\s+AS\s+([\w\.]+))?/im', $sqlColumns, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE );
-            $fieldsList = array ();
+            $count = preg_match_all('/\s*(\*|[\w\.]+)(?:\s+AS\s+([\w\.]+))?/im', $sqlColumns, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
+            $fieldsList = array();
             for ($r = 0; $r < $count; $r ++) {
-                $name = (is_array( $match[2][$r] ) && $match[2][$r][0] !== '') ? $match[2][$r][0] : $match[1][$r][0];
+                $name = (is_array($match[2][$r]) && $match[2][$r][0] !== '') ? $match[2][$r][0] : $match[1][$r][0];
                 $fieldsList[$name] = $match[1][$r][0];
             }
             /* End Block */
             /* Start Block: Order list */
-            $count = preg_match_all( '/\s*(\*|[\w\.]+)(\s+ASC|\s+DESC)?\s*,?/im', $sqlOrderBy, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE );
-            $orderList = array ();
+            $count = preg_match_all('/\s*(\*|[\w\.]+)(\s+ASC|\s+DESC)?\s*,?/im', $sqlOrderBy, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
+            $orderList = array();
             for ($r = $count - 1; $r >= 0; $r --) {
-                $direction = (is_array( $match[2][$r] ) && $match[2][$r][0] !== '') ? $match[2][$r][0] : 'ASC';
-                $direction = strtoupper( $direction );
+                $direction = (is_array($match[2][$r]) && $match[2][$r][0] !== '') ? $match[2][$r][0] : 'ASC';
+                $direction = strtoupper($direction);
                 $orderList[$match[1][$r][0]] = $direction;
             }
             /* End Block */
-            $xmlFrom = '/' . str_replace( '.', '/', $sqlFrom );
-            $node = & $this->xmldoc->findNode( $xmlFrom );
-            if (! isset( $node )) {
+            $xmlFrom = '/' . str_replace('.', '/', $sqlFrom);
+            $node = $this->xmldoc->findNode($xmlFrom);
+            if (! isset($node)) {
                 //$err = new DB_Error( "$xmlFrom node not found in $dsn." );
-                throw new Exception( "$xmlFrom node not found in " . $this->xmlFile . "." );
+                throw new Exception("$xmlFrom node not found in " . $this->xmlFile . ".");
                 return $err;
             } else {
-                $res = $this->fetchChildren( $node );
+                $res = $this->fetchChildren($node);
             }
             /* Start Block: WHERE*/
             if ($sqlWhere !== '') {
                 /*Start Block: Replace the operator */
-                $blocks = preg_split( '/("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\')/im', $sqlWhere, - 1, PREG_SPLIT_DELIM_CAPTURE );
+                $blocks = preg_split('/("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\')/im', $sqlWhere, - 1, PREG_SPLIT_DELIM_CAPTURE);
                 $sqlWhere = '';
-                for ($r = 0; $r < sizeof( $blocks ); $r ++) {
+                for ($r = 0; $r < sizeof($blocks); $r ++) {
                     if (($r % 2) === 0) {
-                        $blocks[$r] = str_replace( '=', '==', $blocks[$r] );
-                        $blocks[$r] = str_replace( '<>', '!=', $blocks[$r] );
-                        $blocks[$r] = str_replace( 'AND', '&&', $blocks[$r] );
-                        $blocks[$r] = str_replace( 'and', '&&', $blocks[$r] );
-                        $blocks[$r] = str_replace( 'OR', '||', $blocks[$r] );
-                        $blocks[$r] = str_replace( 'or', '||', $blocks[$r] );
-                        $blocks[$r] = str_replace( 'NOT', '!', $blocks[$r] );
-                        $blocks[$r] = str_replace( 'not', '!', $blocks[$r] );
-                        $blocks[$r] = preg_replace( '/\b[a-zA-Z_][\w\.]*\b/im', '$res[$r][\'$0\']', $blocks[$r] );
-                        $blocks[$r] = preg_replace( '/\$res\[\$r\]\[\'(like)\'\]/im', '$1', $blocks[$r] );
+                        $blocks[$r] = str_replace('=', '==', $blocks[$r]);
+                        $blocks[$r] = str_replace('<>', '!=', $blocks[$r]);
+                        $blocks[$r] = str_replace('AND', '&&', $blocks[$r]);
+                        $blocks[$r] = str_replace('and', '&&', $blocks[$r]);
+                        $blocks[$r] = str_replace('OR', '||', $blocks[$r]);
+                        $blocks[$r] = str_replace('or', '||', $blocks[$r]);
+                        $blocks[$r] = str_replace('NOT', '!', $blocks[$r]);
+                        $blocks[$r] = str_replace('not', '!', $blocks[$r]);
+                        $blocks[$r] = preg_replace('/\b[a-zA-Z_][\w\.]*\b/im', '$res[$r][\'$0\']', $blocks[$r]);
+                        $blocks[$r] = preg_replace('/\$res\[\$r\]\[\'(like)\'\]/im', '$1', $blocks[$r]);
                     }
                     $sqlWhere .= $blocks[$r];
                 }
-                $sqlWhere = preg_replace_callback( '/(.+)\s+like\s+("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\')/im', array ('XMLConnection','sqlWhereLike'
-                ), $sqlWhere );
-                $sqlWhere = preg_replace_callback( '/"(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\'/im', array ('XMLConnection','sqlString'
-                ), $sqlWhere );
-                $newRes = array ();
-                for ($r = 0; $r < sizeof( $res ); $r ++) {
+                $sqlWhere = preg_replace_callback('/(.+)\s+like\s+("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\')/im', array('XMLConnection','sqlWhereLike'
+                ), $sqlWhere);
+                $sqlWhere = preg_replace_callback('/"(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\'/im', array('XMLConnection','sqlString'
+                ), $sqlWhere);
+                $newRes = array();
+                for ($r = 0; $r < sizeof($res); $r ++) {
                     $evalWhere = false;
-                    @eval( '$evalWhere = ' . $sqlWhere . ';' );
+                    @eval('$evalWhere = ' . $sqlWhere . ';');
                     if ($evalWhere) {
                         $newRes[] = $res[$r];
                     }
@@ -105,14 +105,14 @@ class XMLConnection
             /* Start Block: Expands the resultant data according to fill an array
              *              with the required fields in the query.
              */
-            for ($r = 0; $r < sizeof( $res ); $r ++) {
-                $res[$r] = $this->expandFields( $res[$r], $fieldsList );
+            for ($r = 0; $r < sizeof($res); $r ++) {
+                $res[$r] = $this->expandFields($res[$r], $fieldsList);
             }
             /* End Block */
             /* Start Block: ORDER BY*/
             foreach ($orderList as $field => $direction) {
-                for ($i = 0; $i < sizeof( $res ); $i ++) {
-                    for ($j = $i + 1; $j < sizeof( $res ); $j ++) {
+                for ($i = 0; $i < sizeof($res); $i ++) {
+                    for ($j = $i + 1; $j < sizeof($res); $j ++) {
                         $condition = ($direction === 'ASC') ? ($res[$j] < $res[$i]) : ($res[$j] > $res[$i]);
                         if ($condition) {
                             $swap = $res[$i];
@@ -127,169 +127,169 @@ class XMLConnection
             if ($sqlLowLimit != '' && $sqlHighLimit != '') {
                 $sqlLowLimit = (int) $sqlLowLimit;
                 $sqlHighLimit = (int) $sqlHighLimit;
-                $res = array_slice( $res, $sqlLowLimit, $sqlHighLimit );
+                $res = array_slice($res, $sqlLowLimit, $sqlHighLimit);
             }
             /* End Block */
-            $result = new XMLResult( $res );
+            $result = new XMLResult($res);
             return $result;
-        } elseif (1 === preg_match( '/^\s*DELETE\s+FROM\s+`?([^`]+?)`?(?:\s+WHERE\s+([\w\W]+?))?\s*$/im', $sql, $matches )) {
-            $sqlFrom = isset( $matches[1] ) ? $matches[1] : '';
-            $sqlWhere = isset( $matches[2] ) ? $matches[2] : '1';
+        } elseif (1 === preg_match('/^\s*DELETE\s+FROM\s+`?([^`]+?)`?(?:\s+WHERE\s+([\w\W]+?))?\s*$/im', $sql, $matches)) {
+            $sqlFrom = isset($matches[1]) ? $matches[1] : '';
+            $sqlWhere = isset($matches[2]) ? $matches[2] : '1';
             /* Start Block: WHERE*/
             /*Start Block: Replace the operator */
-            $blocks = preg_split( '/("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\')/im', $sqlWhere, - 1, PREG_SPLIT_DELIM_CAPTURE );
+            $blocks = preg_split('/("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\')/im', $sqlWhere, - 1, PREG_SPLIT_DELIM_CAPTURE);
             $sqlWhere = '';
-            for ($r = 0; $r < sizeof( $blocks ); $r ++) {
+            for ($r = 0; $r < sizeof($blocks); $r ++) {
                 if (($r % 2) === 0) {
-                    $blocks[$r] = str_replace( '=', '==', $blocks[$r] );
-                    $blocks[$r] = str_replace( '<>', '!=', $blocks[$r] );
-                    $blocks[$r] = str_replace( 'AND', '&&', $blocks[$r] );
-                    $blocks[$r] = str_replace( 'and', '&&', $blocks[$r] );
-                    $blocks[$r] = str_replace( 'OR', '||', $blocks[$r] );
-                    $blocks[$r] = str_replace( 'or', '||', $blocks[$r] );
-                    $blocks[$r] = str_replace( 'NOT', '!', $blocks[$r] );
-                    $blocks[$r] = str_replace( 'not', '!', $blocks[$r] );
-                    $blocks[$r] = preg_replace( '/\b[a-zA-Z_][\w\.]*\b/im', '$res[$r][\'$0\']', $blocks[$r] );
-                    $blocks[$r] = preg_replace( '/\$res\[\$r\]\[\'(like)\'\]/im', '$1', $blocks[$r] );
+                    $blocks[$r] = str_replace('=', '==', $blocks[$r]);
+                    $blocks[$r] = str_replace('<>', '!=', $blocks[$r]);
+                    $blocks[$r] = str_replace('AND', '&&', $blocks[$r]);
+                    $blocks[$r] = str_replace('and', '&&', $blocks[$r]);
+                    $blocks[$r] = str_replace('OR', '||', $blocks[$r]);
+                    $blocks[$r] = str_replace('or', '||', $blocks[$r]);
+                    $blocks[$r] = str_replace('NOT', '!', $blocks[$r]);
+                    $blocks[$r] = str_replace('not', '!', $blocks[$r]);
+                    $blocks[$r] = preg_replace('/\b[a-zA-Z_][\w\.]*\b/im', '$res[$r][\'$0\']', $blocks[$r]);
+                    $blocks[$r] = preg_replace('/\$res\[\$r\]\[\'(like)\'\]/im', '$1', $blocks[$r]);
                 }
                 $sqlWhere .= $blocks[$r];
             }
             /* End Block */
-            $sqlWhere = preg_replace_callback( '/(.+)\s+like\s+("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\')/im', array ('XMLConnection','sqlWhereLike'
-            ), $sqlWhere );
-            $sqlWhere = preg_replace_callback( '/"(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\'/im', array ('XMLConnection','sqlString'
-            ), $sqlWhere );
+            $sqlWhere = preg_replace_callback('/(.+)\s+like\s+("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\')/im', array('XMLConnection','sqlWhereLike'
+            ), $sqlWhere);
+            $sqlWhere = preg_replace_callback('/"(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\'/im', array('XMLConnection','sqlString'
+            ), $sqlWhere);
 
             /*Start Block: Removing fields */
-            $xmlFrom = '/' . str_replace( '.', '/', $sqlFrom );
-            $node = & $this->xmldoc->findNode( $xmlFrom );
-            if (! isset( $node )) {
-                $err = new DB_Error( "$xmlFrom node not found!." );
+            $xmlFrom = '/' . str_replace('.', '/', $sqlFrom);
+            $node = $this->xmldoc->findNode($xmlFrom);
+            if (! isset($node)) {
+                $err = new DB_Error("$xmlFrom node not found!.");
                 return $err;
             } else {
-                $res = $this->fetchChildren( $node );
+                $res = $this->fetchChildren($node);
             }
-            $newRes = array ();
-            for ($r = 0; $r < sizeof( $res ); $r ++) {
+            $newRes = array();
+            for ($r = 0; $r < sizeof($res); $r ++) {
                 $evalWhere = false;
-                @eval( '$evalWhere = ' . $sqlWhere . ';' );
+                @eval('$evalWhere = ' . $sqlWhere . ';');
                 if ($evalWhere) {
-                    unset( $node->children[$r] );
+                    unset($node->children[$r]);
                     $newRes[] = $res[$r];
                 }
             }
             //Re-index
-            $node->children = array_values( $node->children );
+            $node->children = array_values($node->children);
             /* End Block */
-            $this->xmldoc->save( $this->xmlFile );
-            $result = new XMLResult( $newRes );
+            $this->xmldoc->save($this->xmlFile);
+            $result = new XMLResult($newRes);
             return $result;
-        } elseif (1 === preg_match( '/^\s*INSERT\s+INTO\s+`?([^`]+?)`?\s*\(([\w\W]+?)\)\s+VALUES\s*\(([\w\W]+?)\)\s*$/im', $sql, $matches )) {
-            $sqlFrom = isset( $matches[1] ) ? $matches[1] : '';
-            $sqlColumns = isset( $matches[2] ) ? $matches[2] : '1';
-            $sqlValues = isset( $matches[3] ) ? $matches[3] : '1';
-            $xmlFrom = '/' . str_replace( '.', '/', $sqlFrom );
-            $node = & $this->xmldoc->findNode( $xmlFrom );
+        } elseif (1 === preg_match('/^\s*INSERT\s+INTO\s+`?([^`]+?)`?\s*\(([\w\W]+?)\)\s+VALUES\s*\(([\w\W]+?)\)\s*$/im', $sql, $matches)) {
+            $sqlFrom = isset($matches[1]) ? $matches[1] : '';
+            $sqlColumns = isset($matches[2]) ? $matches[2] : '1';
+            $sqlValues = isset($matches[3]) ? $matches[3] : '1';
+            $xmlFrom = '/' . str_replace('.', '/', $sqlFrom);
+            $node = $this->xmldoc->findNode($xmlFrom);
             /* Start Block: Fields list */
-            $count = preg_match_all( '/([\w\.]+)/im', $sqlColumns, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE );
-            $fieldsList = array ();
+            $count = preg_match_all('/([\w\.]+)/im', $sqlColumns, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
+            $fieldsList = array();
             for ($r = 0; $r < $count; $r ++) {
                 $fieldsList[] = $match[1][$r][0];
             }
             /* End Block */
             /* Start Block: Fields Values */
-            $count = preg_match_all( '/("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\'|\d+)/im', $sqlValues, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE );
-            $fieldsValues = array ();
+            $count = preg_match_all('/("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\'|\d+)/im', $sqlValues, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
+            $fieldsValues = array();
             for ($r = 0; $r < $count; $r ++) {
-                if (substr( $match[1][$r][0], 0, 1 ) === '"') {
-                    $match[1][$r][0] = substr( $match[1][$r][0], 1, - 1 );
-                    $match[1][$r][0] = str_replace( '""', '"', $match[1][$r][0] );
-                    $match[1][$r][0] = str_replace( "''", "'", $match[1][$r][0] );
+                if (substr($match[1][$r][0], 0, 1) === '"') {
+                    $match[1][$r][0] = substr($match[1][$r][0], 1, - 1);
+                    $match[1][$r][0] = str_replace('""', '"', $match[1][$r][0]);
+                    $match[1][$r][0] = str_replace("''", "'", $match[1][$r][0]);
                 }
-                if (substr( $match[1][$r][0], 0, 1 ) === "'") {
-                    $match[1][$r][0] = substr( $match[1][$r][0], 1, - 1 );
-                    $match[1][$r][0] = str_replace( "''", "'", $match[1][$r][0] );
-                    $match[1][$r][0] = str_replace( '""', '"', $match[1][$r][0] );
+                if (substr($match[1][$r][0], 0, 1) === "'") {
+                    $match[1][$r][0] = substr($match[1][$r][0], 1, - 1);
+                    $match[1][$r][0] = str_replace("''", "'", $match[1][$r][0]);
+                    $match[1][$r][0] = str_replace('""', '"', $match[1][$r][0]);
                 }
                 $fieldsValues[$fieldsList[$r]] = $match[1][$r][0];
             }
             /* End Block */
-            $AAA = getNames( $this->xmldoc->children[0]->children );
-            $this->insertRow( $node, $fieldsValues );
-            $DDD = getNames( $this->xmldoc->children[0]->children );
-            $this->xmldoc->save( $this->xmlFile );
-            $result = new XMLResult( array ($fieldsValues
-            ) );
+            $AAA = getNames($this->xmldoc->children[0]->children);
+            $this->insertRow($node, $fieldsValues);
+            $DDD = getNames($this->xmldoc->children[0]->children);
+            $this->xmldoc->save($this->xmlFile);
+            $result = new XMLResult(array($fieldsValues
+            ));
             return $result;
-        } elseif (1 === preg_match( '/^\s*UPDATE\s+`?([^`]+?)`?\s+SET\s+((?:(?:[a-z][\w\.]*)\s*=\s*(?:"(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\'|\d+)\s*(?:,\s*)?)+)(?:\s+WHERE\s+([\w\W]+?))?\s*$/im', $sql, $matches )) {
-            $sqlFrom = isset( $matches[1] ) ? $matches[1] : '';
-            $sqlColumns = isset( $matches[2] ) ? $matches[2] : '';
-            $sqlWhere = isset( $matches[3] ) ? $matches[3] : '1';
-            $count = preg_match_all( '/([a-z][\w\.]*)\s*=\s*("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\'|\d+)/im', $sqlColumns, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE );
-            $fieldsValues = array ();
+        } elseif (1 === preg_match('/^\s*UPDATE\s+`?([^`]+?)`?\s+SET\s+((?:(?:[a-z][\w\.]*)\s*=\s*(?:"(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\'|\d+)\s*(?:,\s*)?)+)(?:\s+WHERE\s+([\w\W]+?))?\s*$/im', $sql, $matches)) {
+            $sqlFrom = isset($matches[1]) ? $matches[1] : '';
+            $sqlColumns = isset($matches[2]) ? $matches[2] : '';
+            $sqlWhere = isset($matches[3]) ? $matches[3] : '1';
+            $count = preg_match_all('/([a-z][\w\.]*)\s*=\s*("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\'|\d+)/im', $sqlColumns, $match, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
+            $fieldsValues = array();
             for ($r = 0; $r < $count; $r ++) {
-                if (substr( $match[2][$r][0], 0, 1 ) === '"') {
-                    $match[2][$r][0] = substr( $match[2][$r][0], 1, - 1 );
-                    $match[2][$r][0] = str_replace( '""', '"', $match[2][$r][0] );
-                    $match[2][$r][0] = str_replace( "''", "'", $match[2][$r][0] );
+                if (substr($match[2][$r][0], 0, 1) === '"') {
+                    $match[2][$r][0] = substr($match[2][$r][0], 1, - 1);
+                    $match[2][$r][0] = str_replace('""', '"', $match[2][$r][0]);
+                    $match[2][$r][0] = str_replace("''", "'", $match[2][$r][0]);
                 }
-                if (substr( $match[2][$r][0], 0, 1 ) === "'") {
-                    $match[2][$r][0] = substr( $match[2][$r][0], 1, - 1 );
-                    $match[2][$r][0] = str_replace( "''", "'", $match[2][$r][0] );
-                    $match[2][$r][0] = str_replace( '""', '"', $match[2][$r][0] );
+                if (substr($match[2][$r][0], 0, 1) === "'") {
+                    $match[2][$r][0] = substr($match[2][$r][0], 1, - 1);
+                    $match[2][$r][0] = str_replace("''", "'", $match[2][$r][0]);
+                    $match[2][$r][0] = str_replace('""', '"', $match[2][$r][0]);
                 }
                 $fieldsValues[$match[1][$r][0]] = $match[2][$r][0];
             }
             /* Start Block: WHERE*/
             /*Start Block: Replace the operator */
-            $blocks = preg_split( '/("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\')/im', $sqlWhere, - 1, PREG_SPLIT_DELIM_CAPTURE );
+            $blocks = preg_split('/("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\')/im', $sqlWhere, - 1, PREG_SPLIT_DELIM_CAPTURE);
             $sqlWhere = '';
-            for ($r = 0; $r < sizeof( $blocks ); $r ++) {
+            for ($r = 0; $r < sizeof($blocks); $r ++) {
                 if (($r % 2) === 0) {
-                    $blocks[$r] = str_replace( '=', '==', $blocks[$r] );
-                    $blocks[$r] = str_replace( '<>', '!=', $blocks[$r] );
-                    $blocks[$r] = str_replace( 'AND', '&&', $blocks[$r] );
-                    $blocks[$r] = str_replace( 'and', '&&', $blocks[$r] );
-                    $blocks[$r] = str_replace( 'OR', '||', $blocks[$r] );
-                    $blocks[$r] = str_replace( 'or', '||', $blocks[$r] );
-                    $blocks[$r] = str_replace( 'NOT', '!', $blocks[$r] );
-                    $blocks[$r] = str_replace( 'not', '!', $blocks[$r] );
-                    $blocks[$r] = preg_replace( '/\b[a-zA-Z_][\w\.]*\b/im', '$res[$r][\'$0\']', $blocks[$r] );
-                    $blocks[$r] = preg_replace( '/\$res\[\$r\]\[\'(like)\'\]/im', '$1', $blocks[$r] );
+                    $blocks[$r] = str_replace('=', '==', $blocks[$r]);
+                    $blocks[$r] = str_replace('<>', '!=', $blocks[$r]);
+                    $blocks[$r] = str_replace('AND', '&&', $blocks[$r]);
+                    $blocks[$r] = str_replace('and', '&&', $blocks[$r]);
+                    $blocks[$r] = str_replace('OR', '||', $blocks[$r]);
+                    $blocks[$r] = str_replace('or', '||', $blocks[$r]);
+                    $blocks[$r] = str_replace('NOT', '!', $blocks[$r]);
+                    $blocks[$r] = str_replace('not', '!', $blocks[$r]);
+                    $blocks[$r] = preg_replace('/\b[a-zA-Z_][\w\.]*\b/im', '$res[$r][\'$0\']', $blocks[$r]);
+                    $blocks[$r] = preg_replace('/\$res\[\$r\]\[\'(like)\'\]/im', '$1', $blocks[$r]);
                 }
                 $sqlWhere .= $blocks[$r];
             }
             /* End Block */
-            $sqlWhere = preg_replace_callback( '/(.+)\s+like\s+("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\')/im', array ('XMLConnection','sqlWhereLike'
-            ), $sqlWhere );
-            $sqlWhere = preg_replace_callback( '/"(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\'/im', array ('XMLConnection','sqlString'
-            ), $sqlWhere );
+            $sqlWhere = preg_replace_callback('/(.+)\s+like\s+("(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\')/im', array('XMLConnection','sqlWhereLike'
+            ), $sqlWhere);
+            $sqlWhere = preg_replace_callback('/"(?:(?:[^"]|"")*)"|\'(?:(?:[^\']|\'\')*)\'/im', array('XMLConnection','sqlString'
+            ), $sqlWhere);
             /*Start Block: Removing fields */
-            $xmlFrom = '/' . str_replace( '.', '/', $sqlFrom );
-            $node = & $this->xmldoc->findNode( $xmlFrom );
-            if (! isset( $node )) {
-                $err = new DB_Error( "$xmlFrom node not found in $dsn." );
+            $xmlFrom = '/' . str_replace('.', '/', $sqlFrom);
+            $node = $this->xmldoc->findNode($xmlFrom);
+            if (! isset($node)) {
+                $err = new DB_Error("$xmlFrom node not found in $dsn.");
                 return $err;
             } else {
-                $res = $this->fetchChildren( $node );
+                $res = $this->fetchChildren($node);
             }
-            $newRes = array ();
-            for ($r = 0; $r < sizeof( $res ); $r ++) {
+            $newRes = array();
+            for ($r = 0; $r < sizeof($res); $r ++) {
                 $evalWhere = false;
-                @eval( '$evalWhere = ' . $sqlWhere . ';' );
+                @eval('$evalWhere = ' . $sqlWhere . ';');
                 if ($evalWhere) {
-                    $this->updateRow( $node->children[$r], $fieldsValues );
-                    $newRes[] = array_merge( $res[$r], $fieldsValues );
+                    $this->updateRow($node->children[$r], $fieldsValues);
+                    $newRes[] = array_merge($res[$r], $fieldsValues);
                 }
             }
             /* End Block */
-            $nodeTEST = & $this->xmldoc->findNode( $xmlFrom );
-            $this->xmldoc->save( $this->xmlFile );
-            $result = new XMLResult( $newRes );
+            $nodeTEST = $this->xmldoc->findNode($xmlFrom);
+            $this->xmldoc->save($this->xmlFile);
+            $result = new XMLResult($newRes);
             return $result;
         } else {
-            echo ($sql);
-            $err = new DB_Error( "SQL Query is not well formed." );
+            echo($sql);
+            $err = new DB_Error("SQL Query is not well formed.");
             return $err;
         }
     }
@@ -300,12 +300,12 @@ class XMLConnection
      * @param string $a
      * @return void $b
      */
-    public function sqlLike ($a, $b)
+    public function sqlLike($a, $b)
     {
-        $b = addcslashes( $b, '[]()\/{}.?' );
-        $b = str_replace( "%", '.*', $b );
+        $b = addcslashes($b, '[]()\/{}.?');
+        $b = str_replace("%", '.*', $b);
         $b = '/^' . $b . '$/im';
-        return preg_match( $b, $a );
+        return preg_match($b, $a);
     }
 
     /**
@@ -315,16 +315,16 @@ class XMLConnection
      * @param string $fieldsList
      * @return array $res
      */
-    public function expandFields ($resRow, $fieldsList)
+    public function expandFields($resRow, $fieldsList)
     {
-        $res = array ();
+        $res = array();
         foreach ($fieldsList as $key => $value) {
             if ($key === '*') {
                 foreach ($resRow as $k => $v) {
                     $res[$k] = $v;
                 }
             } else {
-                $res[$key] = array_key_exists( $value, $resRow ) ? $resRow[$value] : null;
+                $res[$key] = array_key_exists($value, $resRow) ? $resRow[$value] : null;
             }
         }
         return $res;
@@ -336,13 +336,13 @@ class XMLConnection
      * @param object &$node
      * @return array $res
      */
-    public function fetchNode (&$node)
+    public function fetchNode(&$node)
     {
-        $res = array ('XMLNODE_NAME' => $node->name,'XMLNODE_TYPE' => $node->type,'XMLNODE_VALUE' => $node->value
+        $res = array('XMLNODE_NAME' => $node->name,'XMLNODE_TYPE' => $node->type,'XMLNODE_VALUE' => $node->value
         );
         foreach ($node->attributes as $name => $value) {
             if ($this->caseFolding) {
-                $name = strtoupper( $name );
+                $name = strtoupper($name);
             }
             $res[$name] = $value;
         }
@@ -355,11 +355,11 @@ class XMLConnection
      * @param string &$node
      * @return array $res
      */
-    public function fetchChildren (&$node)
+    public function fetchChildren(&$node)
     {
-        $res = array ();
+        $res = array();
         foreach ($node->children as $name => $child) {
-            $res[] = $this->fetchNode( $child );
+            $res[] = $this->fetchNode($child);
         }
         return $res;
     }
@@ -369,9 +369,9 @@ class XMLConnection
      *
      * @return void
      */
-    public function disconnect ()
+    public function disconnect()
     {
-        unset( $this->xmldoc );
+        unset($this->xmldoc);
     }
 
     /**
@@ -379,9 +379,9 @@ class XMLConnection
      * @param array $match
      * @return object(DB_Error) $err
      */
-    public function sqlWhereLike ($match)
+    public function sqlWhereLike($match)
     {
-        switch (substr( $match[2], 0, 1 )) {
+        switch (substr($match[2], 0, 1)) {
             case '"':
                 return ' $this->sqlLike( ' . $match[1] . ', ' . $match[2] . ' ) ';
                 break;
@@ -389,7 +389,7 @@ class XMLConnection
                 return ' $this->sqlLike( ' . $match[1] . ', ' . $match[2] . ' ) ';
                 break;
             default:
-                $err = new DB_Error( "XMLDB: Syntax error on $match[0]" );
+                $err = new DB_Error("XMLDB: Syntax error on $match[0]");
                 die();
                 return $err;
         }
@@ -401,25 +401,25 @@ class XMLConnection
      * @param array $match
      * @return object(DB_Error) $err
      */
-    public function sqlString ($match)
+    public function sqlString($match)
     {
-        switch (substr( $match[0], 0, 1 )) {
+        switch (substr($match[0], 0, 1)) {
             case '"':
-                $match[0] = substr( $match[0], 1, - 1 );
-                $match[0] = str_replace( '""', '"', $match[0] );
-                $match[0] = str_replace( "''", "'", $match[0] );
-                $match[0] = addcslashes( $match[0], '\\\'' );
+                $match[0] = substr($match[0], 1, - 1);
+                $match[0] = str_replace('""', '"', $match[0]);
+                $match[0] = str_replace("''", "'", $match[0]);
+                $match[0] = addcslashes($match[0], '\\\'');
                 return "'$match[0]'";
                 break;
             case "'":
-                $match[0] = substr( $match[0], 1, - 1 );
-                $match[0] = str_replace( "''", "'", $match[0] );
-                $match[0] = str_replace( '""', '"', $match[0] );
-                $match[0] = addcslashes( $match[0], '\\\'' );
+                $match[0] = substr($match[0], 1, - 1);
+                $match[0] = str_replace("''", "'", $match[0]);
+                $match[0] = str_replace('""', '"', $match[0]);
+                $match[0] = addcslashes($match[0], '\\\'');
                 return "'$match[0]'";
                 break;
             default:
-                $err = new DB_Error( "XMLDB: Syntax error on $match[0]" );
+                $err = new DB_Error("XMLDB: Syntax error on $match[0]");
                 die();
                 return $err;
         }
@@ -432,9 +432,9 @@ class XMLConnection
      * @param object $values
      * @return void
      */
-    public function insertRow (&$node, $values)
+    public function insertRow(&$node, $values)
     {
-        $attributes = array ();
+        $attributes = array();
         foreach ($values as $field => $value) {
             switch ($field) {
                 case 'XMLNODE_NAME':
@@ -442,13 +442,13 @@ class XMLConnection
                 case 'XMLNODE_VALUE':
                     break;
                 default:
-                    $attributes[strtolower( $field )] = $value;
+                    $attributes[strtolower($field)] = $value;
             }
         }
-        $values['XMLNODE_NAME'] = ! isset( $values['XMLNODE_NAME'] ) ? '' : $values['XMLNODE_NAME'];
-        $values['XMLNODE_TYPE'] = ! isset( $values['XMLNODE_TYPE'] ) ? 'open' : $values['XMLNODE_TYPE'];
-        $values['XMLNODE_VALUE'] = ! isset( $values['XMLNODE_VALUE'] ) ? '' : $values['XMLNODE_VALUE'];
-        $node->addChildNode( new Xml_Node( $values['XMLNODE_NAME'], $values['XMLNODE_TYPE'], $values['XMLNODE_VALUE'], $attributes ) );
+        $values['XMLNODE_NAME'] = ! isset($values['XMLNODE_NAME']) ? '' : $values['XMLNODE_NAME'];
+        $values['XMLNODE_TYPE'] = ! isset($values['XMLNODE_TYPE']) ? 'open' : $values['XMLNODE_TYPE'];
+        $values['XMLNODE_VALUE'] = ! isset($values['XMLNODE_VALUE']) ? '' : $values['XMLNODE_VALUE'];
+        $node->addChildNode(new Xml_Node($values['XMLNODE_NAME'], $values['XMLNODE_TYPE'], $values['XMLNODE_VALUE'], $attributes));
     }
 
     /**
@@ -458,7 +458,7 @@ class XMLConnection
      * @param object $values
      * @return void
      */
-    public function updateRow (&$node, $values)
+    public function updateRow(&$node, $values)
     {
         foreach ($values as $field => $value) {
             switch ($field) {
@@ -472,7 +472,7 @@ class XMLConnection
                     $node->value = $value;
                     break;
                 default:
-                    $node->attributes[strtolower( $field )] = $value;
+                    $node->attributes[strtolower($field)] = $value;
             }
         }
     }
diff --git a/workflow/engine/classes/XmlFormFieldToolBar.php b/workflow/engine/classes/XmlFormFieldToolBar.php
index cfdb5bf21..8c1e37a16 100644
--- a/workflow/engine/classes/XmlFormFieldToolBar.php
+++ b/workflow/engine/classes/XmlFormFieldToolBar.php
@@ -35,12 +35,12 @@ class XmlFormFieldToolBar extends XmlFormField
      * @param string $value
      * @return string
      */
-    public function render($value)
+    public function render($value = null, $paramDummy2 = NULL)
     {
         $this->toolBar = new ToolBar($this->xmlfile, $this->home);
         $template = PATH_CORE . 'templates/' . $this->type . '.html';
         $out = $this->toolBar->render($template, $scriptCode);
-        $oHeadPublisher = & headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         $oHeadPublisher->addScriptFile($this->toolBar->scriptURL);
         $oHeadPublisher->addScriptCode($scriptCode);
         return $out;
diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php
index 8049d8128..67b9410c3 100644
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -303,13 +303,12 @@ function executeQuery ($SqlStatement, $DBConnectionUID = 'workflow', $aParameter
             switch (true) {
                 case preg_match( "/^(SELECT|EXECUTE|EXEC|SHOW|DESCRIBE|EXPLAIN|BEGIN)\s/i", $statement ):
                     $rs = $con->executeQuery( $SqlStatement );
-                    $con->commit();
-
                     $result = Array ();
                     $i = 1;
                     while ($rs->next()) {
                         $result[$i ++] = $rs->getRow();
                     }
+                    $con->commit();
                     break;
                 case preg_match( "/^INSERT\s/i", $statement ):
                     $rs = $con->executeUpdate( $SqlStatement );
diff --git a/workflow/engine/classes/class.webdav.php b/workflow/engine/classes/class.webdav.php
index 059742da9..4fd290379 100644
--- a/workflow/engine/classes/class.webdav.php
+++ b/workflow/engine/classes/class.webdav.php
@@ -3,6 +3,8 @@
 /**
  * class.webdav.php
  *
+ * @deprecated
+ *
  * @package workflow.engine.classes
  */
 
@@ -399,7 +401,6 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server
      */
     public function GET(&$options)
     {
-
         $filter = new InputFilter();
         $options = $filter->xssFilterHard($options);
         $paths = $filter->xssFilterHard($this->paths);
@@ -743,13 +744,13 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server
 
         if (is_dir($path)) {
             $query = "DELETE FROM properties WHERE path LIKE '" . $this->_slashify($options["path"]) . "%'";
-            mysql_query($query);
+            mysqli_query($query);
             PearSystem::rm("-rf $path");
         } else {
             unlink($path);
         }
         $query = "DELETE FROM properties WHERE path = '$options[path]'";
-        mysql_query($query);
+        mysqli_query($query);
 
         return "204 No Content";
     }
@@ -838,13 +839,13 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server
                 $query = "UPDATE properties
                   SET path = REPLACE(path, '" . $options["path"] . "', '" . $destpath . "')
                   WHERE path LIKE '" . $this->_slashify($options["path"]) . "%'";
-                mysql_query($query);
+                mysqli_query($query);
             }
 
             $query = "UPDATE properties
                 SET path = '" . $destpath . "'
                 WHERE path = '" . $options["path"] . "'";
-            mysql_query($query);
+            mysqli_query($query);
         } else {
             if (is_dir($source)) {
                 $files = PearSystem::find($source);
@@ -898,9 +899,9 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server
         if (isset($options["update"])) {
             // Lock Update
             $query = "UPDATE locks SET expires = " . (time() + 300);
-            mysql_query($query);
+            mysqli_query($query);
 
-            if (mysql_affected_rows()) {
+            if (mysqli_affected_rows()) {
                 $options["timeout"] = 300; // 5min hardcoded
                 return true;
             } else {
@@ -917,9 +918,9 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server
                   , owner   = '$options[owner]'
                   , expires = '$options[timeout]'
                   , exclusivelock  = " . ($options['scope'] === "exclusive" ? "1" : "0");
-        mysql_query($query);
+        mysqli_query($query);
 
-        return mysql_affected_rows() ? "200 OK" : "409 Conflict";
+        return mysqli_affected_rows() ? "200 OK" : "409 Conflict";
     }
 
     /**
@@ -933,9 +934,9 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server
         $query = "DELETE FROM locks
               WHERE path = '$options[path]'
               AND token  = '$options[token]'";
-        mysql_query($query);
+        mysqli_query($query);
 
-        return mysql_affected_rows() ? "204 No Content" : "409 Conflict";
+        return mysqli_affected_rows() ? "204 No Content" : "409 Conflict";
     }
 
     /**
@@ -946,7 +947,6 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server
      */
     public function checkLock($path)
     {
-
         $filter = new InputFilter();
         $path = $filter->validateInput($path, 'nosql');
         $result = false;
@@ -955,11 +955,11 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server
               FROM locks
             WHERE path = '%s' ";
         $query = $filter->preventSqlInjection($query, array($path));
-        $res = mysql_query($query);
+        $res = mysqli_query($query);
 
         if ($res) {
-            $row = mysql_fetch_array($res);
-            mysql_free_result($res);
+            $row = mysqli_fetch_array($res);
+            mysqli_free_result($res);
 
             if ($row) {
                 $result = array("type" => "write", "scope" => $row["exclusivelock"] ? "exclusive" : "shared", "depth" => 0, "owner" => $row['owner'], "token" => $row['token'], "expires" => $row['expires']
@@ -982,4 +982,3 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server
         return false;
     }
 }
- 
\ No newline at end of file
diff --git a/workflow/engine/classes/model/AdditionalTables.php b/workflow/engine/classes/model/AdditionalTables.php
index 3422cf0ca..f63dde639 100644
--- a/workflow/engine/classes/model/AdditionalTables.php
+++ b/workflow/engine/classes/model/AdditionalTables.php
@@ -19,7 +19,7 @@ require_once 'classes/model/om/BaseAdditionalTables.php';
  * @package    workflow.engine.classes.model
  */
 
-function validateType ($value, $type)
+function validateType($value, $type)
 {
     switch ($type) {
         case 'INTEGER':
@@ -35,16 +35,16 @@ function validateType ($value, $type)
             $posPoint = ($posPoint === false) ? 0 : $posPoint;
 
             if ($pos > $posPoint) {
-                $value2 = substr($value, $pos+1);
+                $value2 = substr($value, $pos + 1);
                 $value1 = substr($value, 0, $pos);
                 $value1 = str_replace(".", "", $value1);
-                $value = $value1.".".$value2;
+                $value = $value1 . "." . $value2;
             } else {
-                if($posPoint) {
-                    $value2 = substr($value, $posPoint+1);
+                if ($posPoint) {
+                    $value2 = substr($value, $posPoint + 1);
                     $value1 = substr($value, 0, $posPoint);
                     $value1 = str_replace(",", "", $value1);
-                    $value = $value1.".".$value2;
+                    $value = $value1 . "." . $value2;
                 }
             }
             break;
@@ -146,12 +146,6 @@ class AdditionalTables extends BaseAdditionalTables
             $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_NAME);
             $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_CLASS_NAME);
             $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_DESCRIPTION);
-            //DEPRECATED! $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_LOG_INSERT);
-            // $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_LOG_UPDATE);
-            // $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_LOG_DELETE);
-            // $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_LOG_SELECT);
-            // $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_MAX_LENGTH);
-            // $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_SDW_AUTO_DELETE);
             $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_PLG_UID);
             $oCriteria->addSelectColumn(AdditionalTablesPeer::DBS_UID);
             $oCriteria->addSelectColumn(AdditionalTablesPeer::PRO_UID);
@@ -203,7 +197,7 @@ class AdditionalTables extends BaseAdditionalTables
                   'SHD_DATE'    => date('Y-m-d H:i:s')));
                  */
 
-                $addTabDescription = ($aData["ADD_TAB_DESCRIPTION"] != "")? ", Description: " . $aData["ADD_TAB_DESCRIPTION"] : ".";
+                $addTabDescription = ($aData["ADD_TAB_DESCRIPTION"] != "") ? ", Description: " . $aData["ADD_TAB_DESCRIPTION"] : ".";
                 G::auditLog("CreatePmtable", "PM Table Name: " . $aData['ADD_TAB_NAME'] . $addTabDescription);
                 return $aData['ADD_TAB_UID'];
             } else {
@@ -232,7 +226,7 @@ class AdditionalTables extends BaseAdditionalTables
                     $iResult = $oAdditionalTables->save();
                     $oConnection->commit();
                     $addTabDescription = (isset($aData["ADD_TAB_DESCRIPTION"]) && $aData["ADD_TAB_DESCRIPTION"] != "") ? ", Description: " . $aData["ADD_TAB_DESCRIPTION"] : ".";
-                    G::auditLog("UpdatePmtable", "PM Table Name: " . ( isset($aData['ADD_TAB_NAME']) ? $aData['ADD_TAB_NAME'] : $aData['ADD_TAB_TAG']) . $addTabDescription . ", PM Table ID: (" . $aData['ADD_TAB_UID'] . ") ");
+                    G::auditLog("UpdatePmtable", "PM Table Name: " . (isset($aData['ADD_TAB_NAME']) ? $aData['ADD_TAB_NAME'] : $aData['ADD_TAB_TAG']) . $addTabDescription . ", PM Table ID: (" . $aData['ADD_TAB_UID'] . ") ");
                 } else {
                     $sMessage = '';
                     $aValidationFailures = $oAdditionalTables->getValidationFailures();
@@ -274,9 +268,9 @@ class AdditionalTables extends BaseAdditionalTables
     /**
      * verify if Additional Table row specified in [sUID] exists.
      *
-     * @param      string $sUID   the uid of the additional table
+     * @param      string $sUID the uid of the additional table
      */
-    public function exists ($sUID)
+    public function exists($sUID)
     {
         $con = Propel::getConnection(AdditionalTablesPeer::DATABASE_NAME);
 
@@ -334,8 +328,8 @@ class AdditionalTables extends BaseAdditionalTables
             $aData = $this->load($sUID, true);
             $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
             $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
-                          ? $aData['ADD_TAB_CLASS_NAME']
-                          : $this->getPHPName($aData['ADD_TAB_NAME']));
+                ? $aData['ADD_TAB_CLASS_NAME']
+                : $this->getPHPName($aData['ADD_TAB_NAME']));
 
             if (file_exists($sPath . $sClassName . '.php')) {
                 require_once $sPath . $sClassName . '.php';
@@ -347,7 +341,6 @@ class AdditionalTables extends BaseAdditionalTables
             $con = Propel::getConnection($aData['DBS_UID']);
             $oCriteria = new Criteria($aData['DBS_UID']);
 
-            //eval('$oCriteria->addSelectColumn(' . $sClassPeerName . '::PM_UNIQUE_ID);');
             eval('$oCriteria->addSelectColumn("\'1\' AS DUMMY");');
             foreach ($aData['FIELDS'] as $aField) {
                 eval('$oCriteria->addSelectColumn(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ');');
@@ -357,18 +350,13 @@ class AdditionalTables extends BaseAdditionalTables
                 case 'VARCHAR':
                 case 'TEXT':
                 case 'DATE':
-                    // if($aField['FLD_NULL']!=1)
-                    // eval('$oCriteria->add(' . $sClassPeerName . '::' . $aField['FLD_NAME']
-                    //. ', \'(�_�_�)\', Criteria::NOT_EQUAL);');
                     break;
-                case 'INT';
+                case 'INT':
                 case 'FLOAT':
                     eval('$oCriteria->add(' . $sClassPeerName . '::' . $aField['FLD_NAME']
-                        .', -99999999999, Criteria::NOT_EQUAL);');
+                        . ', -99999999999, Criteria::NOT_EQUAL);');
                     break;
             }
-            //eval('$oCriteria->addAscendingOrderByColumn(' . $sClassPeerName . '::PM_UNIQUE_ID);');
-            //echo $oCriteria->toString();
             return $oCriteria;
         } catch (Exception $oError) {
             throw($oError);
@@ -385,8 +373,8 @@ class AdditionalTables extends BaseAdditionalTables
         $aData['DBS_UID'] = $aData['DBS_UID'] ? $aData['DBS_UID'] : 'workflow';
         $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
         $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
-                       ? $aData['ADD_TAB_CLASS_NAME']
-                       : $this->getPHPName($aData['ADD_TAB_NAME']));
+            ? $aData['ADD_TAB_CLASS_NAME']
+            : $this->getPHPName($aData['ADD_TAB_NAME']));
 
         if (file_exists($sPath . $sClassName . '.php')) {
             require_once $sPath . $sClassName . '.php';
@@ -398,7 +386,6 @@ class AdditionalTables extends BaseAdditionalTables
         $con = Propel::getConnection($aData['DBS_UID']);
         $oCriteria = new Criteria($aData['DBS_UID']);
 
-        //eval('$oCriteria->addSelectColumn("\'1\' AS DUMMY");');
 
         /*
          * data type:
@@ -414,13 +401,9 @@ class AdditionalTables extends BaseAdditionalTables
                     $field = '$oCriteria->addAsColumn("' . $aField['FLD_NAME'] . '", "round(" . ' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ' . ", ' . ($aField['FLD_TYPE'] == 'DOUBLE' ? '8' : '2') . ')");';
                 }
                 eval($field);
-                /*if ($aField['FLD_KEY'] == '1') {
-                    eval('$oCriteria->addAscendingOrderByColumn('. $sClassPeerName . '::' . $aField['FLD_NAME'] . ');');
-                }*/
             }
         }
         $oCriteriaCount = clone $oCriteria;
-        //$count = $sClassPeerName::doCount($oCriteria);
         eval('$count = ' . $sClassPeerName . '::doCount($oCriteria);');
 
         if ($filter != '' && is_string($filter)) {
@@ -428,17 +411,17 @@ class AdditionalTables extends BaseAdditionalTables
             $closure = '';
             $types = array('INTEGER', 'BIGINT', 'SMALLINT', 'TINYINT', 'DECIMAL', 'DOUBLE', 'FLOAT', 'REAL');
             foreach ($aData['FIELDS'] as $aField) {
-	            if (($appUid == false && $aField['FLD_NAME'] != 'APP_UID') || ($appUid == true)) {
-	                if (in_array($aField['FLD_TYPE'], $types)) {
-	                    if (is_numeric($filter)) {
-	                        $stringOr = $stringOr . '$a = $oCriteria->getNewCriterion(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ', "' . $filter . '", Criteria::EQUAL)' . $closure . ';';
-	                        $closure = '->addOr($a)';
-	                    }
-	                } else {
-	                    $stringOr = $stringOr . '$a = $oCriteria->getNewCriterion(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ', "%' . $filter . '%", Criteria::LIKE)' . $closure . ';';
-	                    $closure = '->addOr($a)';
-	                }
-	            }
+                if (($appUid == false && $aField['FLD_NAME'] != 'APP_UID') || ($appUid == true)) {
+                    if (in_array($aField['FLD_TYPE'], $types)) {
+                        if (is_numeric($filter)) {
+                            $stringOr = $stringOr . '$a = $oCriteria->getNewCriterion(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ', "' . $filter . '", Criteria::EQUAL)' . $closure . ';';
+                            $closure = '->addOr($a)';
+                        }
+                    } else {
+                        $stringOr = $stringOr . '$a = $oCriteria->getNewCriterion(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ', "%' . $filter . '%", Criteria::LIKE)' . $closure . ';';
+                        $closure = '->addOr($a)';
+                    }
+                }
             }
             $stringOr = $stringOr . '$oCriteria->add($a);';
             eval($stringOr);
@@ -488,7 +471,7 @@ class AdditionalTables extends BaseAdditionalTables
             eval('$count = ' . $sClassPeerName . '::doCount($oCriteria);');
         }
 
-        $filter = new InputFilter();        
+        $filter = new InputFilter();
         $sClassPeerName = $filter->validateInput($sClassPeerName);
 
         if (isset($_POST['sort'])) {
@@ -515,11 +498,10 @@ class AdditionalTables extends BaseAdditionalTables
         if (isset($start)) {
             $oCriteria->setOffset($start);
         }
-        //$rs = $sClassPeerName::doSelectRS($oCriteria);
         eval('$rs = ' . $sClassPeerName . '::doSelectRS($oCriteria);');
         $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
-        $rows = Array();
+        $rows = array();
         while ($rs->next()) {
             $rows[] = $rs->getRow();
         }
@@ -533,8 +515,8 @@ class AdditionalTables extends BaseAdditionalTables
             $aData = $this->load($sUID, true);
             $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
             $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
-                          ? $aData['ADD_TAB_CLASS_NAME']
-                          : $this->getPHPName($aData['ADD_TAB_NAME']));
+                ? $aData['ADD_TAB_CLASS_NAME']
+                : $this->getPHPName($aData['ADD_TAB_NAME']));
 
             if (file_exists($sPath . $sClassName . '.php')) {
                 return $sClassName;
@@ -552,9 +534,8 @@ class AdditionalTables extends BaseAdditionalTables
             $aData = $this->load($sUID, true);
             $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
             $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
-                          ? $aData['ADD_TAB_CLASS_NAME']
-                          : $this->getPHPName($aData['ADD_TAB_NAME']));
-            // $oConnection = Propel::getConnection(FieldsPeer::DATABASE_NAME);
+                ? $aData['ADD_TAB_CLASS_NAME']
+                : $this->getPHPName($aData['ADD_TAB_NAME']));
             $oConnection = Propel::getConnection($aData['DBS_UID']);
             $stmt = $oConnection->createStatement();
             require_once $sPath . $sClassName . '.php';
@@ -606,8 +587,8 @@ class AdditionalTables extends BaseAdditionalTables
             $aData = $this->load($sUID, true);
             $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
             $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
-                          ? $aData['ADD_TAB_CLASS_NAME']
-                          : $this->getPHPName($aData['ADD_TAB_NAME']));
+                ? $aData['ADD_TAB_CLASS_NAME']
+                : $this->getPHPName($aData['ADD_TAB_NAME']));
             require_once $sPath . $sClassName . '.php';
             $sKeys = '';
             foreach ($aKeys as $sName => $vValue) {
@@ -616,7 +597,6 @@ class AdditionalTables extends BaseAdditionalTables
             }
             $sKeys = substr($sKeys, 0, -1);
             eval('$oClass = ' . $sClassName . 'Peer::retrieveByPK(' . $sKeys . ');');
-            //eval('$oClass = ' . $sClassName . 'Peer::retrieveByPK($sPMUID);');
             if (!is_null($oClass)) {
                 return $oClass->toArray(BasePeer::TYPE_FIELDNAME);
             } else {
@@ -630,12 +610,11 @@ class AdditionalTables extends BaseAdditionalTables
     public function updateDataInTable($sUID, $aFields)
     {
         try {
-            //$sPMUID = $aFields['PM_UNIQUE_ID'];
             $aData = $this->load($sUID, true);
             $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
             $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
-                          ? $aData['ADD_TAB_CLASS_NAME']
-                          : $this->getPHPName($aData['ADD_TAB_NAME']));
+                ? $aData['ADD_TAB_CLASS_NAME']
+                : $this->getPHPName($aData['ADD_TAB_NAME']));
             $oConnection = Propel::getConnection(FieldsPeer::DATABASE_NAME);
             require_once $sPath . $sClassName . '.php';
             $sKeys = '';
@@ -648,7 +627,6 @@ class AdditionalTables extends BaseAdditionalTables
             }
             $sKeys = substr($sKeys, 0, -1);
             eval('$oClass = ' . $sClassName . 'Peer::retrieveByPK(' . $sKeys . ');');
-            //eval('$oClass = ' . $sClassName . 'Peer::retrieveByPK($sPMUID);');
             if (!is_null($oClass)) {
                 $oClass->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
                 if ($oClass->validate()) {
@@ -681,8 +659,8 @@ class AdditionalTables extends BaseAdditionalTables
             $aData = $this->load($sUID, true);
             $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
             $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
-                          ? $aData['ADD_TAB_CLASS_NAME']
-                          : $this->getPHPName($aData['ADD_TAB_NAME']));
+                ? $aData['ADD_TAB_CLASS_NAME']
+                : $this->getPHPName($aData['ADD_TAB_NAME']));
             $oConnection = Propel::getConnection(FieldsPeer::DATABASE_NAME);
             require_once $sPath . $sClassName . '.php';
             $sKeys = '';
@@ -692,7 +670,6 @@ class AdditionalTables extends BaseAdditionalTables
             }
             $sKeys = substr($sKeys, 0, -1);
             eval('$oClass = ' . $sClassName . 'Peer::retrieveByPK(' . $sKeys . ');');
-            //eval('$oClass = ' . $sClassName . 'Peer::retrieveByPK($sPMUID);');
             if (!is_null($oClass)) {
                 if ($oClass->validate()) {
                     $oConnection->begin();
@@ -728,8 +705,8 @@ class AdditionalTables extends BaseAdditionalTables
         $this->classPeerName = $this->className . 'Peer';
 
         if (!file_exists(PATH_WORKSPACE . 'classes/' . $this->className . '.php')) {
-            throw new Exception( "ERROR: " . PATH_WORKSPACE . 'classes/' . $this->className . '.php'
-                                . " class file doesn't exit!");
+            throw new Exception("ERROR: " . PATH_WORKSPACE . 'classes/' . $this->className . '.php'
+                . " class file doesn't exit!");
         }
 
         require_once PATH_WORKSPACE . 'classes/' . $this->className . '.php';
@@ -765,7 +742,7 @@ class AdditionalTables extends BaseAdditionalTables
                         case 'FLOAT':
                         case 'DOUBLE':
                         case 'INTEGER':
-                            $fieldTypes[] = array($rowfield['FLD_NAME']=>$rowfield['FLD_TYPE']);
+                            $fieldTypes[] = array($rowfield['FLD_NAME'] => $rowfield['FLD_TYPE']);
                             break;
                         default:
                             break;
@@ -780,11 +757,11 @@ class AdditionalTables extends BaseAdditionalTables
                     $j = key($dValue);
                     $dValue = (is_array($dValue[$j])) ? $dValue : $dValue[$j];
                 }
-                if (!is_array($dValue)) {
+                if (is_string($dValue)) {
                     foreach ($fieldTypes as $key => $fieldType) {
                         foreach ($fieldType as $name => $theType) {
                             if (strtoupper($dKey) == $name) {
-                                $caseData[$dKey] = validateType ($dValue, $theType);
+                                $caseData[$dKey] = validateType($dValue, $theType);
                                 unset($name);
                             }
                         }
@@ -795,11 +772,13 @@ class AdditionalTables extends BaseAdditionalTables
                     }
                 } else {
                     // grids
-                    foreach ($caseData[$dKey] as $dIndex => $dRow) {
-                        if (is_array($dRow)) {
-                            foreach ($dRow as $k => $v) {
-                                if (trim($v) === '') {
-                                    $caseData[$dKey][$dIndex][$k] = null;
+                    if (is_array($caseData[$dKey])) {
+                        foreach ($caseData[$dKey] as $dIndex => $dRow) {
+                            if (is_array($dRow)) {
+                                foreach ($dRow as $k => $v) {
+                                    if (is_string($v) && trim($v) === '') {
+                                        $caseData[$dKey][$dIndex][$k] = null;
+                                    }
                                 }
                             }
                         }
@@ -807,7 +786,7 @@ class AdditionalTables extends BaseAdditionalTables
                 }
             }
 
-            if ($type == 'GRID') {
+            if ($type === 'GRID') {
                 list($gridName, $gridUid) = explode('-', $gridKey);
                 $gridData = isset($caseData[$gridName]) ? $caseData[$gridName] : array();
 
@@ -883,7 +862,7 @@ class AdditionalTables extends BaseAdditionalTables
                     case 'FLOAT':
                     case 'DOUBLE':
                     case 'INTEGER':
-                        $fieldTypes[] = array($rowfield['FLD_NAME']=>$rowfield['FLD_TYPE']);
+                        $fieldTypes[] = array($rowfield['FLD_NAME'] => $rowfield['FLD_TYPE']);
                         break;
                     default:
                         break;
@@ -904,8 +883,8 @@ class AdditionalTables extends BaseAdditionalTables
                         }
                         foreach ($fieldTypes as $key => $fieldType) {
                             foreach ($fieldType as $name => $type) {
-                                if ( strtoupper ( $i) == $name) {
-                                    $v = validateType ($v, $type);
+                                if (strtoupper($i) == $name) {
+                                    $v = validateType($v, $type);
                                     unset($name);
                                 }
                             }
@@ -954,8 +933,8 @@ class AdditionalTables extends BaseAdditionalTables
                         foreach ($gridRow as $j => $v) {
                             foreach ($fieldTypes as $key => $fieldType) {
                                 foreach ($fieldType as $name => $type) {
-                                    if ( strtoupper ( $j) == $name) {
-                                        $v = validateType ($v, $type);
+                                    if (strtoupper($j) == $name) {
+                                        $v = validateType($v, $type);
                                         unset($name);
                                     }
                                 }
@@ -995,9 +974,9 @@ class AdditionalTables extends BaseAdditionalTables
                 if ($bWhitType) {
                     if (!in_array($aRow['FLD_NAME'], $aImportedVars)) {
                         $aImportedVars[] = $aRow['FLD_NAME'];
-                        $aVars[] = array('sFieldName'    => $aRow['FLD_NAME'],
-                                         'sFieldDynName' => $aRow['FLD_DYN_NAME'],
-                                         'sType'         => $aRow['FLD_TYPE']);
+                        $aVars[] = array('sFieldName' => $aRow['FLD_NAME'],
+                            'sFieldDynName' => $aRow['FLD_DYN_NAME'],
+                            'sType' => $aRow['FLD_TYPE']);
                     }
                 } else {
                     $aVars[] = $aRow['FLD_NAME'];
@@ -1034,7 +1013,7 @@ class AdditionalTables extends BaseAdditionalTables
         }
         return $reportTables;
     }
-    
+
     public function getAll($start = 0, $limit = 20, $filter = '', $process = null)
     {
         $oCriteria = new Criteria('workflow');
@@ -1058,8 +1037,9 @@ class AdditionalTables extends BaseAdditionalTables
 
         if ($filter != '' && is_string($filter)) {
             $oCriteria->add(
-            $oCriteria->getNewCriterion(AdditionalTablesPeer::ADD_TAB_NAME, '%' . $filter . '%', Criteria::LIKE)->addOr(
-            $oCriteria->getNewCriterion(AdditionalTablesPeer::ADD_TAB_DESCRIPTION, '%' . $filter . '%', Criteria::LIKE))
+                $oCriteria->getNewCriterion(AdditionalTablesPeer::ADD_TAB_NAME, '%' . $filter . '%', Criteria::LIKE)->addOr(
+                    $oCriteria->getNewCriterion(AdditionalTablesPeer::ADD_TAB_DESCRIPTION, '%' . $filter . '%', Criteria::LIKE)
+                )
             );
         }
 
@@ -1082,8 +1062,8 @@ class AdditionalTables extends BaseAdditionalTables
         $oDataset = AdditionalTablesPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
-        $addTables = Array();
-        $proUids = Array();
+        $addTables = array();
+        $proUids = array();
 
         while ($oDataset->next()) {
             $row = $oDataset->getRow();
@@ -1095,12 +1075,11 @@ class AdditionalTables extends BaseAdditionalTables
         }
 
         //process details will have the info about the processes
-        $procDetails = Array();
+        $procDetails = array();
 
         if (count($proUids) > 0) {
             //now get the labels for all process, using an array of Uids,
             $c = new Criteria('workflow');
-            //$c->add ( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL );
             $c->add(ProcessPeer::PRO_UID, $proUids, Criteria::IN);
             $dt = ProcessPeer::doSelectRS($c);
             $dt->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -1143,17 +1122,17 @@ class AdditionalTables extends BaseAdditionalTables
               array_unshift($aFields, $aUID); */
             $aTypes = array(
                 'VARCHAR' => 'string',
-                'TEXT'    => 'string',
-                'DATE'    => 'int',
-                'INT'     => 'int',
-                'FLOAT'   => 'double'
+                'TEXT' => 'string',
+                'DATE' => 'int',
+                'INT' => 'int',
+                'FLOAT' => 'double'
             );
             $aCreoleTypes = array(
                 'VARCHAR' => 'VARCHAR',
-                'TEXT'    => 'LONGVARCHAR',
-                'DATE'    => 'TIMESTAMP',
-                'INT'     => 'INTEGER',
-                'FLOAT'   => 'DOUBLE'
+                'TEXT' => 'LONGVARCHAR',
+                'DATE' => 'TIMESTAMP',
+                'INT' => 'INTEGER',
+                'FLOAT' => 'DOUBLE'
             );
             if ($sClassName == '') {
                 $sClassName = $this->getPHPName($sTableName);
@@ -1177,8 +1156,8 @@ class AdditionalTables extends BaseAdditionalTables
             $aData['GUID'] = $sAddTabUid;
 
             $aData['firstColumn'] = isset($aFields[0])
-                                    ? strtoupper($aFields[0]['FLD_NAME'])
-                                    : ($aFields[1]['FLD_NAME']);
+                ? strtoupper($aFields[0]['FLD_NAME'])
+                : ($aFields[1]['FLD_NAME']);
             $aData['totalColumns'] = count($aFields);
             $aData['useIdGenerator'] = 'false';
             $oTP1 = new TemplatePower(PATH_TPL . 'additionalTables' . PATH_SEP . 'Table.tpl');
@@ -1205,14 +1184,14 @@ class AdditionalTables extends BaseAdditionalTables
                     'creoleType' => $aCreoleTypes[$aField['FLD_TYPE']],
                     'notNull' => ($aField['FLD_NULL'] == 'on' ? 'true' : 'false'),
                     'size' => (($aField['FLD_TYPE'] == 'VARCHAR')
-                              || ($aField['FLD_TYPE'] == 'INT')
-                              || ($aField['FLD_TYPE'] == 'FLOAT') ? $aField['FLD_SIZE'] : 'null'),
+                    || ($aField['FLD_TYPE'] == 'INT')
+                    || ($aField['FLD_TYPE'] == 'FLOAT') ? $aField['FLD_SIZE'] : 'null'),
                     'var' => strtolower($aField['FLD_NAME']),
                     'attribute' => (($aField['FLD_TYPE'] == 'VARCHAR')
-                                   || ($aField['FLD_TYPE'] == 'TEXT')
-                                   || ($aField['FLD_TYPE'] == 'DATE')
-                                   ? '$' . strtolower($aField['FLD_NAME']) . " = ''"
-                                   : '$' . strtolower($aField['FLD_NAME']) . ' = 0'),
+                    || ($aField['FLD_TYPE'] == 'TEXT')
+                    || ($aField['FLD_TYPE'] == 'DATE')
+                        ? '$' . strtolower($aField['FLD_NAME']) . " = ''"
+                        : '$' . strtolower($aField['FLD_NAME']) . ' = 0'),
                     'index' => $i,
                 );
                 if ($aField['FLD_TYPE'] == 'DATE') {
@@ -1327,7 +1306,7 @@ class AdditionalTables extends BaseAdditionalTables
                 $i++;
             }
             $oTP3 = new TemplatePower(PATH_TPL . 'additionalTables' . PATH_SEP . 'map'
-                                    . PATH_SEP . 'TableMapBuilder.tpl');
+                . PATH_SEP . 'TableMapBuilder.tpl');
             $oTP3->prepare();
             $oTP3->assignGlobal($aData);
             foreach ($aPKs as $iIndex => $aColumn) {
@@ -1346,7 +1325,7 @@ class AdditionalTables extends BaseAdditionalTables
                 }
             }
             file_put_contents($sPath . PATH_SEP . 'map' . PATH_SEP . $sClassName
-                           . 'MapBuilder.php', $oTP3->getOutputContent());
+                . 'MapBuilder.php', $oTP3->getOutputContent());
             $oTP4 = new TemplatePower(PATH_TPL . 'additionalTables' . PATH_SEP . 'om' . PATH_SEP . 'BaseTable.tpl');
             $oTP4->prepare();
             switch (count($aPKs)) {
@@ -1363,9 +1342,9 @@ class AdditionalTables extends BaseAdditionalTables
                     $aData['setPrimaryKeyFunction'] = '';
                     foreach ($aPKs as $iIndex => $aColumn) {
                         $aData['getPrimaryKeyFunction'] .= '$pks[' . $iIndex . '] = $this->get'
-                                                         . $aColumn['phpName'] . '();' . "\n";
+                            . $aColumn['phpName'] . '();' . "\n";
                         $aData['setPrimaryKeyFunction'] .= '$this->set' . $aColumn['phpName']
-                                                         . '($keys[' . $iIndex . ']);' . "\n";
+                            . '($keys[' . $iIndex . ']);' . "\n";
                     }
                     $aData['getPrimaryKeyFunction'] .= 'return $pks;' . "\n";
                     break;
@@ -1443,7 +1422,7 @@ class AdditionalTables extends BaseAdditionalTables
                 }
             }
             file_put_contents($sPath . PATH_SEP . 'om' . PATH_SEP . 'Base'
-                            . $sClassName . '.php', $oTP4->getOutputContent());
+                . $sClassName . '.php', $oTP4->getOutputContent());
             $oTP5 = new TemplatePower(PATH_TPL . 'additionalTables' . PATH_SEP . 'om' . PATH_SEP . 'BaseTablePeer.tpl');
             $oTP5->prepare();
             $sKeys = '';
@@ -1526,10 +1505,9 @@ class AdditionalTables extends BaseAdditionalTables
                 }
             }
             file_put_contents($sPath . PATH_SEP . 'om' . PATH_SEP . 'Base'
-                            . $sClassName . 'Peer.php', $oTP5->getOutputContent());
+                . $sClassName . 'Peer.php', $oTP5->getOutputContent());
         } catch (Exception $oError) {
             throw($oError);
         }
     }
 }
-
diff --git a/workflow/engine/classes/model/AddonsManager.php b/workflow/engine/classes/model/AddonsManager.php
index 4549a981e..06d16fedb 100644
--- a/workflow/engine/classes/model/AddonsManager.php
+++ b/workflow/engine/classes/model/AddonsManager.php
@@ -138,7 +138,7 @@ class AddonsManager extends BaseAddonsManager
         $filter = new InputFilter();
         $requiredPath = PATH_PLUGINS . $this->getAddonName() . ".php";
         $requiredPath = $filter->validateInput($requiredPath, 'path');
-        require_once ($requiredPath);
+        require_once($requiredPath);
 
         if ($enable) {
             $oPluginRegistry->enablePlugin($this->getAddonName());
@@ -223,7 +223,7 @@ class AddonsManager extends BaseAddonsManager
         }
 
         ///////
-        $licenseManager = &PmLicenseManager::getSingleton();
+        $licenseManager = PmLicenseManager::getSingleton();
         $activeLicense = $licenseManager->getActiveLicense();
 
         $data = $data . "Content-Disposition: form-data; name=\"licenseFile\"; filename=\"" . $licenseManager->file . "\"\n";
@@ -474,18 +474,18 @@ class AddonsManager extends BaseAddonsManager
      */
     public function update($data)
     {
-        $con = Propel::getConnection( AddonsManagerPeer::DATABASE_NAME );
+        $con = Propel::getConnection(AddonsManagerPeer::DATABASE_NAME);
         try {
             $con->begin();
-            $this->setNew( false );
-            $this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
+            $this->setNew(false);
+            $this->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($this->validate()) {
                 $result = $this->save();
                 $con->commit();
                 return $result;
             } else {
                 $con->rollback();
-                throw (new Exception( "Failed Validation in class " . get_class( $this ) . "." ));
+                throw (new Exception("Failed Validation in class " . get_class($this) . "."));
             }
         } catch (Exception $e) {
             $con->rollback();
diff --git a/workflow/engine/classes/model/AddonsStore.php b/workflow/engine/classes/model/AddonsStore.php
index 852124009..6434164fa 100644
--- a/workflow/engine/classes/model/AddonsStore.php
+++ b/workflow/engine/classes/model/AddonsStore.php
@@ -35,7 +35,7 @@ class AddonsStore extends BaseAddonsStore
     public static function checkLicenseStore()
     {
         //getting the licenseManager....
-        $licenseManager = &PmLicenseManager::getSingleton();
+        $licenseManager = PmLicenseManager::getSingleton();
 
         if (isset($licenseManager->id)) {
             //Remove any license store that is not the active license
@@ -72,7 +72,7 @@ class AddonsStore extends BaseAddonsStore
 
         AddonsStore::checkLicenseStore();
 
-        $licenseManager = &PmLicenseManager::getSingleton(); //Getting the licenseManager
+        $licenseManager = PmLicenseManager::getSingleton(); //Getting the licenseManager
 
         $result["store_errors"] = array();
         list($stores, $errors)  = AddonsStore::updateAll(false, $type);
@@ -155,7 +155,7 @@ class AddonsStore extends BaseAddonsStore
             if ($addon->getAddonId() == "enterprise" && $status== 'ready') {
                 $status = 'installed';
             }
-            if ($status == 'minus-circle' ) {
+            if ($status == 'minus-circle') {
                 $status = "available";
             }
 
@@ -187,7 +187,7 @@ class AddonsStore extends BaseAddonsStore
 
         AddonsStore::checkLicenseStore();
 
-        $licenseManager = &PmLicenseManager::getSingleton(); //Getting the licenseManager
+        $licenseManager = PmLicenseManager::getSingleton(); //Getting the licenseManager
 
         $result["store_errors"] = array();
         list($stores, $errors)  = AddonsStore::updateAll(false);
@@ -256,7 +256,7 @@ class AddonsStore extends BaseAddonsStore
             if ($addon->getAddonId() == "enterprise" && $status== 'ready') {
                 $status = 'installed';
             }
-            if ($status == 'minus-circle' ) {
+            if ($status == 'minus-circle') {
                 $status = "available";
             }
 
@@ -358,7 +358,7 @@ class AddonsStore extends BaseAddonsStore
             $aPluginsPP = unserialize(trim(file_get_contents(PATH_DATA_SITE . 'ee')));
         }
 
-        $pmLicenseManagerO = &PmLicenseManager::getSingleton();
+        $pmLicenseManagerO = PmLicenseManager::getSingleton();
         $localPlugins = array();
 
         if ($type == 'plugin') {
@@ -436,7 +436,7 @@ class AddonsStore extends BaseAddonsStore
             if (is_array($list)) {
                 foreach ($list['addons'] as $key => $feature) {
                     $addon = new AddonsManager();
-                    if($addon->exists($feature['name'],$feature['guid'])){
+                    if ($addon->exists($feature['name'], $feature['guid'])) {
                         $arrayData['ADDON_ID']   = $feature['name'];
                         $arrayData['STORE_ID']   = $feature['guid'];
                         $arrayData['ADDON_NAME'] = $feature['name'];
diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php
index 7e0d4493b..89e9d892a 100644
--- a/workflow/engine/classes/model/AppDelegation.php
+++ b/workflow/engine/classes/model/AppDelegation.php
@@ -100,26 +100,26 @@ class AppDelegation extends BaseAppDelegation
      * @param $isSubprocess is a subprocess inside a process?
      * @return delegation index of the application delegation.
      */
-    public function createAppDelegation ($sProUid, $sAppUid, $sTasUid, $sUsrUid, $sAppThread, $iPriority = 3, $isSubprocess = false, $sPrevious = -1, $sNextTasParam = null, $flagControl = false, $flagControlMulInstance = false, $delPrevious = 0, $appNumber = 0, $taskId = 0, $userId = 0, $proId = 0)
+    public function createAppDelegation($sProUid, $sAppUid, $sTasUid, $sUsrUid, $sAppThread, $iPriority = 3, $isSubprocess = false, $sPrevious = -1, $sNextTasParam = null, $flagControl = false, $flagControlMulInstance = false, $delPrevious = 0, $appNumber = 0, $taskId = 0, $userId = 0, $proId = 0)
     {
-        if (! isset( $sProUid ) || strlen( $sProUid ) == 0) {
-            throw (new Exception( 'Column "PRO_UID" cannot be null.' ));
+        if (! isset($sProUid) || strlen($sProUid) == 0) {
+            throw (new Exception('Column "PRO_UID" cannot be null.'));
         }
 
-        if (! isset( $sAppUid ) || strlen( $sAppUid ) == 0) {
-            throw (new Exception( 'Column "APP_UID" cannot be null.' ));
+        if (! isset($sAppUid) || strlen($sAppUid) == 0) {
+            throw (new Exception('Column "APP_UID" cannot be null.'));
         }
 
-        if (! isset( $sTasUid ) || strlen( $sTasUid ) == 0) {
-            throw (new Exception( 'Column "TAS_UID" cannot be null.' ));
+        if (! isset($sTasUid) || strlen($sTasUid) == 0) {
+            throw (new Exception('Column "TAS_UID" cannot be null.'));
         }
 
-        if (! isset( $sUsrUid ) /*|| strlen($sUsrUid ) == 0*/ ) {
-            throw (new Exception( 'Column "USR_UID" cannot be null.' ));
+        if (! isset($sUsrUid) /*|| strlen($sUsrUid ) == 0*/) {
+            throw (new Exception('Column "USR_UID" cannot be null.'));
         }
 
-        if (! isset( $sAppThread ) || strlen( $sAppThread ) == 0) {
-            throw (new Exception( 'Column "APP_THREAD" cannot be null.' ));
+        if (! isset($sAppThread) || strlen($sAppThread) == 0) {
+            throw (new Exception('Column "APP_THREAD" cannot be null.'));
         }
 
         $this->delegation_id = null;
@@ -161,17 +161,17 @@ class AppDelegation extends BaseAppDelegation
             }
         }
         //Verify successors: parrallel submit in the same time
-        if($flagControl){
+        if ($flagControl) {
             $nextTaskUid = $sTasUid;
             $index = $this->getAllTasksBeforeSecJoin($nextTaskUid, $sAppUid, $delPreviousFather);
-            if($this->createThread($index, $sAppUid)){
+            if ($this->createThread($index, $sAppUid)) {
                 return 0;
             }
         }
-        if($flagControlMulInstance){
+        if ($flagControlMulInstance) {
             $nextTaskUid = $sTasUid;
             $index = $this->getAllTheardMultipleInstance($delPreviousFather, $sAppUid);
-            if($this->createThread($index, $sAppUid, $sUsrUid)){
+            if ($this->createThread($index, $sAppUid, $sUsrUid)) {
                 return 0;
             }
         }
@@ -181,18 +181,18 @@ class AppDelegation extends BaseAppDelegation
         $criteriaUpdate->add(AppDelegationPeer::DEL_LAST_INDEX, 0);
         BasePeer::doUpdate($criteria, $criteriaUpdate, Propel::getConnection('workflow'));
 
-        $this->setAppUid( $sAppUid );
-        $this->setProUid( $sProUid );
-        $this->setTasUid( $sTasUid );
-        $this->setDelIndex( $delIndex );
+        $this->setAppUid($sAppUid);
+        $this->setProUid($sProUid);
+        $this->setTasUid($sTasUid);
+        $this->setDelIndex($delIndex);
         $this->setDelLastIndex(1);
-        $this->setDelPrevious( $sPrevious == - 1 ? 0 : $sPrevious );
-        $this->setUsrUid( $sUsrUid );
-        $this->setDelType( 'NORMAL' );
-        $this->setDelPriority( ($iPriority != '' ? $iPriority : '3') );
-        $this->setDelThread( $sAppThread );
-        $this->setDelThreadStatus( 'OPEN' );
-        $this->setDelDelegateDate( 'now' );
+        $this->setDelPrevious($sPrevious == - 1 ? 0 : $sPrevious);
+        $this->setUsrUid($sUsrUid);
+        $this->setDelType('NORMAL');
+        $this->setDelPriority(($iPriority != '' ? $iPriority : '3'));
+        $this->setDelThread($sAppThread);
+        $this->setDelThreadStatus('OPEN');
+        $this->setDelDelegateDate('now');
         $this->setAppNumber($appNumber);
         $this->setTasId($taskId);
         $this->setUsrId($userId);
@@ -206,17 +206,17 @@ class AppDelegation extends BaseAppDelegation
         $this->setDelTaskDueDate($delTaskDueDate);
         $this->setDelRiskDate($delRiskDate);
 
-        if ((defined( "DEBUG_CALENDAR_LOG" )) && (DEBUG_CALENDAR_LOG)) {
+        if ((defined("DEBUG_CALENDAR_LOG")) && (DEBUG_CALENDAR_LOG)) {
             //$this->setDelData( $delTaskDueDate['DUE_DATE_LOG'] ); // Log of actions made by Calendar Engine
-        	$this->setDelData( $delTaskDueDate );
+            $this->setDelData($delTaskDueDate);
         } else {
-            $this->setDelData( '' );
+            $this->setDelData('');
         }
 
         // this condition assures that an internal delegation like a subprocess dont have an initial date setted
         if ($delIndex == 1 && ! $isSubprocess) {
             //the first delegation, init date this should be now for draft applications, in other cases, should be null.
-            $this->setDelInitDate( 'now' );
+            $this->setDelInitDate('now');
         }
 
         if ($this->validate()) {
@@ -233,13 +233,13 @@ class AppDelegation extends BaseAppDelegation
             foreach ($validationFailuresArray as $objValidationFailure) {
                 $msg .= $objValidationFailure->getMessage() . "<br/>";
             }
-            throw (new Exception( 'Failed Data validation. ' . $msg ));
+            throw (new Exception('Failed Data validation. ' . $msg));
         }
 
         $delIndex = $this->getDelIndex();
 
         // Hook for the trigger PM_CREATE_NEW_DELEGATION
-        if (defined( 'PM_CREATE_NEW_DELEGATION' )) {
+        if (defined('PM_CREATE_NEW_DELEGATION')) {
             $bpmn = new \ProcessMaker\Project\Bpmn();
             $flagActionsByEmail = true;
 
@@ -268,7 +268,7 @@ class AppDelegation extends BaseAppDelegation
                     if ($resultAbe->next()) {
                         $dataAbe = $resultAbe->getRow();
                         $flagActionsByEmail = false;
-                        if($dataAbe['ABE_TYPE']!='' && $data->USR_UID!=''){
+                        if ($dataAbe['ABE_TYPE']!='' && $data->USR_UID!='') {
                             $actionsByEmail = new ActionsByEmailCoreClass();
                             $actionsByEmail->sendActionsByEmail($data, $dataAbe);
                         }
@@ -278,10 +278,10 @@ class AppDelegation extends BaseAppDelegation
 
 
                 /*----------------------------------********---------------------------------*/
-                $licensedFeatures = &PMLicensedFeatures::getSingleton ();
-                if ($licensedFeatures->verifyfeature ( '7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09' )) {
-                    try{
-                        $pmGoogle = new PmGoogleApi ();
+                $licensedFeatures = PMLicensedFeatures::getSingleton();
+                if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
+                    try {
+                        $pmGoogle = new PmGoogleApi();
                         if ($pmGoogle->getServiceGmailStatus()) {
                             $Pmgmail = new \ProcessMaker\BusinessModel\Pmgmail();
                             $Pmgmail->gmailsForRouting($sUsrUid, $sTasUid, $sAppUid, $delIndex, $isSubprocess);
@@ -338,30 +338,30 @@ class AppDelegation extends BaseAppDelegation
      * @return array $Fields the fields
      */
 
-    public function LoadParallel ($AppUid, $index = "")
+    public function LoadParallel($AppUid, $index = "")
     {
         $aCases = array();
 
-        $c = new Criteria( 'workflow' );
-        $c->addSelectColumn( AppDelegationPeer::APP_UID );
-        $c->addSelectColumn( AppDelegationPeer::DEL_INDEX );
-        $c->addSelectColumn( AppDelegationPeer::PRO_UID );
-        $c->addSelectColumn( AppDelegationPeer::TAS_UID );
-        $c->addSelectColumn( AppDelegationPeer::USR_UID );
-        $c->addSelectColumn( AppDelegationPeer::DEL_DELEGATE_DATE );
-        $c->addSelectColumn( AppDelegationPeer::DEL_INIT_DATE );
-        $c->addSelectColumn( AppDelegationPeer::DEL_TASK_DUE_DATE );
-        $c->addSelectColumn( AppDelegationPeer::DEL_FINISH_DATE );
-        $c->addSelectColumn( AppDelegationPeer::DEL_PREVIOUS );
+        $c = new Criteria('workflow');
+        $c->addSelectColumn(AppDelegationPeer::APP_UID);
+        $c->addSelectColumn(AppDelegationPeer::DEL_INDEX);
+        $c->addSelectColumn(AppDelegationPeer::PRO_UID);
+        $c->addSelectColumn(AppDelegationPeer::TAS_UID);
+        $c->addSelectColumn(AppDelegationPeer::USR_UID);
+        $c->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE);
+        $c->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE);
+        $c->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE);
+        $c->addSelectColumn(AppDelegationPeer::DEL_FINISH_DATE);
+        $c->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS);
 
-        $c->add( AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' );
-        $c->add( AppDelegationPeer::APP_UID, $AppUid );
-        if(!empty($index)) {
-            $c->add( AppDelegationPeer::DEL_INDEX, $index );
+        $c->add(AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN');
+        $c->add(AppDelegationPeer::APP_UID, $AppUid);
+        if (!empty($index)) {
+            $c->add(AppDelegationPeer::DEL_INDEX, $index);
         }
-        $c->addDescendingOrderByColumn( AppDelegationPeer::DEL_INDEX );
-        $rs = AppDelegationPeer::doSelectRS( $c );
-        $row= $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $c->addDescendingOrderByColumn(AppDelegationPeer::DEL_INDEX);
+        $rs = AppDelegationPeer::doSelectRS($c);
+        $row= $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
         $rs->next();
         $row = $rs->getRow();
@@ -393,14 +393,14 @@ class AppDelegation extends BaseAppDelegation
      *
      */
 
-    public function update ($aData)
+    public function update($aData)
     {
-        $con = Propel::getConnection( AppDelegationPeer::DATABASE_NAME );
+        $con = Propel::getConnection(AppDelegationPeer::DATABASE_NAME);
         try {
             $con->begin();
-            $oApp = AppDelegationPeer::retrieveByPK( $aData['APP_UID'], $aData['DEL_INDEX'] );
-            if (is_object( $oApp ) && get_class( $oApp ) == 'AppDelegation') {
-                $oApp->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
+            $oApp = AppDelegationPeer::retrieveByPK($aData['APP_UID'], $aData['DEL_INDEX']);
+            if (is_object($oApp) && get_class($oApp) == 'AppDelegation') {
+                $oApp->fromArray($aData, BasePeer::TYPE_FIELDNAME);
                 if ($oApp->validate()) {
                     $res = $oApp->save();
                     $con->commit();
@@ -411,24 +411,24 @@ class AppDelegation extends BaseAppDelegation
                         $msg .= $objValidationFailure->getMessage() . "<br/>";
                     }
 
-                    throw (new PropelException( 'The row cannot be created!', new PropelException( $msg ) ));
+                    throw (new PropelException('The row cannot be created!', new PropelException($msg)));
                 }
             } else {
                 $con->rollback();
-                throw (new Exception( "This AppDelegation row doesn't exist!" ));
+                throw (new Exception("This AppDelegation row doesn't exist!"));
             }
         } catch (Exception $oError) {
             throw ($oError);
         }
     }
 
-    public function remove ($sApplicationUID, $iDelegationIndex)
+    public function remove($sApplicationUID, $iDelegationIndex)
     {
-        $oConnection = Propel::getConnection( StepTriggerPeer::DATABASE_NAME );
+        $oConnection = Propel::getConnection(StepTriggerPeer::DATABASE_NAME);
         try {
             $oConnection->begin();
-            $oApp = AppDelegationPeer::retrieveByPK( $sApplicationUID, $iDelegationIndex );
-            if (is_object( $oApp ) && get_class( $oApp ) == 'AppDelegation') {
+            $oApp = AppDelegationPeer::retrieveByPK($sApplicationUID, $iDelegationIndex);
+            if (is_object($oApp) && get_class($oApp) == 'AppDelegation') {
                 $result = $oApp->delete();
             }
             $oConnection->commit();
@@ -441,20 +441,20 @@ class AppDelegation extends BaseAppDelegation
 
     // TasTypeDay = 1  => working days
     // TasTypeDay = 2  => calendar days
-    public function calculateDueDate ($sNextTasParam)
+    public function calculateDueDate($sNextTasParam)
     {
         //Get Task properties
-        $task = TaskPeer::retrieveByPK( $this->getTasUid() );
+        $task = TaskPeer::retrieveByPK($this->getTasUid());
 
         $aData = array();
         $aData['TAS_UID'] = $this->getTasUid();
         //Added to allow User defined Timing Control at Run time from Derivation screen
-        if (isset( $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] ) && $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] == 'true') {
+        if (isset($sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY']) && $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] == 'true') {
             $aData['TAS_DURATION'] = $sNextTasParam['NEXT_TASK']['TAS_DURATION'];
             $aData['TAS_TIMEUNIT'] = $sNextTasParam['NEXT_TASK']['TAS_TIMEUNIT'];
             $aData['TAS_TYPE_DAY'] = $sNextTasParam['NEXT_TASK']['TAS_TYPE_DAY'];
 
-            if (isset( $sNextTasParam['NEXT_TASK']['TAS_CALENDAR'] ) && $sNextTasParam['NEXT_TASK']['TAS_CALENDAR'] != '') {
+            if (isset($sNextTasParam['NEXT_TASK']['TAS_CALENDAR']) && $sNextTasParam['NEXT_TASK']['TAS_CALENDAR'] != '') {
                 $aCalendarUID = $sNextTasParam['NEXT_TASK']['TAS_CALENDAR'];
             } else {
                 $aCalendarUID = '';
@@ -462,9 +462,9 @@ class AppDelegation extends BaseAppDelegation
 
             //Updating the task Table , so that user will see updated values in the assign screen in consequent cases
             $oTask = new Task();
-            $oTask->update( $aData );
+            $oTask->update($aData);
         } else {
-            if (is_null( $task )) {
+            if (is_null($task)) {
                 return 0;
             }
             $aData['TAS_DURATION'] = $task->getTasDuration();
@@ -496,13 +496,12 @@ class AppDelegation extends BaseAppDelegation
     public function calculateRiskDate($dueDate, $risk)
     {
         try {
-
             $data = array();
-            if (isset( $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] ) && $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] == 'true') {
+            if (isset($sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY']) && $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] == 'true') {
                 $data['TAS_DURATION'] = $sNextTasParam['NEXT_TASK']['TAS_DURATION'];
                 $data['TAS_TIMEUNIT'] = $sNextTasParam['NEXT_TASK']['TAS_TIMEUNIT'];
             } else {
-                $task = TaskPeer::retrieveByPK( $this->getTasUid() );
+                $task = TaskPeer::retrieveByPK($this->getTasUid());
                 $data['TAS_DURATION'] = $task->getTasDuration();
                 $data['TAS_TIMEUNIT'] = $task->getTasTimeUnit();
             }
@@ -529,47 +528,47 @@ class AppDelegation extends BaseAppDelegation
         }
     }
 
-    public function getDiffDate ($date1, $date2)
+    public function getDiffDate($date1, $date2)
     {
         return ($date1 - $date2) / (24 * 60 * 60); //days
         return ($date1 - $date2) / 3600;
     }
 
-	//usually this function is called when routing in the flow, so by default cron =0
-	public function calculateDuration($cron = 0)
-	{
-		$this->writeFileIfCalledFromCronForCalculateDuration($cron);
-		$this->patchDataWithValuesForCalculateDuration();
-		$rs = $this->recordSetForCalculateDuration();
-		$rs->next();
-		$row = $rs->getRow();
-		$i = 0;
-		$calendar = new Calendar();
-		$now = new DateTime();
-		while (is_array ($row)) {
-			$oAppDel = AppDelegationPeer::retrieveByPk( $row['APP_UID'], $row['DEL_INDEX'] );
+    //usually this function is called when routing in the flow, so by default cron =0
+    public function calculateDuration($cron = 0)
+    {
+        $this->writeFileIfCalledFromCronForCalculateDuration($cron);
+        $this->patchDataWithValuesForCalculateDuration();
+        $rs = $this->recordSetForCalculateDuration();
+        $rs->next();
+        $row = $rs->getRow();
+        $i = 0;
+        $calendar = new Calendar();
+        $now = new DateTime();
+        while (is_array($row)) {
+            $oAppDel = AppDelegationPeer::retrieveByPk($row['APP_UID'], $row['DEL_INDEX']);
             $calendar = new Calendar();
             $calendar->getCalendar($row['USR_UID'], $row['PRO_UID'], $row['TAS_UID']);
             $calData = $calendar->getCalendarData();
             $calculatedValues = $this->getValuesToStoreForCalculateDuration($row, $calendar, $calData, $now);
 
-			$oAppDel->setDelStarted($calculatedValues['isStarted']);
-			$oAppDel->setDelFinished($calculatedValues['isFinished']);
-			$oAppDel->setDelDelayed($calculatedValues['isDelayed']);
-			$oAppDel->setDelQueueDuration($calculatedValues['queueTime']);
-			$oAppDel->setDelDelayDuration($calculatedValues['delayTime']);
-			$oAppDel->setDelDuration($calculatedValues['durationTime']);
-			$oAppDel->setAppOverduePercentage($calculatedValues['percentDelay']);
-			$RES = $oAppDel->save();
-			$rs->next();
-			$row = $rs->getRow();
-		}
-	}
+            $oAppDel->setDelStarted($calculatedValues['isStarted']);
+            $oAppDel->setDelFinished($calculatedValues['isFinished']);
+            $oAppDel->setDelDelayed($calculatedValues['isDelayed']);
+            $oAppDel->setDelQueueDuration($calculatedValues['queueTime']);
+            $oAppDel->setDelDelayDuration($calculatedValues['delayTime']);
+            $oAppDel->setDelDuration($calculatedValues['durationTime']);
+            $oAppDel->setAppOverduePercentage($calculatedValues['percentDelay']);
+            $RES = $oAppDel->save();
+            $rs->next();
+            $row = $rs->getRow();
+        }
+    }
 
-	public function getValuesToStoreForCalculateDuration($row, $calendar, $calData, $nowDate)
-	{
+    public function getValuesToStoreForCalculateDuration($row, $calendar, $calData, $nowDate)
+    {
         $rowValues = $this->completeRowDataForCalculateDuration($row, $nowDate);
-		return Array(
+        return array(
             'isStarted'    => $this->createDateFromString($row['DEL_INIT_DATE']) != null ? 1 : 0,
             'isFinished'   => $this->createDateFromString($row['DEL_FINISH_DATE']) != null ? 1: 0,
             'isDelayed'    => $this->calculateDelayTime($calendar, $calData, $rowValues) > 0 ? 1 : 0,
@@ -577,11 +576,11 @@ class AppDelegation extends BaseAppDelegation
             'delayTime'    => $this->calculateDelayTime($calendar, $calData, $rowValues),
             'durationTime' => $this->calculateNetProcessingTime($calendar, $calData, $rowValues),
             'percentDelay' => $this->calculateOverduePercentage($calendar, $calData, $rowValues)
-		);
-	}
+        );
+    }
 
-	private function calculateOverduePercentage($calendar, $calData, $rowValues)
-	{
+    private function calculateOverduePercentage($calendar, $calData, $rowValues)
+    {
         if ($rowValues['fTaskDuration'] == 0) {
             return 0;
         }
@@ -591,203 +590,210 @@ class AppDelegation extends BaseAppDelegation
                     : $rowValues['fTaskDuration'] / 24;
 
         return $this->calculateDelayTime($calendar, $calData, $rowValues)  * 100/ $taskTime;
-	}
+    }
 
-	//time in days from init or delegate date to finish or today's date
-	private function calculateNetProcessingTime($calendar, $calData, $rowValues)
-	{
-		$initDateForCalc = $this->selectDate ($rowValues['dInitDate'], $rowValues['dDelegateDate'], 'max');
-		$endDateForCalc = $this->selectDate ($rowValues['dFinishDate'], $rowValues['dNow'], 'min');
-		return $calendar->dashCalculateDurationWithCalendar(
-							$initDateForCalc->format('Y-m-d H:i:s'),
-							$endDateForCalc->format('Y-m-d H:i:s'),
-							$calData)/(24*60*60);
-	}
+    //time in days from init or delegate date to finish or today's date
+    private function calculateNetProcessingTime($calendar, $calData, $rowValues)
+    {
+        $initDateForCalc = $this->selectDate($rowValues['dInitDate'], $rowValues['dDelegateDate'], 'max');
+        $endDateForCalc = $this->selectDate($rowValues['dFinishDate'], $rowValues['dNow'], 'min');
+        return $calendar->dashCalculateDurationWithCalendar(
+                            $initDateForCalc->format('Y-m-d H:i:s'),
+                            $endDateForCalc->format('Y-m-d H:i:s'),
+                            $calData
+        )/(24*60*60);
+    }
 
-	//time in days from delegate date to init date
-	private function calculateQueueTime($calendar,  $calData, $rowValues)
-	{
-		$initDateForCalc = $rowValues['dDelegateDate'];
-		$endDateForCalc = $this->selectDate ($rowValues['dInitDate'], $rowValues['dNow'], 'min');
-		return $calendar->dashCalculateDurationWithCalendar(
-							$initDateForCalc->format('Y-m-d H:i:s'),
-							$endDateForCalc->format('Y-m-d H:i:s'),
-							$calData)/(24*60*60);
-	}
+    //time in days from delegate date to init date
+    private function calculateQueueTime($calendar, $calData, $rowValues)
+    {
+        $initDateForCalc = $rowValues['dDelegateDate'];
+        $endDateForCalc = $this->selectDate($rowValues['dInitDate'], $rowValues['dNow'], 'min');
+        return $calendar->dashCalculateDurationWithCalendar(
+                            $initDateForCalc->format('Y-m-d H:i:s'),
+                            $endDateForCalc->format('Y-m-d H:i:s'),
+                            $calData
+        )/(24*60*60);
+    }
 
-	//time in days from due date to finish or today date
-	private function calculateDelayTime($calendar, $calData, $rowValues)
-	{
-		$initDateForCalc = $this->selectDate($rowValues['dDueDate'], $rowValues['dDelegateDate'], 'max');
-		$endDateForCalc = $this->selectDate ($rowValues['dFinishDate'], $rowValues['dNow'], 'min');
-		return $calendar->dashCalculateDurationWithCalendar(
-							$initDateForCalc->format('Y-m-d H:i:s'),
-							$endDateForCalc->format('Y-m-d H:i:s'),
-							$calData)/(24*60*60);
-	}
+    //time in days from due date to finish or today date
+    private function calculateDelayTime($calendar, $calData, $rowValues)
+    {
+        $initDateForCalc = $this->selectDate($rowValues['dDueDate'], $rowValues['dDelegateDate'], 'max');
+        $endDateForCalc = $this->selectDate($rowValues['dFinishDate'], $rowValues['dNow'], 'min');
+        return $calendar->dashCalculateDurationWithCalendar(
+                            $initDateForCalc->format('Y-m-d H:i:s'),
+                            $endDateForCalc->format('Y-m-d H:i:s'),
+                            $calData
+        )/(24*60*60);
+    }
 
     //to avoid aplying many times the same conversions and functions the row data
     //is used to create dates as DateTime objects and other fields are stracted also,
     //so the array returned will work as a "context" object for the rest of the functions.
-	private function completeRowDataForCalculateDuration($row, $nowDate)
-	{
-		return Array(
-			'dDelegateDate'       => $this->createDateFromString ($row['DEL_DELEGATE_DATE']),
-			'dInitDate'           => $this->createDateFromString ($row['DEL_INIT_DATE']),
-			'dDueDate'            => $this->createDateFromString ($row['DEL_TASK_DUE_DATE']),
-			'dFinishDate'         => $this->createDateFromString ($row['DEL_FINISH_DATE']),
-			'fTaskDuration'       => $row['TAS_DURATION'] * 1.0,
-			'cTaskDurationUnit'   => $row['TAS_TIMEUNIT'],
-			'dNow'                => $nowDate,
-			'row'                 => $row
-		);
-	}
+    private function completeRowDataForCalculateDuration($row, $nowDate)
+    {
+        return array(
+            'dDelegateDate'       => $this->createDateFromString($row['DEL_DELEGATE_DATE']),
+            'dInitDate'           => $this->createDateFromString($row['DEL_INIT_DATE']),
+            'dDueDate'            => $this->createDateFromString($row['DEL_TASK_DUE_DATE']),
+            'dFinishDate'         => $this->createDateFromString($row['DEL_FINISH_DATE']),
+            'fTaskDuration'       => $row['TAS_DURATION'] * 1.0,
+            'cTaskDurationUnit'   => $row['TAS_TIMEUNIT'],
+            'dNow'                => $nowDate,
+            'row'                 => $row
+        );
+    }
 
-	//by default min function returns de null value if one of the params is null
+    //by default min function returns de null value if one of the params is null
     //to avoid that behaviour this function was created so the function returns the first
     //not null date or if both are not null the mix/max date
     //NOTE date1 and date2 are DateTime objects.
-	private function selectDate($date1, $date2, $compareFunction)
-	{
-		if ($date1 == null)
-			return $date2;
+    private function selectDate($date1, $date2, $compareFunction)
+    {
+        if ($date1 == null) {
+            return $date2;
+        }
 
-		if ($date2 == null)
-			return $date1;
+        if ($date2 == null) {
+            return $date1;
+        }
 
-		return $compareFunction($date1, $date2);
-	}
+        return $compareFunction($date1, $date2);
+    }
 
     //Creates a DateTime object from a string. If the string is null or empty a null object is returned
-	private function createDateFromString($stringDate) {
-		if ($stringDate == null || $stringDate == '')
-			return null;
-		return new DateTime($stringDate);
-	}
-
-	private function recordSetForCalculateDuration()
-	{
-		//walk in all rows with DEL_STARTED = 0 or DEL_FINISHED = 0
-		$c = new Criteria( 'workflow' );
-		$c->clearSelectColumns();
-		$c->addSelectColumn( AppDelegationPeer::APP_UID );
-		$c->addSelectColumn( AppDelegationPeer::DEL_INDEX );
-		$c->addSelectColumn( AppDelegationPeer::USR_UID);
-		$c->addSelectColumn( AppDelegationPeer::PRO_UID);
-		$c->addSelectColumn( AppDelegationPeer::TAS_UID);
-		$c->addSelectColumn( AppDelegationPeer::DEL_DELEGATE_DATE );
-		$c->addSelectColumn( AppDelegationPeer::DEL_INIT_DATE );
-		$c->addSelectColumn( AppDelegationPeer::DEL_TASK_DUE_DATE );
-		$c->addSelectColumn( AppDelegationPeer::DEL_FINISH_DATE );
-		$c->addSelectColumn( AppDelegationPeer::DEL_DURATION );
-		$c->addSelectColumn( AppDelegationPeer::DEL_QUEUE_DURATION );
-		$c->addSelectColumn( AppDelegationPeer::DEL_DELAY_DURATION );
-		$c->addSelectColumn( AppDelegationPeer::DEL_STARTED );
-		$c->addSelectColumn( AppDelegationPeer::DEL_FINISHED );
-		$c->addSelectColumn( AppDelegationPeer::DEL_DELAYED );
-		$c->addSelectColumn( TaskPeer::TAS_DURATION );
-		$c->addSelectColumn( TaskPeer::TAS_TIMEUNIT );
-		$c->addSelectColumn( TaskPeer::TAS_TYPE_DAY );
-
-		$c->addJoin( AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN );
-		$cton1 = $c->getNewCriterion( AppDelegationPeer::DEL_STARTED, 0 );
-		$cton2 = $c->getNewCriterion( AppDelegationPeer::DEL_FINISHED, 0 );
-		$cton1->addOR( $cton2 );
-		$c->add( $cton1 );
-		$rs = AppDelegationPeer::doSelectRS( $c );
-		$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-		return $rs;
-	}
-    private function writeFileIfCalledFromCronForCalculateDuration($cron)
-	{
-		if ($cron == 1) {
-			$arrayCron = unserialize( trim( @file_get_contents( PATH_DATA . "cron" ) ) );
-			$arrayCron["processcTimeStart"] = time();
-			@file_put_contents( PATH_DATA . "cron", serialize( $arrayCron ) );
-		}
-	}
-
-	private function patchDataWithValuesForCalculateDuration()
-	{
-		//patch  rows with initdate = null and finish_date
-		$c = new Criteria();
-		$c->clearSelectColumns();
-		$c->addSelectColumn( AppDelegationPeer::APP_UID );
-		$c->addSelectColumn( AppDelegationPeer::DEL_INDEX );
-		$c->addSelectColumn( AppDelegationPeer::DEL_DELEGATE_DATE );
-		$c->addSelectColumn( AppDelegationPeer::DEL_FINISH_DATE );
-		$c->add( AppDelegationPeer::DEL_INIT_DATE, null, Criteria::ISNULL );
-		$c->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNOTNULL );
-		//$c->add(AppDelegationPeer::DEL_INDEX, 1);
-
-
-		$rs = AppDelegationPeer::doSelectRS( $c );
-		$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-		$rs->next();
-		$row = $rs->getRow();
-
-		while (is_array( $row )) {
-			$oAppDel = AppDelegationPeer::retrieveByPk( $row['APP_UID'], $row['DEL_INDEX'] );
-			if (isset( $row['DEL_FINISH_DATE'] )) {
-				$oAppDel->setDelInitDate( $row['DEL_FINISH_DATE'] );
-			} else {
-				$oAppDel->setDelInitDate( $row['DEL_INIT_DATE'] );
-			}
-			$oAppDel->save();
-
-			$rs->next();
-			$row = $rs->getRow();
-		}
-	}
-
-
-
-    public function getLastDeleration ($APP_UID)
+    private function createDateFromString($stringDate)
     {
-        $c = new Criteria( 'workflow' );
-        $c->addSelectColumn( AppDelegationPeer::APP_UID );
-        $c->addSelectColumn( AppDelegationPeer::DEL_INDEX );
-        $c->addSelectColumn( AppDelegationPeer::DEL_DELEGATE_DATE );
-        $c->addSelectColumn( AppDelegationPeer::DEL_INIT_DATE );
-        $c->addSelectColumn( AppDelegationPeer::DEL_TASK_DUE_DATE );
-        $c->addSelectColumn( AppDelegationPeer::DEL_FINISH_DATE );
-        $c->addSelectColumn( AppDelegationPeer::DEL_DURATION );
-        $c->addSelectColumn( AppDelegationPeer::DEL_QUEUE_DURATION );
-        $c->addSelectColumn( AppDelegationPeer::DEL_DELAY_DURATION );
-        $c->addSelectColumn( AppDelegationPeer::DEL_STARTED );
-        $c->addSelectColumn( AppDelegationPeer::DEL_FINISHED );
-        $c->addSelectColumn( AppDelegationPeer::DEL_DELAYED );
-        $c->addSelectColumn( AppDelegationPeer::USR_UID );
+        if ($stringDate == null || $stringDate == '') {
+            return null;
+        }
+        return new DateTime($stringDate);
+    }
 
-        $c->add( AppDelegationPeer::APP_UID, $APP_UID );
-        $c->addDescendingOrderByColumn( AppDelegationPeer::DEL_INDEX );
-        $rs = AppDelegationPeer::doSelectRS( $c );
-        $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    private function recordSetForCalculateDuration()
+    {
+        //walk in all rows with DEL_STARTED = 0 or DEL_FINISHED = 0
+        $c = new Criteria('workflow');
+        $c->clearSelectColumns();
+        $c->addSelectColumn(AppDelegationPeer::APP_UID);
+        $c->addSelectColumn(AppDelegationPeer::DEL_INDEX);
+        $c->addSelectColumn(AppDelegationPeer::USR_UID);
+        $c->addSelectColumn(AppDelegationPeer::PRO_UID);
+        $c->addSelectColumn(AppDelegationPeer::TAS_UID);
+        $c->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE);
+        $c->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE);
+        $c->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE);
+        $c->addSelectColumn(AppDelegationPeer::DEL_FINISH_DATE);
+        $c->addSelectColumn(AppDelegationPeer::DEL_DURATION);
+        $c->addSelectColumn(AppDelegationPeer::DEL_QUEUE_DURATION);
+        $c->addSelectColumn(AppDelegationPeer::DEL_DELAY_DURATION);
+        $c->addSelectColumn(AppDelegationPeer::DEL_STARTED);
+        $c->addSelectColumn(AppDelegationPeer::DEL_FINISHED);
+        $c->addSelectColumn(AppDelegationPeer::DEL_DELAYED);
+        $c->addSelectColumn(TaskPeer::TAS_DURATION);
+        $c->addSelectColumn(TaskPeer::TAS_TIMEUNIT);
+        $c->addSelectColumn(TaskPeer::TAS_TYPE_DAY);
+
+        $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
+        $cton1 = $c->getNewCriterion(AppDelegationPeer::DEL_STARTED, 0);
+        $cton2 = $c->getNewCriterion(AppDelegationPeer::DEL_FINISHED, 0);
+        $cton1->addOR($cton2);
+        $c->add($cton1);
+        $rs = AppDelegationPeer::doSelectRS($c);
+        $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        return $rs;
+    }
+    private function writeFileIfCalledFromCronForCalculateDuration($cron)
+    {
+        if ($cron == 1) {
+            $arrayCron = unserialize(trim(@file_get_contents(PATH_DATA . "cron")));
+            $arrayCron["processcTimeStart"] = time();
+            @file_put_contents(PATH_DATA . "cron", serialize($arrayCron));
+        }
+    }
+
+    private function patchDataWithValuesForCalculateDuration()
+    {
+        //patch  rows with initdate = null and finish_date
+        $c = new Criteria();
+        $c->clearSelectColumns();
+        $c->addSelectColumn(AppDelegationPeer::APP_UID);
+        $c->addSelectColumn(AppDelegationPeer::DEL_INDEX);
+        $c->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE);
+        $c->addSelectColumn(AppDelegationPeer::DEL_FINISH_DATE);
+        $c->add(AppDelegationPeer::DEL_INIT_DATE, null, Criteria::ISNULL);
+        $c->add(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNOTNULL);
+        //$c->add(AppDelegationPeer::DEL_INDEX, 1);
+
+
+        $rs = AppDelegationPeer::doSelectRS($c);
+        $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $rs->next();
+        $row = $rs->getRow();
+
+        while (is_array($row)) {
+            $oAppDel = AppDelegationPeer::retrieveByPk($row['APP_UID'], $row['DEL_INDEX']);
+            if (isset($row['DEL_FINISH_DATE'])) {
+                $oAppDel->setDelInitDate($row['DEL_FINISH_DATE']);
+            } else {
+                $oAppDel->setDelInitDate($row['DEL_INIT_DATE']);
+            }
+            $oAppDel->save();
+
+            $rs->next();
+            $row = $rs->getRow();
+        }
+    }
+
+
+
+    public function getLastDeleration($APP_UID)
+    {
+        $c = new Criteria('workflow');
+        $c->addSelectColumn(AppDelegationPeer::APP_UID);
+        $c->addSelectColumn(AppDelegationPeer::DEL_INDEX);
+        $c->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE);
+        $c->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE);
+        $c->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE);
+        $c->addSelectColumn(AppDelegationPeer::DEL_FINISH_DATE);
+        $c->addSelectColumn(AppDelegationPeer::DEL_DURATION);
+        $c->addSelectColumn(AppDelegationPeer::DEL_QUEUE_DURATION);
+        $c->addSelectColumn(AppDelegationPeer::DEL_DELAY_DURATION);
+        $c->addSelectColumn(AppDelegationPeer::DEL_STARTED);
+        $c->addSelectColumn(AppDelegationPeer::DEL_FINISHED);
+        $c->addSelectColumn(AppDelegationPeer::DEL_DELAYED);
+        $c->addSelectColumn(AppDelegationPeer::USR_UID);
+
+        $c->add(AppDelegationPeer::APP_UID, $APP_UID);
+        $c->addDescendingOrderByColumn(AppDelegationPeer::DEL_INDEX);
+        $rs = AppDelegationPeer::doSelectRS($c);
+        $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $rs->next();
         return $rs->getRow();
     }
 
-    public function getCurrentIndex ($appUid)
+    public function getCurrentIndex($appUid)
     {
         $oCriteria = new Criteria();
-        $oCriteria->addSelectColumn( AppDelegationPeer::DEL_INDEX );
-        $oCriteria->add( AppDelegationPeer::APP_UID, $appUid );
-        $oCriteria->addDescendingOrderByColumn( AppDelegationPeer::DEL_INDEX );
-        $oRuleSet = AppDelegationPeer::doSelectRS( $oCriteria );
-        $oRuleSet->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oCriteria->addSelectColumn(AppDelegationPeer::DEL_INDEX);
+        $oCriteria->add(AppDelegationPeer::APP_UID, $appUid);
+        $oCriteria->addDescendingOrderByColumn(AppDelegationPeer::DEL_INDEX);
+        $oRuleSet = AppDelegationPeer::doSelectRS($oCriteria);
+        $oRuleSet->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oRuleSet->next();
         $data = $oRuleSet->getRow();
         return (int)$data['DEL_INDEX'];
     }
 
-    public function getCurrentTask ($appUid)
+    public function getCurrentTask($appUid)
     {
         $oCriteria = new Criteria();
-        $oCriteria->addSelectColumn( AppDelegationPeer::TAS_UID );
-        $oCriteria->add( AppDelegationPeer::APP_UID, $appUid );
-        $oCriteria->addDescendingOrderByColumn( AppDelegationPeer::DEL_INDEX );
-        $oRuleSet = AppDelegationPeer::doSelectRS( $oCriteria );
-        $oRuleSet->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oCriteria->addSelectColumn(AppDelegationPeer::TAS_UID);
+        $oCriteria->add(AppDelegationPeer::APP_UID, $appUid);
+        $oCriteria->addDescendingOrderByColumn(AppDelegationPeer::DEL_INDEX);
+        $oRuleSet = AppDelegationPeer::doSelectRS($oCriteria);
+        $oRuleSet->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oRuleSet->next();
         $data = $oRuleSet->getRow();
         return $data['TAS_UID'];
@@ -801,18 +807,16 @@ class AppDelegation extends BaseAppDelegation
     */
     public function getCurrentUsers($appUid, $index)
     {
-        $criteria = new Criteria();
-        $criteria->addSelectColumn( AppDelegationPeer::USR_UID );
-        $criteria->add( AppDelegationPeer::APP_UID, $appUid );
-        $criteria->add( AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' );
-        $criteria->add( AppDelegationPeer::DEL_INDEX, $index );
-        $dataResult = AppDelegationPeer::doSelectRS( $criteria );
-        $dataResult->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-        if($dataResult->next()) {
-            return $dataResult->getRow();
-        } else {
-            return [];
-        }
+        $oCriteria = new Criteria();
+        $oCriteria->addSelectColumn(AppDelegationPeer::USR_UID);
+        $oCriteria->add(AppDelegationPeer::APP_UID, $appUid);
+        $oCriteria->add(AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN');
+        $oCriteria->add(AppDelegationPeer::DEL_INDEX, $index);
+        $oRuleSet = AppDelegationPeer::doSelectRS($oCriteria);
+        $oRuleSet->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $oRuleSet->next();
+        $data = $oRuleSet->getRow();
+        return $data;
     }
 
     /**
@@ -822,7 +826,7 @@ class AppDelegation extends BaseAppDelegation
     * @return array $Fields the fields
     */
 
-    public function alreadyRouted ($appUid, $sDelIndex)
+    public function alreadyRouted($appUid, $sDelIndex)
     {
         $c = new Criteria("workflow");
         $c->clearSelectColumns();
@@ -832,7 +836,7 @@ class AppDelegation extends BaseAppDelegation
         $c->add(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNOTNULL);
         $result = AppDelegationPeer::doSelectRS($c);
         $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        if($result->next()) {
+        if ($result->next()) {
             return true;
         } else {
             return false;
@@ -858,7 +862,8 @@ class AppDelegation extends BaseAppDelegation
     * @param string $sAppUid
     * @return array $index
     */
-    public static function getAllTasksBeforeSecJoin($nextTaskUid, $sAppUid, $sDelPrevious, $threadStatus = ''){
+    public static function getAllTasksBeforeSecJoin($nextTaskUid, $sAppUid, $sDelPrevious, $threadStatus = '')
+    {
         $criteriaR = new Criteria('workflow');
         $criteriaR->addSelectColumn(AppDelegationPeer::DEL_INDEX);
         $criteriaR->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS);
@@ -874,7 +879,7 @@ class AppDelegation extends BaseAppDelegation
         $rsCriteriaR->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $index = array();
         $c = 0;
-        while($rsCriteriaR->next()){
+        while ($rsCriteriaR->next()) {
             $row = $rsCriteriaR->getRow();
             $index[$c++] = $row['DEL_INDEX'];
         }
@@ -889,13 +894,14 @@ class AppDelegation extends BaseAppDelegation
     * @param string $sUsrUid
     * @return boolean $res
     */
-    public static function createThread($index, $sAppUid, $sUsrUid = ''){
+    public static function createThread($index, $sAppUid, $sUsrUid = '')
+    {
         $criteriaDel = new Criteria("workflow");
         $criteriaDel->addSelectColumn(AppDelegationPeer::DEL_INDEX);
         $criteriaDel->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS);
         $criteriaDel->add(AppDelegationPeer::APP_UID, $sAppUid);
         $criteriaDel->add(AppDelegationPeer::DEL_PREVIOUS, $index, Criteria::IN);
-        if($sUsrUid !== ''){
+        if ($sUsrUid !== '') {
             $criteriaDel->add(AppDelegationPeer::USR_UID, $sUsrUid);
         }
         $criteriaDel = AppDelegationPeer::doSelectRS($criteriaDel);
@@ -911,7 +917,8 @@ class AppDelegation extends BaseAppDelegation
     * @param string $sAppUid
     * @return array $index
     */
-    public static function getAllTheardMultipleInstance($sPrevious, $sAppUid){
+    public static function getAllTheardMultipleInstance($sPrevious, $sAppUid)
+    {
         $criteriaR = new Criteria('workflow');
         $criteriaR->addSelectColumn(AppDelegationPeer::DEL_INDEX);
         $criteriaR->add(AppDelegationPeer::APP_UID, $sAppUid, Criteria::EQUAL);
@@ -920,7 +927,7 @@ class AppDelegation extends BaseAppDelegation
         $rsCriteriaR->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $index = array();
         $c = 0;
-        while($rsCriteriaR->next()){
+        while ($rsCriteriaR->next()) {
             $row = $rsCriteriaR->getRow();
             $index[$c++] = $row['DEL_INDEX'];
         }
diff --git a/workflow/engine/classes/model/Content.php b/workflow/engine/classes/model/Content.php
index 86180e6e8..5df9b2977 100644
--- a/workflow/engine/classes/model/Content.php
+++ b/workflow/engine/classes/model/Content.php
@@ -51,18 +51,18 @@ class Content extends BaseContent
      * @param string $sUID
      * @return variant
     */
-    public static function load ($ConCategory, $ConParent, $ConId, $ConLang)
+    public static function load($ConCategory, $ConParent, $ConId, $ConLang)
     {
-        $content = ContentPeer::retrieveByPK( $ConCategory, $ConParent, $ConId, $ConLang );
-        if (is_null( $content )) {
+        $content = ContentPeer::retrieveByPK($ConCategory, $ConParent, $ConId, $ConLang);
+        if (is_null($content)) {
             //we dont find any value for this field and language in CONTENT table;
-            $ConValue = Content::autoLoadSave( $ConCategory, $ConParent, $ConId, $ConLang );
+            $ConValue = Content::autoLoadSave($ConCategory, $ConParent, $ConId, $ConLang);
         } else {
             //krumo($content);
             $ConValue = $content->getConValue();
             if ($ConValue == "") {
                 //try to find a valid translation
-                $ConValue = Content::autoLoadSave( $ConCategory, $ConParent, $ConId, $ConLang );
+                $ConValue = Content::autoLoadSave($ConCategory, $ConParent, $ConId, $ConLang);
             }
         }
         return $ConValue;
@@ -76,27 +76,27 @@ class Content extends BaseContent
     * @return string
     *
     */
-    public static function getDefaultContentLang ($ConCategory, $ConParent, $ConId, $destConLang)
+    public static function getDefaultContentLang($ConCategory, $ConParent, $ConId, $destConLang)
     {
-        $Criteria = new Criteria( 'workflow' );
+        $Criteria = new Criteria('workflow');
         $Criteria->clearSelectColumns()->clearOrderByColumns();
 
-        $Criteria->addSelectColumn( ContentPeer::CON_CATEGORY );
-        $Criteria->addSelectColumn( ContentPeer::CON_PARENT );
-        $Criteria->addSelectColumn( ContentPeer::CON_ID );
-        $Criteria->addSelectColumn( ContentPeer::CON_LANG );
-        $Criteria->addSelectColumn( ContentPeer::CON_VALUE );
+        $Criteria->addSelectColumn(ContentPeer::CON_CATEGORY);
+        $Criteria->addSelectColumn(ContentPeer::CON_PARENT);
+        $Criteria->addSelectColumn(ContentPeer::CON_ID);
+        $Criteria->addSelectColumn(ContentPeer::CON_LANG);
+        $Criteria->addSelectColumn(ContentPeer::CON_VALUE);
 
-        $Criteria->add( ContentPeer::CON_CATEGORY, $ConCategory, CRITERIA::EQUAL );
-        $Criteria->add( ContentPeer::CON_PARENT, $ConParent, CRITERIA::EQUAL );
-        $Criteria->add( ContentPeer::CON_ID, $ConId, CRITERIA::EQUAL );
-        $Criteria->add( ContentPeer::CON_LANG, $destConLang, CRITERIA::NOT_EQUAL );
+        $Criteria->add(ContentPeer::CON_CATEGORY, $ConCategory, CRITERIA::EQUAL);
+        $Criteria->add(ContentPeer::CON_PARENT, $ConParent, CRITERIA::EQUAL);
+        $Criteria->add(ContentPeer::CON_ID, $ConId, CRITERIA::EQUAL);
+        $Criteria->add(ContentPeer::CON_LANG, $destConLang, CRITERIA::NOT_EQUAL);
 
-        $rs = ContentPeer::doSelectRS( $Criteria );
-        $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $rs = ContentPeer::doSelectRS($Criteria);
+        $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $rs->next();
 
-        if (is_array( $row = $rs->getRow() )) {
+        if (is_array($row = $rs->getRow())) {
             $defaultLang = $row['CON_LANG'];
         } else {
             $defaultLang = "";
@@ -113,7 +113,7 @@ class Content extends BaseContent
     * @return void
     *
     */
-    public static function updateEqualValue ($ConCategory, $ConParent, $ConId, $ConValue)
+    public static function updateEqualValue($ConCategory, $ConParent, $ConId, $ConValue)
     {
         $con = Propel::getConnection('workflow');
         $c1 = new Criteria('workflow');
@@ -136,18 +136,18 @@ class Content extends BaseContent
     * @return string
     * if the row doesn't exist, it will be created automatically, even the default 'en' language
     */
-    public static function autoLoadSave ($ConCategory, $ConParent, $ConId, $destConLang)
+    public static function autoLoadSave($ConCategory, $ConParent, $ConId, $destConLang)
     {
         //search in 'en' language, the default language
-        $content = ContentPeer::retrieveByPK( $ConCategory, $ConParent, $ConId, 'en' );
+        $content = ContentPeer::retrieveByPK($ConCategory, $ConParent, $ConId, 'en');
 
-        if ((is_null( $content )) || ($content->getConValue() == "")) {
-            $differentLang = Content::getDefaultContentLang( $ConCategory, $ConParent, $ConId, $destConLang );
-            $content = ContentPeer::retrieveByPK( $ConCategory, $ConParent, $ConId, $differentLang );
+        if ((is_null($content)) || ($content->getConValue() == "")) {
+            $differentLang = Content::getDefaultContentLang($ConCategory, $ConParent, $ConId, $destConLang);
+            $content = ContentPeer::retrieveByPK($ConCategory, $ConParent, $ConId, $differentLang);
         }
 
         //to do: review if the $destConLang is a valid language/
-        if (is_null( $content )) {
+        if (is_null($content)) {
             $ConValue = '';
             //we dont find any value for this field and language in CONTENT table
         } else {
@@ -155,15 +155,15 @@ class Content extends BaseContent
         }
 
         try {
-            $con = ContentPeer::retrieveByPK( $ConCategory, $ConParent, $ConId, $destConLang );
-            if (is_null( $con )) {
+            $con = ContentPeer::retrieveByPK($ConCategory, $ConParent, $ConId, $destConLang);
+            if (is_null($con)) {
                 $con = new Content();
             }
-            $con->setConCategory( $ConCategory );
-            $con->setConParent( $ConParent );
-            $con->setConId( $ConId );
-            $con->setConLang( $destConLang );
-            $con->setConValue( $ConValue );
+            $con->setConCategory($ConCategory);
+            $con->setConParent($ConParent);
+            $con->setConId($ConId);
+            $con->setConLang($destConLang);
+            $con->setConValue($ConValue);
             if ($con->validate()) {
                 $res = $con->save();
             }
@@ -183,32 +183,32 @@ class Content extends BaseContent
     * @param string $ConValue
     * @return variant
     */
-    public static function addContent ($ConCategory, $ConParent, $ConId, $ConLang, $ConValue)
+    public static function addContent($ConCategory, $ConParent, $ConId, $ConLang, $ConValue)
     {
         try {
             if ($ConLang != 'en') {
-                $baseLangContent = ContentPeer::retrieveByPk( $ConCategory, $ConParent, $ConId, 'en' );
+                $baseLangContent = ContentPeer::retrieveByPk($ConCategory, $ConParent, $ConId, 'en');
                 if ($baseLangContent === null) {
-                    Content::addContent( $ConCategory, $ConParent, $ConId, 'en', $ConValue );
+                    Content::addContent($ConCategory, $ConParent, $ConId, 'en', $ConValue);
                 }
             }
 
-            $con = ContentPeer::retrieveByPK( $ConCategory, $ConParent, $ConId, $ConLang );
+            $con = ContentPeer::retrieveByPK($ConCategory, $ConParent, $ConId, $ConLang);
 
-            if (is_null( $con )) {
+            if (is_null($con)) {
                 $con = new Content();
-                $con->setConCategory( $ConCategory );
+                $con->setConCategory($ConCategory);
                 if ($con->getConParent() != $ConParent) {
-                    $con->setConParent( $ConParent );
+                    $con->setConParent($ConParent);
                 }
-                $con->setConId( $ConId );
-                $con->setConLang( $ConLang );
-                $con->setConValue( $ConValue );
+                $con->setConId($ConId);
+                $con->setConLang($ConLang);
+                $con->setConValue($ConValue);
                 if ($con->validate()) {
                     $res = $con->save();
                     return $res;
                 } else {
-                    $e = new Exception( "Error in addcontent, the row $ConCategory, $ConParent, $ConId, $ConLang is not Valid" );
+                    $e = new Exception("Error in addcontent, the row $ConCategory, $ConParent, $ConId, $ConLang is not Valid");
                     throw ($e);
                 }
             } else {
@@ -216,7 +216,7 @@ class Content extends BaseContent
                     return true;
                 }
             }
-            Content::updateEqualValue( $ConCategory, $ConParent, $ConId, $ConValue );
+            Content::updateEqualValue($ConCategory, $ConParent, $ConId, $ConValue);
             return true;
         } catch (Exception $e) {
             throw ($e);
@@ -232,20 +232,20 @@ class Content extends BaseContent
     * @param string $ConValue
     * @return variant
     */
-    public function insertContent ($ConCategory, $ConParent, $ConId, $ConLang, $ConValue)
+    public function insertContent($ConCategory, $ConParent, $ConId, $ConLang, $ConValue)
     {
         try {
             $con = new Content();
-            $con->setConCategory( $ConCategory );
-            $con->setConParent( $ConParent );
-            $con->setConId( $ConId );
-            $con->setConLang( $ConLang );
-            $con->setConValue( $ConValue );
+            $con->setConCategory($ConCategory);
+            $con->setConParent($ConParent);
+            $con->setConId($ConId);
+            $con->setConLang($ConLang);
+            $con->setConValue($ConValue);
             if ($con->validate()) {
                 $res = $con->save();
                 return $res;
             } else {
-                $e = new Exception( "Error in addcontent, the row $ConCategory, $ConParent, $ConId, $ConLang is not Valid" );
+                $e = new Exception("Error in addcontent, the row $ConCategory, $ConParent, $ConId, $ConLang is not Valid");
                 throw ($e);
             }
         } catch (Exception $e) {
@@ -262,25 +262,24 @@ class Content extends BaseContent
     * @param string $ConValue
     * @return variant
     */
-    public static function removeContent ($ConCategory, $ConParent, $ConId)
+    public static function removeContent($ConCategory, $ConParent, $ConId)
     {
         try {
             $c = new Criteria();
-            $c->add( ContentPeer::CON_CATEGORY, $ConCategory );
-            $c->add( ContentPeer::CON_PARENT, $ConParent );
-            $c->add( ContentPeer::CON_ID, $ConId );
-            $result = ContentPeer::doSelectRS( $c );
+            $c->add(ContentPeer::CON_CATEGORY, $ConCategory);
+            $c->add(ContentPeer::CON_PARENT, $ConParent);
+            $c->add(ContentPeer::CON_ID, $ConId);
+            $result = ContentPeer::doSelectRS($c);
             $result->next();
             $row = $result->getRow();
-            while (is_array( $row )) {
-                ContentPeer::doDelete( array ($ConCategory,$ConParent,$ConId,$row[3]) );
+            while (is_array($row)) {
+                ContentPeer::doDelete(array($ConCategory,$ConParent,$ConId,$row[3]));
                 $result->next();
                 $row = $result->getRow();
             }
         } catch (Exception $e) {
             throw ($e);
         }
-
     }
 
     /*
@@ -293,11 +292,11 @@ class Content extends BaseContent
     * @param  string  $ConValue
     * @return boolean true or false
     */
-    public function Exists ($ConCategory, $ConParent, $ConId, $ConLang)
+    public function Exists($ConCategory, $ConParent, $ConId, $ConLang)
     {
         try {
-            $oPro = ContentPeer::retrieveByPk( $ConCategory, $ConParent, $ConId, $ConLang );
-            if (is_object( $oPro ) && get_class( $oPro ) == 'Content') {
+            $oPro = ContentPeer::retrieveByPk($ConCategory, $ConParent, $ConId, $ConLang);
+            if (is_object($oPro) && get_class($oPro) == 'Content') {
                 return true;
             } else {
                 return false;
@@ -318,14 +317,14 @@ class Content extends BaseContent
             $workSpace = config("system.workspace");
         }
         //Search the language
-        $key = array_search( 'en', $langs );
+        $key = array_search('en', $langs);
         if ($key === false) {
-            $key = array_search( SYS_LANG, $langs );
+            $key = array_search(SYS_LANG, $langs);
             if ($key === false) {
                 $key = '0';
             }
         }
-        $this->langsAsoc = array ();
+        $this->langsAsoc = [];
         foreach ($langs as $key => $value) {
             $this->langsAsoc[$value] = $value;
         }
@@ -337,26 +336,25 @@ class Content extends BaseContent
         $this->rowsClustered = 0;
 
         //Creating table CONTENT_BACKUP
-        $connection = Propel::getConnection( 'workflow' );
-        $oStatement = $connection->prepareStatement( "CREATE TABLE IF NOT EXISTS `CONTENT_BACKUP` (
+        $connection = Propel::getConnection('workflow');
+        $oStatement = $connection->prepareStatement("CREATE TABLE IF NOT EXISTS `CONTENT_BACKUP` (
             `CON_CATEGORY` VARCHAR(30) default '' NOT NULL,
             `CON_PARENT` VARCHAR(32) default '' NOT NULL,
             `CON_ID` VARCHAR(100) default '' NOT NULL,
             `CON_LANG` VARCHAR(10) default '' NOT NULL,
             `CON_VALUE` MEDIUMTEXT NOT NULL,
             CONSTRAINT CONTENT_BACKUP_PK PRIMARY KEY (CON_CATEGORY,CON_PARENT,CON_ID,CON_LANG)
-        )Engine=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Table for add content';" );
+        )Engine=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Table for add content';");
         $oStatement->executeQuery();
 
-        $sql = " SELECT DISTINCT CON_LANG
-                FROM CONTENT ";
+        $sql = ' SELECT DISTINCT CON_LANG FROM CONTENT ';
         $stmt = $connection->createStatement();
-        $rs = $stmt->executeQuery( $sql, ResultSet::FETCHMODE_ASSOC );
+        $rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
         while ($rs->next()) {
             $row = $rs->getRow();
             $language = $row['CON_LANG'];
-            if (array_search( $row['CON_LANG'], $langs ) === false) {
-                Content::removeLanguageContent( $row['CON_LANG'] );
+            if (array_search($row['CON_LANG'], $langs) === false) {
+                Content::removeLanguageContent($row['CON_LANG']);
             }
         }
 
@@ -364,126 +362,127 @@ class Content extends BaseContent
                 FROM CONTENT
                 ORDER BY CON_ID, CON_CATEGORY, CON_PARENT, CON_LANG";
 
-        $workSpace = new WorkspaceTools( $workSpace );
+        $workSpace = new WorkspaceTools($workSpace);
         $workSpace->getDBInfo();
 
-        $link = @mysql_pconnect( $workSpace->dbHost, $workSpace->dbUser, $workSpace->dbPass) or die( "Could not connect" );
+        $mysqli = new mysqli($workSpace->dbHost, $workSpace->dbUser, $workSpace->dbPass, $workSpace->dbName) or die("Could not connect");
 
-        mysql_select_db( $workSpace->dbName, $link );
-        mysql_query( "SET NAMES 'utf8';" );
-        mysql_query( "SET FOREIGN_KEY_CHECKS=0;" );
-        mysql_query( 'SET OPTION SQL_BIG_SELECTS=1' );
-        $result = mysql_unbuffered_query( $sql, $link );
-        $list = array ();
-        $default = array ();
-        $sw = array ('CON_ID' => '','CON_CATEGORY' => '','CON_PARENT' => ''
+        $mysqli->query( 'SET NAMES "utf8";');
+        $mysqli->query( 'SET FOREIGN_KEY_CHECKS=0;');
+        $mysqli->query( 'SET OPTION SQL_BIG_SELECTS=1');
+        $result = $mysqli->query( $sql, MYSQLI_USE_RESULT);
+        $list = [];
+        $default = [];
+        $sw = array('CON_ID' => '','CON_CATEGORY' => '','CON_PARENT' => ''
         );
-        while ($row = mysql_fetch_assoc( $result )) {
-            if ($sw['CON_ID'] == $row['CON_ID'] && $sw['CON_CATEGORY'] == $row['CON_CATEGORY'] && $sw['CON_PARENT'] == $row['CON_PARENT']) {
+        while ($row = $result->fetch_assoc()) {
+            if ($sw['CON_ID'] === $row['CON_ID'] && $sw['CON_CATEGORY'] === $row['CON_CATEGORY'] && $sw['CON_PARENT'] === $row['CON_PARENT']) {
                 $list[] = $row;
             } else {
                 $this->rowsClustered ++;
-                if (count( $langs ) != count( $list )) {
-                    $this->checkLanguage( $list, $default );
+                if (count($langs) !== count($list)) {
+                    $this->checkLanguage($list, $default);
                 } else {
-                    $this->rowsUnchanged = $this->rowsUnchanged + count( $langs );
+                    $this->rowsUnchanged += count($langs);
                 }
-                $sw = array ();
+                $sw = [];
                 $sw['CON_ID'] = $row['CON_ID'];
                 $sw['CON_CATEGORY'] = $row['CON_CATEGORY'];
                 $sw['CON_LANG'] = $row['CON_LANG'];
                 $sw['CON_PARENT'] = $row['CON_PARENT'];
-                unset( $list );
-                unset( $default );
-                $list = array ();
-                $default = array ();
+                unset($list);
+                unset($default);
+                $list = [];
+                $default = [];
                 $list[] = $row;
             }
-            if ($sw['CON_LANG'] == $langs[$key]) {
+            if ($sw['CON_LANG'] === $langs[$key]) {
                 $default = $row;
             }
             $this->rowsProcessed ++;
         }
-        if (count( $langs ) != count( $list )) {
-            $this->checkLanguage( $list, $default );
+        if (count($langs) !== count($list)) {
+            $this->checkLanguage($list, $default);
         } else {
-            $this->rowsUnchanged = $this->rowsUnchanged + count( $langs );
+            $this->rowsUnchanged += count($langs);
         }
-        mysql_free_result( $result );
+        mysqli_free_result($result);
         $total = $this->rowsProcessed + $this->rowsInserted;
 
-        $statement = $connection->prepareStatement( "REPLACE INTO CONTENT
+        $result->close();
+
+        $statement = $connection->prepareStatement("REPLACE INTO CONTENT
             SELECT CON_CATEGORY, CON_PARENT, CON_ID , CON_LANG, CON_VALUE
-            FROM CONTENT_BACKUP" );
+            FROM CONTENT_BACKUP");
         $statement->executeQuery();
 
-        $statement = $connection->prepareStatement( "DROP TABLE CONTENT_BACKUP" );
+        $statement = $connection->prepareStatement("DROP TABLE CONTENT_BACKUP");
         $statement->executeQuery();
 
         //close connection
         $sql = "SELECT * FROM information_schema.processlist WHERE command = 'Sleep' and user = SUBSTRING_INDEX(USER(),'@',1) and db = DATABASE() ORDER BY id;";
         $stmt = $connection->createStatement();
-        $rs = $stmt->executeQuery( $sql, ResultSet::FETCHMODE_ASSOC );
+        $rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC);
         while ($rs->next()) {
             $row = $rs->getRow();
-            $oStatement = $connection->prepareStatement( "kill ". $row['ID'] );
+            $oStatement = $connection->prepareStatement("kill ". $row['ID']);
             $oStatement->executeQuery();
         }
 
-        if (! isset( $_SERVER['SERVER_NAME'] )) {
-            CLI::logging( "Rows Processed ---> $this->rowsProcessed ..... \n" );
-            CLI::logging( "Rows Clustered ---> $this->rowsClustered ..... \n" );
-            CLI::logging( "Rows Unchanged ---> $this->rowsUnchanged ..... \n" );
-            CLI::logging( "Rows Inserted  ---> $this->rowsInserted ..... \n" );
-            CLI::logging( "Rows Total     ---> $total ..... \n" );
+        if (! isset($_SERVER['SERVER_NAME'])) {
+            CLI::logging("Rows Processed ---> $this->rowsProcessed ..... \n");
+            CLI::logging("Rows Clustered ---> $this->rowsClustered ..... \n");
+            CLI::logging("Rows Unchanged ---> $this->rowsUnchanged ..... \n");
+            CLI::logging("Rows Inserted  ---> $this->rowsInserted ..... \n");
+            CLI::logging("Rows Total     ---> $total ..... \n");
         }
     }
 
-    public function checkLanguage ($content, $default)
+    public function checkLanguage($content, $default)
     {
-        if (count( $content ) > 0) {
+        if (count($content) > 0) {
             $langs = $this->langs;
             $langsAsoc = $this->langsAsoc;
             //Element default
-            $default = (count( $default ) > 0) ? $default : $content[0];
+            $default = (count($default) > 0) ? $default : $content[0];
             foreach ($content as $key => $value) {
-                unset( $langsAsoc[$value['CON_LANG']] );
+                unset($langsAsoc[$value['CON_LANG']]);
             }
             foreach ($langsAsoc as $key => $value) {
                 $this->rowsInserted ++;
-                $this->fastInsertContent( $default['CON_CATEGORY'], $default['CON_PARENT'], $default['CON_ID'], $value, $default['CON_VALUE'] );
+                $this->fastInsertContent($default['CON_CATEGORY'], $default['CON_PARENT'], $default['CON_ID'], $value, $default['CON_VALUE']);
             }
         }
     }
 
-    public function fastInsertContent ($ConCategory, $ConParent, $ConId, $ConLang, $ConValue)
+    public function fastInsertContent($ConCategory, $ConParent, $ConId, $ConLang, $ConValue)
     {
-        $ConValue = mysql_real_escape_string( $ConValue );
-        $connection = Propel::getConnection( 'workflow' );
-        $statement = $connection->prepareStatement( "INSERT INTO CONTENT_BACKUP (
+        $connection = Propel::getConnection('workflow');
+        $ConValue = mysqli_real_escape_string($connection, $ConValue);
+        $statement = $connection->prepareStatement("INSERT INTO CONTENT_BACKUP (
         CON_CATEGORY, CON_PARENT, CON_ID , CON_LANG, CON_VALUE)
-        VALUES ('$ConCategory', '$ConParent', '$ConId', '$ConLang', '$ConValue');" );
+        VALUES ('$ConCategory', '$ConParent', '$ConId', '$ConLang', '$ConValue');");
         $statement->executeQuery();
     }
 
-    public function removeLanguageContent ($lanId)
+    public function removeLanguageContent($lanId)
     {
         try {
             $c = new Criteria();
-            $c->addSelectColumn( ContentPeer::CON_CATEGORY );
-            $c->addSelectColumn( ContentPeer::CON_PARENT );
-            $c->addSelectColumn( ContentPeer::CON_ID );
-            $c->addSelectColumn( ContentPeer::CON_LANG );
+            $c->addSelectColumn(ContentPeer::CON_CATEGORY);
+            $c->addSelectColumn(ContentPeer::CON_PARENT);
+            $c->addSelectColumn(ContentPeer::CON_ID);
+            $c->addSelectColumn(ContentPeer::CON_LANG);
 
-            $c->add( ContentPeer::CON_LANG, $lanId );
+            $c->add(ContentPeer::CON_LANG, $lanId);
 
-            $result = ContentPeer::doSelectRS( $c );
-            $result->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $result = ContentPeer::doSelectRS($c);
+            $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $result->next();
             $row = $result->getRow();
 
-            while (is_array( $row )) {
-                $content = ContentPeer::retrieveByPK( $row['CON_CATEGORY'], $row['CON_PARENT'], $row['CON_ID'], $lanId );
+            while (is_array($row)) {
+                $content = ContentPeer::retrieveByPK($row['CON_CATEGORY'], $row['CON_PARENT'], $row['CON_ID'], $lanId);
 
                 if ($content !== null) {
                     $content->delete();
@@ -491,29 +490,32 @@ class Content extends BaseContent
                 $result->next();
                 $row = $result->getRow();
             }
-
         } catch (Exception $e) {
             throw ($e);
         }
     }
 
-    //Added by Enrique at Feb 9th,2011
-    //Gets all Role Names by Role
-    public function getAllContentsByRole ($sys_lang = SYS_LANG)
+    /**
+     * Gets all Role Names by Role
+     *
+     * @param string $sys_lang  language
+     *
+     * @return array
+     */
+    public function getAllContentsByRole($sys_lang = SYS_LANG)
     {
-        if (! isset( $sys_lang )) {
+        if (! isset($sys_lang)) {
             $sys_lang = 'en';
         }
-        $oCriteria = new Criteria( 'workflow' );
+        $oCriteria = new Criteria('workflow');
         $oCriteria->clearSelectColumns();
-        $oCriteria->addSelectColumn( ContentPeer::CON_ID );
-        $oCriteria->addAsColumn( 'ROL_NAME', ContentPeer::CON_VALUE );
-        //$oCriteria->addAsColumn('ROL_UID', ContentPeer::CON_ID);
-        $oCriteria->add( ContentPeer::CON_CATEGORY, 'ROL_NAME' );
-        $oCriteria->add( ContentPeer::CON_LANG, $sys_lang );
-        $oDataset = ContentPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-        $aRoles = Array ();
+        $oCriteria->addSelectColumn(ContentPeer::CON_ID);
+        $oCriteria->addAsColumn('ROL_NAME', ContentPeer::CON_VALUE);
+        $oCriteria->add(ContentPeer::CON_CATEGORY, 'ROL_NAME');
+        $oCriteria->add(ContentPeer::CON_LANG, $sys_lang);
+        $oDataset = ContentPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $aRoles = [];
         while ($oDataset->next()) {
             $xRow = $oDataset->getRow();
             $aRoles[$xRow['CON_ID']] = $xRow['ROL_NAME'];
@@ -521,4 +523,3 @@ class Content extends BaseContent
         return $aRoles;
     }
 }
-
diff --git a/workflow/engine/classes/model/DashboardIndicator.php b/workflow/engine/classes/model/DashboardIndicator.php
index d98d735fa..4a9367b70 100644
--- a/workflow/engine/classes/model/DashboardIndicator.php
+++ b/workflow/engine/classes/model/DashboardIndicator.php
@@ -6,7 +6,7 @@ require_once 'classes/model/om/BaseDashboardIndicator.php';
 /**
  * Skeleton subclass for representing a row from the 'DASHBOARD_INDICATOR' table.
  *
- * 
+ *
  *
  * You should add additional methods to this class to meet the
  * application requirements.  This class will only be generated as
@@ -16,68 +16,75 @@ require_once 'classes/model/om/BaseDashboardIndicator.php';
  */
 class DashboardIndicator extends BaseDashboardIndicator
 {
-    public function load ($dasIndUid)
+    public function load($dasIndUid)
     {
         try {
             $dashboardIndicator = DashboardIndicatorPeer::retrieveByPK($dasIndUid);
             $fields = $dashboardIndicator->toArray(BasePeer::TYPE_FIELDNAME);
-            $dashboardIndicator->fromArray( $fields, BasePeer::TYPE_FIELDNAME );
+            $dashboardIndicator->fromArray($fields, BasePeer::TYPE_FIELDNAME);
             return $fields;
         } catch (Exception $error) {
             throw $error;
         }
     }
- function loadbyDasUid ($dasUid, $vcompareDate, $vmeasureDate, $userUid)
-	{
+
+    public function loadbyDasUid($dasUid, $vcompareDate, $vmeasureDate, $userUid)
+    {
         $calculator = new \IndicatorsCalculator();
 
         try {
+            $connection = Propel::getConnection('workflow');
+            $qryString = "select * from CONFIGURATION where CFG_UID = 'DASHBOARDS_SETTINGS' and USR_UID = '$userUid'";
+            $qry = $connection->PrepareStatement($qryString);
+            $dataSet = $qry->executeQuery();
+            $dashConfig = array();
+            while ($dataSet->next()) {
+                $row = $dataSet->getRow();
+                $dashConfig = unserialize($row['CFG_VALUE']);
+            }
 
-		$connection = Propel::getConnection('workflow');
-		$qryString = "select * from CONFIGURATION where CFG_UID = 'DASHBOARDS_SETTINGS' and USR_UID = '$userUid'";
-		$qry = $connection->PrepareStatement($qryString);
-		$dataSet = $qry->executeQuery();	
-		$dashConfig = array();
-		while ($dataSet->next()){
-			$row =  $dataSet->getRow();
-			$dashConfig = unserialize($row['CFG_VALUE']);
-		}
-
-            $criteria = new Criteria( 'workflow' );
+            $criteria = new Criteria('workflow');
             $criteria->clearSelectColumns()->clearOrderByColumns();
 
-            $criteria->add( DashboardIndicatorPeer::DAS_UID, $dasUid, criteria::EQUAL );
+            $criteria->add(DashboardIndicatorPeer::DAS_UID, $dasUid, criteria::EQUAL);
 
-            $rs = DashboardIndicatorPeer::doSelectRS( $criteria );
-            $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $rs = DashboardIndicatorPeer::doSelectRS($criteria);
+            $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $dashboardIndicator = array();
 
             while ($rs->next()) {
                 $row = $rs->getRow();
 
-				//$currentDate = new DateTime (date("Y-m-d"));
-				$measureDate  = new DateTime ($vmeasureDate);
-				$compareDate  = new DateTime ($vcompareDate);
-				$uid = ($row['DAS_UID_PROCESS'] == '0' ? null: $row['DAS_UID_PROCESS']) ;
-				switch ($row['DAS_IND_TYPE']) {
-					case '1010':
-						$value = current(reset($calculator->peiHistoric($uid, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
-						$oldValue = current(reset($calculator->peiHistoric($uid, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE)));
-						$row['DAS_IND_VARIATION'] = $value - $oldValue;
-						$row['DAS_IND_OLD_VALUE'] = $oldValue;
-						$row['DAS_IND_PERCENT_VARIATION'] =  $oldValue != 0
-															? round(($value - $oldValue) * 100 / $oldValue)
-															: "--";
-						break;
-					case '1030':
-						$value = current(reset($calculator->ueiHistoric(null, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
-						$oldValue = current(reset($calculator->ueiHistoric($uid, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE)));
-						$row['DAS_IND_VARIATION'] = $value - $oldValue;
-						$row['DAS_IND_OLD_VALUE'] = $oldValue;
-						$row['DAS_IND_PERCENT_VARIATION'] =  $oldValue != 0
-															? round(($value - $oldValue) * 100 / $oldValue)
-															: "--";
-						break;
+                $measureDate = new DateTime($vmeasureDate);
+                $compareDate = new DateTime($vcompareDate);
+                $uid = ($row['DAS_UID_PROCESS'] == '0' ? null : $row['DAS_UID_PROCESS']);
+                switch ($row['DAS_IND_TYPE']) {
+                    case '1010':
+                        $value = $calculator->peiHistoric($uid, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE);
+                        $value = reset($value);
+                        $value = current($value);
+                        $oldValue = $calculator->peiHistoric($uid, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE);
+                        $oldValue = reset($oldValue);
+                        $oldValue = current($oldValue);
+                        $row['DAS_IND_VARIATION'] = $value - $oldValue;
+                        $row['DAS_IND_OLD_VALUE'] = $oldValue;
+                        $row['DAS_IND_PERCENT_VARIATION'] = $oldValue != 0
+                            ? round(($value - $oldValue) * 100 / $oldValue)
+                            : "--";
+                        break;
+                    case '1030':
+                        $value = $calculator->ueiHistoric(null, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE);
+                        $value = reset($value);
+                        $value = current($value);
+                        $oldValue = $calculator->ueiHistoric($uid, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE);
+                        $oldValue = reset($oldValue);
+                        $oldValue = current($oldValue);
+                        $row['DAS_IND_VARIATION'] = $value - $oldValue;
+                        $row['DAS_IND_OLD_VALUE'] = $oldValue;
+                        $row['DAS_IND_PERCENT_VARIATION'] = $oldValue != 0
+                            ? round(($value - $oldValue) * 100 / $oldValue)
+                            : "--";
+                        break;
                     case '1050':
                         $value = $calculator->statusIndicatorGeneral($userUid);
                         $row['OVERDUE'] = 0;
@@ -94,41 +101,41 @@ class DashboardIndicator extends BaseDashboardIndicator
 
                             $total = $row['OVERDUE'] + $row['AT_RISK'] + $row['ON_TIME'];
                             if ($total != 0) {
-                                $row['PERCENTAGE_OVERDUE'] = ($row['OVERDUE']*100)/$total;
-                                $row['PERCENTAGE_AT_RISK']  = ($row['AT_RISK']*100)/$total;
-                                $row['PERCENTAGE_ON_TIME']  = ($row['ON_TIME']*100)/$total;
+                                $row['PERCENTAGE_OVERDUE'] = ($row['OVERDUE'] * 100) / $total;
+                                $row['PERCENTAGE_AT_RISK'] = ($row['AT_RISK'] * 100) / $total;
+                                $row['PERCENTAGE_ON_TIME'] = ($row['ON_TIME'] * 100) / $total;
                             }
                         }
                         break;
-					default:
-						$arrResult = $calculator->generalIndicatorData($row['DAS_IND_UID'], $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE);
-						$value = $arrResult[0]['value'];
-						$row['DAS_IND_VARIATION'] = $row['DAS_IND_GOAL'];						
-						break;
-				}
-				$row['DAS_IND_VALUE'] = $value;
+                    default:
+                        $arrResult = $calculator->generalIndicatorData($row['DAS_IND_UID'], $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE);
+                        $value = $arrResult[0]['value'];
+                        $row['DAS_IND_VARIATION'] = $row['DAS_IND_GOAL'];
+                        break;
+                }
+                $row['DAS_IND_VALUE'] = $value;
 
-				$indId = $row['DAS_IND_UID'];
-				$row['DAS_IND_X'] = 0;
-				$row['DAS_IND_Y'] = 0;
-				$row['DAS_IND_WIDTH'] = 0;
-				$row['DAS_IND_HEIGHT'] = 0;
-				$row['DAS_IND_FAVORITE'] = 0;
-				
-				foreach ($dashConfig as $dashId=>$oneDash) {
-					if($dashId == $dasUid && is_array($oneDash['dashData'])) {
-						foreach($oneDash['dashData'] as $graphConfig) {
-							if ($graphConfig['indicatorId'] == $indId) {
-								$row['DAS_IND_X'] = $graphConfig['x'];
-								$row['DAS_IND_Y'] = $graphConfig['y'];
-								$row['DAS_IND_WIDTH'] = $graphConfig['width'];
-								$row['DAS_IND_HEIGHT'] = $graphConfig['height'];
-							}
-						}
-					}
-				}
+                $indId = $row['DAS_IND_UID'];
+                $row['DAS_IND_X'] = 0;
+                $row['DAS_IND_Y'] = 0;
+                $row['DAS_IND_WIDTH'] = 0;
+                $row['DAS_IND_HEIGHT'] = 0;
+                $row['DAS_IND_FAVORITE'] = 0;
 
-				$dashboardIndicator[] = $row;
+                foreach ($dashConfig as $dashId => $oneDash) {
+                    if ($dashId == $dasUid && is_array($oneDash['dashData'])) {
+                        foreach ($oneDash['dashData'] as $graphConfig) {
+                            if ($graphConfig['indicatorId'] == $indId) {
+                                $row['DAS_IND_X'] = $graphConfig['x'];
+                                $row['DAS_IND_Y'] = $graphConfig['y'];
+                                $row['DAS_IND_WIDTH'] = $graphConfig['width'];
+                                $row['DAS_IND_HEIGHT'] = $graphConfig['height'];
+                            }
+                        }
+                    }
+                }
+
+                $dashboardIndicator[] = $row;
             }
             return $dashboardIndicator;
         } catch (Exception $error) {
@@ -137,7 +144,6 @@ class DashboardIndicator extends BaseDashboardIndicator
     }
 
 
-
     public function createOrUpdate($data)
     {
         $connection = Propel::getConnection(DashboardIndicatorPeer::DATABASE_NAME);
@@ -158,10 +164,10 @@ class DashboardIndicator extends BaseDashboardIndicator
                 $result = $dashboardIndicator->save();
                 $connection->commit();
 
-                if ((!isset($_SESSION['USER_LOGGED']) || $_SESSION['USER_LOGGED'] == '') && isset($data['USR_UID']) &&  $data['USR_UID'] != '') {
+                if ((!isset($_SESSION['USER_LOGGED']) || $_SESSION['USER_LOGGED'] == '') && isset($data['USR_UID']) && $data['USR_UID'] != '') {
                     $this->setUser($data['USR_UID']);
                 }
-                G::auditLog($msg, "Dashboard Indicator Name: ".$dashboardIndicator->getDasIndTitle()." Dashboard indicator ID: (".$dashboardIndicator->getDasIndUid() .") ");
+                G::auditLog($msg, "Dashboard Indicator Name: " . $dashboardIndicator->getDasIndTitle() . " Dashboard indicator ID: (" . $dashboardIndicator->getDasIndUid() . ") ");
                 return $dashboardIndicator->getDasIndUid();
             } else {
                 $message = '';
@@ -177,7 +183,7 @@ class DashboardIndicator extends BaseDashboardIndicator
         }
     }
 
-    public function remove($dasIndUid, $userLogged ='')
+    public function remove($dasIndUid, $userLogged = '')
     {
         $connection = Propel::getConnection(DashboardIndicatorPeer::DATABASE_NAME);
         try {
@@ -191,10 +197,10 @@ class DashboardIndicator extends BaseDashboardIndicator
                 if ((!isset($_SESSION['USER_LOGGED']) || $_SESSION['USER_LOGGED'] == '') && $userLogged != '') {
                     $this->setUser($userLogged);
                 }
-                G::auditLog("Delete", "Dashboard Indicator Name: ". $dashboardIndicatorData['DAS_IND_TITLE']." Dashboard Instance ID: (".$dasIndUid.") ");
+                G::auditLog("Delete", "Dashboard Indicator Name: " . $dashboardIndicatorData['DAS_IND_TITLE'] . " Dashboard Instance ID: (" . $dasIndUid . ") ");
                 return $result;
             } else {
-                throw new Exception('Error trying to delete: The row "' .  $dasIndUid. '" does not exist.');
+                throw new Exception('Error trying to delete: The row "' . $dasIndUid . '" does not exist.');
             }
         } catch (Exception $error) {
             $connection->rollback();
@@ -202,11 +208,11 @@ class DashboardIndicator extends BaseDashboardIndicator
         }
     }
 
-    public function setUser($usrId) {
-        $user = new Users ();
+    public function setUser($usrId)
+    {
+        $user = new Users();
         $user = $user->loadDetails($usrId);
         $_SESSION['USER_LOGGED'] = $user['USR_UID'];
         $_SESSION['USR_FULLNAME'] = $user['USR_FULLNAME'];
     }
 }
-
diff --git a/workflow/engine/classes/model/OutputDocument.php b/workflow/engine/classes/model/OutputDocument.php
index b30a14c60..2b3283ae8 100644
--- a/workflow/engine/classes/model/OutputDocument.php
+++ b/workflow/engine/classes/model/OutputDocument.php
@@ -1,1196 +1,1202 @@
-<?php
-
-/**
- * OutputDocument.php
- * @package    workflow.engine.classes.model
- *
- * 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.
- *
- * 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.
- *
- */
-//require_once ("classes/model/om/BaseOutputDocument.php");
-//require_once ("classes/model/Content.php");
-
-/**
- * Skeleton subclass for representing a row from the 'OUTPUT_DOCUMENT' table.
- *
- *
- *
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    workflow.engine.classes.model
- */
-class OutputDocument extends BaseOutputDocument
-{
-
-    public function __construct()
-    {
-        $javaInput = PATH_C . 'javaBridgePM' . PATH_SEP . 'input' . PATH_SEP;
-        $javaOutput = PATH_C . 'javaBridgePM' . PATH_SEP . 'output' . PATH_SEP;
-
-        G::mk_dir($javaInput);
-        G::mk_dir($javaOutput);
-    }
-
-    public function getByUid($sOutDocUid)
-    {
-        try {
-            $oOutputDocument = OutputDocumentPeer::retrieveByPK($sOutDocUid);
-
-            if (is_null($oOutputDocument)) {
-                return false;
-            }
-
-            $aFields = $oOutputDocument->toArray(BasePeer::TYPE_FIELDNAME);
-            $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
-
-            return $aFields;
-        } catch (Exception $oError) {
-            throw ($oError);
-        }
-    }
-
-    /*
-     * Load the application document registry
-     * @param string $sAppDocUid
-     * @return variant
-     */
-
-    public function load($sOutDocUid)
-    {
-        try {
-            $oOutputDocument = OutputDocumentPeer::retrieveByPK($sOutDocUid);
-
-            if (!is_null($oOutputDocument)) {
-                $aFields = $oOutputDocument->toArray(BasePeer::TYPE_FIELDNAME);
-                $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
-
-                return $aFields;
-            } else {
-                throw(new Exception('This row doesn\'t exist!'));
-            }
-        } catch (Exception $oError) {
-            throw ($oError);
-        }
-    }
-
-    /**
-     * Create the application document registry
-     * @param array $aData
-     * @return string
-     * */
-    public function create($aData)
-    {
-        $oConnection = Propel::getConnection(OutputDocumentPeer::DATABASE_NAME);
-
-        try {
-            if (isset($aData['OUT_DOC_UID']) && $aData['OUT_DOC_UID'] == '') {
-                unset($aData['OUT_DOC_UID']);
-            }
-
-            if (!isset($aData['OUT_DOC_UID'])) {
-                $aData['OUT_DOC_UID'] = G::generateUniqueID();
-            }
-
-            if (!isset($aData['OUT_DOC_GENERATE'])) {
-                $aData['OUT_DOC_GENERATE'] = 'BOTH';
-            } else {
-                if ($aData['OUT_DOC_GENERATE'] == '') {
-                    $aData['OUT_DOC_GENERATE'] = 'BOTH';
-                }
-            }
-
-            $oOutputDocument = new OutputDocument();
-            $oOutputDocument->fromArray($aData, BasePeer::TYPE_FIELDNAME);
-
-            if ($oOutputDocument->validate()) {
-                $oConnection->begin();
-
-                if (isset($aData['OUT_DOC_TITLE'])) {
-                    $oOutputDocument->setOutDocTitleContent($aData['OUT_DOC_TITLE']);
-                }
-
-                if (isset($aData['OUT_DOC_DESCRIPTION'])) {
-                    $oOutputDocument->setOutDocDescriptionContent($aData['OUT_DOC_DESCRIPTION']);
-                }
-
-                $oOutputDocument->setOutDocFilenameContent($aData['OUT_DOC_FILENAME']);
-
-                if (isset($aData['OUT_DOC_TEMPLATE'])) {
-                    $oOutputDocument->setOutDocTemplateContent($aData['OUT_DOC_TEMPLATE']);
-                }
-
-                $iResult = $oOutputDocument->save();
-                $oConnection->commit();
-                //Add Audit Log
-                $description = "Output Document Name: ".$aData['OUT_DOC_TITLE'].", Output Document Uid: ".$aData['OUT_DOC_UID'].", Filename generated: ".$aData['OUT_DOC_FILENAME'];
-                if(!empty($aData['OUT_DOC_DESCRIPTION'])){
-                  $description .= ", Description: ".$aData['OUT_DOC_DESCRIPTION'];
-                }
-                if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){
-                    $description .= ", Report Generator: ". $aData['OUT_DOC_REPORT_GENERATOR'];
-                }
-                if(!empty($aData['OUT_DOC_GENERATE'])){
-                    $description .= ", Output Document to Generate: ".$aData['OUT_DOC_GENERATE'];
-                }
-                if($aData['OUT_DOC_PDF_SECURITY_ENABLED']==0){
-                  $pdfSecurity = 'Disabled';
-                }else{
-                  $pdfSecurity = 'Enabled';
-                }
-                $description .= ", PDF Security: ".$pdfSecurity;
-                if(!empty($aData['OUT_DOC_VERSIONING'])){
-                  $description .= ", Enable Versioning: Yes";
-                }
-                if(!empty($aData['OUT_DOC_DESTINATION_PATH'])){
-                  $description .= ", Destination Path: ".$aData['OUT_DOC_DESTINATION_PATH'];
-                }
-                if(!empty($aData['OUT_DOC_TAGS'])){
-                  $description .= ", Tags: ".$aData['OUT_DOC_TAGS'];
-                }
-                if(!empty($aData['OUT_DOC_OPEN_TYPE'])){
-                    if($aData['OUT_DOC_OPEN_TYPE']==0){
-                        $genLink = 'Open the file';
-                    }else{
-                        $genLink = 'Download the file';
-                    }
-                    $description .= ", By clicking on the generated file link: ".$genLink;
-                }
-                G::auditLog("CreateOutputDocument", $description);
-
-                return $aData['OUT_DOC_UID'];
-            } else {
-                $sMessage = '';
-                $aValidationFailures = $oOutputDocument->getValidationFailures();
-
-                foreach ($aValidationFailures as $oValidationFailure) {
-                    $sMessage .= $oValidationFailure->getMessage() . '<br />';
-                }
-
-                throw (new Exception('The registry cannot be created!<br />' . $sMessage));
-            }
-        } catch (Exception $oError) {
-            $oConnection->rollback();
-
-            throw ($oError);
-        }
-    }
-
-    /**
-     * Update the application document registry
-     * @param array $aData
-     * @return string
-     * */
-    public function update($aData)
-    {
-        $oConnection = Propel::getConnection(OutputDocumentPeer::DATABASE_NAME);
-
-        try {
-            $oOutputDocument = OutputDocumentPeer::retrieveByPK($aData['OUT_DOC_UID']);
-
-            if (!is_null($oOutputDocument)) {
-                $oOutputDocument->fromArray($aData, BasePeer::TYPE_FIELDNAME);
-
-                if ($oOutputDocument->validate()) {
-                    $oConnection->begin();
-
-                    if (isset($aData['OUT_DOC_TITLE'])) {
-                        $oOutputDocument->setOutDocTitleContent($aData['OUT_DOC_TITLE']);
-                    }
-
-                    if (isset($aData['OUT_DOC_DESCRIPTION'])) {
-                        $oOutputDocument->setOutDocDescriptionContent($aData['OUT_DOC_DESCRIPTION']);
-                    }
-
-                    if (isset($aData['OUT_DOC_FILENAME'])) {
-                        $oOutputDocument->setOutDocFilenameContent($aData['OUT_DOC_FILENAME']);
-                    }
-
-                    if (isset($aData['OUT_DOC_TEMPLATE'])) {
-                        $oOutputDocument->setOutDocTemplateContent($aData['OUT_DOC_TEMPLATE']);
-                    }
-
-                    $iResult = $oOutputDocument->save();
-                    $oConnection->commit();
-                    //Add Audit Log
-                    $description = 'Output Document Uid: ' . $aData['OUT_DOC_UID'];
-
-                    if (array_key_exists('OUT_DOC_TITLE', $aData) && (string)($aData['OUT_DOC_TITLE']) != '') {
-                        $description .= ', Output Document Name: ' . $aData['OUT_DOC_TITLE'];
-                    }
-
-                    if (array_key_exists('OUT_DOC_FILENAME', $aData) && (string)($aData['OUT_DOC_FILENAME']) != '') {
-                        $description .= ', Filename generated: ' . $aData['OUT_DOC_FILENAME'];
-                    }
-
-                    if(!empty($aData['OUT_DOC_DESCRIPTION'])){
-                      $description .= ", Description: ".$aData['OUT_DOC_DESCRIPTION'];
-                    }
-                    if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){
-                        $description .= ", Report Generator: ". $aData['OUT_DOC_REPORT_GENERATOR'];
-                    }
-                    if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){
-                        $description .= ", Output Document to Generate: ".$aData['OUT_DOC_GENERATE'];
-                    }
-
-                    if (array_key_exists('OUT_DOC_PDF_SECURITY_ENABLED', $aData) && (string)($aData['OUT_DOC_PDF_SECURITY_ENABLED']) != '') {
-                        $description .= ', PDF Security: ' . (((int)($aData['OUT_DOC_PDF_SECURITY_ENABLED']) != 0)? 'Enabled' : 'Disabled');
-                    }
-
-                    if(!empty($aData['OUT_DOC_VERSIONING'])){
-                      $description .= ", Enable Versioning: Yes";
-                    }
-                    if(!empty($aData['OUT_DOC_DESTINATION_PATH'])){
-                      $description .= ", Destination Path: ".$aData['OUT_DOC_DESTINATION_PATH'];
-                    }
-                    if(!empty($aData['OUT_DOC_TAGS'])){
-                      $description .= ", Tags: ".$aData['OUT_DOC_TAGS'];
-                    }
-                    if(!empty($aData['OUT_DOC_OPEN_TYPE'])){
-                       if($aData['OUT_DOC_OPEN_TYPE']==0){
-                          $genLink = 'Open the file';
-                       }else{
-                          $genLink = 'Download the file';
-                       }
-                       $description .= ", By clicking on the generated file link: ".$genLink;
-                    }
-                    if (isset($aData['OUT_DOC_TEMPLATE'])) {
-                        $description .= ", [EDIT TEMPLATE]";
-                    }
-                    G::auditLog("UpdateOutputDocument", $description);
-
-                    return $iResult;
-                } else {
-                    $sMessage = '';
-                    $aValidationFailures = $oOutputDocument->getValidationFailures();
-
-                    foreach ($aValidationFailures as $oValidationFailure) {
-                        $sMessage .= $oValidationFailure->getMessage() . '<br />';
-                    }
-
-                    throw (new Exception('The registry cannot be updated!<br />' . $sMessage));
-                }
-            } else {
-                throw (new Exception('This row doesn\'t exist!'));
-            }
-        } catch (Exception $oError) {
-            $oConnection->rollback();
-
-            throw ($oError);
-        }
-    }
-
-    /**
-     * Remove the application document registry
-     * @param array $aData
-     * @return string
-     * */
-    public function remove($sOutDocUid)
-    {
-        $oConnection = Propel::getConnection(OutputDocumentPeer::DATABASE_NAME);
-
-        try {
-            $oOutputDocument = OutputDocumentPeer::retrieveByPK($sOutDocUid);
-
-            if (!is_null($oOutputDocument)) {
-                $oConnection->begin();
-                Content::removeContent('OUT_DOC_TITLE', '', $oOutputDocument->getOutDocUid());
-                Content::removeContent('OUT_DOC_DESCRIPTION', '', $oOutputDocument->getOutDocUid());
-                Content::removeContent('OUT_DOC_FILENAME', '', $oOutputDocument->getOutDocUid());
-                Content::removeContent('OUT_DOC_TEMPLATE', '', $oOutputDocument->getOutDocUid());
-                $iResult = $oOutputDocument->delete();
-                $oConnection->commit();
-
-                //Add Audit Log
-                G::auditLog("DeleteOutputDocument", "Output Document Name: " . $oOutputDocument->getOutDocTitle() . ", Output Document Uid: " . $sOutDocUid . ", Description: " . $oOutputDocument->getOutDocDescription() . ", Filename generated: " . $oOutputDocument->getOutDocFilename());
-
-                //Return
-                return $iResult;
-            } else {
-                throw (new Exception('This row doesn\'t exist!'));
-            }
-        } catch (Exception $oError) {
-            $oConnection->rollback();
-
-            throw ($oError);
-        }
-    }
-
-    /**
-     * Get the [out_doc_title] column value.
-     * @return string
-     */
-    public function getOutDocTitleContent()
-    {
-        if ($this->out_doc_title == '') {
-            try {
-                $this->out_doc_title = Content::load(
-                    'OUT_DOC_TITLE', '', $this->getOutDocUid(), (defined('SYS_LANG') ? SYS_LANG : 'en')
-                );
-            } catch (Exception $oError) {
-                throw ($oError);
-            }
-        }
-
-        return $this->out_doc_title;
-    }
-
-    /**
-     * Set the [out_doc_title] column value.
-     *
-     * @param string $sValue new value
-     * @return void
-     */
-    public function setOutDocTitleContent($sValue)
-    {
-        if ($sValue !== null && !is_string($sValue)) {
-            $sValue = (string) $sValue;
-        }
-        if (in_array(OutputDocumentPeer::OUT_DOC_TITLE, $this->modifiedColumns) || $sValue === '') {
-            try {
-                $this->out_doc_title = $sValue;
-
-                $iResult = Content::addContent(
-                    'OUT_DOC_TITLE', '', $this->getOutDocUid(), (defined('SYS_LANG') ? SYS_LANG : 'en'), $this->out_doc_title
-                );
-            } catch (Exception $oError) {
-                $this->out_doc_title = '';
-
-                throw ($oError);
-            }
-        }
-    }
-
-    /**
-     * Get the [out_doc_comment] column value.
-     * @return string
-     */
-    public function getOutDocDescriptionContent()
-    {
-        if ($this->out_doc_description == '') {
-            try {
-                $this->out_doc_description = Content::load(
-                    'OUT_DOC_DESCRIPTION', '', $this->getOutDocUid(), (defined('SYS_LANG') ? SYS_LANG : 'en')
-                );
-            } catch (Exception $oError) {
-                throw ($oError);
-            }
-        }
-
-        return $this->out_doc_description;
-    }
-
-    /**
-     * Set the [out_doc_comment] column value.
-     *
-     * @param string $sValue new value
-     * @return void
-     */
-    public function setOutDocDescriptionContent($sValue)
-    {
-        if ($sValue !== null && !is_string($sValue)) {
-            $sValue = (string) $sValue;
-        }
-
-        if (in_array(OutputDocumentPeer::OUT_DOC_DESCRIPTION, $this->modifiedColumns) || $sValue === '') {
-            try {
-                $this->out_doc_description = $sValue;
-
-                $iResult = Content::addContent(
-                    'OUT_DOC_DESCRIPTION', '', $this->getOutDocUid(), (defined('SYS_LANG') ? SYS_LANG : 'en'), $this->out_doc_description
-                );
-            } catch (Exception $oError) {
-                $this->out_doc_description = '';
-
-                throw ($oError);
-            }
-        }
-    }
-
-    /**
-     * Get the [out_doc_filename] column value.
-     * @return string
-     */
-    public function getOutDocFilenameContent()
-    {
-        if ($this->out_doc_filename == '') {
-            try {
-                $this->out_doc_filename = Content::load(
-                    'OUT_DOC_FILENAME', '', $this->getOutDocUid(), (defined('SYS_LANG') ? SYS_LANG : 'en')
-                );
-            } catch (Exception $oError) {
-                throw ($oError);
-            }
-        }
-
-        return $this->out_doc_filename;
-    }
-
-    /**
-     * Set the [out_doc_filename] column value.
-     *
-     * @param string $sValue new value
-     * @return void
-     */
-    public function setOutDocFilenameContent($sValue)
-    {
-        if ($sValue !== null && !is_string($sValue)) {
-            $sValue = (string) $sValue;
-        }
-
-        if (in_array(OutputDocumentPeer::OUT_DOC_FILENAME, $this->modifiedColumns) || $sValue === '') {
-            try {
-                $this->out_doc_filename = $sValue;
-
-                $iResult = Content::addContent(
-                    'OUT_DOC_FILENAME', '', $this->getOutDocUid(), (defined('SYS_LANG') ? SYS_LANG : 'en'), $this->out_doc_filename
-                );
-            } catch (Exception $oError) {
-                $this->out_doc_filename = '';
-
-                throw ($oError);
-            }
-        }
-    }
-
-    /**
-     * Get the [out_doc_template] column value.
-     * @return string
-     */
-    public function getOutDocTemplateContent()
-    {
-        if ($this->out_doc_template == '') {
-            try {
-                $this->out_doc_template = Content::load(
-                    'OUT_DOC_TEMPLATE', '', $this->getOutDocUid(), (defined('SYS_LANG') ? SYS_LANG : 'en')
-                );
-            } catch (Exception $oError) {
-                throw ($oError);
-            }
-        }
-
-        return $this->out_doc_template;
-    }
-
-    /**
-     * Set the [out_doc_template] column value.
-     *
-     * @param string $sValue new value
-     * @return void
-     */
-    public function setOutDocTemplateContent($sValue)
-    {
-        if ($sValue !== null && !is_string($sValue)) {
-            $sValue = (string) $sValue;
-        }
-
-        if (in_array(OutputDocumentPeer::OUT_DOC_TEMPLATE, $this->modifiedColumns) || $sValue === '') {
-            try {
-                $this->out_doc_template = $sValue;
-
-                $iResult = Content::addContent(
-                    'OUT_DOC_TEMPLATE', '', $this->getOutDocUid(), (defined('SYS_LANG') ? SYS_LANG : 'en'), $this->out_doc_template
-                );
-            } catch (Exception $oError) {
-                $this->out_doc_template = '';
-
-                throw ($oError);
-            }
-        }
-    }
-
-    /*
-     * Generate the output document
-     * @param string $sUID
-     * @param array $aFields
-     * @param string $sPath
-     * @return variant
-     */
-
-    public function generate($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape = false, $sTypeDocToGener = 'BOTH', $aProperties = array())
-    {
-        if (($sUID != '') && is_array($aFields) && ($sPath != '')) {
-            $sContent = G::replaceDataGridField($sContent, $aFields);
-
-            if (strpos($sContent, '<!---{') !== false) {
-                $template = new Smarty();
-                $template->compile_dir      = PATH_SMARTY_C;
-                $template->cache_dir        = PATH_SMARTY_CACHE;
-                $template->config_dir       = PATH_THIRDPARTY . 'smarty/configs';
-                $template->caching          = false;
-                $template->left_delimiter   = '<!---{';
-                $template->right_delimiter  = '}--->';
-                $oFile = fopen($sPath .  $sFilename . '_smarty.html', 'wb');
-                fwrite($oFile, $sContent);
-                fclose($oFile);
-                $template->templateFile = $sPath . $sFilename . '_smarty.html';
-                //assign the variables and use the template $template
-                $template->assign($aFields);
-                $sContent = $template->fetch($template->templateFile);
-                unlink($template->templateFile);
-            }
-
-            G::verifyPath($sPath, true);
-
-            //Start - Create .doc
-            $oFile = fopen($sPath . $sFilename . '.doc', 'wb');
-
-            $size = array();
-            $size["Letter"] = "216mm  279mm";
-            $size["Legal"] = "216mm  357mm";
-            $size["Executive"] = "184mm  267mm";
-            $size["B5"] = "182mm  257mm";
-            $size["Folio"] = "216mm  330mm";
-            $size["A0Oversize"] = "882mm  1247mm";
-            $size["A0"] = "841mm  1189mm";
-            $size["A1"] = "594mm  841mm";
-            $size["A2"] = "420mm  594mm";
-            $size["A3"] = "297mm  420mm";
-            $size["A4"] = "210mm  297mm";
-            $size["A5"] = "148mm  210mm";
-            $size["A6"] = "105mm  148mm";
-            $size["A7"] = "74mm   105mm";
-            $size["A8"] = "52mm   74mm";
-            $size["A9"] = "37mm   52mm";
-            $size["A10"] = "26mm   37mm";
-            $size["Screenshot640"] = "640mm  480mm";
-            $size["Screenshot800"] = "800mm  600mm";
-            $size["Screenshot1024"] = "1024mm 768mm";
-
-            $sizeLandscape["Letter"] = "279mm  216mm";
-            $sizeLandscape["Legal"] = "357mm  216mm";
-            $sizeLandscape["Executive"] = "267mm  184mm";
-            $sizeLandscape["B5"] = "257mm  182mm";
-            $sizeLandscape["Folio"] = "330mm  216mm";
-            $sizeLandscape["A0Oversize"] = "1247mm 882mm";
-            $sizeLandscape["A0"] = "1189mm 841mm";
-            $sizeLandscape["A1"] = "841mm  594mm";
-            $sizeLandscape["A2"] = "594mm  420mm";
-            $sizeLandscape["A3"] = "420mm  297mm";
-            $sizeLandscape["A4"] = "297mm  210mm";
-            $sizeLandscape["A5"] = "210mm  148mm";
-            $sizeLandscape["A6"] = "148mm  105mm";
-            $sizeLandscape["A7"] = "105mm  74mm";
-            $sizeLandscape["A8"] = "74mm   52mm";
-            $sizeLandscape["A9"] = "52mm   37mm";
-            $sizeLandscape["A10"] = "37mm   26mm";
-            $sizeLandscape["Screenshot640"] = "480mm  640mm";
-            $sizeLandscape["Screenshot800"] = "600mm  800mm";
-            $sizeLandscape["Screenshot1024"] = "768mm  1024mm";
-
-            if (!isset($aProperties['media'])) {
-                $aProperties['media'] = 'Letter';
-            }
-
-            if ($sLandscape) {
-                $media = $sizeLandscape[$aProperties['media']];
-            } else {
-                $media = $size[$aProperties['media']];
-            }
-
-            $marginLeft = '15';
-
-            if (isset($aProperties['margins']['left'])) {
-                $marginLeft = $aProperties['margins']['left'];
-            }
-
-            $marginRight = '15';
-
-            if (isset($aProperties['margins']['right'])) {
-                $marginRight = $aProperties['margins']['right'];
-            }
-
-            $marginTop = '15';
-
-            if (isset($aProperties['margins']['top'])) {
-                $marginTop = $aProperties['margins']['top'];
-            }
-
-            $marginBottom = '15';
-
-            if (isset($aProperties['margins']['bottom'])) {
-                $marginBottom = $aProperties['margins']['bottom'];
-            }
-
-            fwrite($oFile, '<html xmlns:v="urn:schemas-microsoft-com:vml"
-            xmlns:o="urn:schemas-microsoft-com:office:office"
-            xmlns:w="urn:schemas-microsoft-com:office:word"
-            xmlns="http://www.w3.org/TR/REC-html40">
-            <head>
-            <meta http-equiv=Content-Type content="text/html; charset=utf-8">
-            <meta name=ProgId content=Word.Document>
-            <meta name=Generator content="Microsoft Word 9">
-            <meta name=Originator content="Microsoft Word 9">
-            <!--[if !mso]>
-            <style>
-            v\:* {behavior:url(#default#VML);}
-            o\:* {behavior:url(#default#VML);}
-            w\:* {behavior:url(#default#VML);}
-            .shape {behavior:url(#default#VML);}
-            </style>
-            <![endif]-->
-            <!--[if gte mso 9]><xml>
-             <w:WordDocument>
-              <w:View>Print</w:View>
-              <w:DoNotHyphenateCaps/>
-              <w:PunctuationKerning/>
-              <w:DrawingGridHorizontalSpacing>9.35 pt</w:DrawingGridHorizontalSpacing>
-              <w:DrawingGridVerticalSpacing>9.35 pt</w:DrawingGridVerticalSpacing>
-             </w:WordDocument>
-            </xml><![endif]-->
-
-            <style>
-            <!--
-            @page WordSection1
-             {size:' . $media . ';
-             margin-left:' . $marginLeft . 'mm;
-             margin-right:' . $marginRight . 'mm;
-             margin-bottom:' . $marginBottom . 'mm;
-             margin-top:' . $marginTop . 'mm;
-             mso-header-margin:35.4pt;
-             mso-footer-margin:35.4pt;
-             mso-paper-source:0;}
-            div.WordSection1
-             {page:WordSection1;}
-            -->
-            </style>
-            </head>
-            <body>
-            <div class=WordSection1>');
-
-            fwrite($oFile, $sContent);
-            fwrite($oFile, "\n</div></body></html>\n\n");
-            fclose($oFile);
-            /* End - Create .doc */
-
-            if ($sTypeDocToGener == 'BOTH' || $sTypeDocToGener == 'PDF') {
-                $oFile = fopen($sPath . $sFilename . '.html', 'wb');
-                fwrite($oFile, $sContent);
-                fclose($oFile);
-                /* Start - Create .pdf */
-                if (isset($aProperties['report_generator'])) {
-                    switch ($aProperties['report_generator']) {
-                        case 'TCPDF':
-                            $this->generateTcpdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape, $aProperties);
-                            break;
-                        case 'HTML2PDF':
-                        default:
-                            $this->generateHtml2ps_pdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape, $aProperties);
-                            break;
-                    }
-                } else {
-                    $this->generateHtml2ps_pdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape, $aProperties);
-                }
-            }
-            //end if $sTypeDocToGener
-            /* End - Create .pdf */
-        } else {
-            return PEAR::raiseError(
-                null, G_ERROR_USER_UID, null, null, 'You tried to call to a generate method without send the Output Document UID, fields to use and the file path!', 'G_Error', true
-            );
-        }
-    }
-
-    public function generateHtml2pdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape = false, $aProperties = array())
-    {
-
-        // define("MAX_FREE_FRACTION", 1);
-        define('PATH_OUTPUT_FILE_DIRECTORY', PATH_HTML . 'files/' . $_SESSION['APPLICATION'] . '/outdocs/');
-        G::verifyPath(PATH_OUTPUT_FILE_DIRECTORY, true);
-
-        require_once(PATH_THIRDPARTY . 'html2pdf/html2pdf.class.php');
-
-        // define Save file
-        $sOutput = 2;
-        $sOrientation = ($sLandscape == false) ? 'P' : 'L';
-        $sLang = (defined('SYS_LANG')) ? SYS_LANG : 'en';
-        $sMedia = $aProperties['media'];
-        // margin define
-        define("MINIMAL_MARGIN", 15);
-        $marges = array(MINIMAL_MARGIN, MINIMAL_MARGIN, MINIMAL_MARGIN, MINIMAL_MARGIN);
-        if (isset($aProperties['margins'])) {
-            // Default marges (left, top, right, bottom)
-            $margins = $aProperties['margins'];
-            $margins['left'] = ($margins['left'] > 0) ? $margins['left'] : MINIMAL_MARGIN;
-            $margins['top'] = ($margins['top'] > 0) ? $margins['top'] : MINIMAL_MARGIN;
-            $margins['right'] = ($margins['right'] > 0) ? $margins['right'] : MINIMAL_MARGIN;
-            $margins['bottom'] = ($margins['bottom'] > 0) ? $margins['bottom'] : MINIMAL_MARGIN;
-            $marges = array($margins['left'], $margins['top'], $margins['right'], $margins['bottom']);
-        }
-
-        $html2pdf = new HTML2PDF($sOrientation, $sMedia, $sLang, true, 'UTF-8', $marges);
-
-        $html2pdf->pdf->SetAuthor($aFields['USR_USERNAME']);
-        $html2pdf->pdf->SetTitle('Processmaker');
-        $html2pdf->pdf->SetSubject($sFilename);
-        $html2pdf->pdf->SetCompression(true);
-
-        //$html2pdf->pdf->SetKeywords('HTML2PDF, TCPDF, processmaker');
-
-        if (isset($aProperties['pdfSecurity'])) {
-            $pdfSecurity = $aProperties['pdfSecurity'];
-            $userPass = G::decrypt($pdfSecurity['openPassword'], $sUID);
-            $ownerPass = ($pdfSecurity['ownerPassword'] != '') ? G::decrypt($pdfSecurity['ownerPassword'], $sUID) : null;
-            $permissions = explode("|", $pdfSecurity['permissions']);
-            $html2pdf->pdf->SetProtection($permissions, $userPass, $ownerPass);
-        }
-
-        $html2pdf->setTestTdInOnePage(false);
-        $html2pdf->setTestIsImage(false);
-        $html2pdf->setTestIsDeprecated(false);
-
-        $html2pdf->writeHTML($html2pdf->getHtmlFromPage($sContent));
-
-        switch ($sOutput) {
-            case 0:
-                // Vrew browser
-                $html2pdf->Output($sPath . $sFilename . '.pdf', 'I');
-                break;
-            case 1:
-                // Donwnload
-                $html2pdf->Output($sPath . $sFilename . '.pdf', 'D');
-                break;
-            case 2:
-                // Save file
-                $html2pdf->Output($sPath . $sFilename . '.pdf', 'F');
-                break;
-        }
-
-        copy($sPath . $sFilename . '.html', PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.html');
-
-        copy(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf', $sPath . $sFilename . '.pdf');
-        unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf');
-        unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.html');
-    }
-
-    public function generateTcpdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape = false, $aProperties = array())
-    {
-        require_once (PATH_THIRDPARTY . "tcpdf" . PATH_SEP . "config" . PATH_SEP . "lang" . PATH_SEP . "eng.php");
-        require_once (PATH_THIRDPARTY . "tcpdf" . PATH_SEP . "tcpdf.php");
-
-        $nrt = array("\n", "\r", "\t");
-        $nrthtml = array("(n /)", "(r /)", "(t /)");
-
-        $strContentAux = str_replace($nrt, $nrthtml, $sContent);
-        $sContent = null;
-
-        while (preg_match("/^(.*)<font([^>]*)>(.*)$/i", $strContentAux, $arrayMatch)) {
-            $str = trim($arrayMatch[2]);
-            $strAttribute = null;
-
-            if (!empty($str)) {
-                $strAux = $str;
-                $str = null;
-
-                while (preg_match("/^(.*)([\"'].*[\"'])(.*)$/", $strAux, $arrayMatch2)) {
-                    $strAux = $arrayMatch2[1];
-                    $str = str_replace(" ", "__SPACE__", $arrayMatch2[2]) . $arrayMatch2[3] . $str;
-                }
-
-                $str = $strAux . $str;
-
-                //Get attributes
-                $strStyle = null;
-                $array = explode(" ", $str);
-
-                foreach ($array as $value) {
-                    $arrayAux = explode("=", $value);
-
-                    if (isset($arrayAux[1])) {
-                        $a = trim($arrayAux[0]);
-                        $v = trim(str_replace(array("__SPACE__", "\"", "'"), array(" ", null, null), $arrayAux[1]));
-
-                        switch (strtolower($a)) {
-                            case "color":
-                                $strStyle = $strStyle . "color: $v;";
-                                break;
-                            case "face":
-                                $strStyle = $strStyle . "font-family: $v;";
-                                break;
-                            case "size":
-                                $arrayPt = array(0, 8, 10, 12, 14, 18, 24, 36);
-                                $strStyle = $strStyle . "font-size: " . $arrayPt[intval($v)] . "pt;";
-                                break;
-                            case "style":
-                                $strStyle = $strStyle . "$v;";
-                                break;
-                            default:
-                                $strAttribute = $strAttribute . " $a=\"$v\"";
-                                break;
-                        }
-                    }
-                }
-
-                if ($strStyle != null) {
-                    $strAttribute = $strAttribute . " style=\"$strStyle\"";
-                }
-            }
-
-            $strContentAux = $arrayMatch[1];
-            $sContent = "<span" . $strAttribute . ">" . $arrayMatch[3] . $sContent;
-        }
-
-        $sContent = $strContentAux . $sContent;
-
-        $sContent = str_ireplace("</font>", "</span>", $sContent);
-
-        $sContent = str_replace($nrthtml, $nrt, $sContent);
-
-        $sContent = str_replace("margin-left", "text-indent", $sContent);
-
-        // define Save file
-        $sOutput = 2;
-        $sOrientation = ($sLandscape == false) ? PDF_PAGE_ORIENTATION : 'L';
-        $sMedia = (isset($aProperties['media'])) ? $aProperties['media'] : PDF_PAGE_FORMAT;
-        $sLang = (defined('SYS_LANG')) ? SYS_LANG : 'en';
-
-        // create new PDF document
-        $pdf = new TCPDF($sOrientation, PDF_UNIT, $sMedia, true, 'UTF-8', false);
-
-        // set document information
-        $pdf->SetCreator(PDF_CREATOR);
-        $pdf->SetAuthor($aFields['USR_USERNAME']);
-        $pdf->SetTitle('Processmaker');
-        $pdf->SetSubject($sFilename);
-        $pdf->SetCompression(true);
-
-        $margins = $aProperties['margins'];
-        $margins["left"] = ($margins["left"] >= 0) ? $margins["left"] : PDF_MARGIN_LEFT;
-        $margins["top"] = ($margins["top"] >= 0) ? $margins["top"] : PDF_MARGIN_TOP;
-        $margins["right"] = ($margins["right"] >= 0) ? $margins["right"] : PDF_MARGIN_RIGHT;
-        $margins["bottom"] = ($margins["bottom"] >= 0) ? $margins["bottom"] : PDF_MARGIN_BOTTOM;
-
-        $pdf->setPrintHeader(false);
-        $pdf->setPrintFooter(false);
-        $pdf->SetLeftMargin($margins['left']);
-        $pdf->SetTopMargin($margins['top']);
-        $pdf->SetRightMargin($margins['right']);
-        $pdf->SetAutoPageBreak(true, $margins['bottom']);
-
-        $oServerConf = &ServerConf::getSingleton();
-
-        // set some language dependent data:
-        $lg = array();
-        $lg['a_meta_charset'] = 'UTF-8';
-        $lg['a_meta_dir'] = ($oServerConf->isRtl($sLang)) ? 'rtl' : 'ltr';
-        $lg['a_meta_language'] = $sLang;
-        $lg['w_page'] = 'page';
-
-        //set some language-dependent strings
-        $pdf->setLanguageArray($lg);
-
-        if (isset($aProperties['pdfSecurity'])) {
-            $tcpdfPermissions = array('print', 'modify', 'copy', 'annot-forms', 'fill-forms', 'extract', 'assemble', 'print-high');
-            $pdfSecurity = $aProperties['pdfSecurity'];
-            $userPass = G::decrypt($pdfSecurity['openPassword'], $sUID);
-            $ownerPass = ($pdfSecurity['ownerPassword'] != '') ? G::decrypt($pdfSecurity['ownerPassword'], $sUID) : null;
-            $permissions = explode("|", $pdfSecurity['permissions']);
-            $permissions = array_diff($tcpdfPermissions, $permissions);
-            $pdf->SetProtection($permissions, $userPass, $ownerPass);
-        }
-        // ---------------------------------------------------------
-        // set default font subsetting mode
-        $pdf->setFontSubsetting(true);
-
-        // Set font
-        // dejavusans is a UTF-8 Unicode font, if you only need to
-        // print standard ASCII chars, you can use core fonts like
-        // helvetica or times to reduce file size.
-        //$pdf->SetFont('dejavusans', '', 14, '', true);
-        // Detect chinese, japanese, thai
-        if (preg_match('/[\x{30FF}\x{3040}-\x{309F}\x{4E00}-\x{9FFF}\x{0E00}-\x{0E7F}]/u', $sContent, $matches)) {
-            $fileArialunittf = PATH_THIRDPARTY . "tcpdf" . PATH_SEP . "fonts" . PATH_SEP . "arialuni.ttf";
-
-            $pdf->SetFont((!file_exists($fileArialunittf))? "kozminproregular" : $pdf->addTTFfont($fileArialunittf, "TrueTypeUnicode", "", 32));
-        }
-
-        // Add a page
-        // This method has several options, check the source code documentation for more information.
-        $pdf->AddPage();
-
-        // set text shadow effect
-        //$pdf->setTextShadow(array('enabled'=>true, 'depth_w'=>0.2, 'depth_h'=>0.2, 'color'=>array(196,196,196), 'opacity'=>1, 'blend_mode'=>'Normal'));
-        // Print text using writeHTMLCell()
-        // $pdf->writeHTMLCell($w=0, $h=0, $x='', $y='', $html, $border=0, $ln=1, $fill=0, $reseth=true, $align='', $autopadding=true);
-        if (mb_detect_encoding($sContent) == 'UTF-8') {
-            $sContent = mb_convert_encoding($sContent, 'HTML-ENTITIES', 'UTF-8');
-        }
-        $doc = new DOMDocument('1.0', 'UTF-8');
-        if ($sContent != '') {
-            $doc->loadHtml($sContent);
-        }
-        $pdf->writeHTML($doc->saveXML(), false, false, false, false, '');
-        // ---------------------------------------------------------
-        // Close and output PDF document
-        // This method has several options, check the source code documentation for more information.
-        //$pdf->Output('example_00.pdf', 'I');
-        //$pdf->Output('/home/hector/processmaker/example_00.pdf', 'D');
-        switch ($sOutput) {
-            case 0:
-                // Vrew browser
-                $pdf->Output($sPath . $sFilename . '.pdf', 'I');
-                break;
-            case 1:
-                // Donwnload
-                $pdf->Output($sPath . $sFilename . '.pdf', 'D');
-                break;
-            case 2:
-                // Save file
-                $pdf->Output($sPath . $sFilename . '.pdf', 'F');
-                break;
-        }
-    }
-
-    public function generateHtml2ps_pdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape = false, $aProperties = array())
-    {
-
-        define("MAX_FREE_FRACTION", 1);
-        define('PATH_OUTPUT_FILE_DIRECTORY', PATH_HTML . 'files/' . $_SESSION['APPLICATION'] . '/outdocs/');
-        G::verifyPath(PATH_OUTPUT_FILE_DIRECTORY, true);
-        require_once (PATH_THIRDPARTY . 'html2ps_pdf/config.inc.php');
-        require_once (PATH_THIRDPARTY . 'html2ps_pdf/pipeline.factory.class.php');
-
-        parse_config_file(PATH_THIRDPARTY . 'html2ps_pdf/html2ps.config');
-
-        $GLOBALS['g_config'] = array(
-            'cssmedia' => 'screen',
-            'media' => 'Letter',
-            'scalepoints' => false,
-            'renderimages' => true,
-            'renderfields' => true,
-            'renderforms' => false,
-            'pslevel' => 3,
-            'renderlinks' => true,
-            'pagewidth' => 800,
-            'landscape' => $sLandscape,
-            'method' => 'fpdf',
-            'margins' => array('left' => 15, 'right' => 15, 'top' => 15, 'bottom' => 15,),
-            'encoding' => (version_compare(PHP_VERSION, '5.4.0', '<') ? '' : 'utf-8'),
-            'ps2pdf' => false,
-            'compress' => true,
-            'output' => 2,
-            'pdfversion' => '1.3',
-            'transparency_workaround' => false,
-            'imagequality_workaround' => false,
-            'draw_page_border' => isset($_REQUEST['pageborder']),
-            'debugbox' => false,
-            'html2xhtml' => true,
-            'mode' => 'html',
-            'smartpagebreak' => true
-        );
-
-        $GLOBALS['g_config'] = array_merge($GLOBALS['g_config'], $aProperties);
-        $g_media = Media::predefined($GLOBALS['g_config']['media']);
-        $g_media->set_landscape($GLOBALS['g_config']['landscape']);
-        $g_media->set_margins($GLOBALS['g_config']['margins']);
-        $g_media->set_pixels($GLOBALS['g_config']['pagewidth']);
-
-
-        if (isset($GLOBALS['g_config']['pdfSecurity'])) {
-            if (isset($GLOBALS['g_config']['pdfSecurity']['openPassword']) &&
-                    $GLOBALS['g_config']['pdfSecurity']['openPassword'] != ""
-            ) {
-                $GLOBALS['g_config']['pdfSecurity']['openPassword'] = G::decrypt(
-                                $GLOBALS['g_config']['pdfSecurity']['openPassword'], $sUID
-                );
-            }
-
-            if (isset($GLOBALS['g_config']['pdfSecurity']['ownerPassword']) &&
-                    $GLOBALS['g_config']['pdfSecurity']['ownerPassword'] != ""
-            ) {
-                $GLOBALS['g_config']['pdfSecurity']['ownerPassword'] = G::decrypt(
-                                $GLOBALS['g_config']['pdfSecurity']['ownerPassword'], $sUID
-                );
-            }
-
-            $g_media->set_security($GLOBALS['g_config']['pdfSecurity']);
-
-            require_once (HTML2PS_DIR . 'pdf.fpdf.encryption.php');
-        }
-
-        $pipeline = new Pipeline();
-
-        if (extension_loaded('curl')) {
-            require_once (HTML2PS_DIR . 'fetcher.url.curl.class.php');
-
-            $pipeline->fetchers = array(new FetcherURLCurl());
-
-            if (isset($proxy)) {
-                if ($proxy != '') {
-                    $pipeline->fetchers[0]->set_proxy($proxy);
-                }
-            }
-        } else {
-            require_once (HTML2PS_DIR . 'fetcher.url.class.php');
-            $pipeline->fetchers[] = new FetcherURL();
-        }
-
-        $pipeline->data_filters[] = new DataFilterDoctype();
-        $pipeline->data_filters[] = new DataFilterUTF8($GLOBALS['g_config']['encoding']);
-
-        if ($GLOBALS['g_config']['html2xhtml']) {
-            $pipeline->data_filters[] = new DataFilterHTML2XHTML();
-        } else {
-            $pipeline->data_filters[] = new DataFilterXHTML2XHTML();
-        }
-
-        $pipeline->parser = new ParserXHTML();
-        $pipeline->pre_tree_filters = array();
-        $header_html = '';
-        $footer_html = '';
-        $filter = new PreTreeFilterHeaderFooter($header_html, $footer_html);
-        $pipeline->pre_tree_filters[] = $filter;
-
-        if ($GLOBALS['g_config']['renderfields']) {
-            $pipeline->pre_tree_filters[] = new PreTreeFilterHTML2PSFields();
-        }
-
-        if ($GLOBALS['g_config']['method'] === 'ps') {
-            $pipeline->layout_engine = new LayoutEnginePS();
-        } else {
-            $pipeline->layout_engine = new LayoutEngineDefault();
-        }
-
-        $pipeline->post_tree_filters = array();
-
-        if ($GLOBALS['g_config']['pslevel'] == 3) {
-            $image_encoder = new PSL3ImageEncoderStream();
-        } else {
-            $image_encoder = new PSL2ImageEncoderStream();
-        }
-
-        switch ($GLOBALS['g_config']['method']) {
-            case 'fastps':
-                if ($GLOBALS['g_config']['pslevel'] == 3) {
-                    $pipeline->output_driver = new OutputDriverFastPS($image_encoder);
-                } else {
-                    $pipeline->output_driver = new OutputDriverFastPSLevel2($image_encoder);
-                }
-                break;
-            case 'pdflib':
-                $pipeline->output_driver = new OutputDriverPDFLIB16($GLOBALS['g_config']['pdfversion']);
-                break;
-            case 'fpdf':
-                $pipeline->output_driver = new OutputDriverFPDF();
-                break;
-            case 'png':
-                $pipeline->output_driver = new OutputDriverPNG();
-                break;
-            case 'pcl':
-                $pipeline->output_driver = new OutputDriverPCL();
-                break;
-            default:
-                die('Unknown output method');
-        }
-
-        if (isset($GLOBALS['g_config']['watermarkhtml'])) {
-            $watermark_text = $GLOBALS['g_config']['watermarkhtml'];
-        } else {
-            $watermark_text = '';
-        }
-
-        $pipeline->output_driver->set_watermark($watermark_text);
-
-        if ($watermark_text != '') {
-            $dispatcher = & $pipeline->getDispatcher();
-        }
-
-        if ($GLOBALS['g_config']['debugbox']) {
-            $pipeline->output_driver->set_debug_boxes(true);
-        }
-
-        if ($GLOBALS['g_config']['draw_page_border']) {
-            $pipeline->output_driver->set_show_page_border(true);
-        }
-
-        if ($GLOBALS['g_config']['ps2pdf']) {
-            $pipeline->output_filters[] = new OutputFilterPS2PDF($GLOBALS['g_config']['pdfversion']);
-        }
-
-        if ($GLOBALS['g_config']['compress'] && $GLOBALS['g_config']['method'] == 'fastps') {
-            $pipeline->output_filters[] = new OutputFilterGZip();
-        }
-
-        if (!isset($GLOBALS['g_config']['process_mode'])) {
-            $GLOBALS['g_config']['process_mode'] = '';
-        }
-
-        if ($GLOBALS['g_config']['process_mode'] == 'batch') {
-            $filename = 'batch';
-        } else {
-            $filename = $sFilename;
-        }
-
-        switch ($GLOBALS['g_config']['output']) {
-            case 0:
-                $pipeline->destination = new DestinationBrowser($filename);
-                break;
-            case 1:
-                $pipeline->destination = new DestinationDownload($filename);
-                break;
-            case 2:
-                $pipeline->destination = new DestinationFile($filename);
-                break;
-        }
-
-        copy($sPath . $sFilename . '.html', PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.html');
-        try {
-            $status = $pipeline->process((G::is_https() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . '/files/' . $_SESSION['APPLICATION'] . '/outdocs/' . $sFilename . '.html', $g_media);
-            copy(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf', $sPath . $sFilename . '.pdf');
-            unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf');
-            unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.html');
-        } catch (Exception $e) {
-            if ($e->getMessage() == 'ID_OUTPUT_NOT_GENERATE') {
-                include_once 'classes/model/AppDocument.php';
-                $dataDocument = explode('_', $sFilename);
-                if (!isset($dataDocument[1])) {
-                    $dataDocument[1] = 1;
-                }
-                $oAppDocument = new AppDocument();
-                $oAppDocument->remove($dataDocument[0], $dataDocument[1]);
-                G::SendTemporalMessage(G::LoadTranslation('ID_OUTPUT_NOT_GENERATE'), 'Error');
-            }
-        }
-    }
-
-    /**
-     * verify if Output row specified in [sUid] exists.
-     *
-     * @param      string $sUid   the uid of the Prolication
-     */
-    public function OutputExists($sUid)
-    {
-        $con = Propel::getConnection(OutputDocumentPeer::DATABASE_NAME);
-
-        try {
-            $oObj = OutputDocumentPeer::retrieveByPk($sUid);
-
-            if (is_object($oObj) && get_class($oObj) == 'OutputDocument') {
-                return true;
-            } else {
-                return false;
-            }
-        } catch (Exception $oError) {
-            throw ($oError);
-        }
-    }
-}
-
+<?php
+
+/**
+ * Skeleton subclass for representing a row from the 'OUTPUT_DOCUMENT' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    workflow.engine.classes.model
+ */
+class OutputDocument extends BaseOutputDocument
+{
+    public function __construct()
+    {
+        $javaInput = PATH_C . 'javaBridgePM' . PATH_SEP . 'input' . PATH_SEP;
+        $javaOutput = PATH_C . 'javaBridgePM' . PATH_SEP . 'output' . PATH_SEP;
+
+        G::mk_dir($javaInput);
+        G::mk_dir($javaOutput);
+    }
+
+    public function getByUid($sOutDocUid)
+    {
+        try {
+            $oOutputDocument = OutputDocumentPeer::retrieveByPK($sOutDocUid);
+
+            if (is_null($oOutputDocument)) {
+                return false;
+            }
+
+            $aFields = $oOutputDocument->toArray(BasePeer::TYPE_FIELDNAME);
+            $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
+
+            return $aFields;
+        } catch (Exception $oError) {
+            throw ($oError);
+        }
+    }
+
+    /*
+     * Load the application document registry
+     * @param string $sAppDocUid
+     * @return variant
+     */
+
+    public function load($sOutDocUid)
+    {
+        try {
+            $oOutputDocument = OutputDocumentPeer::retrieveByPK($sOutDocUid);
+
+            if (!is_null($oOutputDocument)) {
+                $aFields = $oOutputDocument->toArray(BasePeer::TYPE_FIELDNAME);
+                $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
+
+                return $aFields;
+            } else {
+                throw(new Exception('This row doesn\'t exist!'));
+            }
+        } catch (Exception $oError) {
+            throw ($oError);
+        }
+    }
+
+    /**
+     * Create the application document registry
+     * @param array $aData
+     * @return string
+     * */
+    public function create($aData)
+    {
+        $oConnection = Propel::getConnection(OutputDocumentPeer::DATABASE_NAME);
+
+        try {
+            if (isset($aData['OUT_DOC_UID']) && $aData['OUT_DOC_UID'] == '') {
+                unset($aData['OUT_DOC_UID']);
+            }
+
+            if (!isset($aData['OUT_DOC_UID'])) {
+                $aData['OUT_DOC_UID'] = G::generateUniqueID();
+            }
+
+            if (!isset($aData['OUT_DOC_GENERATE'])) {
+                $aData['OUT_DOC_GENERATE'] = 'BOTH';
+            } else {
+                if ($aData['OUT_DOC_GENERATE'] == '') {
+                    $aData['OUT_DOC_GENERATE'] = 'BOTH';
+                }
+            }
+
+            $oOutputDocument = new OutputDocument();
+            $oOutputDocument->fromArray($aData, BasePeer::TYPE_FIELDNAME);
+
+            if ($oOutputDocument->validate()) {
+                $oConnection->begin();
+
+                if (isset($aData['OUT_DOC_TITLE'])) {
+                    $oOutputDocument->setOutDocTitleContent($aData['OUT_DOC_TITLE']);
+                }
+
+                if (isset($aData['OUT_DOC_DESCRIPTION'])) {
+                    $oOutputDocument->setOutDocDescriptionContent($aData['OUT_DOC_DESCRIPTION']);
+                }
+
+                $oOutputDocument->setOutDocFilenameContent($aData['OUT_DOC_FILENAME']);
+
+                if (isset($aData['OUT_DOC_TEMPLATE'])) {
+                    $oOutputDocument->setOutDocTemplateContent($aData['OUT_DOC_TEMPLATE']);
+                }
+
+                $iResult = $oOutputDocument->save();
+                $oConnection->commit();
+                //Add Audit Log
+                $description = "Output Document Name: " . $aData['OUT_DOC_TITLE'] . ", Output Document Uid: " . $aData['OUT_DOC_UID'] . ", Filename generated: " . $aData['OUT_DOC_FILENAME'];
+                if (!empty($aData['OUT_DOC_DESCRIPTION'])) {
+                    $description .= ", Description: " . $aData['OUT_DOC_DESCRIPTION'];
+                }
+                if (!empty($aData['OUT_DOC_REPORT_GENERATOR'])) {
+                    $description .= ", Report Generator: " . $aData['OUT_DOC_REPORT_GENERATOR'];
+                }
+                if (!empty($aData['OUT_DOC_GENERATE'])) {
+                    $description .= ", Output Document to Generate: " . $aData['OUT_DOC_GENERATE'];
+                }
+                if ($aData['OUT_DOC_PDF_SECURITY_ENABLED'] == 0) {
+                    $pdfSecurity = 'Disabled';
+                } else {
+                    $pdfSecurity = 'Enabled';
+                }
+                $description .= ", PDF Security: " . $pdfSecurity;
+                if (!empty($aData['OUT_DOC_VERSIONING'])) {
+                    $description .= ", Enable Versioning: Yes";
+                }
+                if (!empty($aData['OUT_DOC_DESTINATION_PATH'])) {
+                    $description .= ", Destination Path: " . $aData['OUT_DOC_DESTINATION_PATH'];
+                }
+                if (!empty($aData['OUT_DOC_TAGS'])) {
+                    $description .= ", Tags: " . $aData['OUT_DOC_TAGS'];
+                }
+                if (!empty($aData['OUT_DOC_OPEN_TYPE'])) {
+                    if ($aData['OUT_DOC_OPEN_TYPE'] == 0) {
+                        $genLink = 'Open the file';
+                    } else {
+                        $genLink = 'Download the file';
+                    }
+                    $description .= ", By clicking on the generated file link: " . $genLink;
+                }
+                G::auditLog("CreateOutputDocument", $description);
+
+                return $aData['OUT_DOC_UID'];
+            } else {
+                $sMessage = '';
+                $aValidationFailures = $oOutputDocument->getValidationFailures();
+
+                foreach ($aValidationFailures as $oValidationFailure) {
+                    $sMessage .= $oValidationFailure->getMessage() . '<br />';
+                }
+
+                throw (new Exception('The registry cannot be created!<br />' . $sMessage));
+            }
+        } catch (Exception $oError) {
+            $oConnection->rollback();
+
+            throw ($oError);
+        }
+    }
+
+    /**
+     * Update the application document registry
+     * @param array $aData
+     * @return string
+     * */
+    public function update($aData)
+    {
+        $oConnection = Propel::getConnection(OutputDocumentPeer::DATABASE_NAME);
+
+        try {
+            $oOutputDocument = OutputDocumentPeer::retrieveByPK($aData['OUT_DOC_UID']);
+
+            if (!is_null($oOutputDocument)) {
+                $oOutputDocument->fromArray($aData, BasePeer::TYPE_FIELDNAME);
+
+                if ($oOutputDocument->validate()) {
+                    $oConnection->begin();
+
+                    if (isset($aData['OUT_DOC_TITLE'])) {
+                        $oOutputDocument->setOutDocTitleContent($aData['OUT_DOC_TITLE']);
+                    }
+
+                    if (isset($aData['OUT_DOC_DESCRIPTION'])) {
+                        $oOutputDocument->setOutDocDescriptionContent($aData['OUT_DOC_DESCRIPTION']);
+                    }
+
+                    if (isset($aData['OUT_DOC_FILENAME'])) {
+                        $oOutputDocument->setOutDocFilenameContent($aData['OUT_DOC_FILENAME']);
+                    }
+
+                    if (isset($aData['OUT_DOC_TEMPLATE'])) {
+                        $oOutputDocument->setOutDocTemplateContent($aData['OUT_DOC_TEMPLATE']);
+                    }
+
+                    $iResult = $oOutputDocument->save();
+                    $oConnection->commit();
+                    //Add Audit Log
+                    $description = 'Output Document Uid: ' . $aData['OUT_DOC_UID'];
+
+                    if (array_key_exists('OUT_DOC_TITLE', $aData) && (string)($aData['OUT_DOC_TITLE']) != '') {
+                        $description .= ', Output Document Name: ' . $aData['OUT_DOC_TITLE'];
+                    }
+
+                    if (array_key_exists('OUT_DOC_FILENAME', $aData) && (string)($aData['OUT_DOC_FILENAME']) != '') {
+                        $description .= ', Filename generated: ' . $aData['OUT_DOC_FILENAME'];
+                    }
+
+                    if (!empty($aData['OUT_DOC_DESCRIPTION'])) {
+                        $description .= ", Description: " . $aData['OUT_DOC_DESCRIPTION'];
+                    }
+                    if (!empty($aData['OUT_DOC_REPORT_GENERATOR'])) {
+                        $description .= ", Report Generator: " . $aData['OUT_DOC_REPORT_GENERATOR'];
+                    }
+                    if (!empty($aData['OUT_DOC_REPORT_GENERATOR'])) {
+                        $description .= ", Output Document to Generate: " . $aData['OUT_DOC_GENERATE'];
+                    }
+
+                    if (array_key_exists('OUT_DOC_PDF_SECURITY_ENABLED', $aData) && (string)($aData['OUT_DOC_PDF_SECURITY_ENABLED']) != '') {
+                        $description .= ', PDF Security: ' . (((int)($aData['OUT_DOC_PDF_SECURITY_ENABLED']) != 0) ? 'Enabled' : 'Disabled');
+                    }
+
+                    if (!empty($aData['OUT_DOC_VERSIONING'])) {
+                        $description .= ", Enable Versioning: Yes";
+                    }
+                    if (!empty($aData['OUT_DOC_DESTINATION_PATH'])) {
+                        $description .= ", Destination Path: " . $aData['OUT_DOC_DESTINATION_PATH'];
+                    }
+                    if (!empty($aData['OUT_DOC_TAGS'])) {
+                        $description .= ", Tags: " . $aData['OUT_DOC_TAGS'];
+                    }
+                    if (!empty($aData['OUT_DOC_OPEN_TYPE'])) {
+                        if ($aData['OUT_DOC_OPEN_TYPE'] == 0) {
+                            $genLink = 'Open the file';
+                        } else {
+                            $genLink = 'Download the file';
+                        }
+                        $description .= ", By clicking on the generated file link: " . $genLink;
+                    }
+                    if (isset($aData['OUT_DOC_TEMPLATE'])) {
+                        $description .= ", [EDIT TEMPLATE]";
+                    }
+                    G::auditLog("UpdateOutputDocument", $description);
+
+                    return $iResult;
+                } else {
+                    $sMessage = '';
+                    $aValidationFailures = $oOutputDocument->getValidationFailures();
+
+                    foreach ($aValidationFailures as $oValidationFailure) {
+                        $sMessage .= $oValidationFailure->getMessage() . '<br />';
+                    }
+
+                    throw (new Exception('The registry cannot be updated!<br />' . $sMessage));
+                }
+            } else {
+                throw (new Exception('This row doesn\'t exist!'));
+            }
+        } catch (Exception $oError) {
+            $oConnection->rollback();
+
+            throw ($oError);
+        }
+    }
+
+    /**
+     * Remove the application document registry
+     * @param array $aData
+     * @return string
+     * */
+    public function remove($sOutDocUid)
+    {
+        $oConnection = Propel::getConnection(OutputDocumentPeer::DATABASE_NAME);
+
+        try {
+            $oOutputDocument = OutputDocumentPeer::retrieveByPK($sOutDocUid);
+
+            if (!is_null($oOutputDocument)) {
+                $oConnection->begin();
+                Content::removeContent('OUT_DOC_TITLE', '', $oOutputDocument->getOutDocUid());
+                Content::removeContent('OUT_DOC_DESCRIPTION', '', $oOutputDocument->getOutDocUid());
+                Content::removeContent('OUT_DOC_FILENAME', '', $oOutputDocument->getOutDocUid());
+                Content::removeContent('OUT_DOC_TEMPLATE', '', $oOutputDocument->getOutDocUid());
+                $iResult = $oOutputDocument->delete();
+                $oConnection->commit();
+
+                //Add Audit Log
+                G::auditLog("DeleteOutputDocument", "Output Document Name: " . $oOutputDocument->getOutDocTitle() . ", Output Document Uid: " . $sOutDocUid . ", Description: " . $oOutputDocument->getOutDocDescription() . ", Filename generated: " . $oOutputDocument->getOutDocFilename());
+
+                //Return
+                return $iResult;
+            } else {
+                throw (new Exception('This row doesn\'t exist!'));
+            }
+        } catch (Exception $oError) {
+            $oConnection->rollback();
+
+            throw ($oError);
+        }
+    }
+
+    /**
+     * Get the [out_doc_title] column value.
+     * @return string
+     */
+    public function getOutDocTitleContent()
+    {
+        if ($this->out_doc_title == '') {
+            try {
+                $this->out_doc_title = Content::load(
+                    'OUT_DOC_TITLE',
+                    '',
+                    $this->getOutDocUid(),
+                    (defined('SYS_LANG') ? SYS_LANG : 'en')
+                );
+            } catch (Exception $oError) {
+                throw ($oError);
+            }
+        }
+
+        return $this->out_doc_title;
+    }
+
+    /**
+     * Set the [out_doc_title] column value.
+     *
+     * @param string $sValue new value
+     * @return void
+     */
+    public function setOutDocTitleContent($sValue)
+    {
+        if ($sValue !== null && !is_string($sValue)) {
+            $sValue = (string)$sValue;
+        }
+        if (in_array(OutputDocumentPeer::OUT_DOC_TITLE, $this->modifiedColumns) || $sValue === '') {
+            try {
+                $this->out_doc_title = $sValue;
+
+                $iResult = Content::addContent(
+                    'OUT_DOC_TITLE',
+                    '',
+                    $this->getOutDocUid(),
+                    (defined('SYS_LANG') ? SYS_LANG : 'en'),
+                    $this->out_doc_title
+                );
+            } catch (Exception $oError) {
+                $this->out_doc_title = '';
+
+                throw ($oError);
+            }
+        }
+    }
+
+    /**
+     * Get the [out_doc_comment] column value.
+     * @return string
+     */
+    public function getOutDocDescriptionContent()
+    {
+        if ($this->out_doc_description == '') {
+            try {
+                $this->out_doc_description = Content::load(
+                    'OUT_DOC_DESCRIPTION',
+                    '',
+                    $this->getOutDocUid(),
+                    (defined('SYS_LANG') ? SYS_LANG : 'en')
+                );
+            } catch (Exception $oError) {
+                throw ($oError);
+            }
+        }
+
+        return $this->out_doc_description;
+    }
+
+    /**
+     * Set the [out_doc_comment] column value.
+     *
+     * @param string $sValue new value
+     * @return void
+     */
+    public function setOutDocDescriptionContent($sValue)
+    {
+        if ($sValue !== null && !is_string($sValue)) {
+            $sValue = (string)$sValue;
+        }
+
+        if (in_array(OutputDocumentPeer::OUT_DOC_DESCRIPTION, $this->modifiedColumns) || $sValue === '') {
+            try {
+                $this->out_doc_description = $sValue;
+
+                $iResult = Content::addContent(
+                    'OUT_DOC_DESCRIPTION',
+                    '',
+                    $this->getOutDocUid(),
+                    (defined('SYS_LANG') ? SYS_LANG : 'en'),
+                    $this->out_doc_description
+                );
+            } catch (Exception $oError) {
+                $this->out_doc_description = '';
+
+                throw ($oError);
+            }
+        }
+    }
+
+    /**
+     * Get the [out_doc_filename] column value.
+     * @return string
+     */
+    public function getOutDocFilenameContent()
+    {
+        if ($this->out_doc_filename == '') {
+            try {
+                $this->out_doc_filename = Content::load(
+                    'OUT_DOC_FILENAME',
+                    '',
+                    $this->getOutDocUid(),
+                    (defined('SYS_LANG') ? SYS_LANG : 'en')
+                );
+            } catch (Exception $oError) {
+                throw ($oError);
+            }
+        }
+
+        return $this->out_doc_filename;
+    }
+
+    /**
+     * Set the [out_doc_filename] column value.
+     *
+     * @param string $sValue new value
+     * @return void
+     */
+    public function setOutDocFilenameContent($sValue)
+    {
+        if ($sValue !== null && !is_string($sValue)) {
+            $sValue = (string)$sValue;
+        }
+
+        if (in_array(OutputDocumentPeer::OUT_DOC_FILENAME, $this->modifiedColumns) || $sValue === '') {
+            try {
+                $this->out_doc_filename = $sValue;
+
+                $iResult = Content::addContent(
+                    'OUT_DOC_FILENAME',
+                    '',
+                    $this->getOutDocUid(),
+                    (defined('SYS_LANG') ? SYS_LANG : 'en'),
+                    $this->out_doc_filename
+                );
+            } catch (Exception $oError) {
+                $this->out_doc_filename = '';
+
+                throw ($oError);
+            }
+        }
+    }
+
+    /**
+     * Get the [out_doc_template] column value.
+     * @return string
+     */
+    public function getOutDocTemplateContent()
+    {
+        if ($this->out_doc_template == '') {
+            try {
+                $this->out_doc_template = Content::load(
+                    'OUT_DOC_TEMPLATE',
+                    '',
+                    $this->getOutDocUid(),
+                    (defined('SYS_LANG') ? SYS_LANG : 'en')
+                );
+            } catch (Exception $oError) {
+                throw ($oError);
+            }
+        }
+
+        return $this->out_doc_template;
+    }
+
+    /**
+     * Set the [out_doc_template] column value.
+     *
+     * @param string $sValue new value
+     * @return void
+     */
+    public function setOutDocTemplateContent($sValue)
+    {
+        if ($sValue !== null && !is_string($sValue)) {
+            $sValue = (string)$sValue;
+        }
+
+        if (in_array(OutputDocumentPeer::OUT_DOC_TEMPLATE, $this->modifiedColumns) || $sValue === '') {
+            try {
+                $this->out_doc_template = $sValue;
+
+                $iResult = Content::addContent(
+                    'OUT_DOC_TEMPLATE',
+                    '',
+                    $this->getOutDocUid(),
+                    (defined('SYS_LANG') ? SYS_LANG : 'en'),
+                    $this->out_doc_template
+                );
+            } catch (Exception $oError) {
+                $this->out_doc_template = '';
+
+                throw ($oError);
+            }
+        }
+    }
+
+    /*
+     * Generate the output document
+     * @param string $sUID
+     * @param array $aFields
+     * @param string $sPath
+     * @return variant
+     */
+
+    public function generate($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape = false, $sTypeDocToGener = 'BOTH', $aProperties = array())
+    {
+        if (($sUID != '') && is_array($aFields) && ($sPath != '')) {
+            $sContent = G::replaceDataGridField($sContent, $aFields);
+
+            if (strpos($sContent, '<!---{') !== false) {
+                $template = new Smarty();
+                $template->compile_dir = PATH_SMARTY_C;
+                $template->cache_dir = PATH_SMARTY_CACHE;
+                $template->config_dir = PATH_THIRDPARTY . 'smarty/configs';
+                $template->caching = false;
+                $template->left_delimiter = '<!---{';
+                $template->right_delimiter = '}--->';
+                $oFile = fopen($sPath . $sFilename . '_smarty.html', 'wb');
+                fwrite($oFile, $sContent);
+                fclose($oFile);
+                $template->templateFile = $sPath . $sFilename . '_smarty.html';
+                //assign the variables and use the template $template
+                $template->assign($aFields);
+                $sContent = $template->fetch($template->templateFile);
+                unlink($template->templateFile);
+            }
+
+            G::verifyPath($sPath, true);
+
+            //Start - Create .doc
+            $oFile = fopen($sPath . $sFilename . '.doc', 'wb');
+
+            $size = [];
+            $size["Letter"] = "216mm  279mm";
+            $size["Legal"] = "216mm  357mm";
+            $size["Executive"] = "184mm  267mm";
+            $size["B5"] = "182mm  257mm";
+            $size["Folio"] = "216mm  330mm";
+            $size["A0Oversize"] = "882mm  1247mm";
+            $size["A0"] = "841mm  1189mm";
+            $size["A1"] = "594mm  841mm";
+            $size["A2"] = "420mm  594mm";
+            $size["A3"] = "297mm  420mm";
+            $size["A4"] = "210mm  297mm";
+            $size["A5"] = "148mm  210mm";
+            $size["A6"] = "105mm  148mm";
+            $size["A7"] = "74mm   105mm";
+            $size["A8"] = "52mm   74mm";
+            $size["A9"] = "37mm   52mm";
+            $size["A10"] = "26mm   37mm";
+            $size["Screenshot640"] = "640mm  480mm";
+            $size["Screenshot800"] = "800mm  600mm";
+            $size["Screenshot1024"] = "1024mm 768mm";
+
+            $sizeLandscape["Letter"] = "279mm  216mm";
+            $sizeLandscape["Legal"] = "357mm  216mm";
+            $sizeLandscape["Executive"] = "267mm  184mm";
+            $sizeLandscape["B5"] = "257mm  182mm";
+            $sizeLandscape["Folio"] = "330mm  216mm";
+            $sizeLandscape["A0Oversize"] = "1247mm 882mm";
+            $sizeLandscape["A0"] = "1189mm 841mm";
+            $sizeLandscape["A1"] = "841mm  594mm";
+            $sizeLandscape["A2"] = "594mm  420mm";
+            $sizeLandscape["A3"] = "420mm  297mm";
+            $sizeLandscape["A4"] = "297mm  210mm";
+            $sizeLandscape["A5"] = "210mm  148mm";
+            $sizeLandscape["A6"] = "148mm  105mm";
+            $sizeLandscape["A7"] = "105mm  74mm";
+            $sizeLandscape["A8"] = "74mm   52mm";
+            $sizeLandscape["A9"] = "52mm   37mm";
+            $sizeLandscape["A10"] = "37mm   26mm";
+            $sizeLandscape["Screenshot640"] = "480mm  640mm";
+            $sizeLandscape["Screenshot800"] = "600mm  800mm";
+            $sizeLandscape["Screenshot1024"] = "768mm  1024mm";
+
+            if (!isset($aProperties['media'])) {
+                $aProperties['media'] = 'Letter';
+            }
+
+            if ($sLandscape) {
+                $media = $sizeLandscape[$aProperties['media']];
+            } else {
+                $media = $size[$aProperties['media']];
+            }
+
+            $marginLeft = '15';
+
+            if (isset($aProperties['margins']['left'])) {
+                $marginLeft = $aProperties['margins']['left'];
+            }
+
+            $marginRight = '15';
+
+            if (isset($aProperties['margins']['right'])) {
+                $marginRight = $aProperties['margins']['right'];
+            }
+
+            $marginTop = '15';
+
+            if (isset($aProperties['margins']['top'])) {
+                $marginTop = $aProperties['margins']['top'];
+            }
+
+            $marginBottom = '15';
+
+            if (isset($aProperties['margins']['bottom'])) {
+                $marginBottom = $aProperties['margins']['bottom'];
+            }
+
+            fwrite($oFile, '<html xmlns:v="urn:schemas-microsoft-com:vml"
+            xmlns:o="urn:schemas-microsoft-com:office:office"
+            xmlns:w="urn:schemas-microsoft-com:office:word"
+            xmlns="http://www.w3.org/TR/REC-html40">
+            <head>
+            <meta http-equiv=Content-Type content="text/html; charset=utf-8">
+            <meta name=ProgId content=Word.Document>
+            <meta name=Generator content="Microsoft Word 9">
+            <meta name=Originator content="Microsoft Word 9">
+            <!--[if !mso]>
+            <style>
+            v\:* {behavior:url(#default#VML);}
+            o\:* {behavior:url(#default#VML);}
+            w\:* {behavior:url(#default#VML);}
+            .shape {behavior:url(#default#VML);}
+            </style>
+            <![endif]-->
+            <!--[if gte mso 9]><xml>
+             <w:WordDocument>
+              <w:View>Print</w:View>
+              <w:DoNotHyphenateCaps/>
+              <w:PunctuationKerning/>
+              <w:DrawingGridHorizontalSpacing>9.35 pt</w:DrawingGridHorizontalSpacing>
+              <w:DrawingGridVerticalSpacing>9.35 pt</w:DrawingGridVerticalSpacing>
+             </w:WordDocument>
+            </xml><![endif]-->
+
+            <style>
+            <!--
+            @page WordSection1
+             {size:' . $media . ';
+             margin-left:' . $marginLeft . 'mm;
+             margin-right:' . $marginRight . 'mm;
+             margin-bottom:' . $marginBottom . 'mm;
+             margin-top:' . $marginTop . 'mm;
+             mso-header-margin:35.4pt;
+             mso-footer-margin:35.4pt;
+             mso-paper-source:0;}
+            div.WordSection1
+             {page:WordSection1;}
+            -->
+            </style>
+            </head>
+            <body>
+            <div class=WordSection1>');
+
+            fwrite($oFile, $sContent);
+            fwrite($oFile, "\n</div></body></html>\n\n");
+            fclose($oFile);
+            /* End - Create .doc */
+
+            if ($sTypeDocToGener == 'BOTH' || $sTypeDocToGener == 'PDF') {
+                $oFile = fopen($sPath . $sFilename . '.html', 'wb');
+                fwrite($oFile, $sContent);
+                fclose($oFile);
+                /* Start - Create .pdf */
+                if (isset($aProperties['report_generator'])) {
+                    switch ($aProperties['report_generator']) {
+                        case 'TCPDF':
+                            $this->generateTcpdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape, $aProperties);
+                            break;
+                        case 'HTML2PDF':
+                        default:
+                            $this->generateHtml2ps_pdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape, $aProperties);
+                            break;
+                    }
+                } else {
+                    $this->generateHtml2ps_pdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape, $aProperties);
+                }
+            }
+            //end if $sTypeDocToGener
+            /* End - Create .pdf */
+        } else {
+            return PEAR::raiseError(
+                null,
+                G_ERROR_USER_UID,
+                null,
+                null,
+                'You tried to call to a generate method without send the Output Document UID, fields to use and the file path!',
+                'G_Error',
+                true
+            );
+        }
+    }
+
+    public function generateHtml2pdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape = false, $aProperties = array())
+    {
+
+        // define("MAX_FREE_FRACTION", 1);
+        define('PATH_OUTPUT_FILE_DIRECTORY', PATH_HTML . 'files/' . $_SESSION['APPLICATION'] . '/outdocs/');
+        G::verifyPath(PATH_OUTPUT_FILE_DIRECTORY, true);
+
+        require_once(PATH_THIRDPARTY . 'html2pdf/html2pdf.class.php');
+
+        // define Save file
+        $sOutput = 2;
+        $sOrientation = ($sLandscape == false) ? 'P' : 'L';
+        $sLang = (defined('SYS_LANG')) ? SYS_LANG : 'en';
+        $sMedia = $aProperties['media'];
+        // margin define
+        define("MINIMAL_MARGIN", 15);
+        $marges = array(MINIMAL_MARGIN, MINIMAL_MARGIN, MINIMAL_MARGIN, MINIMAL_MARGIN);
+        if (isset($aProperties['margins'])) {
+            // Default marges (left, top, right, bottom)
+            $margins = $aProperties['margins'];
+            $margins['left'] = ($margins['left'] > 0) ? $margins['left'] : MINIMAL_MARGIN;
+            $margins['top'] = ($margins['top'] > 0) ? $margins['top'] : MINIMAL_MARGIN;
+            $margins['right'] = ($margins['right'] > 0) ? $margins['right'] : MINIMAL_MARGIN;
+            $margins['bottom'] = ($margins['bottom'] > 0) ? $margins['bottom'] : MINIMAL_MARGIN;
+            $marges = array($margins['left'], $margins['top'], $margins['right'], $margins['bottom']);
+        }
+
+        $html2pdf = new HTML2PDF($sOrientation, $sMedia, $sLang, true, 'UTF-8', $marges);
+
+        $html2pdf->pdf->SetAuthor($aFields['USR_USERNAME']);
+        $html2pdf->pdf->SetTitle('Processmaker');
+        $html2pdf->pdf->SetSubject($sFilename);
+        $html2pdf->pdf->SetCompression(true);
+
+        //$html2pdf->pdf->SetKeywords('HTML2PDF, TCPDF, processmaker');
+
+        if (isset($aProperties['pdfSecurity'])) {
+            $pdfSecurity = $aProperties['pdfSecurity'];
+            $userPass = G::decrypt($pdfSecurity['openPassword'], $sUID);
+            $ownerPass = ($pdfSecurity['ownerPassword'] != '') ? G::decrypt($pdfSecurity['ownerPassword'], $sUID) : null;
+            $permissions = explode("|", $pdfSecurity['permissions']);
+            $html2pdf->pdf->SetProtection($permissions, $userPass, $ownerPass);
+        }
+
+        $html2pdf->setTestTdInOnePage(false);
+        $html2pdf->setTestIsImage(false);
+        $html2pdf->setTestIsDeprecated(false);
+
+        $html2pdf->writeHTML($html2pdf->getHtmlFromPage($sContent));
+
+        switch ($sOutput) {
+            case 0:
+                // Vrew browser
+                $html2pdf->Output($sPath . $sFilename . '.pdf', 'I');
+                break;
+            case 1:
+                // Donwnload
+                $html2pdf->Output($sPath . $sFilename . '.pdf', 'D');
+                break;
+            case 2:
+                // Save file
+                $html2pdf->Output($sPath . $sFilename . '.pdf', 'F');
+                break;
+        }
+
+        copy($sPath . $sFilename . '.html', PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.html');
+
+        copy(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf', $sPath . $sFilename . '.pdf');
+        unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf');
+        unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.html');
+    }
+
+    public function generateTcpdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape = false, $aProperties = array())
+    {
+        require_once(PATH_THIRDPARTY . "tcpdf" . PATH_SEP . "config" . PATH_SEP . "lang" . PATH_SEP . "eng.php");
+        require_once(PATH_THIRDPARTY . "tcpdf" . PATH_SEP . "tcpdf.php");
+
+        $nrt = array("\n", "\r", "\t");
+        $nrthtml = array("(n /)", "(r /)", "(t /)");
+
+        $strContentAux = str_replace($nrt, $nrthtml, $sContent);
+        $sContent = null;
+
+        while (preg_match("/^(.*)<font([^>]*)>(.*)$/i", $strContentAux, $arrayMatch)) {
+            $str = trim($arrayMatch[2]);
+            $strAttribute = null;
+
+            if (!empty($str)) {
+                $strAux = $str;
+                $str = null;
+
+                while (preg_match("/^(.*)([\"'].*[\"'])(.*)$/", $strAux, $arrayMatch2)) {
+                    $strAux = $arrayMatch2[1];
+                    $str = str_replace(" ", "__SPACE__", $arrayMatch2[2]) . $arrayMatch2[3] . $str;
+                }
+
+                $str = $strAux . $str;
+
+                //Get attributes
+                $strStyle = null;
+                $array = explode(" ", $str);
+
+                foreach ($array as $value) {
+                    $arrayAux = explode("=", $value);
+
+                    if (isset($arrayAux[1])) {
+                        $a = trim($arrayAux[0]);
+                        $v = trim(str_replace(array("__SPACE__", "\"", "'"), array(" ", null, null), $arrayAux[1]));
+
+                        switch (strtolower($a)) {
+                            case "color":
+                                $strStyle = $strStyle . "color: $v;";
+                                break;
+                            case "face":
+                                $strStyle = $strStyle . "font-family: $v;";
+                                break;
+                            case "size":
+                                $arrayPt = array(0, 8, 10, 12, 14, 18, 24, 36);
+                                $strStyle = $strStyle . "font-size: " . $arrayPt[intval($v)] . "pt;";
+                                break;
+                            case "style":
+                                $strStyle = $strStyle . "$v;";
+                                break;
+                            default:
+                                $strAttribute = $strAttribute . " $a=\"$v\"";
+                                break;
+                        }
+                    }
+                }
+
+                if ($strStyle != null) {
+                    $strAttribute = $strAttribute . " style=\"$strStyle\"";
+                }
+            }
+
+            $strContentAux = $arrayMatch[1];
+            $sContent = "<span" . $strAttribute . ">" . $arrayMatch[3] . $sContent;
+        }
+
+        $sContent = $strContentAux . $sContent;
+
+        $sContent = str_ireplace("</font>", "</span>", $sContent);
+
+        $sContent = str_replace($nrthtml, $nrt, $sContent);
+
+        $sContent = str_replace("margin-left", "text-indent", $sContent);
+
+        // define Save file
+        $sOutput = 2;
+        $sOrientation = ($sLandscape == false) ? PDF_PAGE_ORIENTATION : 'L';
+        $sMedia = (isset($aProperties['media'])) ? $aProperties['media'] : PDF_PAGE_FORMAT;
+        $sLang = (defined('SYS_LANG')) ? SYS_LANG : 'en';
+
+        // create new PDF document
+        $pdf = new TCPDF($sOrientation, PDF_UNIT, $sMedia, true, 'UTF-8', false);
+
+        // set document information
+        $pdf->SetCreator(PDF_CREATOR);
+        $pdf->SetAuthor($aFields['USR_USERNAME']);
+        $pdf->SetTitle('Processmaker');
+        $pdf->SetSubject($sFilename);
+        $pdf->SetCompression(true);
+
+        $margins = $aProperties['margins'];
+        $margins["left"] = ($margins["left"] >= 0) ? $margins["left"] : PDF_MARGIN_LEFT;
+        $margins["top"] = ($margins["top"] >= 0) ? $margins["top"] : PDF_MARGIN_TOP;
+        $margins["right"] = ($margins["right"] >= 0) ? $margins["right"] : PDF_MARGIN_RIGHT;
+        $margins["bottom"] = ($margins["bottom"] >= 0) ? $margins["bottom"] : PDF_MARGIN_BOTTOM;
+
+        $pdf->setPrintHeader(false);
+        $pdf->setPrintFooter(false);
+        $pdf->SetLeftMargin($margins['left']);
+        $pdf->SetTopMargin($margins['top']);
+        $pdf->SetRightMargin($margins['right']);
+        $pdf->SetAutoPageBreak(true, $margins['bottom']);
+
+        $oServerConf = ServerConf::getSingleton();
+
+        // set some language dependent data:
+        $lg = [];
+        $lg['a_meta_charset'] = 'UTF-8';
+        $lg['a_meta_dir'] = ($oServerConf->isRtl($sLang)) ? 'rtl' : 'ltr';
+        $lg['a_meta_language'] = $sLang;
+        $lg['w_page'] = 'page';
+
+        //set some language-dependent strings
+        $pdf->setLanguageArray($lg);
+
+        if (isset($aProperties['pdfSecurity'])) {
+            $tcpdfPermissions = array('print', 'modify', 'copy', 'annot-forms', 'fill-forms', 'extract', 'assemble', 'print-high');
+            $pdfSecurity = $aProperties['pdfSecurity'];
+            $userPass = G::decrypt($pdfSecurity['openPassword'], $sUID);
+            $ownerPass = ($pdfSecurity['ownerPassword'] != '') ? G::decrypt($pdfSecurity['ownerPassword'], $sUID) : null;
+            $permissions = explode("|", $pdfSecurity['permissions']);
+            $permissions = array_diff($tcpdfPermissions, $permissions);
+            $pdf->SetProtection($permissions, $userPass, $ownerPass);
+        }
+        // ---------------------------------------------------------
+        // set default font subsetting mode
+        $pdf->setFontSubsetting(true);
+
+        // Set font
+        // dejavusans is a UTF-8 Unicode font, if you only need to
+        // print standard ASCII chars, you can use core fonts like
+        // helvetica or times to reduce file size.
+        //$pdf->SetFont('dejavusans', '', 14, '', true);
+        // Detect chinese, japanese, thai
+        if (preg_match('/[\x{30FF}\x{3040}-\x{309F}\x{4E00}-\x{9FFF}\x{0E00}-\x{0E7F}]/u', $sContent, $matches)) {
+            $fileArialunittf = PATH_THIRDPARTY . "tcpdf" . PATH_SEP . "fonts" . PATH_SEP . "arialuni.ttf";
+
+            $pdf->SetFont((!file_exists($fileArialunittf)) ? "kozminproregular" : $pdf->addTTFfont($fileArialunittf, "TrueTypeUnicode", "", 32));
+        }
+
+        // Add a page
+        // This method has several options, check the source code documentation for more information.
+        $pdf->AddPage();
+
+        // set text shadow effect
+        //$pdf->setTextShadow(array('enabled'=>true, 'depth_w'=>0.2, 'depth_h'=>0.2, 'color'=>array(196,196,196), 'opacity'=>1, 'blend_mode'=>'Normal'));
+        // Print text using writeHTMLCell()
+        // $pdf->writeHTMLCell($w=0, $h=0, $x='', $y='', $html, $border=0, $ln=1, $fill=0, $reseth=true, $align='', $autopadding=true);
+        if (mb_detect_encoding($sContent) == 'UTF-8') {
+            $sContent = mb_convert_encoding($sContent, 'HTML-ENTITIES', 'UTF-8');
+        }
+        $doc = new DOMDocument('1.0', 'UTF-8');
+        if ($sContent != '') {
+            $doc->loadHtml($sContent);
+        }
+        $pdf->writeHTML($doc->saveXML(), false, false, false, false, '');
+        // ---------------------------------------------------------
+        // Close and output PDF document
+        // This method has several options, check the source code documentation for more information.
+        //$pdf->Output('example_00.pdf', 'I');
+        //$pdf->Output('/home/hector/processmaker/example_00.pdf', 'D');
+        switch ($sOutput) {
+            case 0:
+                // Vrew browser
+                $pdf->Output($sPath . $sFilename . '.pdf', 'I');
+                break;
+            case 1:
+                // Donwnload
+                $pdf->Output($sPath . $sFilename . '.pdf', 'D');
+                break;
+            case 2:
+                // Save file
+                $pdf->Output($sPath . $sFilename . '.pdf', 'F');
+                break;
+        }
+    }
+
+    public function generateHtml2ps_pdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape = false, $aProperties = array())
+    {
+        define("MAX_FREE_FRACTION", 1);
+        define('PATH_OUTPUT_FILE_DIRECTORY', PATH_HTML . 'files/' . $_SESSION['APPLICATION'] . '/outdocs/');
+        G::verifyPath(PATH_OUTPUT_FILE_DIRECTORY, true);
+        require_once(PATH_THIRDPARTY . 'html2ps_pdf/config.inc.php');
+        require_once(PATH_THIRDPARTY . 'html2ps_pdf/pipeline.factory.class.php');
+
+        parse_config_file(PATH_THIRDPARTY . 'html2ps_pdf/html2ps.config');
+
+        $GLOBALS['g_config'] = array(
+            'cssmedia' => 'screen',
+            'media' => 'Letter',
+            'scalepoints' => false,
+            'renderimages' => true,
+            'renderfields' => true,
+            'renderforms' => false,
+            'pslevel' => 3,
+            'renderlinks' => true,
+            'pagewidth' => 800,
+            'landscape' => $sLandscape,
+            'method' => 'fpdf',
+            'margins' => array('left' => 15, 'right' => 15, 'top' => 15, 'bottom' => 15,),
+            'encoding' => (version_compare(PHP_VERSION, '5.4.0', '<') ? '' : 'utf-8'),
+            'ps2pdf' => false,
+            'compress' => true,
+            'output' => 2,
+            'pdfversion' => '1.3',
+            'transparency_workaround' => false,
+            'imagequality_workaround' => false,
+            'draw_page_border' => isset($_REQUEST['pageborder']),
+            'debugbox' => false,
+            'html2xhtml' => true,
+            'mode' => 'html',
+            'smartpagebreak' => true
+        );
+
+        $GLOBALS['g_config'] = array_merge($GLOBALS['g_config'], $aProperties);
+        $g_media = Media::predefined($GLOBALS['g_config']['media']);
+        $g_media->set_landscape($GLOBALS['g_config']['landscape']);
+        $g_media->set_margins($GLOBALS['g_config']['margins']);
+        $g_media->set_pixels($GLOBALS['g_config']['pagewidth']);
+
+
+        if (isset($GLOBALS['g_config']['pdfSecurity'])) {
+            if (isset($GLOBALS['g_config']['pdfSecurity']['openPassword']) &&
+                $GLOBALS['g_config']['pdfSecurity']['openPassword'] != ""
+            ) {
+                $GLOBALS['g_config']['pdfSecurity']['openPassword'] = G::decrypt(
+                    $GLOBALS['g_config']['pdfSecurity']['openPassword'],
+                    $sUID
+                );
+            }
+
+            if (isset($GLOBALS['g_config']['pdfSecurity']['ownerPassword']) &&
+                $GLOBALS['g_config']['pdfSecurity']['ownerPassword'] != ""
+            ) {
+                $GLOBALS['g_config']['pdfSecurity']['ownerPassword'] = G::decrypt(
+                    $GLOBALS['g_config']['pdfSecurity']['ownerPassword'],
+                    $sUID
+                );
+            }
+
+            $g_media->set_security($GLOBALS['g_config']['pdfSecurity']);
+
+            require_once(HTML2PS_DIR . 'pdf.fpdf.encryption.php');
+        }
+
+        $pipeline = new Pipeline();
+
+        if (extension_loaded('curl')) {
+            require_once(HTML2PS_DIR . 'fetcher.url.curl.class.php');
+
+            $pipeline->fetchers = array(new FetcherURLCurl());
+
+            if (isset($proxy)) {
+                if ($proxy != '') {
+                    $pipeline->fetchers[0]->set_proxy($proxy);
+                }
+            }
+        } else {
+            require_once(HTML2PS_DIR . 'fetcher.url.class.php');
+            $pipeline->fetchers[] = new FetcherURL();
+        }
+
+        $pipeline->data_filters[] = new DataFilterDoctype();
+        $pipeline->data_filters[] = new DataFilterUTF8($GLOBALS['g_config']['encoding']);
+
+        if ($GLOBALS['g_config']['html2xhtml']) {
+            $pipeline->data_filters[] = new DataFilterHTML2XHTML();
+        } else {
+            $pipeline->data_filters[] = new DataFilterXHTML2XHTML();
+        }
+
+        $pipeline->parser = new ParserXHTML();
+        $pipeline->pre_tree_filters = [];
+        $header_html = '';
+        $footer_html = '';
+        $filter = new PreTreeFilterHeaderFooter($header_html, $footer_html);
+        $pipeline->pre_tree_filters[] = $filter;
+
+        if ($GLOBALS['g_config']['renderfields']) {
+            $pipeline->pre_tree_filters[] = new PreTreeFilterHTML2PSFields();
+        }
+
+        if ($GLOBALS['g_config']['method'] === 'ps') {
+            $pipeline->layout_engine = new LayoutEnginePS();
+        } else {
+            $pipeline->layout_engine = new LayoutEngineDefault();
+        }
+
+        $pipeline->post_tree_filters = [];
+
+        if ($GLOBALS['g_config']['pslevel'] == 3) {
+            $image_encoder = new PSL3ImageEncoderStream();
+        } else {
+            $image_encoder = new PSL2ImageEncoderStream();
+        }
+
+        switch ($GLOBALS['g_config']['method']) {
+            case 'fastps':
+                if ($GLOBALS['g_config']['pslevel'] == 3) {
+                    $pipeline->output_driver = new OutputDriverFastPS($image_encoder);
+                } else {
+                    $pipeline->output_driver = new OutputDriverFastPSLevel2($image_encoder);
+                }
+                break;
+            case 'pdflib':
+                $pipeline->output_driver = new OutputDriverPDFLIB16($GLOBALS['g_config']['pdfversion']);
+                break;
+            case 'fpdf':
+                $pipeline->output_driver = new OutputDriverFPDF();
+                break;
+            case 'png':
+                $pipeline->output_driver = new OutputDriverPNG();
+                break;
+            case 'pcl':
+                $pipeline->output_driver = new OutputDriverPCL();
+                break;
+            default:
+                die('Unknown output method');
+        }
+
+        if (isset($GLOBALS['g_config']['watermarkhtml'])) {
+            $watermark_text = $GLOBALS['g_config']['watermarkhtml'];
+        } else {
+            $watermark_text = '';
+        }
+
+        $pipeline->output_driver->set_watermark($watermark_text);
+
+        if ($watermark_text != '') {
+            $dispatcher = $pipeline->getDispatcher();
+        }
+
+        if ($GLOBALS['g_config']['debugbox']) {
+            $pipeline->output_driver->set_debug_boxes(true);
+        }
+
+        if ($GLOBALS['g_config']['draw_page_border']) {
+            $pipeline->output_driver->set_show_page_border(true);
+        }
+
+        if ($GLOBALS['g_config']['ps2pdf']) {
+            $pipeline->output_filters[] = new OutputFilterPS2PDF($GLOBALS['g_config']['pdfversion']);
+        }
+
+        if ($GLOBALS['g_config']['compress'] && $GLOBALS['g_config']['method'] == 'fastps') {
+            $pipeline->output_filters[] = new OutputFilterGZip();
+        }
+
+        if (!isset($GLOBALS['g_config']['process_mode'])) {
+            $GLOBALS['g_config']['process_mode'] = '';
+        }
+
+        if ($GLOBALS['g_config']['process_mode'] == 'batch') {
+            $filename = 'batch';
+        } else {
+            $filename = $sFilename;
+        }
+
+        switch ($GLOBALS['g_config']['output']) {
+            case 0:
+                $pipeline->destination = new DestinationBrowser($filename);
+                break;
+            case 1:
+                $pipeline->destination = new DestinationDownload($filename);
+                break;
+            case 2:
+                $pipeline->destination = new DestinationFile($filename);
+                break;
+        }
+
+        copy($sPath . $sFilename . '.html', PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.html');
+        try {
+            $status = $pipeline->process((G::is_https() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . '/files/' . $_SESSION['APPLICATION'] . '/outdocs/' . $sFilename . '.html', $g_media);
+            copy(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf', $sPath . $sFilename . '.pdf');
+            unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf');
+            unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.html');
+        } catch (Exception $e) {
+            if ($e->getMessage() == 'ID_OUTPUT_NOT_GENERATE') {
+                include_once 'classes/model/AppDocument.php';
+                $dataDocument = explode('_', $sFilename);
+                if (!isset($dataDocument[1])) {
+                    $dataDocument[1] = 1;
+                }
+                $oAppDocument = new AppDocument();
+                $oAppDocument->remove($dataDocument[0], $dataDocument[1]);
+                G::SendTemporalMessage(G::LoadTranslation('ID_OUTPUT_NOT_GENERATE'), 'Error');
+            }
+        }
+    }
+
+    /**
+     * verify if Output row specified in [sUid] exists.
+     *
+     * @param      string $sUid the uid of the Prolication
+     */
+    public function OutputExists($sUid)
+    {
+        $con = Propel::getConnection(OutputDocumentPeer::DATABASE_NAME);
+
+        try {
+            $oObj = OutputDocumentPeer::retrieveByPk($sUid);
+
+            if (is_object($oObj) && get_class($oObj) == 'OutputDocument') {
+                return true;
+            } else {
+                return false;
+            }
+        } catch (Exception $oError) {
+            throw ($oError);
+        }
+    }
+}
diff --git a/workflow/engine/classes/model/Process.php b/workflow/engine/classes/model/Process.php
index 4ae0c0030..17b27868b 100644
--- a/workflow/engine/classes/model/Process.php
+++ b/workflow/engine/classes/model/Process.php
@@ -56,13 +56,13 @@ class Process extends BaseProcess
      *
      * @return string
      */
-    public function getProTitleContent ()
+    public function getProTitleContent()
     {
         if ($this->getProUid() == '') {
-            throw (new Exception( "Error in getProTitle, the PRO_UID can't be blank" ));
+            throw (new Exception("Error in getProTitle, the PRO_UID can't be blank"));
         }
-        $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
-        $this->pro_title_content = Content::load( 'PRO_TITLE', '', $this->getProUid(), $lang );
+        $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
+        $this->pro_title_content = Content::load('PRO_TITLE', '', $this->getProUid(), $lang);
         return $this->pro_title_content;
     }
 
@@ -72,24 +72,23 @@ class Process extends BaseProcess
      * @param string $v new value
      * @return void
      */
-    public function setProTitleContent ($v)
+    public function setProTitleContent($v)
     {
         if ($this->getProUid() == '') {
-            throw (new Exception( "Error in setProTitle, the PRO_UID can't be blank" . print_r( debug_backtrace(), 1 ) ));
+            throw (new Exception("Error in setProTitle, the PRO_UID can't be blank" . print_r(debug_backtrace(), 1)));
         }
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
-        if ($v !== null && ! is_string( $v )) {
+        if ($v !== null && ! is_string($v)) {
             $v = (string) $v;
         }
 
         if (in_array(ProcessPeer::PRO_TITLE, $this->modifiedColumns) || $v === '') {
             $this->pro_title_content = $v;
-            $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
+            $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
 
-            $res = Content::addContent( 'PRO_TITLE', '', $this->getProUid(), $lang, $this->pro_title_content );
+            $res = Content::addContent('PRO_TITLE', '', $this->getProUid(), $lang, $this->pro_title_content);
         }
-
     } // set()
 
 
@@ -105,13 +104,13 @@ class Process extends BaseProcess
      *
      * @return string
      */
-    public function getProDescriptionContent ()
+    public function getProDescriptionContent()
     {
         if ($this->getProUid() == '') {
-            throw (new Exception( "Error in getProDescription, the PRO_UID can't be blank" ));
+            throw (new Exception("Error in getProDescription, the PRO_UID can't be blank"));
         }
-        $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
-        $this->pro_description_content = Content::load( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang );
+        $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
+        $this->pro_description_content = Content::load('PRO_DESCRIPTION', '', $this->getProUid(), $lang);
         return $this->pro_description_content;
     }
 
@@ -121,24 +120,23 @@ class Process extends BaseProcess
      * @param string $v new value
      * @return void
      */
-    public function setProDescriptionContent ($v)
+    public function setProDescriptionContent($v)
     {
         if ($this->getProUid() == '') {
-            throw (new Exception( "Error in setProDescription, the PRO_UID can't be blank" ));
+            throw (new Exception("Error in setProDescription, the PRO_UID can't be blank"));
         }
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
-        if ($v !== null && ! is_string( $v )) {
+        if ($v !== null && ! is_string($v)) {
             $v = (string) $v;
         }
 
         if (in_array(ProcessPeer::PRO_DESCRIPTION, $this->modifiedColumns) || $v === '') {
             $this->pro_description_content = $v;
-            $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
+            $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
 
-            $res = Content::addContent( 'PRO_DESCRIPTION', '', $this->getProUid(), $lang, $this->pro_description_content );
+            $res = Content::addContent('PRO_DESCRIPTION', '', $this->getProUid(), $lang, $this->pro_description_content);
         }
-
     } // set()
 
 
@@ -152,17 +150,17 @@ class Process extends BaseProcess
      * @return string
      */
 
-    public function create ($aData, $generateUid = true)
+    public function create($aData, $generateUid = true)
     {
-        if (! isset( $aData['USR_UID'] )) {
-            throw (new PropelException( 'The process cannot be created. The USR_UID is empty.' ));
+        if (! isset($aData['USR_UID'])) {
+            throw (new PropelException('The process cannot be created. The USR_UID is empty.'));
         }
-        $con = Propel::getConnection( ProcessPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ProcessPeer::DATABASE_NAME);
         try {
             if ($generateUid) {
                 do {
                     $sNewProUid = G::generateUniqueID();
-                } while ($this->processExists( $sNewProUid ));
+                } while ($this->processExists($sNewProUid));
             } else {
                 $sNewProUid = $aData['PRO_UID'];
                 if (!empty($aData['PRO_ID'])) {
@@ -170,45 +168,45 @@ class Process extends BaseProcess
                 }
             }
 
-            $this->setProUid( $sNewProUid );
+            $this->setProUid($sNewProUid);
             $this->setProTitle((isset($aData['PRO_TITLE'])) ? $aData['PRO_TITLE'] : 'Default Process Title');
             $this->setProDescription((isset($aData['PRO_DESCRIPTION'])) ? $aData['PRO_DESCRIPTION'] : 'Default Process Description');
-            $this->setProParent( $sNewProUid );
-            $this->setProTime( 1 );
-            $this->setProTimeunit( 'DAYS' );
+            $this->setProParent($sNewProUid);
+            $this->setProTime(1);
+            $this->setProTimeunit('DAYS');
             $this->setProStatus((isset($aData["PRO_STATUS"])) ? $aData["PRO_STATUS"] : 'ACTIVE');
-            $this->setProTypeDay( '' );
+            $this->setProTypeDay('');
             $this->setProType((isset($aData["PRO_TYPE"]))? $aData["PRO_TYPE"]: "NORMAL");
-            $this->setProAssignment( 'FALSE' );
-            $this->setProShowMap( '' );
-            $this->setProShowMessage( '' );
-            $this->setProShowDelegate( '' );
-            $this->setProShowDynaform( '' );
+            $this->setProAssignment('FALSE');
+            $this->setProShowMap('');
+            $this->setProShowMessage('');
+            $this->setProShowDelegate('');
+            $this->setProShowDynaform('');
             $this->setProCategory((isset($aData["PRO_CATEGORY"]))? $aData["PRO_CATEGORY"]: "");
-            $this->setProSubCategory( '' );
-            $this->setProIndustry( '' );
-            $this->setProCreateDate( date("Y-m-d H:i:s") );
-            $this->setProCreateUser( $aData['USR_UID'] );
-            $this->setProHeight( 5000 );
-            $this->setProWidth( 10000 );
-            $this->setProTitleX( 0 );
-            $this->setProTitleY( 0 );
-            $this->setProItee( 1 );
-            $this->setProDynaforms( isset( $aData['PRO_DYNAFORMS'] ) ? (is_array( $aData['PRO_DYNAFORMS'] ) ? serialize( $aData['PRO_DYNAFORMS'] ) : $aData['PRO_DYNAFORMS']) : '' );
+            $this->setProSubCategory('');
+            $this->setProIndustry('');
+            $this->setProCreateDate(date("Y-m-d H:i:s"));
+            $this->setProCreateUser($aData['USR_UID']);
+            $this->setProHeight(5000);
+            $this->setProWidth(10000);
+            $this->setProTitleX(0);
+            $this->setProTitleY(0);
+            $this->setProItee(1);
+            $this->setProDynaforms(isset($aData['PRO_DYNAFORMS']) ? (is_array($aData['PRO_DYNAFORMS']) ? serialize($aData['PRO_DYNAFORMS']) : $aData['PRO_DYNAFORMS']) : '');
 
             if ($this->validate()) {
                 $con->begin();
 
-                if (isset( $aData['PRO_TITLE'] )) {
-                    $this->setProTitleContent( $aData['PRO_TITLE'] );
+                if (isset($aData['PRO_TITLE'])) {
+                    $this->setProTitleContent($aData['PRO_TITLE']);
                 } else {
-                    $this->setProTitleContent( 'Default Process Title' );
+                    $this->setProTitleContent('Default Process Title');
                 }
 
-                if (isset( $aData['PRO_DESCRIPTION'] )) {
-                    $this->setProDescriptionContent( $aData['PRO_DESCRIPTION'] );
+                if (isset($aData['PRO_DESCRIPTION'])) {
+                    $this->setProDescriptionContent($aData['PRO_DESCRIPTION']);
                 } else {
-                    $this->setProDescriptionContent( 'Default Process Description' );
+                    $this->setProDescriptionContent('Default Process Description');
                 }
 
                 $res = $this->save();
@@ -222,7 +220,7 @@ class Process extends BaseProcess
                 foreach ($this->getValidationFailures() as $objValidationFailure) {
                     $msg .= $objValidationFailure->getMessage() . "<br/>";
                 }
-                throw (new PropelException( 'The row cannot be created!', new PropelException( $msg ) ));
+                throw (new PropelException('The row cannot be created!', new PropelException($msg)));
             }
         } catch (Exception $e) {
             $con->rollback();
@@ -235,12 +233,12 @@ class Process extends BaseProcess
      *
      * @param string $sProUid the uid of the Prolication
      */
-    public function processExists ($ProUid)
+    public function processExists($ProUid)
     {
-        $con = Propel::getConnection( ProcessPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ProcessPeer::DATABASE_NAME);
         try {
-            $oPro = ProcessPeer::retrieveByPk( $ProUid );
-            if (is_object( $oPro ) && get_class( $oPro ) == 'Process') {
+            $oPro = ProcessPeer::retrieveByPk($ProUid);
+            if (is_object($oPro) && get_class($oPro) == 'Process') {
                 return true;
             } else {
                 return false;
@@ -256,14 +254,14 @@ class Process extends BaseProcess
      * @param string $ProUid the uid of the Prolication
      * @return array $Fields the fields
      */
-    public function load ($ProUid, $getAllLang = false)
+    public function load($ProUid, $getAllLang = false)
     {
-        $con = Propel::getConnection( ProcessPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ProcessPeer::DATABASE_NAME);
         try {
-            $oPro = ProcessPeer::retrieveByPk( $ProUid );
-            if (is_object( $oPro ) && get_class( $oPro ) == 'Process') {
-                $aFields = $oPro->toArray( BasePeer::TYPE_FIELDNAME );
-                $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
+            $oPro = ProcessPeer::retrieveByPk($ProUid);
+            if (is_object($oPro) && get_class($oPro) == 'Process') {
+                $aFields = $oPro->toArray(BasePeer::TYPE_FIELDNAME);
+                $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
                 //optimized to avoid double and multiple execution of the same query
                 //        $aFields['PRO_TITLE']       = $oPro->getProTitle();
                 //        $aFields['PRO_DESCRIPTION'] = $oPro->getProDescription();
@@ -272,68 +270,68 @@ class Process extends BaseProcess
 
                 //the following code is to copy the parent in old process, when the parent was empty.
                 if ($oPro->getProParent() == '') {
-                    $oPro->setProParent( $oPro->getProUid() );
+                    $oPro->setProParent($oPro->getProUid());
                     $oPro->save();
                 }
 
                 //Get category Name, by default No category
-                $aFields['PRO_CATEGORY_LABEL'] = G::LoadTranslation( "ID_PROCESS_NO_CATEGORY" );
+                $aFields['PRO_CATEGORY_LABEL'] = G::LoadTranslation("ID_PROCESS_NO_CATEGORY");
                 if ($aFields['PRO_CATEGORY'] != "") {
-                    $oProCat = ProcessCategoryPeer::retrieveByPk( $aFields['PRO_CATEGORY'] );
-                    if (is_object( $oProCat ) && get_class( $oProCat ) == 'ProcessCategory') {
+                    $oProCat = ProcessCategoryPeer::retrieveByPk($aFields['PRO_CATEGORY']);
+                    if (is_object($oProCat) && get_class($oProCat) == 'ProcessCategory') {
                         $aFields['PRO_CATEGORY_LABEL'] = $oProCat->getCategoryName();
                     }
                 }
 
-                $aFields['PRO_DYNAFORMS'] = @unserialize( $aFields['PRO_DYNAFORMS'] );
+                $aFields['PRO_DYNAFORMS'] = @unserialize($aFields['PRO_DYNAFORMS']);
                 //Check if is BPMN process
                 $aFields['PRO_BPMN'] = $this->isBpmnProcess($ProUid);
 
                 return $aFields;
             } else {
-                throw (new Exception( "The row '$ProUid' in table Process doesn't exist!" ));
+                throw (new Exception("The row '$ProUid' in table Process doesn't exist!"));
             }
         } catch (Exception $oError) {
             throw ($oError);
         }
     }
 
-    public function getAll ()
+    public function getAll()
     {
-        $oCriteria = new Criteria( 'workflow' );
+        $oCriteria = new Criteria('workflow');
 
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_DESCRIPTION );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_PARENT );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_STATUS );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_CATEGORY );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_CREATE_DATE );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_CREATE_USER );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_DEBUG );
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_UID);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_DESCRIPTION);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_PARENT);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_STATUS);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_CREATE_DATE);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_CREATE_USER);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_DEBUG);
 
-        $oCriteria->add( ProcessPeer::PRO_UID, '', Criteria::NOT_EQUAL );
-        $oCriteria->add( ProcessPeer::PRO_STATUS, 'DISABLED', Criteria::NOT_EQUAL );
+        $oCriteria->add(ProcessPeer::PRO_UID, '', Criteria::NOT_EQUAL);
+        $oCriteria->add(ProcessPeer::PRO_STATUS, 'DISABLED', Criteria::NOT_EQUAL);
 
         //execute the query
-        $oDataset = ProcessPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-        $processes = Array ();
-        $uids = array ();
+        $oDataset = ProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $processes = array();
+        $uids = array();
         while ($oDataset->next()) {
             $row = $oDataset->getRow();
 
             $processes[] = $row;
-            $uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID'];
+            $uids[] = $processes[sizeof($processes) - 1]['PRO_UID'];
         }
 
         $oConf = new Configurations();
-        $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
+        $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
 
         if ($this->dir=='ASC') {
-        	usort( $processes, array($this, "ordProcessAsc") );
+            usort($processes, array($this, "ordProcessAsc"));
         } else {
-        	usort( $processes, array($this, "ordProcessDesc") );
+            usort($processes, array($this, "ordProcessDesc"));
         }
 
         return $processes;
@@ -346,24 +344,24 @@ class Process extends BaseProcess
      * @return variant
      *
      */
-    public function update ($aData)
+    public function update($aData)
     {
-        if (isset( $aData['PRO_DYNAFORMS'] ) && is_array( $aData['PRO_DYNAFORMS'] )) {
-            $aData['PRO_DYNAFORMS'] = @serialize( $aData['PRO_DYNAFORMS'] );
+        if (isset($aData['PRO_DYNAFORMS']) && is_array($aData['PRO_DYNAFORMS'])) {
+            $aData['PRO_DYNAFORMS'] = @serialize($aData['PRO_DYNAFORMS']);
         }
 
-        $con = Propel::getConnection( ProcessPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ProcessPeer::DATABASE_NAME);
         try {
             $con->begin();
-            $oPro = ProcessPeer::retrieveByPK( $aData['PRO_UID'] );
-            if (is_object( $oPro ) && get_class( $oPro ) == 'Process') {
-                $oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
+            $oPro = ProcessPeer::retrieveByPK($aData['PRO_UID']);
+            if (is_object($oPro) && get_class($oPro) == 'Process') {
+                $oPro->fromArray($aData, BasePeer::TYPE_FIELDNAME);
                 if ($oPro->validate()) {
-                    if (isset( $aData['PRO_TITLE'] )) {
-                        $oPro->setProTitleContent( $aData['PRO_TITLE'] );
+                    if (isset($aData['PRO_TITLE'])) {
+                        $oPro->setProTitleContent($aData['PRO_TITLE']);
                     }
-                    if (isset( $aData['PRO_DESCRIPTION'] )) {
-                        $oPro->setProDescriptionContent( $aData['PRO_DESCRIPTION'] );
+                    if (isset($aData['PRO_DESCRIPTION'])) {
+                        $oPro->setProDescriptionContent($aData['PRO_DESCRIPTION']);
                     }
                     $res = $oPro->save();
                     $con->commit();
@@ -377,11 +375,11 @@ class Process extends BaseProcess
                         $msg .= $objValidationFailure->getMessage() . "<br/>";
                     }
 
-                    throw (new Exception( 'The row cannot be updated!' . $msg ));
+                    throw (new Exception('The row cannot be updated!' . $msg));
                 }
             } else {
                 $con->rollback();
-                throw (new Exception( "The row '" . $aData['PRO_UID'] . "' in table Process doesn't exist!" ));
+                throw (new Exception("The row '" . $aData['PRO_UID'] . "' in table Process doesn't exist!"));
             }
         } catch (Exception $oError) {
             throw ($oError);
@@ -395,65 +393,65 @@ class Process extends BaseProcess
      * @return variant
      *
      */
-    public function createRow ($aData)
+    public function createRow($aData)
     {
-        $con = Propel::getConnection( ProcessPeer::DATABASE_NAME );
+        $con = Propel::getConnection(ProcessPeer::DATABASE_NAME);
         //$con->begin(); //does not allow dual BEGIN
-        $this->setProUid( $aData['PRO_UID'] );
+        $this->setProUid($aData['PRO_UID']);
         $this->setProTitle((isset($aData['PRO_TITLE'])) ? $aData['PRO_TITLE'] : 'Default Process Title');
         $this->setProDescription((isset($aData['PRO_DESCRIPTION'])) ? $aData['PRO_DESCRIPTION'] : 'Default Process Description');
-        $this->setProParent( $aData['PRO_PARENT'] );
-        $this->setProTime( $aData['PRO_TIME'] );
-        $this->setProTimeunit( $aData['PRO_TIMEUNIT'] );
-        $this->setProStatus( $aData['PRO_STATUS'] );
-        $this->setProTypeDay( $aData['PRO_TYPE_DAY'] );
-        $this->setProType( $aData['PRO_TYPE'] );
-        $this->setProAssignment( $aData['PRO_ASSIGNMENT'] );
-        $this->setProShowMap( $aData['PRO_SHOW_MAP'] );
-        $this->setProShowMessage( $aData['PRO_SHOW_MESSAGE'] );
-        $this->setProSubprocess( isset( $aData['PRO_SUBPROCESS'] ) ? $aData['PRO_SUBPROCESS'] : '' );
-        $this->setProTriDeleted( isset( $aData['PRO_TRI_DELETED'] ) ? $aData['PRO_TRI_DELETED'] : '' );
-        $this->setProTriCanceled( isset( $aData['PRO_TRI_CANCELED'] ) ? $aData['PRO_TRI_CANCELED'] : '' );
-        $this->setProTriPaused( isset( $aData['PRO_TRI_PAUSED'] ) ? $aData['PRO_TRI_PAUSED'] : '' );
-        $this->setProTriReassigned( isset( $aData['PRO_TRI_REASSIGNED'] ) ? $aData['PRO_TRI_REASSIGNED'] : '' );
-        $this->setProTriUnpaused( isset( $aData['PRO_TRI_UNPAUSED'] ) ? $aData['PRO_TRI_UNPAUSED'] : '' );
-        $this->setProShowDelegate( $aData['PRO_SHOW_DELEGATE'] );
-        $this->setProShowDynaform( $aData['PRO_SHOW_DYNAFORM'] );
-        $this->setProDerivationScreenTpl( isset( $aData['PRO_DERIVATION_SCREEN_TPL']) ? $aData['PRO_DERIVATION_SCREEN_TPL'] : '' );
+        $this->setProParent($aData['PRO_PARENT']);
+        $this->setProTime($aData['PRO_TIME']);
+        $this->setProTimeunit($aData['PRO_TIMEUNIT']);
+        $this->setProStatus($aData['PRO_STATUS']);
+        $this->setProTypeDay($aData['PRO_TYPE_DAY']);
+        $this->setProType($aData['PRO_TYPE']);
+        $this->setProAssignment($aData['PRO_ASSIGNMENT']);
+        $this->setProShowMap($aData['PRO_SHOW_MAP']);
+        $this->setProShowMessage($aData['PRO_SHOW_MESSAGE']);
+        $this->setProSubprocess(isset($aData['PRO_SUBPROCESS']) ? $aData['PRO_SUBPROCESS'] : '');
+        $this->setProTriDeleted(isset($aData['PRO_TRI_DELETED']) ? $aData['PRO_TRI_DELETED'] : '');
+        $this->setProTriCanceled(isset($aData['PRO_TRI_CANCELED']) ? $aData['PRO_TRI_CANCELED'] : '');
+        $this->setProTriPaused(isset($aData['PRO_TRI_PAUSED']) ? $aData['PRO_TRI_PAUSED'] : '');
+        $this->setProTriReassigned(isset($aData['PRO_TRI_REASSIGNED']) ? $aData['PRO_TRI_REASSIGNED'] : '');
+        $this->setProTriUnpaused(isset($aData['PRO_TRI_UNPAUSED']) ? $aData['PRO_TRI_UNPAUSED'] : '');
+        $this->setProShowDelegate($aData['PRO_SHOW_DELEGATE']);
+        $this->setProShowDynaform($aData['PRO_SHOW_DYNAFORM']);
+        $this->setProDerivationScreenTpl(isset($aData['PRO_DERIVATION_SCREEN_TPL']) ? $aData['PRO_DERIVATION_SCREEN_TPL'] : '');
 
         // validate if the category exists
-        $criteria = new Criteria( 'workflow' );
-        $criteria->add( ProcessCategoryPeer::CATEGORY_UID, $aData['PRO_CATEGORY'] );
-        $ds = ProcessCategoryPeer::doSelectRS( $criteria, Propel::getDbConnection('workflow_ro') );
-        $ds->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $criteria = new Criteria('workflow');
+        $criteria->add(ProcessCategoryPeer::CATEGORY_UID, $aData['PRO_CATEGORY']);
+        $ds = ProcessCategoryPeer::doSelectRS($criteria, Propel::getDbConnection('workflow_ro'));
+        $ds->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $ds->next();
         // if it is not set, set value as empty "No Category"
         if (! $ds->getRow()) {
             $aData['PRO_CATEGORY'] = '';
         }
 
-        $this->setProCategory( $aData['PRO_CATEGORY'] );
-        $this->setProSubCategory( $aData['PRO_SUB_CATEGORY'] );
-        $this->setProIndustry( $aData['PRO_INDUSTRY'] );
-        $this->setProCreateDate( $aData['PRO_CREATE_DATE'] );
-        $this->setProCreateUser( $aData['PRO_CREATE_USER'] );
-        $this->setProHeight( $aData['PRO_HEIGHT'] );
-        $this->setProWidth( $aData['PRO_WIDTH'] );
-        $this->setProTitleX( $aData['PRO_TITLE_X'] );
-        $this->setProTitleY( $aData['PRO_TITLE_Y'] );
-        $this->setProDynaforms( isset( $aData['PRO_DYNAFORMS'] ) ? (is_array( $aData['PRO_DYNAFORMS'] ) ? serialize( $aData['PRO_DYNAFORMS'] ) : $aData['PRO_DYNAFORMS']) : '' );
+        $this->setProCategory($aData['PRO_CATEGORY']);
+        $this->setProSubCategory($aData['PRO_SUB_CATEGORY']);
+        $this->setProIndustry($aData['PRO_INDUSTRY']);
+        $this->setProCreateDate($aData['PRO_CREATE_DATE']);
+        $this->setProCreateUser($aData['PRO_CREATE_USER']);
+        $this->setProHeight($aData['PRO_HEIGHT']);
+        $this->setProWidth($aData['PRO_WIDTH']);
+        $this->setProTitleX($aData['PRO_TITLE_X']);
+        $this->setProTitleY($aData['PRO_TITLE_Y']);
+        $this->setProDynaforms(isset($aData['PRO_DYNAFORMS']) ? (is_array($aData['PRO_DYNAFORMS']) ? serialize($aData['PRO_DYNAFORMS']) : $aData['PRO_DYNAFORMS']) : '');
         if ($this->validate()) {
             $con->begin();
 
-            if (isset( $aData['PRO_TITLE'] ) && trim( $aData['PRO_TITLE'] ) != '') {
-                $this->setProTitleContent( $aData['PRO_TITLE'] );
+            if (isset($aData['PRO_TITLE']) && trim($aData['PRO_TITLE']) != '') {
+                $this->setProTitleContent($aData['PRO_TITLE']);
             } else {
-                $this->setProTitleContent( 'Default Process Title' );
+                $this->setProTitleContent('Default Process Title');
             }
-            if (isset( $aData['PRO_DESCRIPTION'] )) {
-                $this->setProDescriptionContent( $aData['PRO_DESCRIPTION'] );
+            if (isset($aData['PRO_DESCRIPTION'])) {
+                $this->setProDescriptionContent($aData['PRO_DESCRIPTION']);
             } else {
-                $this->setProDescriptionContent( 'Default Process Description' );
+                $this->setProDescriptionContent('Default Process Description');
             }
 
             $res = $this->save();
@@ -468,9 +466,8 @@ class Process extends BaseProcess
                 $msg .= $objValidationFailure->getMessage() . "<br/>";
             }
 
-            throw (new PropelException( 'The row cannot be created!', new PropelException( $msg ) ));
+            throw (new PropelException('The row cannot be created!', new PropelException($msg)));
         }
-
     }
 
     /**
@@ -480,30 +477,30 @@ class Process extends BaseProcess
      * @return string
      *
      */
-    public function remove ($ProUid)
+    public function remove($ProUid)
     {
-        if (is_array( $ProUid )) {
-            $ProUid = (isset( $ProUid['PRO_UID'] ) ? $ProUid['PRO_UID'] : '');
+        if (is_array($ProUid)) {
+            $ProUid = (isset($ProUid['PRO_UID']) ? $ProUid['PRO_UID'] : '');
         }
         try {
-            $oPro = ProcessPeer::retrieveByPK( $ProUid );
-            if (! is_null( $oPro )) {
-                Content::removeContent( 'PRO_TITLE', '', $oPro->getProUid() );
-                Content::removeContent( 'PRO_DESCRIPTION', '', $oPro->getProUid() );
+            $oPro = ProcessPeer::retrieveByPK($ProUid);
+            if (! is_null($oPro)) {
+                Content::removeContent('PRO_TITLE', '', $oPro->getProUid());
+                Content::removeContent('PRO_DESCRIPTION', '', $oPro->getProUid());
                 $this->memcachedDelete();
                 return $oPro->delete();
             } else {
-                throw (new Exception( "The row '$ProUid' in table Process doesn't exist!" ));
+                throw (new Exception("The row '$ProUid' in table Process doesn't exist!"));
             }
         } catch (Exception $oError) {
             throw ($oError);
         }
     }
 
-    public function exists ($ProUid)
+    public function exists($ProUid)
     {
-        $oPro = ProcessPeer::retrieveByPk( $ProUid );
-        return (is_object( $oPro ) && get_class( $oPro ) == 'Process');
+        $oPro = ProcessPeer::retrieveByPk($ProUid);
+        return (is_object($oPro) && get_class($oPro) == 'Process');
     }
 
     /**
@@ -557,66 +554,66 @@ class Process extends BaseProcess
         return $proTitle . "-" . ($may + 1);
     }
 
-    public function getAllProcessesCount ()
+    public function getAllProcessesCount()
     {
         $c = $this->tmpCriteria;
         $c->clearSelectColumns();
-        $c->addSelectColumn( 'COUNT(*)' );
-        $oDataset = ProcessPeer::doSelectRS( $c, Propel::getDbConnection('workflow_ro') );
+        $c->addSelectColumn('COUNT(*)');
+        $oDataset = ProcessPeer::doSelectRS($c, Propel::getDbConnection('workflow_ro'));
         $oDataset->next();
         $aRow = $oDataset->getRow();
 
-        if (is_array( $aRow )) {
+        if (is_array($aRow)) {
             return $aRow[0];
         } else {
             return 0;
         }
     }
 
-    public function getAllProcesses ($start, $limit, $category = null, $processName = null, $counters = true, $reviewSubProcess = false, $userLogged = "")
+    public function getAllProcesses($start, $limit, $category = null, $processName = null, $counters = true, $reviewSubProcess = false, $userLogged = "")
     {
-    	require_once PATH_RBAC . "model/RbacUsers.php";
+        require_once PATH_RBAC . "model/RbacUsers.php";
         require_once "classes/model/ProcessCategory.php";
         require_once "classes/model/Users.php";
 
         $user = new RbacUsers();
-        $aProcesses = Array ();
-        $categories = Array ();
-        $oCriteria = new Criteria( 'workflow' );
+        $aProcesses = array();
+        $categories = array();
+        $oCriteria = new Criteria('workflow');
 
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_UID );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_DESCRIPTION );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_PARENT );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_STATUS );
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_UID);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_DESCRIPTION);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_PARENT);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_STATUS);
         $oCriteria->addSelectColumn(ProcessPeer::PRO_TYPE);
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_CATEGORY );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_UPDATE_DATE );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_CREATE_DATE );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_CREATE_USER );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_DEBUG );
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_UPDATE_DATE);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_CREATE_DATE);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_CREATE_USER);
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_DEBUG);
         $oCriteria->addSelectColumn(ProcessPeer::PRO_TYPE_PROCESS);
 
-        $oCriteria->addSelectColumn( UsersPeer::USR_UID );
-        $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
-        $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
-        $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
+        $oCriteria->addSelectColumn(UsersPeer::USR_UID);
+        $oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
+        $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
+        $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
 
-        $oCriteria->addSelectColumn( ProcessCategoryPeer::CATEGORY_UID );
-        $oCriteria->addSelectColumn( ProcessCategoryPeer::CATEGORY_NAME );
+        $oCriteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_UID);
+        $oCriteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_NAME);
 
-        $oCriteria->add( ProcessPeer::PRO_UID, '', Criteria::NOT_EQUAL );
-        $oCriteria->add( ProcessPeer::PRO_STATUS, 'DISABLED', Criteria::NOT_EQUAL );
+        $oCriteria->add(ProcessPeer::PRO_UID, '', Criteria::NOT_EQUAL);
+        $oCriteria->add(ProcessPeer::PRO_STATUS, 'DISABLED', Criteria::NOT_EQUAL);
         if ($reviewSubProcess) {
-            $oCriteria->add( ProcessPeer::PRO_SUBPROCESS, '1', Criteria::NOT_EQUAL );
+            $oCriteria->add(ProcessPeer::PRO_SUBPROCESS, '1', Criteria::NOT_EQUAL);
         }
 
-        if (isset( $category )) {
-            $oCriteria->add( ProcessPeer::PRO_CATEGORY, $category, Criteria::EQUAL );
+        if (isset($category)) {
+            $oCriteria->add(ProcessPeer::PRO_CATEGORY, $category, Criteria::EQUAL);
         }
 
-        $oCriteria->addJoin( ProcessPeer::PRO_CREATE_USER, UsersPeer::USR_UID, Criteria::LEFT_JOIN );
-        $oCriteria->addJoin( ProcessPeer::PRO_CATEGORY, ProcessCategoryPeer::CATEGORY_UID, Criteria::LEFT_JOIN );
+        $oCriteria->addJoin(ProcessPeer::PRO_CREATE_USER, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
+        $oCriteria->addJoin(ProcessPeer::PRO_CATEGORY, ProcessCategoryPeer::CATEGORY_UID, Criteria::LEFT_JOIN);
 
         if ($this->sort == "PRO_CREATE_DATE") {
             if ($this->dir == "DESC") {
@@ -629,7 +626,8 @@ class Process extends BaseProcess
         if ($userLogged != "") {
             $oCriteria->add(
                 $oCriteria->getNewCriterion(ProcessPeer::PRO_TYPE_PROCESS, "PUBLIC", Criteria::EQUAL)->addOr(
-                $oCriteria->getNewCriterion(ProcessPeer::PRO_CREATE_USER, $userLogged, Criteria::EQUAL))
+                $oCriteria->getNewCriterion(ProcessPeer::PRO_CREATE_USER, $userLogged, Criteria::EQUAL)
+                )
             );
         }
 
@@ -643,7 +641,7 @@ class Process extends BaseProcess
         // getting bpmn projects
         $c = new Criteria('workflow');
         $c->addSelectColumn(BpmnProjectPeer::PRJ_UID);
-        $ds = ProcessPeer::doSelectRS($c, Propel::getDbConnection('workflow_ro') );
+        $ds = ProcessPeer::doSelectRS($c, Propel::getDbConnection('workflow_ro'));
         $ds->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $bpmnProjects = array();
 
@@ -653,42 +651,42 @@ class Process extends BaseProcess
         }
 
         //execute the query
-        $oDataset = ProcessPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-        $processes = Array ();
-        $uids = array ();
+        $oDataset = ProcessPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $processes = array();
+        $uids = array();
         while ($oDataset->next()) {
             $row = $oDataset->getRow();
 
             $row["PROJECT_TYPE"] = ($row["PRO_TYPE"] == "NORMAL")? ((in_array($row["PRO_UID"], $bpmnProjects))? "bpmn" : "classic") : $row["PRO_TYPE"];
 
             $processes[] = $row;
-            $uids[] = $processes[sizeof( $processes ) - 1]['PRO_UID'];
+            $uids[] = $processes[sizeof($processes) - 1]['PRO_UID'];
         }
 
         $oConf = new Configurations();
-        $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
+        $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
 
         foreach ($processes as $process) {
             $proTitle = isset($process['PRO_TITLE'])? $process['PRO_TITLE'] : '';
             $proDescription = isset($process['PRO_DESCRIPTION']) ? htmlspecialchars($process['PRO_DESCRIPTION']) : '';
             $process["PRO_TYPE_PROCESS"] = ($process["PRO_TYPE_PROCESS"] == "PUBLIC") ? G::LoadTranslation("ID_PUBLIC") : G::LoadTranslation("ID_PRIVATE");
             // verify if the title is already set on the current language
-            if (trim( $proTitle ) == '') {
+            if (trim($proTitle) == '') {
                 // if not, then load the record to generate content for current language
-                $proData = $this->load( $process['PRO_UID'] );
+                $proData = $this->load($process['PRO_UID']);
                 $proTitle = $proData['PRO_TITLE'];
                 $proDescription = htmlspecialchars($proData['PRO_DESCRIPTION']);
             }
 
             //filtering by $processName
-            if (isset( $processName ) && $processName != '' && stripos( $proTitle, $processName ) === false) {
+            if (isset($processName) && $processName != '' && stripos($proTitle, $processName) === false) {
                 continue;
             }
 
             if ($counters) {
                 $casesCountTotal = 0;
-                if (isset( $casesCnt[$process['PRO_UID']] )) {
+                if (isset($casesCnt[$process['PRO_UID']])) {
                     foreach ($casesCnt[$process['PRO_UID']] as $item) {
                         $casesCountTotal += $item;
                     }
@@ -696,12 +694,12 @@ class Process extends BaseProcess
             }
 
             //get user format from configuration
-            $userOwner = isset( $oConf->aConfig['format'] ) ? $oConf->aConfig['format'] : '';
-            $creationDateMask = isset( $oConf->aConfig['dateFormat'] ) ? $oConf->aConfig['dateFormat'] : '';
+            $userOwner = isset($oConf->aConfig['format']) ? $oConf->aConfig['format'] : '';
+            $creationDateMask = isset($oConf->aConfig['dateFormat']) ? $oConf->aConfig['dateFormat'] : '';
             if ($userOwner != '') {
-                $userOwner = str_replace( '@userName', $process['USR_USERNAME'], $userOwner );
-                $userOwner = str_replace( '@firstName', $process['USR_FIRSTNAME'], $userOwner );
-                $userOwner = str_replace( '@lastName', $process['USR_LASTNAME'], $userOwner );
+                $userOwner = str_replace('@userName', $process['USR_USERNAME'], $userOwner);
+                $userOwner = str_replace('@firstName', $process['USR_FIRSTNAME'], $userOwner);
+                $userOwner = str_replace('@lastName', $process['USR_LASTNAME'], $userOwner);
                 if ($userOwner == " ( )") {
                     $userOwner = '-';
                 }
@@ -711,41 +709,40 @@ class Process extends BaseProcess
 
             //get date format from configuration
             if ($creationDateMask != '') {
-                list ($date, $time) = explode( ' ', $process['PRO_CREATE_DATE'] );
-                list ($y, $m, $d) = explode( '-', $date );
-                list ($h, $i, $s) = explode( ':', $time );
+                list($date, $time) = explode(' ', $process['PRO_CREATE_DATE']);
+                list($y, $m, $d) = explode('-', $date);
+                list($h, $i, $s) = explode(':', $time);
 
-                $process['PRO_CREATE_DATE'] = date( $creationDateMask, mktime( $h, $i, $s, $m, $d, $y ) );
+                $process['PRO_CREATE_DATE'] = date($creationDateMask, mktime($h, $i, $s, $m, $d, $y));
             }
 
-            $process['PRO_CATEGORY_LABEL'] = trim( $process['PRO_CATEGORY'] ) != '' ? $process['CATEGORY_NAME'] : '- ' . G::LoadTranslation( 'ID_PROCESS_NO_CATEGORY' ) . ' -';
+            $process['PRO_CATEGORY_LABEL'] = trim($process['PRO_CATEGORY']) != '' ? $process['CATEGORY_NAME'] : '- ' . G::LoadTranslation('ID_PROCESS_NO_CATEGORY') . ' -';
             $process['PRO_TITLE'] = $proTitle;
             $process['PRO_DESCRIPTION'] = $proDescription;
             $process['PRO_DEBUG'] = $process['PRO_DEBUG'];
-            $process['PRO_DEBUG_LABEL'] = ($process['PRO_DEBUG'] == "1") ? G::LoadTranslation( 'ID_ON' ) : G::LoadTranslation( 'ID_OFF' );
-            $process['PRO_STATUS_LABEL'] = $process['PRO_STATUS'] == 'ACTIVE' ? G::LoadTranslation( 'ID_ACTIVE' ) : G::LoadTranslation( 'ID_INACTIVE' );
+            $process['PRO_DEBUG_LABEL'] = ($process['PRO_DEBUG'] == "1") ? G::LoadTranslation('ID_ON') : G::LoadTranslation('ID_OFF');
+            $process['PRO_STATUS_LABEL'] = $process['PRO_STATUS'] == 'ACTIVE' ? G::LoadTranslation('ID_ACTIVE') : G::LoadTranslation('ID_INACTIVE');
             $process['PRO_CREATE_USER_LABEL'] = $userOwner;
             if ($counters) {
-                $process['CASES_COUNT_TO_DO'] = (isset( $casesCnt[$process['PRO_UID']]['TO_DO'] ) ? $casesCnt[$process['PRO_UID']]['TO_DO'] : 0);
-                $process['CASES_COUNT_COMPLETED'] = (isset( $casesCnt[$process['PRO_UID']]['COMPLETED'] ) ? $casesCnt[$process['PRO_UID']]['COMPLETED'] : 0);
-                $process['CASES_COUNT_DRAFT'] = (isset( $casesCnt[$process['PRO_UID']]['DRAFT'] ) ? $casesCnt[$process['PRO_UID']]['DRAFT'] : 0);
-                $process['CASES_COUNT_CANCELLED'] = (isset( $casesCnt[$process['PRO_UID']]['CANCELLED'] ) ? $casesCnt[$process['PRO_UID']]['CANCELLED'] : 0);
+                $process['CASES_COUNT_TO_DO'] = (isset($casesCnt[$process['PRO_UID']]['TO_DO']) ? $casesCnt[$process['PRO_UID']]['TO_DO'] : 0);
+                $process['CASES_COUNT_COMPLETED'] = (isset($casesCnt[$process['PRO_UID']]['COMPLETED']) ? $casesCnt[$process['PRO_UID']]['COMPLETED'] : 0);
+                $process['CASES_COUNT_DRAFT'] = (isset($casesCnt[$process['PRO_UID']]['DRAFT']) ? $casesCnt[$process['PRO_UID']]['DRAFT'] : 0);
+                $process['CASES_COUNT_CANCELLED'] = (isset($casesCnt[$process['PRO_UID']]['CANCELLED']) ? $casesCnt[$process['PRO_UID']]['CANCELLED'] : 0);
                 $process['CASES_COUNT'] = $casesCountTotal;
             }
 
-            unset( $process['PRO_CREATE_USER'] );
+            unset($process['PRO_CREATE_USER']);
 
             $aProcesses[] = $process;
-
         }
 
-        $memcache = & PMmemcached::getSingleton( config("system.workspace") );
-        if (isset($memcache) && $memcache->enabled == 1 ) {
-        	return $aProcesses;
+        $memcache = PMmemcached::getSingleton(config("system.workspace"));
+        if (isset($memcache) && $memcache->enabled == 1) {
+            return $aProcesses;
         }
 
         if ($limit == '') {
-        	$limit = count($aProcesses);
+            $limit = count($aProcesses);
         }
 
         if ($this->sort != "PRO_CREATE_DATE") {
@@ -759,58 +756,58 @@ class Process extends BaseProcess
         return $aProcesses;
     }
 
-    public function getCasesCountInAllProcesses ()
+    public function getCasesCountInAllProcesses()
     {
         /*SELECT PRO_UID, APP_STATUS, COUNT( * )
           FROM APPLICATION
           GROUP BY PRO_UID, APP_STATUS*/
         require_once 'classes/model/Application.php';
 
-        $memcache = & PMmemcached::getSingleton( config("system.workspace") );
+        $memcache = PMmemcached::getSingleton( config("system.workspace") );
         $memkey = 'getCasesCountInAllProcesses';
-        if (($aProcesses = $memcache->get( $memkey )) === false) {
-            $oCriteria = new Criteria( 'workflow' );
-            $oCriteria->addSelectColumn( ApplicationPeer::PRO_UID );
-            $oCriteria->addSelectColumn( ApplicationPeer::APP_STATUS );
-            $oCriteria->addSelectColumn( 'COUNT(*) AS CNT' );
-            $oCriteria->addGroupByColumn( ApplicationPeer::PRO_UID );
-            $oCriteria->addGroupByColumn( ApplicationPeer::APP_STATUS );
+        if (($aProcesses = $memcache->get($memkey)) === false) {
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->addSelectColumn(ApplicationPeer::PRO_UID);
+            $oCriteria->addSelectColumn(ApplicationPeer::APP_STATUS);
+            $oCriteria->addSelectColumn('COUNT(*) AS CNT');
+            $oCriteria->addGroupByColumn(ApplicationPeer::PRO_UID);
+            $oCriteria->addGroupByColumn(ApplicationPeer::APP_STATUS);
 
-            $oDataset = ProcessPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
-            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oDataset = ProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
-            $aProcesses = Array ();
+            $aProcesses = array();
             while ($oDataset->next()) {
                 $row = $oDataset->getRow();
                 $aProcesses[$row['PRO_UID']][$row['APP_STATUS']] = $row['CNT'];
             }
-            $memcache->set( $memkey, $aProcesses, PMmemcached::ONE_HOUR );
+            $memcache->set($memkey, $aProcesses, PMmemcached::ONE_HOUR);
         }
         return $aProcesses;
     }
 
     public function getCasesCountForProcess($pro_uid)
     {
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->addSelectColumn( 'COUNT(*) AS TOTAL_CASES' );
-        $oCriteria->add( ApplicationPeer::PRO_UID, $pro_uid );
-        $oDataset = ApplicationPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn('COUNT(*) AS TOTAL_CASES');
+        $oCriteria->add(ApplicationPeer::PRO_UID, $pro_uid);
+        $oDataset = ApplicationPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
         $oDataset->next();
         $cases = $oDataset->getRow();
         return (int)$cases['TOTAL_CASES'];
     }
 
-    public function getAllProcessesByCategory ()
+    public function getAllProcessesByCategory()
     {
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_CATEGORY );
-        $oCriteria->addSelectColumn( 'COUNT(*) AS CNT' );
-        $oCriteria->addGroupByColumn( ProcessPeer::PRO_CATEGORY );
-        $oDataSet = ProcessPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
-        $oDataSet->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-        $aProc = Array ();
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_CATEGORY);
+        $oCriteria->addSelectColumn('COUNT(*) AS CNT');
+        $oCriteria->addGroupByColumn(ProcessPeer::PRO_CATEGORY);
+        $oDataSet = ProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
+        $oDataSet->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $aProc = array();
         while ($oDataSet->next()) {
             $row = $oDataSet->getRow();
             $aProc[$row['PRO_CATEGORY']] = $row['CNT'];
@@ -818,15 +815,15 @@ class Process extends BaseProcess
         return $aProc;
     }
 
-    public function getTriggerWebBotProcess ($proUid, $action)
+    public function getTriggerWebBotProcess($proUid, $action)
     {
-        require_once ("classes/model/Triggers.php");
+        require_once("classes/model/Triggers.php");
 
-        if ((! isset( $proUid ) && $proUid == '') || (! isset( $action ) && $action == '')) {
+        if ((! isset($proUid) && $proUid == '') || (! isset($action) && $action == '')) {
             return false;
         }
 
-        $action = G::toUpper( $action );
+        $action = G::toUpper($action);
         $arrayWebBotTrigger = [];
 
         switch ($action) {
@@ -853,15 +850,15 @@ class Process extends BaseProcess
                 break;
         }
 
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->addSelectColumn( $var );
-        $oCriteria->addSelectColumn( TriggersPeer::TRI_UID);
-        $oCriteria->addSelectColumn( TriggersPeer::TRI_WEBBOT );
-        $oCriteria->addJoin( $var, TriggersPeer::TRI_UID, Criteria::LEFT_JOIN );
-        $oCriteria->add( ProcessPeer::PRO_UID, $proUid );
-        $oDataSet = ProcessPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn($var);
+        $oCriteria->addSelectColumn(TriggersPeer::TRI_UID);
+        $oCriteria->addSelectColumn(TriggersPeer::TRI_WEBBOT);
+        $oCriteria->addJoin($var, TriggersPeer::TRI_UID, Criteria::LEFT_JOIN);
+        $oCriteria->add(ProcessPeer::PRO_UID, $proUid);
+        $oDataSet = ProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
 
-        $oDataSet->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataSet->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         if ($oDataSet->next()) {
             $row = $oDataSet->getRow();
             $arrayWebBotTrigger = ['TRI_UID' => $row['TRI_UID'], 'TRI_WEBBOT' => $row['TRI_WEBBOT']];
@@ -871,7 +868,7 @@ class Process extends BaseProcess
         return $arrayWebBotTrigger;
     }
 
-    public function memcachedDelete ()
+    public function memcachedDelete()
     {
         //Limit defined in processmaker/workflow/engine/templates/processes/main.js
         $limit = 25;
@@ -883,30 +880,30 @@ class Process extends BaseProcess
             $memkey = "processList-allProcesses-" . ($start * $limit) . "-" . $limit;
             $memkeyTotal = $memkey . "-total";
 
-            $r = $memcache->delete( $memkey );
-            $r = $memcache->delete( $memkeyTotal );
+            $r = $memcache->delete($memkey);
+            $r = $memcache->delete($memkeyTotal);
         }
     }
 
     public function orderMemcache($dataMemcache, $start, $limit)
     {
-    	if ($this->dir=='ASC') {
-    	    usort( $dataMemcache, array($this, "ordProcessAsc") );
-    	} else {
-    		usort( $dataMemcache, array($this, "ordProcessDesc") );
-    	}
-    	$response = new stdclass();
+        if ($this->dir=='ASC') {
+            usort($dataMemcache, array($this, "ordProcessAsc"));
+        } else {
+            usort($dataMemcache, array($this, "ordProcessDesc"));
+        }
+        $response = new stdclass();
         $response->totalCount = count($dataMemcache);
         $dataMemcache = array_splice($dataMemcache, $start, $limit);
         $response->dataMemcache = $dataMemcache;
-    	return $response;
+        return $response;
     }
 
-    public function ordProcessAsc ($a, $b)
+    public function ordProcessAsc($a, $b)
     {
-    	if (($this->sort) == '')  {
-    		$this->sort = 'PRO_TITLE';
-    	}
+        if (($this->sort) == '') {
+            $this->sort = 'PRO_TITLE';
+        }
         if (strtolower($a[$this->sort]) > strtolower($b[$this->sort])) {
             return 1;
         } elseif (strtolower($a[$this->sort]) < strtolower($b[$this->sort])) {
@@ -916,18 +913,18 @@ class Process extends BaseProcess
         }
     }
 
-    public function ordProcessDesc ($a, $b)
+    public function ordProcessDesc($a, $b)
     {
-    	if (($this->sort) == '')  {
-    		$this->sort = 'PRO_TITLE';
-    	}
-		if (strtolower($a[$this->sort]) > strtolower($b[$this->sort])) {
-			return - 1;
-		} elseif (strtolower($a[$this->sort]) < strtolower($b[$this->sort])) {
-			return 1;
-		} else {
-			return 0;
-		}
+        if (($this->sort) == '') {
+            $this->sort = 'PRO_TITLE';
+        }
+        if (strtolower($a[$this->sort]) > strtolower($b[$this->sort])) {
+            return - 1;
+        } elseif (strtolower($a[$this->sort]) < strtolower($b[$this->sort])) {
+            return 1;
+        } else {
+            return 0;
+        }
     }
     /**
      * Check is the Process is BPMN.
@@ -935,25 +932,26 @@ class Process extends BaseProcess
      * @param string $ProUid the uid of the Prolication
      * @return int 1 if is BPMN process or 0 if a Normal process
     */
-    public function isBpmnProcess($proUid){
-      $c = new Criteria("workflow");
-      $c->add(BpmnProcessPeer::PRJ_UID, $proUid);
-      $res = BpmnProcessPeer::doSelect($c);
-      if( sizeof($res) == 0 ){
-        return 0;
-      }else{
-        return 1;
-      }
+    public function isBpmnProcess($proUid)
+    {
+        $c = new Criteria("workflow");
+        $c->add(BpmnProcessPeer::PRJ_UID, $proUid);
+        $res = BpmnProcessPeer::doSelect($c);
+        if (sizeof($res) == 0) {
+            return 0;
+        } else {
+            return 1;
+        }
     }
 
     public function getAllConfiguredCurrencies()
     {
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->addSelectColumn( ProcessPeer::PRO_UNIT_COST);
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn(ProcessPeer::PRO_UNIT_COST);
         $oCriteria->setDistinct();
-        $oDataSet = ProcessPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
-        $oDataSet->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-        $aProc = Array ();
+        $oDataSet = ProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
+        $oDataSet->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $aProc = array();
         while ($oDataSet->next()) {
             $row = $oDataSet->getRow();
             $aProc[$row['PRO_UNIT_COST']] = $row['PRO_UNIT_COST'];
@@ -966,16 +964,16 @@ class Process extends BaseProcess
         try {
             /*get cases by process uid*/
             $oCase = new Cases();
-            $oCriteria = new Criteria( 'workflow' );
-            $oCriteria->addSelectColumn( ApplicationPeer::APP_UID);
-            $oCriteria->add( ApplicationPeer::PRO_UID, $proUid );
-            $oDataset = ApplicationPeer::doSelectRS( $oCriteria, Propel::getDbConnection('workflow_ro') );
-            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->addSelectColumn(ApplicationPeer::APP_UID);
+            $oCriteria->add(ApplicationPeer::PRO_UID, $proUid);
+            $oDataset = ApplicationPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             while ($oDataset->next()) {
                 $row = $oDataset->getRow();
                 $oCase->removeCase($row['APP_UID'], false);
             }
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             throw ($e);
         }
     }
@@ -995,23 +993,23 @@ class Process extends BaseProcess
         $users = new Users();
         $oCase = new Cases();
         $oCriteria = new Criteria();
-        $oCriteria->addSelectColumn( AppDelegationPeer::APP_UID );
-        $oCriteria->addSelectColumn( AppDelegationPeer::USR_UID );
+        $oCriteria->addSelectColumn(AppDelegationPeer::APP_UID);
+        $oCriteria->addSelectColumn(AppDelegationPeer::USR_UID);
         $oCriteria->setDistinct();
-        $oCriteria->add( AppDelegationPeer::PRO_UID, $proUidArray, Criteria::IN );
-        $oRuleSet = AppDelegationPeer::doSelectRS( $oCriteria );
-        $oRuleSet->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-        while($oRuleSet->next()) {
+        $oCriteria->add(AppDelegationPeer::PRO_UID, $proUidArray, Criteria::IN);
+        $oRuleSet = AppDelegationPeer::doSelectRS($oCriteria);
+        $oRuleSet->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        while ($oRuleSet->next()) {
             $row = $oRuleSet->getRow();
-            if(isset($row['USR_UID']) && $row['USR_UID'] != '' ) {
+            if (isset($row['USR_UID']) && $row['USR_UID'] != '') {
                 $usersArray[$row['USR_UID']] = $row['USR_UID'];
             }
             $oCase->deleteDelegation($row['APP_UID']);
         }
 
-        foreach($usersArray as $value) {
+        foreach ($usersArray as $value) {
             $oAppCache = new AppCacheView();
-            $aCount = $oAppCache->getAllCounters( $aTypes, $value );
+            $aCount = $oAppCache->getAllCounters($aTypes, $value);
             $newData = array(
                 'USR_UID'                   => $value,
                 'USR_TOTAL_INBOX'           => $aCount['to_do'],
@@ -1032,7 +1030,8 @@ class Process extends BaseProcess
      * @param type $id
      * @return Process
      */
-    public static function loadById($id) {
+    public static function loadById($id)
+    {
         $criteria = new Criteria(ProcessPeer::DATABASE_NAME);
         $criteria->add(ProcessPeer::PRO_ID, $id);
         return ProcessPeer::doSelect($criteria)[0];
diff --git a/workflow/engine/classes/model/Route.php b/workflow/engine/classes/model/Route.php
index f50a24062..a6c3c94cd 100644
--- a/workflow/engine/classes/model/Route.php
+++ b/workflow/engine/classes/model/Route.php
@@ -264,7 +264,7 @@ class Route extends BaseRoute
                 $c->add(RoutePeer::ROU_NEXT_TASK, $aData['ROU_NEXT_TASK'], Criteria::EQUAL);
             }
 
-            $query =$c->toString();
+            $query = $c->toString();
             $rs = RoutePeer::doSelectRS($c);
             $rs->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
             $routes = array();
diff --git a/workflow/engine/classes/model/UsersProperties.php b/workflow/engine/classes/model/UsersProperties.php
index 784bb0d1e..ccf321c0e 100644
--- a/workflow/engine/classes/model/UsersProperties.php
+++ b/workflow/engine/classes/model/UsersProperties.php
@@ -24,41 +24,41 @@ class UsersProperties extends BaseUsersProperties
     public $usrID = '';
     public $lang = 'en';
 
-    public function __construct ()
+    public function __construct()
     {
-        $this->lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
+        $this->lang = defined('SYS_LANG') ? SYS_LANG : 'en';
     }
 
-    public function UserPropertyExists ($sUserUID)
+    public function UserPropertyExists($sUserUID)
     {
-        $oUserProperty = UsersPropertiesPeer::retrieveByPk( $sUserUID );
-        if (! is_null( $oUserProperty ) && is_object( $oUserProperty ) && get_class( $oUserProperty ) == 'UsersProperties') {
-            $this->fields = $oUserProperty->toArray( BasePeer::TYPE_FIELDNAME );
-            $this->fromArray( $this->fields, BasePeer::TYPE_FIELDNAME );
+        $oUserProperty = UsersPropertiesPeer::retrieveByPk($sUserUID);
+        if (! is_null($oUserProperty) && is_object($oUserProperty) && get_class($oUserProperty) == 'UsersProperties') {
+            $this->fields = $oUserProperty->toArray(BasePeer::TYPE_FIELDNAME);
+            $this->fromArray($this->fields, BasePeer::TYPE_FIELDNAME);
             return true;
         } else {
             return false;
         }
     }
 
-    public function load ($sUserUID)
+    public function load($sUserUID)
     {
-        $oUserProperty = UsersPropertiesPeer::retrieveByPK( $sUserUID );
-        if (! is_null( $oUserProperty )) {
-            $aFields = $oUserProperty->toArray( BasePeer::TYPE_FIELDNAME );
-            $this->fromArray( $aFields, BasePeer::TYPE_FIELDNAME );
+        $oUserProperty = UsersPropertiesPeer::retrieveByPK($sUserUID);
+        if (! is_null($oUserProperty)) {
+            $aFields = $oUserProperty->toArray(BasePeer::TYPE_FIELDNAME);
+            $this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
             return $aFields;
         } else {
-            throw new Exception( "User with $sUserUID does not exist!" );
+            throw new Exception("User with $sUserUID does not exist!");
         }
     }
 
-    public function create ($aData)
+    public function create($aData)
     {
-        $oConnection = Propel::getConnection( UsersPropertiesPeer::DATABASE_NAME );
+        $oConnection = Propel::getConnection(UsersPropertiesPeer::DATABASE_NAME);
         try {
             $oUserProperty = new UsersProperties();
-            $oUserProperty->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
+            $oUserProperty->fromArray($aData, BasePeer::TYPE_FIELDNAME);
             if ($oUserProperty->validate()) {
                 $oConnection->begin();
                 $iResult = $oUserProperty->save();
@@ -70,7 +70,7 @@ class UsersProperties extends BaseUsersProperties
                 foreach ($aValidationFailures as $oValidationFailure) {
                     $sMessage .= $oValidationFailure->getMessage() . '<br />';
                 }
-                throw (new Exception( 'The registry cannot be created!<br />' . $sMessage ));
+                throw (new Exception('The registry cannot be created!<br />' . $sMessage));
             }
         } catch (Exception $oError) {
             $oConnection->rollback();
@@ -78,13 +78,13 @@ class UsersProperties extends BaseUsersProperties
         }
     }
 
-    public function update ($aData)
+    public function update($aData)
     {
-        $oConnection = Propel::getConnection( UsersPropertiesPeer::DATABASE_NAME );
+        $oConnection = Propel::getConnection(UsersPropertiesPeer::DATABASE_NAME);
         try {
-            $oUserProperty = UsersPropertiesPeer::retrieveByPK( $aData['USR_UID'] );
-            if (! is_null( $oUserProperty )) {
-                $oUserProperty->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
+            $oUserProperty = UsersPropertiesPeer::retrieveByPK($aData['USR_UID']);
+            if (! is_null($oUserProperty)) {
+                $oUserProperty->fromArray($aData, BasePeer::TYPE_FIELDNAME);
                 if ($oUserProperty->validate()) {
                     $oConnection->begin();
                     $iResult = $oUserProperty->save();
@@ -96,10 +96,10 @@ class UsersProperties extends BaseUsersProperties
                     foreach ($aValidationFailures as $oValidationFailure) {
                         $sMessage .= $oValidationFailure->getMessage() . '<br />';
                     }
-                    throw (new Exception( 'The registry cannot be updated!<br />' . $sMessage ));
+                    throw (new Exception('The registry cannot be updated!<br />' . $sMessage));
                 }
             } else {
-                throw (new Exception( 'This row doesn\'t exist!' ));
+                throw (new Exception('This row doesn\'t exist!'));
             }
         } catch (Exception $oError) {
             $oConnection->rollback();
@@ -107,17 +107,17 @@ class UsersProperties extends BaseUsersProperties
         }
     }
 
-    public function loadOrCreateIfNotExists ($sUserUID, $aUserProperty = array())
+    public function loadOrCreateIfNotExists($sUserUID, $aUserProperty = array())
     {
-        if (! $this->UserPropertyExists( $sUserUID )) {
+        if (! $this->UserPropertyExists($sUserUID)) {
             $aUserProperty['USR_UID'] = $sUserUID;
-            if (! isset( $aUserProperty['USR_LAST_UPDATE_DATE'] )) {
-                $aUserProperty['USR_LAST_UPDATE_DATE'] = date( 'Y-m-d H:i:s' );
+            if (! isset($aUserProperty['USR_LAST_UPDATE_DATE'])) {
+                $aUserProperty['USR_LAST_UPDATE_DATE'] = date('Y-m-d H:i:s');
             }
-            if (! isset( $aUserProperty['USR_LOGGED_NEXT_TIME'] )) {
+            if (! isset($aUserProperty['USR_LOGGED_NEXT_TIME'])) {
                 $aUserProperty['USR_LOGGED_NEXT_TIME'] = 0;
             }
-            $this->create( $aUserProperty );
+            $this->create($aUserProperty);
         } else {
             $aUserProperty = $this->fields;
         }
@@ -125,32 +125,32 @@ class UsersProperties extends BaseUsersProperties
         return $aUserProperty;
     }
 
-    public function validatePassword ($sPassword, $sLastUpdate, $iChangePasswordNextTime, $nowLogin = false)
+    public function validatePassword($sPassword, $sLastUpdate, $iChangePasswordNextTime, $nowLogin = false)
     {
-        if (! defined( 'PPP_MINIMUM_LENGTH' )) {
-            define( 'PPP_MINIMUM_LENGTH', 5 );
+        if (! defined('PPP_MINIMUM_LENGTH')) {
+            define('PPP_MINIMUM_LENGTH', 5);
         }
-        if (! defined( 'PPP_MAXIMUM_LENGTH' )) {
-            define( 'PPP_MAXIMUM_LENGTH', 20 );
+        if (! defined('PPP_MAXIMUM_LENGTH')) {
+            define('PPP_MAXIMUM_LENGTH', 20);
         }
-        if (! defined( 'PPP_NUMERICAL_CHARACTER_REQUIRED' )) {
-            define( 'PPP_NUMERICAL_CHARACTER_REQUIRED', 0 );
+        if (! defined('PPP_NUMERICAL_CHARACTER_REQUIRED')) {
+            define('PPP_NUMERICAL_CHARACTER_REQUIRED', 0);
         }
-        if (! defined( 'PPP_UPPERCASE_CHARACTER_REQUIRED' )) {
-            define( 'PPP_UPPERCASE_CHARACTER_REQUIRED', 0 );
+        if (! defined('PPP_UPPERCASE_CHARACTER_REQUIRED')) {
+            define('PPP_UPPERCASE_CHARACTER_REQUIRED', 0);
         }
-        if (! defined( 'PPP_SPECIAL_CHARACTER_REQUIRED' )) {
-            define( 'PPP_SPECIAL_CHARACTER_REQUIRED', 0 );
+        if (! defined('PPP_SPECIAL_CHARACTER_REQUIRED')) {
+            define('PPP_SPECIAL_CHARACTER_REQUIRED', 0);
         }
-        if (! defined( 'PPP_EXPIRATION_IN' )) {
-            define( 'PPP_EXPIRATION_IN', 0 );
+        if (! defined('PPP_EXPIRATION_IN')) {
+            define('PPP_EXPIRATION_IN', 0);
         }
-        if (function_exists( 'mb_strlen' )) {
-            $iLength = mb_strlen( $sPassword );
+        if (function_exists('mb_strlen')) {
+            $iLength = mb_strlen($sPassword);
         } else {
-            $iLength = strlen( $sPassword );
+            $iLength = strlen($sPassword);
         }
-        $aErrors = array ();
+        $aErrors = array();
         if ($iLength < PPP_MINIMUM_LENGTH || $nowLogin) {
             $aErrors[] = 'ID_PPP_MINIMUM_LENGTH';
         }
@@ -158,17 +158,17 @@ class UsersProperties extends BaseUsersProperties
             $aErrors[] = 'ID_PPP_MAXIMUM_LENGTH';
         }
         if (PPP_NUMERICAL_CHARACTER_REQUIRED == 1) {
-            if (preg_match_all( '/[0-9]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0 || $nowLogin) {
+            if (preg_match_all('/[0-9]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE) == 0 || $nowLogin) {
                 $aErrors[] = 'ID_PPP_NUMERICAL_CHARACTER_REQUIRED';
             }
         }
         if (PPP_UPPERCASE_CHARACTER_REQUIRED == 1) {
-            if (preg_match_all( '/[A-Z]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0 || $nowLogin) {
+            if (preg_match_all('/[A-Z]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE) == 0 || $nowLogin) {
                 $aErrors[] = 'ID_PPP_UPPERCASE_CHARACTER_REQUIRED';
             }
         }
         if (PPP_SPECIAL_CHARACTER_REQUIRED == 1) {
-            if (preg_match_all( '/[��\\!|"@�#$~%�&�\/()=\'?��*+\-_.:,;]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0 || $nowLogin) {
+            if (preg_match_all('/[��\\!|"@�#$~%�&�\/()=\'?��*+\-_.:,;]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE) == 0 || $nowLogin) {
                 $aErrors[] = 'ID_PPP_SPECIAL_CHARACTER_REQUIRED';
             }
         }
@@ -176,11 +176,11 @@ class UsersProperties extends BaseUsersProperties
             $oCalendar = new Calendar();
 
             if ($oCalendar->pmCalendarUid == '') {
-            	$oCalendar->pmCalendarUid = '00000000000000000000000000000001';
-            	$oCalendar->getCalendarData();
+                $oCalendar->pmCalendarUid = '00000000000000000000000000000001';
+                $oCalendar->getCalendarData();
             }
 
-            $fDays = $oCalendar->calculateDuration( date( 'Y-m-d H:i:s' ), $sLastUpdate );
+            $fDays = $oCalendar->calculateDuration(date('Y-m-d H:i:s'), $sLastUpdate);
             if ($fDays > (PPP_EXPIRATION_IN * 24) || $nowLogin) {
                 $aErrors[] = 'ID_PPP_EXPIRATION_IN';
             }
@@ -195,24 +195,24 @@ class UsersProperties extends BaseUsersProperties
      * get user location
      * defined by precedence plugin->ux->default
      */
-    public function redirectTo ($usrID, $lang = '')
+    public function redirectTo($usrID, $lang = '')
     {
         $this->usrID = $usrID;
-        $this->lang = empty( $lang ) ? $this->lang : $lang;
+        $this->lang = empty($lang) ? $this->lang : $lang;
 
         $url = $this->_getPluginLocation();
 
-        if (empty( $url )) {
+        if (empty($url)) {
             $url = $this->_getUXLocation();
         }
 
         $urlUx = $this->_getUXSkinVariant();
-        if (empty( $url ) && ! empty( $urlUx )) {
+        if (empty($url) && ! empty($urlUx)) {
             $_SESSION['_defaultUserLocation'] = $url;
             $url = $urlUx;
         }
 
-        if (empty( $url )) {
+        if (empty($url)) {
             $url = $this->_getDefaultLocation();
         }
 
@@ -224,19 +224,19 @@ class UsersProperties extends BaseUsersProperties
      * defined by precedence plugin->default
      * note that is getting location without User Inbox Simplified varification
      */
-    public function getUserLocation ($usrID, $lang = 'en')
+    public function getUserLocation($usrID, $lang = 'en')
     {
         $this->usrID = $usrID;
-        $this->lang = empty( $lang ) ? $this->lang : $lang;
+        $this->lang = empty($lang) ? $this->lang : $lang;
 
         $url = $this->_getPluginLocation();
 
-        if (empty( $url )) {
+        if (empty($url)) {
             $url = $this->_getDefaultLocation();
         }
 
         $urlUx = $this->_getUXSkinVariant();
-        if (! empty( $urlUx )) {
+        if (! empty($urlUx)) {
             $_SESSION['_defaultUserLocation'] = $url;
             $url = $urlUx;
         }
@@ -248,13 +248,13 @@ class UsersProperties extends BaseUsersProperties
      * to verify if the user is using some "ux..." skin variant
      * if that is the case, the redirection will change to 'main' controller
      */
-    public function _getUXSkinVariant ()
+    public function _getUXSkinVariant()
     {
         $url = '';
 
-        if (substr( SYS_SKIN, 0, 2 ) == 'ux' && SYS_SKIN != 'uxs') {
+        if (substr(SYS_SKIN, 0, 2) == 'ux' && SYS_SKIN != 'uxs') {
             if (isset($_COOKIE['workspaceSkin'])) {
-                if (substr( $_COOKIE['workspaceSkin'], 0, 2 ) != 'ux') {
+                if (substr($_COOKIE['workspaceSkin'], 0, 2) != 'ux') {
                     $url = $this->_getDefaultLocation();
                     return $url;
                 } else {
@@ -265,8 +265,8 @@ class UsersProperties extends BaseUsersProperties
             }
             global $RBAC;
             $oConf = new Configurations();
-            $oConf->loadConfig( $x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '' );
-            if (sizeof( $oConf->aConfig ) > 0) {
+            $oConf->loadConfig($x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '');
+            if (sizeof($oConf->aConfig) > 0) {
                 if ($oConf->aConfig['DEFAULT_MENU'] == 'PM_USERS') {
                     $oConf->aConfig['DEFAULT_MENU'] = 'PM_SETUP';
                 }
@@ -275,27 +275,27 @@ class UsersProperties extends BaseUsersProperties
 
                 switch ($oConf->aConfig['DEFAULT_MENU']) {
                     case 'PM_SETUP':
-                        if ($RBAC->userCanAccess( 'PM_SETUP' ) == 1) {
+                        if ($RBAC->userCanAccess('PM_SETUP') == 1) {
                             $getUrl = 'admin';
                         }
                         break;
                     case 'PM_FACTORY':
-                        if ($RBAC->userCanAccess( 'PM_FACTORY' ) == 1) {
+                        if ($RBAC->userCanAccess('PM_FACTORY') == 1) {
                             $getUrl = 'designer';
                         }
                         break;
                     case 'PM_CASES':
-                        if ($RBAC->userCanAccess( 'PM_CASES' ) == 1) {
+                        if ($RBAC->userCanAccess('PM_CASES') == 1) {
                             $getUrl = 'home';
                         }
                         break;
                     case 'PM_USERS':
-                        if ($RBAC->userCanAccess( 'PM_USERS' ) == 1) {
+                        if ($RBAC->userCanAccess('PM_USERS') == 1) {
                             $getUrl = 'admin';
                         }
                         break;
                     case 'PM_DASHBOARD':
-                        if ($RBAC->userCanAccess( 'PM_DASHBOARD' ) == 1) {
+                        if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) {
                             $getUrl = 'dashboard';
                         }
                         break;
@@ -311,14 +311,14 @@ class UsersProperties extends BaseUsersProperties
      * get the plugins, and check if there is redirectLogins
      * if yes, then redirect goes according his Role
      */
-    public function _getPluginLocation ()
+    public function _getPluginLocation()
     {
         global $RBAC;
         $url = '';
 
-        if (class_exists( 'redirectDetail' )) {
+        if (class_exists('redirectDetail')) {
             //to do: complete the validation
-            if (isset( $RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE'] )) {
+            if (isset($RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE'])) {
                 $userRole = $RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE'];
             }
 
@@ -347,10 +347,10 @@ class UsersProperties extends BaseUsersProperties
      *
      * @author Erik Amaru Ortiz <erik@colosa.com>
      */
-    public function _getUXLocation ()
+    public function _getUXLocation()
     {
         require_once 'classes/model/Users.php';
-        $u = UsersPeer::retrieveByPK( $this->usrID );
+        $u = UsersPeer::retrieveByPK($this->usrID);
         $url = '';
 
         $uxType = $u->getUsrUx();
@@ -360,7 +360,7 @@ class UsersProperties extends BaseUsersProperties
         if ($uxType == '' || $uxType == 'NORMAL') {
             require_once 'classes/model/GroupUser.php';
             $gu = new GroupUser();
-            $ugList = $gu->getAllUserGroups( $this->usrID );
+            $ugList = $gu->getAllUserGroups($this->usrID);
 
             foreach ($ugList as $row) {
                 if ($row['GRP_UX'] != 'NORMAL' && $row['GRP_UX'] != '') {
@@ -387,11 +387,11 @@ class UsersProperties extends BaseUsersProperties
      * get user preferences for default redirect
      * verifying if it has any preferences on configurations table
      */
-    public function _getDefaultLocation ()
+    public function _getDefaultLocation()
     {
         global $RBAC;
         $oConf = new Configurations();
-        $oConf->loadConfig( $x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '' );
+        $oConf->loadConfig($x, 'USER_PREFERENCES', '', '', $_SESSION['USER_LOGGED'], '');
 
         if (isset($_COOKIE['workspaceSkin'])) {
             $baseUrl = '/sys' . config("system.workspace") . '/' . $this->lang . '/' . $_COOKIE['workspaceSkin'] . '/';
@@ -400,7 +400,7 @@ class UsersProperties extends BaseUsersProperties
         }
         $url = '';
 
-        if (sizeof( $oConf->aConfig ) > 0) {
+        if (sizeof($oConf->aConfig) > 0) {
             // this user has a configuration record
             // backward compatibility, because now, we don't have user and dashboard menu.
             if ($oConf->aConfig['DEFAULT_MENU'] == 'PM_USERS') {
@@ -409,34 +409,34 @@ class UsersProperties extends BaseUsersProperties
 
             switch ($oConf->aConfig['DEFAULT_MENU']) {
                 case 'PM_SETUP':
-                    if ($RBAC->userCanAccess( 'PM_SETUP' ) == 1 || $RBAC->userCanAccess('PM_USERS') == 1) {
+                    if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1) {
                         $url = 'setup/main';
                     }
                     break;
                 case 'PM_FACTORY':
-                    if ($RBAC->userCanAccess( 'PM_FACTORY' ) == 1) {
+                    if ($RBAC->userCanAccess('PM_FACTORY') == 1) {
                         $url = 'processes/main';
                     }
                     break;
                 case 'PM_CASES':
-                    if ($RBAC->userCanAccess( 'PM_CASES' ) == 1) {
+                    if ($RBAC->userCanAccess('PM_CASES') == 1) {
                         $url = 'cases/main';
                     }
                     break;
                 case 'PM_USERS':
-                    if ($RBAC->userCanAccess( 'PM_USERS' ) == 1) {
+                    if ($RBAC->userCanAccess('PM_USERS') == 1) {
                         $url = 'setup/main';
                     }
                     break;
                 case 'PM_DASHBOARD':
-                    if ($RBAC->userCanAccess( 'PM_DASHBOARD' ) == 1) {
+                    if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) {
                         $url = 'dashboard/main';
                     }
                     break;
                 /*----------------------------------********---------------------------------*/
                 case 'PM_STRATEGIC_DASHBOARD':
-                    $licensedFeatures = & PMLicensedFeatures::getSingleton();
-                    if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=') && $RBAC->userCanAccess( 'PM_SETUP' ) == 1) {
+                    $licensedFeatures = PMLicensedFeatures::getSingleton();
+                    if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=') && $RBAC->userCanAccess('PM_SETUP') == 1) {
                         $url = 'strategicDashboard/main';
                     }
                     break;
@@ -444,16 +444,16 @@ class UsersProperties extends BaseUsersProperties
             }
         }
 
-        if (empty( $url )) {
-            if ($RBAC->userCanAccess( 'PM_FACTORY' ) == 1) {
+        if (empty($url)) {
+            if ($RBAC->userCanAccess('PM_FACTORY') == 1) {
                 $url = 'processes/main';
-            } elseif ($RBAC->userCanAccess( 'PM_SETUP' ) == 1) {
+            } elseif ($RBAC->userCanAccess('PM_SETUP') == 1) {
                 $url = 'setup/main';
-            } elseif ($RBAC->userCanAccess( 'PM_CASES' ) == 1) {
+            } elseif ($RBAC->userCanAccess('PM_CASES') == 1) {
                 $url = 'cases/main';
-            } elseif ($RBAC->userCanAccess( 'PM_USERS' ) == 1) {
+            } elseif ($RBAC->userCanAccess('PM_USERS') == 1) {
                 $url = 'setup/main';
-            } elseif ($RBAC->userCanAccess( 'PM_DASHBOARD' ) == 1) {
+            } elseif ($RBAC->userCanAccess('PM_DASHBOARD') == 1) {
                 $url = 'dashboard/dashboard';
             } else {
                 $url = 'users/myInfo';
@@ -463,4 +463,3 @@ class UsersProperties extends BaseUsersProperties
         return $baseUrl . $url;
     }
 }
-
diff --git a/workflow/engine/classes/triggers/api/Zimbra.php b/workflow/engine/classes/triggers/api/Zimbra.php
index dceac7d28..eb30e3c7e 100644
--- a/workflow/engine/classes/triggers/api/Zimbra.php
+++ b/workflow/engine/classes/triggers/api/Zimbra.php
@@ -25,7 +25,6 @@ use ProcessMaker\Core\System;
  */
 class Zimbra
 {
-
     public $debug = false;
     public $error;
     protected $_connected = false; // boolean to determine if the connect function has been called
@@ -119,7 +118,6 @@ class Zimbra
         $option_string = '';
 
         try {
-
             $soap = '<CreateAccountRequest xmlns="urn:zimbraAccount">
             <name>' . $name . '@' . $this->_server1 . '</name>
             <password>' . $password . '</password>' . $option_string . '
@@ -820,7 +818,6 @@ class Zimbra
     protected function message($message)
     {
         if ($this->debug) {
-
             $filter = new InputFilter();
             $message = $filter->xssFilterHard($message);
             echo $message;
@@ -843,7 +840,6 @@ class Zimbra
      */
     protected function soapRequest($body, $header = false, $connecting = false)
     {
-
         $filter = new InputFilter();
 
         if (!$connecting && !$this->_connected) {
@@ -865,7 +861,7 @@ class Zimbra
 
         curl_setopt($this->_curl, CURLOPT_POSTFIELDS, $soap_message);
 
-        $this->_curl = $filter->xssFilterHard($this->_curl,"url");
+        $this->_curl = $filter->xssFilterHard($this->_curl, "url");
         $response = curl_exec($this->_curl);
         if (!$response) {
             $this->error = 'ERROR: curl_exec - (' . curl_errno($this->_curl) . ') ' . curl_error($this->_curl);
@@ -928,7 +924,6 @@ class Zimbra
         // this is our target
         $ret = array();
         foreach ($values as $key => $val) {
-
             switch ($val['type']) {
                 case 'open':
                     array_push($hash_stack, $val['tag']);
@@ -983,7 +978,7 @@ class Zimbra
 
         // does the current element refer to a list
         if (sizeof($elements) > 0) {
-            $array[$element][sizeof($array[$element]) - 1] = &$this->composeArray($array[$element][sizeof($array[$element]) - 1], $elements, $value);
+            $array[$element][sizeof($array[$element]) - 1] = $this->composeArray($array[$element][sizeof($array[$element]) - 1], $elements, $value);
         } else {
             // if (is_array($value))
             $array[$element][sizeof($array[$element])] = $value;
diff --git a/workflow/engine/config/databases.php b/workflow/engine/config/databases.php
index c6d8c3761..f140d7e40 100644
--- a/workflow/engine/config/databases.php
+++ b/workflow/engine/config/databases.php
@@ -25,8 +25,9 @@
 
 if (defined('PATH_DB') && !empty(config("system.workspace"))) {
 
-    if (!file_exists(PATH_DB . config("system.workspace") . '/db.php'))
+    if (!file_exists(PATH_DB . config("system.workspace") . '/db.php')) {
         throw new Exception("Could not find db.php in current workspace " . config("system.workspace"));
+    }
 
     require_once(PATH_DB . config("system.workspace") . '/db.php');
     //to do: enable for other databases
@@ -63,7 +64,6 @@ if (defined('PATH_DB') && !empty(config("system.workspace"))) {
 
     $pro ['datasources']['rp']['connection'] = $dsnReport;
     $pro ['datasources']['rp']['adapter'] = DB_ADAPTER;
-
 }
 
 $pro ['datasources']['dbarray']['connection'] = 'dbarray://user:pass@localhost/pm_os';
diff --git a/workflow/engine/config/propel.mysqli.ini b/workflow/engine/config/propel.mysqli.ini
new file mode 100644
index 000000000..607d54e26
--- /dev/null
+++ b/workflow/engine/config/propel.mysqli.ini
@@ -0,0 +1,44 @@
+propel.targetPackage       = classes.model
+propel.packageObjectModel  = true
+propel.project             = opensource
+propel.database            = mysql
+propel.database.createUrl  = mysql://root@localhost/
+propel.database.url        = mysql://root@localhost/base_workflow
+
+propel.addGenericAccessors = true
+propel.addGenericMutators  = true
+propel.addTimeStamp        = false
+
+propel.schema.validate     = false
+
+; directories
+propel.home                    = .
+propel.output.dir              = .
+propel.schema.dir              = ${propel.output.dir}config
+propel.conf.dir                = ${propel.output.dir}config
+propel.phpconf.dir             = ${propel.output.dir}config
+propel.sql.dir                 = ${propel.output.dir}data/mysqli
+propel.runtime.conf.file       = runtime-conf.xml
+propel.php.dir                 = ${propel.output.dir}
+propel.default.schema.basename = schema
+propel.datadump.mapper.from    = *schema.xml
+propel.datadump.mapper.to      = *data.xml
+
+; builder settings
+;_propel.builder.peer.class              = addon.propel.builder.SfPeerBuilder
+;propel.builder.object.class            = addon.propel.builder.SfObjectBuilder
+
+;propel.builder.objectstub.class        = addon.propel.builder.SfExtensionObjectBuilder
+;propel.builder.peerstub.class          = addon.propel.builder.SfExtensionPeerBuilder
+;propel.builder.objectmultiextend.class = addon.propel.builder.SfMultiExtendObjectBuilder
+;propel.builder.mapbuilder.class        = addon.propel.builder.SfMapBuilderBuilder
+propel.builder.interface.class         = propel.engine.builder.om.php5.PHP5InterfaceBuilder
+propel.builder.node.class              = propel.engine.builder.om.php5.PHP5NodeBuilder
+propel.builder.nodepeer.class          = propel.engine.builder.om.php5.PHP5NodePeerBuilder
+propel.builder.nodestub.class          = propel.engine.builder.om.php5.PHP5ExtensionNodeBuilder
+propel.builder.nodepeerstub.class      = propel.engine.builder.om.php5.PHP5ExtensionNodePeerBuilder
+
+propel.builder.addIncludes = false
+propel.builder.addComments = false
+
+propel.builder.addBehaviors = false
diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po
index ea7a42982..4fc00efb0 100644
--- a/workflow/engine/content/translations/english/processmaker.en.po
+++ b/workflow/engine/content/translations/english/processmaker.en.po
@@ -20111,6 +20111,12 @@ msgstr "Photo"
 msgid "PHP Information"
 msgstr "PHP Information"
 
+# TRANSLATION
+# LABEL/ID_PHP_MYSQLI_NOT_INSTALL
+#: LABEL/ID_PHP_MYSQLI_NOT_INSTALL
+msgid "php-mysqli is Not Installed"
+msgstr "php-mysqli is Not Installed"
+
 # TRANSLATION
 # LABEL/ID_PHP_MSSQL_NOT_INSTALLED
 #: LABEL/ID_PHP_MSSQL_NOT_INSTALLED
@@ -21056,8 +21062,8 @@ msgstr "Open SSL is optional"
 # TRANSLATION
 # LABEL/ID_PROCESSMAKER_REQUIREMENTS_PHP
 #: LABEL/ID_PROCESSMAKER_REQUIREMENTS_PHP
-msgid "PHP recommended version 5.6 or higher (7.0 not supported)"
-msgstr "PHP recommended version 5.6 or higher (7.0 not supported)"
+msgid "PHP recommended version 5.6 or higher"
+msgstr "PHP recommended version 5.6 or higher"
 
 # TRANSLATION
 # LABEL/ID_PROCESSMAKER_REQUIREMENTS_SOAP
diff --git a/workflow/engine/controllers/InstallerModule.php b/workflow/engine/controllers/InstallerModule.php
index 4ca644af4..223704a66 100644
--- a/workflow/engine/controllers/InstallerModule.php
+++ b/workflow/engine/controllers/InstallerModule.php
@@ -19,7 +19,7 @@ class InstallerModule extends Controller
     public $link; #resource for database connection
 
 
-    public function __construct ()
+    public function __construct()
     {
         $this->path_config = PATH_CORE . 'config/';
         $this->path_languages = PATH_CORE . 'content/languages/';
@@ -34,7 +34,7 @@ class InstallerModule extends Controller
         $this->path_translationsMafe = PATH_HOME . 'public_html/translations/';
     }
 
-    public function index ($httpData)
+    public function index($httpData)
     {
         if (file_exists(FILE_PATHS_INSTALLED)) {
             $this->setJSVar('messageError', G::LoadTranslation('ID_PROCESSMAKER_ALREADY_INSTALLED'));
@@ -51,39 +51,39 @@ class InstallerModule extends Controller
             return;
         }
 
-        $licenseContent = file_get_contents( PATH_TRUNK . 'LICENSE.txt' );
+        $licenseContent = file_get_contents(PATH_TRUNK . 'LICENSE.txt');
 
-        $this->includeExtJS( 'installer/CardLayout', false );
-        $this->includeExtJS( 'installer/Wizard', false );
-        $this->includeExtJS( 'installer/Header', false );
-        $this->includeExtJS( 'installer/Card', false );
+        $this->includeExtJS('installer/CardLayout', false);
+        $this->includeExtJS('installer/Wizard', false);
+        $this->includeExtJS('installer/Header', false);
+        $this->includeExtJS('installer/Card', false);
 
-        $this->includeExtJS( 'installer/installer_cards' );
-        $this->includeExtJS( 'installer/main', false );
+        $this->includeExtJS('installer/installer_cards');
+        $this->includeExtJS('installer/main', false);
 
-        $this->setJSVar( 'licenseTxt', $licenseContent );
+        $this->setJSVar('licenseTxt', $licenseContent);
 
-        $this->setJSVar( 'path_config', $this->path_config );
-        $this->setJSVar( 'path_languages', $this->path_languages );
-        $this->setJSVar( 'path_plugins', $this->path_plugins );
-        $this->setJSVar( 'path_xmlforms', $this->path_xmlforms );
-        $this->setJSVar( 'path_public', $this->path_public );
-        $this->setJSVar( 'path_shared', $this->path_shared );
-        $this->setJSVar( 'path_sep', $this->path_sep );
-        $this->setJSVar( 'path_translations', $this->path_translations );
-        $this->setJSVar( 'path_translationsMafe', $this->path_translationsMafe );
+        $this->setJSVar('path_config', $this->path_config);
+        $this->setJSVar('path_languages', $this->path_languages);
+        $this->setJSVar('path_plugins', $this->path_plugins);
+        $this->setJSVar('path_xmlforms', $this->path_xmlforms);
+        $this->setJSVar('path_public', $this->path_public);
+        $this->setJSVar('path_shared', $this->path_shared);
+        $this->setJSVar('path_sep', $this->path_sep);
+        $this->setJSVar('path_translations', $this->path_translations);
+        $this->setJSVar('path_translationsMafe', $this->path_translationsMafe);
 
-        $this->setView( 'installer/main' );
+        $this->setView('installer/main');
 
-        G::RenderPage( 'publish', 'extJs' );
+        G::RenderPage('publish', 'extJs');
     }
 
     /**
      * This function can be create a new workspace
      * The user need permission PM_SETUP_ADVANCE for this action
      * @return void
-    */
-    public function newSite ()
+     */
+    public function newSite()
     {
         if (!$this->pmIsInstalled()) {
             $textStep1 = G::LoadTranslation('ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_1');
@@ -99,7 +99,7 @@ class InstallerModule extends Controller
             $this->setJSVar('DB_ADAPTER', DB_ADAPTER);
             $aux = explode(':', DB_HOST);
             $this->setJSVar('DB_HOST', $aux[0]);
-            $this->setJSVar('DB_PORT', isset( $aux[1] ) ? $aux[1] : (DB_ADAPTER == 'mssql' ? '1433' : '3306'));
+            $this->setJSVar('DB_PORT', isset($aux[1]) ? $aux[1] : (DB_ADAPTER == 'mssql' ? '1433' : '3306'));
             $this->setJSVar('DB_NAME', 'workflow');
             $this->setJSVar('DB_USER', '');
             $this->setJSVar('DB_PASS', '');
@@ -116,14 +116,14 @@ class InstallerModule extends Controller
         }
     }
 
-    public function getSystemInfo ()
+    public function getSystemInfo()
     {
-        $this->setResponseType( 'json' );
+        $this->setResponseType('json');
 
         // PHP info and verification
         $phpVer = phpversion();
-        preg_match( '/[0-9\.]+/', $phpVer, $match );
-        $phpVerNum = (float) $match[0];
+        preg_match('/[0-9\.]+/', $phpVer, $match);
+        $phpVerNum = (float)$match[0];
 
         $info = new stdclass();
         $info->php = new stdclass();
@@ -139,23 +139,23 @@ class InstallerModule extends Controller
         $info->mcrypt = new stdclass();
         $info->memory = new stdclass();
 
-        $info->php->version = phpversion();
-        $info->php->result = (version_compare(phpversion(), '5.4', '>=') && version_compare(phpversion(), '7.0', '<')) ? true : false;
+        $info->php->version = $phpVer;
+        $info->php->result = version_compare($phpVer, '5.4', '>=');
 
         // MYSQL info and verification
         $info->mysql->result = false;
-        if (function_exists( 'mysql_query' )) {
-            $mysqlVer = mysql_get_client_info();
-            preg_match( '/[0-9\.]+/', $mysqlVer, $match );
-            $mysqlNum = (float) $match[0];
+        if (function_exists('mysqli_query')) {
+            $mysqlVer = mysqli_get_client_info();
+            preg_match('/[0-9\.]+/', $mysqlVer, $match);
+            $mysqlNum = (float)$match[0];
             $info->mysql->version = 'Client API version ' . $mysqlVer;
-            $info->mysql->result = $mysqlNum >= 5.0 ? true : false;
+            $info->mysql->result = $mysqlNum >= 5.0;
         }
 
         // MSSQL info and verification
         $info->mssql->result = false;
         $info->mssql->version = G::LoadTranslation('ID_NOT_ENABLED');
-        if (function_exists( 'mssql_query' )) {
+        if (function_exists('mssql_query')) {
             $info->mssql->result = true;
             $info->mssql->version = G::LoadTranslation('ID_ENABLED');
         }
@@ -163,7 +163,7 @@ class InstallerModule extends Controller
         // OpenSSL info
         $info->openssl->result = false;
         $info->openssl->version = G::LoadTranslation('ID_NOT_ENABLED');
-        if (function_exists( 'openssl_open' )) {
+        if (function_exists('openssl_open')) {
             $info->openssl->result = true;
             $info->openssl->version = G::LoadTranslation('ID_ENABLED');
         }
@@ -171,7 +171,7 @@ class InstallerModule extends Controller
         // Curl info
         $info->curl->result = false;
         $info->curl->version = G::LoadTranslation('ID_NOT_ENABLED');
-        if (function_exists( 'curl_version' )) {
+        if (function_exists('curl_version')) {
             $info->curl->result = true;
             $version = curl_version();
             $info->curl->version = 'cURL ' . $version['version'];
@@ -181,7 +181,7 @@ class InstallerModule extends Controller
         // DOMDocument info
         $info->dom->result = false;
         $info->dom->version = G::LoadTranslation('ID_NOT_ENABLED');
-        if (class_exists( 'DOMDocument' )) {
+        if (class_exists('DOMDocument')) {
             $info->dom->result = true;
             $info->dom->version = G::LoadTranslation('ID_ENABLED');
         }
@@ -189,7 +189,7 @@ class InstallerModule extends Controller
         // GD info
         $info->gd->result = false;
         $info->gd->version = G::LoadTranslation('ID_NOT_ENABLED');
-        if (function_exists( 'gd_info' )) {
+        if (function_exists('gd_info')) {
             $info->gd->result = true;
             $gdinfo = gd_info();
             $info->gd->version = $gdinfo['GD Version'];
@@ -198,7 +198,7 @@ class InstallerModule extends Controller
         // Multibyte info
         $info->multibyte->result = false;
         $info->multibyte->version = G::LoadTranslation('ID_NOT_ENABLED');
-        if (function_exists( 'mb_check_encoding' )) {
+        if (function_exists('mb_check_encoding')) {
             $info->multibyte->result = true;
             $info->multibyte->version = G::LoadTranslation('ID_ENABLED');
         }
@@ -206,97 +206,96 @@ class InstallerModule extends Controller
         // soap info
         $info->soap->result = false;
         $info->soap->version = G::LoadTranslation('ID_NOT_ENABLED');
-        if (class_exists( 'SoapClient' )) {
+        if (class_exists('SoapClient')) {
             $info->soap->result = true;
             $info->soap->version = G::LoadTranslation('ID_ENABLED');
         }
 
         //mcrypt  info
-        $info->mcrypt->result = extension_loaded("mcrypt");
-        $info->mcrypt->version = ($info->mcrypt->result)? G::LoadTranslation("ID_ENABLED") : G::LoadTranslation("ID_NOT_ENABLED");
+        $info->mcrypt->result = extension_loaded('mcrypt');
+        $info->mcrypt->version = $info->mcrypt->result ? G::LoadTranslation('ID_ENABLED') : G::LoadTranslation('ID_NOT_ENABLED');
 
         // ldap info
         $info->ldap->result = false;
         $info->ldap->version = G::LoadTranslation('ID_NOT_ENABLED');
-        if (function_exists( 'ldap_connect' )) {
+        if (function_exists('ldap_connect')) {
             $info->ldap->result = true;
             $info->ldap->version = G::LoadTranslation('ID_ENABLED');
         }
 
         // memory limit verification
-        $memory = (int) ini_get( "memory_limit" );
+        $memory = (int)ini_get('memory_limit');
         $info->memory->version = $memory . 'M';
-        if ($memory > 255) {
-            $info->memory->result = true;
-        } else {
-            $info->memory->result = false;
-        }
+        $info->memory->result = $memory > 255;
 
         return $info;
     }
 
-    public function is_dir_writable ($path)
+    public function is_dir_writable($path)
     {
-        return G::is_writable_r( $path );
+        return G::is_writable_r($path);
     }
 
-    public function getPermissionInfo ()
+    public function getPermissionInfo()
     {
-        $this->setResponseType( 'json' );
+        $this->setResponseType('json');
         $info = new StdClass();
         $info->success = true;
-        $noWritableFiles = array ();
+        $noWritableFiles = array();
+        $noWritable = G::LoadTranslation('ID_INDEX_NOT_WRITEABLE');
+        $writable = G::LoadTranslation('ID_WRITEABLE');
+
         // pathConfig
         $info->pathConfig = new stdclass();
-        $info->pathConfig->message = G::LoadTranslation('ID_INDEX_NOT_WRITEABLE');
-        $info->pathConfig->result = G::is_writable_r( $_REQUEST['pathConfig'], $noWritableFiles );
+        $info->pathConfig->message = $noWritable;
+        $info->pathConfig->result = G::is_writable_r($_REQUEST['pathConfig'], $noWritableFiles);
         if ($info->pathConfig->result) {
-            $info->pathConfig->message = G::LoadTranslation('ID_WRITEABLE');
+            $info->pathConfig->message = $writable;
         } else {
             $info->success = false;
         }
 
         $info->pathLanguages = new stdclass();
-        $info->pathLanguages->message = G::LoadTranslation('ID_INDEX_NOT_WRITEABLE');
-        $info->pathLanguages->result = G::is_writable_r( $_REQUEST['pathLanguages'], $noWritableFiles );
+        $info->pathLanguages->message = $noWritable;
+        $info->pathLanguages->result = G::is_writable_r($_REQUEST['pathLanguages'], $noWritableFiles);
         if ($info->pathLanguages->result) {
-            $info->pathLanguages->message = G::LoadTranslation('ID_WRITEABLE');
+            $info->pathLanguages->message = $writable;
         } else {
             $info->success = false;
         }
 
         $info->pathPlugins = new stdclass();
-        $info->pathPlugins->message = G::LoadTranslation('ID_INDEX_NOT_WRITEABLE');
-        $info->pathPlugins->result = G::is_writable_r( $_REQUEST['pathPlugins'], $noWritableFiles );
+        $info->pathPlugins->message = $noWritable;
+        $info->pathPlugins->result = G::is_writable_r($_REQUEST['pathPlugins'], $noWritableFiles);
         if ($info->pathPlugins->result) {
-            $info->pathPlugins->message = G::LoadTranslation('ID_WRITEABLE');
+            $info->pathPlugins->message = $writable;
         } else {
             $info->success = false;
         }
 
         $info->pathXmlforms = new stdclass();
-        $info->pathXmlforms->message = G::LoadTranslation('ID_INDEX_NOT_WRITEABLE');
-        $info->pathXmlforms->result = G::is_writable_r( $_REQUEST['pathXmlforms'], $noWritableFiles );
+        $info->pathXmlforms->message = $noWritable;
+        $info->pathXmlforms->result = G::is_writable_r($_REQUEST['pathXmlforms'], $noWritableFiles);
         if ($info->pathXmlforms->result) {
-            $info->pathXmlforms->message = G::LoadTranslation('ID_WRITEABLE');
+            $info->pathXmlforms->message = $writable;
         } else {
             $info->success = false;
         }
 
         $info->pathTranslations = new stdclass();
         $info->pathTranslations->message = G::LoadTranslation('ID_TRANSLATION_NOT_WRITEABLE');
-        $info->pathTranslations->result = G::is_writable_r( $_REQUEST['pathTranslations'], $noWritableFiles );
+        $info->pathTranslations->result = G::is_writable_r($_REQUEST['pathTranslations'], $noWritableFiles);
         if ($info->pathTranslations->result) {
-            $info->pathTranslations->message = G::LoadTranslation('ID_WRITEABLE');
+            $info->pathTranslations->message = $writable;
         } else {
             $info->success = false;
         }
 
         $info->pathTranslationsMafe = new stdclass();
         $info->pathTranslationsMafe->message = G::LoadTranslation('ID_MAFE_TRANSLATION_NOT_WRITEABLE');
-        $info->pathTranslationsMafe->result = G::is_writable_r( $_REQUEST['pathTranslationsMafe'], $noWritableFiles );
+        $info->pathTranslationsMafe->result = G::is_writable_r($_REQUEST['pathTranslationsMafe'], $noWritableFiles);
         if ($info->pathTranslationsMafe->result) {
-            $info->pathTranslationsMafe->message = G::LoadTranslation('ID_WRITEABLE');
+            $info->pathTranslationsMafe->message = $writable;
         } else {
             $info->success = false;
         }
@@ -304,72 +303,83 @@ class InstallerModule extends Controller
         $info->pathPublic = new stdclass();
 
         $info->pathShared = new stdclass();
-        $info->pathPublic->message = G::LoadTranslation('ID_INDEX_NOT_WRITEABLE');
-        $info->pathPublic->result = G::is_writable_r( $_REQUEST['pathPublic'], $noWritableFiles );
+        $info->pathPublic->message = $noWritable;
+        $info->pathPublic->result = G::is_writable_r($_REQUEST['pathPublic'], $noWritableFiles);
         if ($info->pathPublic->result) {
-            $info->pathShared->message = G::LoadTranslation('ID_WRITEABLE');
+            $info->pathShared->message = $writable;
         } else {
             $info->success = false;
         }
 
-        $info->pathShared->message = G::LoadTranslation('ID_INDEX_NOT_WRITEABLE');
-        $info->pathShared->result = G::is_writable_r( $_REQUEST['pathShared'], $noWritableFiles );
+        $info->pathShared->message = $noWritable;
+        $info->pathShared->result = G::is_writable_r($_REQUEST['pathShared'], $noWritableFiles);
         if ($info->pathShared->result) {
-            $info->pathShared->message = G::LoadTranslation('ID_WRITEABLE');
+            $info->pathShared->message = $writable;
         } else {
             //Verify and create the shared path
-            G::verifyPath( $_REQUEST['pathShared'], true );
-            $info->pathShared->result = G::is_writable_r( $_REQUEST['pathShared'], $noWritableFiles );
+            G::verifyPath($_REQUEST['pathShared'], true);
+            $info->pathShared->result = G::is_writable_r($_REQUEST['pathShared'], $noWritableFiles);
             if ($info->pathShared->result) {
-                $info->pathShared->message = G::LoadTranslation('ID_WRITEABLE');
+                $info->pathShared->message = $writable;
                 $info->success = $this->verifySharedFrameworkPaths($_REQUEST['pathShared']);
             } else {
                 $info->success = false;
             }
         }
 
-
         $filter = new InputFilter();
         $pathShared = $filter->validateInput($_REQUEST['pathShared'], 'path');
 
         if ($info->pathShared->result) {
-            $aux = pathinfo( $_REQUEST['pathLogFile'] );
-            G::verifyPath( $aux['dirname'], true );
-            if (is_dir( $aux['dirname'] )) {
-                if (! file_exists( $_REQUEST['pathLogFile'] )) {
-                    @file_put_contents( $_REQUEST['pathLogFile'], '' );
-                    @chmod($pathShared , 0770);
+            $aux = pathinfo($_REQUEST['pathLogFile']);
+            G::verifyPath($aux['dirname'], true);
+            if (is_dir($aux['dirname'])) {
+                if (!file_exists($_REQUEST['pathLogFile'])) {
+                    @file_put_contents($_REQUEST['pathLogFile'], '');
+                    @chmod($pathShared, 0770);
                 }
             }
         }
 
         $info->pathLogFile = new stdclass();
         $info->pathLogFile->message = G::LoadTranslation('ID_CREATE_LOG_INSTALLATION');
-        $info->pathLogFile->result = file_exists( $_REQUEST['pathLogFile'] );
+        $info->pathLogFile->result = file_exists($_REQUEST['pathLogFile']);
 
         if ($info->pathLogFile->result) {
             $info->pathLogFile->message = G::LoadTranslation('ID_INSTALLATION_FILE_LOG');
         }
 
-        if ($info->success) {
-            $info->notify = G::LoadTranslation('ID_SUCCESS_DIRECTORIES_WRITABLE');
-        } else {
-            $info->notify = G::LoadTranslation('ID_DIRECTORIES_NOT_WRITABLE');
-        }
+        $info->notify = $info->success ? G::LoadTranslation('ID_SUCCESS_DIRECTORIES_WRITABLE') : G::LoadTranslation('ID_DIRECTORIES_NOT_WRITABLE');
 
         $info->noWritableFiles = $noWritableFiles;
 
         return $info;
     }
 
-    public function testConnection ()
+    /**
+     * Test db connection
+     *
+     * @return StdClass
+     */
+    public function testConnection()
     {
-        $this->setResponseType( 'json' );
-        if (isset($_REQUEST["db_engine"]) && $_REQUEST["db_engine"] == "mysql") {
-            return $this->testMySQLconnection();
-        } else {
-            return $this->testMSSQLconnection();
+        $this->setResponseType('json');
+        $info = new StdClass();
+        try {
+            switch ($_REQUEST['db_engine']) {
+                case 'mysql':
+                case 'mysqli':
+                    $info = $this->testMySQLConnection();
+                    break;
+                case 'mssql':
+                    $info = $this->testMSSQLConnection();
+                    break;
+            }
+        } catch (Exception $e) {
+            $info->result = false;
+            $info->message = G::LoadTranslation('DBCONNECTIONS_MSGA');
         }
+        return $info;
     }
 
     /**
@@ -377,30 +387,30 @@ class InstallerModule extends Controller
      * the install.log files should be placed in shared/logs
      * for that reason we are using the $_REQUEST of pathShared
      */
-    public function installLog ($text)
+    public function installLog($text)
     {
         $serverAddr = $_SERVER['SERVER_ADDR'];
         //if this function is called outside the createWorkspace, just returns and do nothing
-        if (! isset( $_REQUEST['pathShared'] )) {
+        if (!isset($_REQUEST['pathShared'])) {
             return;
         }
-            //log file is in shared/logs
-        $pathShared = trim( $_REQUEST['pathShared'] );
-        if (substr( $pathShared, - 1 ) != '/') {
+        //log file is in shared/logs
+        $pathShared = trim($_REQUEST['pathShared']);
+        if (substr($pathShared, -1) != '/') {
             $pathShared .= '/';
         }
-        $pathSharedLog =  $pathShared . 'log/';
+        $pathSharedLog = $pathShared . 'log/';
         G::verifyPath($pathSharedLog, true);
         $logFile = $pathSharedLog . 'install.log';
 
-        if (! is_file( $logFile )) {
-            G::mk_dir( dirname( $pathShared ) );
-            $fpt = fopen( $logFile, 'w' );
+        if (!is_file($logFile)) {
+            G::mk_dir(dirname($pathShared));
+            $fpt = fopen($logFile, 'w');
             if ($fpt !== null) {
-                fwrite( $fpt, sprintf( "%s %s\n", date( 'Y:m:d H:i:s' ), '----- '. G::LoadTranslation('ID_STARTING_LOG_FILE') .' ------' ) );
-                fclose( $fpt );
+                fwrite($fpt, sprintf("%s %s\n", date('Y:m:d H:i:s'), '----- ' . G::LoadTranslation('ID_STARTING_LOG_FILE') . ' ------'));
+                fclose($fpt);
             } else {
-                throw (new Exception( G::LoadTranslation('ID_FILE_NOT_WRITEABLE', SYS_LANG, Array($logFile) ) ));
+                throw (new Exception(G::LoadTranslation('ID_FILE_NOT_WRITEABLE', SYS_LANG, array($logFile))));
                 return $false;
             }
         }
@@ -409,31 +419,40 @@ class InstallerModule extends Controller
         $filter = new InputFilter();
         $logFile = $filter->validateInput($logFile, 'path');
 
-        $fpt = fopen( $logFile, 'a' );
-        fwrite( $fpt, sprintf( "%s %s\n", date( 'Y:m:d H:i:s' ), trim( $text ) ) );
-        fclose( $fpt );
+        $fpt = fopen($logFile, 'a');
+        fwrite($fpt, sprintf("%s %s\n", date('Y:m:d H:i:s'), trim($text)));
+        fclose($fpt);
         return true;
     }
 
     /**
      * function to create a workspace
-     * in fact this function is calling appropiate functions for mysql and mssql
+     * in fact this function is calling appropriate functions for mysql and mssql
      * need permission PM_SETUP_ADVANCE for this action
-     * @return void
+     * @return stdClass information create a workspace.
      */
-    public function createWorkspace ()
+    public function createWorkspace()
     {
         if (!$this->pmIsInstalled()) {
             $pathSharedPartner = trim($_REQUEST['pathShared']);
             if (file_exists(trim($pathSharedPartner, PATH_SEP) . PATH_SEP . 'partner.info')) {
                 $this->systemName = $this->getSystemName($pathSharedPartner);
-                $_REQUEST["PARTNER_FLAG"] = true;
+                $_REQUEST['PARTNER_FLAG'] = true;
             }
             $this->setResponseType('json');
-            if ($_REQUEST['db_engine'] == 'mysql') {
-                $info = $this->createMySQLWorkspace();
-            } else {
-                $info = $this->createMSSQLWorkspace();
+            $info = new StdClass();
+            try {
+                switch ($_REQUEST['db_engine']) {
+                    case 'mysql':
+                        $info = $this->createMySQLWorkspace();
+                        break;
+                    case 'mssql':
+                        $info = $this->createMSSQLWorkspace();
+                        break;
+                }
+            } catch (Exception $e) {
+                $info->result = false;
+                $info->message = G::LoadTranslation('DBCONNECTIONS_MSGA');
             }
 
             return $info;
@@ -446,8 +465,9 @@ class InstallerModule extends Controller
      * We check if processMaker is not installed
      *
      * @return boolean
-    */
-    private function pmIsInstalled(){
+     */
+    private function pmIsInstalled()
+    {
         return file_exists(FILE_PATHS_INSTALLED);
     }
 
@@ -456,17 +476,18 @@ class InstallerModule extends Controller
      *
      * @return void
      */
-    private function displayError(){
+    private function displayError()
+    {
         $this->setJSVar('messageError', G::LoadTranslation('ID_PROCESSMAKER_ALREADY_INSTALLED'));
         $this->includeExtJS('installer/stopInstall');
         $this->setView('installer/mainStopInstall');
         G::RenderPage('publish', 'extJs');
     }
 
-    public function forceTogenerateTranslationsFiles ($url)
+    public function forceTogenerateTranslationsFiles($url)
     {
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, G::browserCacheFilesUrl(( G::is_https()? "https://" : "http://" ) . $_SERVER["HTTP_HOST"] . "/js/ext/translation.en.js?r=" . rand(1, 10000)));
+        curl_setopt($ch, CURLOPT_URL, G::browserCacheFilesUrl((G::is_https() ? "https://" : "http://") . $_SERVER["HTTP_HOST"] . "/js/ext/translation.en.js?r=" . rand(1, 10000)));
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_FRESH_CONNECT, 1);
         curl_setopt($ch, CURLOPT_TIMEOUT, 60);
@@ -478,40 +499,38 @@ class InstallerModule extends Controller
     /**
      * send a query to MySQL and log the query
      */
-    public function mysqlQuery ($sql)
+    public function mysqlQuery($sql)
     {
-
-        $filter = new InputFilter();
-        $sql = $filter->preventSqlInjection($sql, Array());
-        $this->installLog( $sql );
-        $query = @mysql_query( $sql, $this->link );
-        if (! $query) {
-            $errorMessage = mysql_error( $this->link );
-            $this->installLog( G::LoadTranslation('ID_MYSQL_ERROR', SYS_LANG, Array($errorMessage) ) );
-            throw new Exception( $errorMessage );
+        $this->installLog($sql);
+        $query = mysqli_query($this->link, $sql);
+        if (!$query) {
+            $errorMessage = mysqli_error($this->link);
+            $this->installLog(G::LoadTranslation('ID_MYSQL_ERROR', SYS_LANG, array($errorMessage)));
+            throw new \Exception($errorMessage);
             return false;
         }
-        @mysql_free_result( $query );
+        if (is_object($query)) {
+            mysqli_free_result($query);
+        }
         return true;
     }
 
     /**
      * send a query to MSSQL and log the query
      */
-    public function mssqlQuery ($sql)
+    public function mssqlQuery($sql)
     {
-
         $filter = new InputFilter();
-        $sql = $filter->preventSqlInjection($sql, Array());
-        $this->installLog( $sql );
-        $query = @mssql_query( $sql, $this->link );
-        if (! $query) {
+        $sql = $filter->preventSqlInjection($sql, array());
+        $this->installLog($sql);
+        $query = @mssql_query($sql, $this->link);
+        if (!$query) {
             $errorMessage = mssql_get_last_message();
-            $this->installLog( G::LoadTranslation('ID_MYSQL_ERROR', SYS_LANG, Array($errorMessage) ));
-            throw (new Exception( $errorMessage ));
+            $this->installLog(G::LoadTranslation('ID_MYSQL_ERROR', SYS_LANG, array($errorMessage)));
+            throw (new Exception($errorMessage));
             return false;
         }
-        @mssql_free_result( $query );
+        @mssql_free_result($query);
         return true;
     }
 
@@ -522,57 +541,38 @@ class InstallerModule extends Controller
      * @param string $connection
      * @return array $report
      */
-    public function mysqlFileQuery ($file)
+    public function mysqlFileQuery($file)
     {
-        if (! is_file( $file )) {
-            throw (new Exception( G::LoadTranslation('ID_SQL_FILE_INVALID', SYS_LANG, Array($file) ) ));
+        if (!is_file($file)) {
+            throw (new Exception(G::LoadTranslation('ID_SQL_FILE_INVALID', SYS_LANG, array($file))));
             return $false;
         }
-        $this->installLog( G::LoadTranslation('ID_PROCESING', SYS_LANG, Array($file) ));
-        $startTime = microtime( true );
-        // $content = file_get_contents($file);
-        // $queries = explode(';', $content);
+        $this->installLog(G::LoadTranslation('ID_PROCESING', SYS_LANG, array($file)));
+        $startTime = microtime(true);
+        //New Update, to support more complex queries
 
 
-        // foreach( $queries as $sql) {
-        //   if (trim($sql) != '') {
-        //     $query = @mysql_query($sql, $this->link);
-        //     if (!$query) {
-        //       $errorMessage = mysql_error($this->link);
-
-
-        //       $this->installLog ( sprintf ( 'MySQL error: %s  Query: %s ', $errorMessage, $sql ) );
-        //       throw ( new Exception ( $errorMessage ) );
-        //       return false;
-        //     }
-        //   }
-        // }
-
-
-        //erik: New Update, to support more complex queries
-
-
-        $lines = file( $file );
+        $lines = file($file);
         $previous = null;
         $errors = '';
-        @mysql_query( "SET NAMES 'utf8';" );
+        mysqli_query($this->link, "SET NAMES 'utf8';");
         foreach ($lines as $j => $line) {
-            $line = trim( $line ); // Remove comments from the script
+            $line = trim($line); // Remove comments from the script
 
 
-            if (strpos( $line, "--" ) === 0) {
-                $line = substr( $line, 0, strpos( $line, "--" ) );
+            if (strpos($line, "--") === 0) {
+                $line = substr($line, 0, strpos($line, "--"));
             }
 
-            if (empty( $line )) {
+            if (empty($line)) {
                 continue;
             }
 
-            if (strpos( $line, "#" ) === 0) {
-                $line = substr( $line, 0, strpos( $line, "#" ) );
+            if (strpos($line, "#") === 0) {
+                $line = substr($line, 0, strpos($line, "#"));
             }
 
-            if (empty( $line )) {
+            if (empty($line)) {
                 continue;
             }
 
@@ -584,17 +584,17 @@ class InstallerModule extends Controller
 
             // If the current line doesnt end with ; then put this line together
             // with the next one, thus supporting multi-line statements.
-            if (strrpos( $line, ";" ) != strlen( $line ) - 1) {
+            if (strrpos($line, ";") != strlen($line) - 1) {
                 $previous = $line;
                 continue;
             }
 
-            $line = substr( $line, 0, strrpos( $line, ";" ) );
-            @mysql_query( $line, $this->link );
+            $line = substr($line, 0, strrpos($line, ";"));
+            mysqli_query($this->link, $line);
         }
 
-        $endTime = microtime( true );
-        $this->installLog( G::LoadTranslation('ID_FILE_PROCESSED', SYS_LANG, Array(basename( $file ), $endTime - $startTime )) );
+        $endTime = microtime(true);
+        $this->installLog(G::LoadTranslation('ID_FILE_PROCESSED', SYS_LANG, array(basename($file), $endTime - $startTime)));
         return true;
     }
 
@@ -605,28 +605,28 @@ class InstallerModule extends Controller
      * @param string $connection
      * @return array $report
      */
-    public function mssqlFileQuery ($file)
+    public function mssqlFileQuery($file)
     {
-        if (! is_file( $file )) {
-            throw (new Exception( G::LoadTranslation('ID_SQL_FILE_INVALID', SYS_LANG, Array($file) )));
+        if (!is_file($file)) {
+            throw (new Exception(G::LoadTranslation('ID_SQL_FILE_INVALID', SYS_LANG, array($file))));
             return $false;
         }
-        $this->installLog( G::LoadTranslation('ID_PROCESING', SYS_LANG, Array($file) ));
-        $startTime = microtime( true );
-        $content = file_get_contents( $file );
-        $queries = explode( ';', $content );
+        $this->installLog(G::LoadTranslation('ID_PROCESING', SYS_LANG, array($file)));
+        $startTime = microtime(true);
+        $content = file_get_contents($file);
+        $queries = explode(';', $content);
 
         foreach ($queries as $sql) {
-            $query = @mssql_query( $sql, $this->link );
-            if (! $query) {
+            $query = @mssql_query($sql, $this->link);
+            if (!$query) {
                 $errorMessage = mssql_get_last_message();
-                $this->installLog( G::LoadTranslation('ID_MYSQL_ERROR',SYS_LANG, Array( $errorMessage . G::LoadTranslation('ID_QUERY') .": ". $sql) ));
-                throw (new Exception( $errorMessage ));
+                $this->installLog(G::LoadTranslation('ID_MYSQL_ERROR', SYS_LANG, array($errorMessage . G::LoadTranslation('ID_QUERY') . ": " . $sql)));
+                throw (new Exception($errorMessage));
                 return false;
             }
         }
-        $endTime = microtime( true );
-        $this->installLog( G::LoadTranslation('ID_FILE_PROCESSED', SYS_LANG, Array(basename( $file ), $endTime - $startTime )) );
+        $endTime = microtime(true);
+        $this->installLog(G::LoadTranslation('ID_FILE_PROCESSED', SYS_LANG, array(basename($file), $endTime - $startTime)));
         return true;
     }
 
@@ -638,28 +638,29 @@ class InstallerModule extends Controller
      * @param string $psDatabase
      * @return void
      */
-    public function setGrantPrivilegesMySQL ($psUser, $psPassword, $psDatabase, $host)
+    public function setGrantPrivilegesMySQL($psUser, $psPassword, $psDatabase, $host)
     {
-
         $filter = new InputFilter();
         $host = ($host == 'localhost' || $host == '127.0.0.1' ? 'localhost' : '%');
 
         $query = "GRANT ALL PRIVILEGES ON `%s`.* TO %s@'%s' IDENTIFIED BY '%s' WITH GRANT OPTION";
-        $sql = sprintf( $query, $psDatabase, $psUser, $host, $psPassword );
-        $sql = $filter->preventSqlInjection($query, array($psDatabase, $psUser, $host, $psPassword ));
-        $query = @mysql_query( $sql, $this->link );
+        $sql = sprintf($query, $psDatabase, $psUser, $host, $psPassword);
+        $sql = $filter->preventSqlInjection($query, array($psDatabase, $psUser, $host, $psPassword), $this->link);
+        $query = mysqli_query($this->link, $sql);
 
-        if (! $query) {
-            $errorMessage = mysql_error( $this->link );
-            $this->installLog( G::LoadTranslation('ID_MYSQL_ERROR', SYS_LANG, Array($errorMessage) ) );
-            if (mysql_errno( $this->link) == 1410 || mysql_errno( $this->link) == 1132) {
+        if (!$query) {
+            $errorMessage = mysqli_error($this->link);
+            $this->installLog(G::LoadTranslation('ID_MYSQL_ERROR', SYS_LANG, array($errorMessage)));
+            if (mysqli_errno($this->link) === 1410 || mysqli_errno($this->link) === 1132) {
                 $errorMessage .= '. ' . G::LoadTranslation('ID_INSTALL_USE_CURRENT_USER');
             }
-            throw new Exception( $errorMessage );
+            throw new Exception($errorMessage);
             return false;
         }
-        @mysql_free_result( $query );
-        $this->installLog( $sql );
+        if (is_object($query)) {
+            mysqli_free_result($query);
+        }
+        $this->installLog($sql);
     }
 
     /**
@@ -670,104 +671,110 @@ class InstallerModule extends Controller
      * @param string $psDatabase
      * @return void
      */
-    public function setGrantPrivilegesMSSQL ($psUser, $psPassword, $psDatabase)
+    public function setGrantPrivilegesMSSQL($psUser, $psPassword, $psDatabase)
     {
+        $query = sprintf("IF  EXISTS (SELECT * FROM sys.server_principals WHERE name = N'%s') DROP LOGIN [%s]", $psUser, $psUser);
+        $this->mssqlQuery($query);
 
-        $query = sprintf( "IF  EXISTS (SELECT * FROM sys.server_principals WHERE name = N'%s') DROP LOGIN [%s]", $psUser, $psUser );
-        $this->mssqlQuery( $query );
+        $query = sprintf("CREATE LOGIN [%s] WITH PASSWORD=N'%s', DEFAULT_DATABASE=[%s], CHECK_EXPIRATION=OFF, CHECK_POLICY=OFF ", $psUser, $psPassword, $psDatabase);
+        $this->mssqlQuery($query);
 
-        $query = sprintf( "CREATE LOGIN [%s] WITH PASSWORD=N'%s', DEFAULT_DATABASE=[%s], CHECK_EXPIRATION=OFF, CHECK_POLICY=OFF ", $psUser, $psPassword, $psDatabase );
-        $this->mssqlQuery( $query );
+        $query = sprintf("USE %s;", $psDatabase);
+        $this->mssqlQuery($query);
 
-        $query = sprintf( "USE %s;", $psDatabase );
-        $this->mssqlQuery( $query );
+        $query = sprintf("IF  EXISTS (SELECT * FROM sys.database_principals WHERE name = N'%s') DROP USER [%s]", $psUser, $psUser);
+        $this->mssqlQuery($query);
 
-        $query = sprintf( "IF  EXISTS (SELECT * FROM sys.database_principals WHERE name = N'%s') DROP USER [%s]", $psUser, $psUser );
-        $this->mssqlQuery( $query );
+        $query = sprintf("CREATE USER %s FOR LOGIN %s;", $psUser, $psUser);
+        $this->mssqlQuery($query);
 
-        $query = sprintf( "CREATE USER %s FOR LOGIN %s;", $psUser, $psUser );
-        $this->mssqlQuery( $query );
+        $query = sprintf("sp_addrolemember 'db_owner', '%s' ", $psUser);
+        $this->mssqlQuery($query);
 
-        $query = sprintf( "sp_addrolemember 'db_owner', '%s' ", $psUser );
-        $this->mssqlQuery( $query );
+        $query = sprintf("sp_addrolemember 'db_ddladmin', '%s' ", $psUser);
+        $this->mssqlQuery($query);
 
-        $query = sprintf( "sp_addrolemember 'db_ddladmin', '%s' ", $psUser );
-        $this->mssqlQuery( $query );
+        $query = sprintf("sp_addrolemember 'db_accessadmin', '%s' ", $psUser);
+        $this->mssqlQuery($query);
 
-        $query = sprintf( "sp_addrolemember 'db_accessadmin', '%s' ", $psUser );
-        $this->mssqlQuery( $query );
-
-        $query = sprintf( "use master " );
-        $this->mssqlQuery( $query );
+        $query = sprintf("use master ");
+        $this->mssqlQuery($query);
 
         return true;
     }
 
-    public function createMySQLWorkspace ()
-    {
+    private function file_get_contents_utf8($fn) {
+        $content = file_get_contents($fn);
+        return mb_convert_encoding($content, 'UTF-8',
+            mb_detect_encoding($content, 'UTF-8, ISO-8859-1', true));
+    }
 
+    public function createMySQLWorkspace()
+    {
         $filter = new InputFilter();
-        ini_set( 'max_execution_time', '0' );
+        ini_set('max_execution_time', '0');
         $info = new StdClass();
         $info->result = false;
         $info->message = '';
         $info->canRedirect = true;
 
-        $db_hostname = trim( $_REQUEST['db_hostname'] );
-        $db_port = trim( $_REQUEST['db_port'] );
+        $db_hostname = trim($_REQUEST['db_hostname']);
+        $db_port = trim($_REQUEST['db_port']);
         $db_port = $filter->validateInput($db_port);
-        $db_username = trim( $_REQUEST['db_username'] );
+        $db_username = trim($_REQUEST['db_username']);
         $db_username = $filter->validateInput($db_username);
         $db_password = urlencode(trim($_REQUEST['db_password']));
         $db_password = urldecode($filter->validateInput($db_password));
-        $wf = trim( $_REQUEST['wfDatabase'] );
-        $rb = trim( $_REQUEST['wfDatabase'] );
-        $rp = trim( $_REQUEST['wfDatabase'] );
-        $workspace = trim( $_REQUEST['workspace'] );
-        $pathConfig = trim( $_REQUEST['pathConfig'] );
-        $pathLanguages = trim( $_REQUEST['pathLanguages'] );
-        $pathPlugins = trim( $_REQUEST['pathPlugins'] );
-        $pathShared = trim( $_REQUEST['pathShared'] );
-        $pathXmlforms = trim( $_REQUEST['pathXmlforms'] );
-        $adminPassword = trim( $_REQUEST['adminPassword'] );
+        $wf = trim($_REQUEST['wfDatabase']);
+        $rb = trim($_REQUEST['wfDatabase']);
+        $rp = trim($_REQUEST['wfDatabase']);
+        $workspace = trim($_REQUEST['workspace']);
+        $pathConfig = trim($_REQUEST['pathConfig']);
+        $pathLanguages = trim($_REQUEST['pathLanguages']);
+        $pathPlugins = trim($_REQUEST['pathPlugins']);
+        $pathShared = trim($_REQUEST['pathShared']);
+        $pathXmlforms = trim($_REQUEST['pathXmlforms']);
+        $adminPassword = trim($_REQUEST['adminPassword']);
         $adminPassword = $filter->validateInput($adminPassword);
-        $adminUsername = trim( $_REQUEST['adminUsername'] );
+        $adminUsername = trim($_REQUEST['adminUsername']);
         $adminUsername = $filter->validateInput($adminUsername);
         $deleteDB = ($_REQUEST['deleteDB'] == 'true');
         $userLogged = (isset($_REQUEST['userLogged']) ? ($_REQUEST['userLogged'] == 'true') : false);
         $userLogged = $filter->validateInput($userLogged);
 
-        if (substr( $pathShared, - 1 ) != '/') {
+        if (substr($pathShared, -1) != '/') {
             $pathShared .= '/';
         }
 
-        $this->installLog( '-------------------------------------------' );
-        $this->installLog( G::LoadTranslation('ID_CREATING_WORKSPACE', SYS_LANG, Array($workspace)));
+        $this->installLog('-------------------------------------------');
+        $this->installLog(G::LoadTranslation('ID_CREATING_WORKSPACE', SYS_LANG, array($workspace)));
 
         try {
             $db_host = ($db_port != '' && $db_port != 3306) ? $db_hostname . ':' . $db_port : $db_hostname;
-            $this->link = @mysql_connect( $db_host, $db_username, $db_password );
-            $this->installLog( G::LoadTranslation('ID_CONNECT_TO_SERVER', SYS_LANG, Array($db_hostname, $db_port, $db_username ) ));
+            $this->link = mysqli_connect($db_host, $db_username, $db_password);
+
+            mysqli_set_charset($this->link, 'utf8');
+            $this->installLog(G::LoadTranslation('ID_CONNECT_TO_SERVER', SYS_LANG, array($db_hostname, $db_port, $db_username)));
 
             if ($deleteDB) {
-                $q = sprintf( 'DROP DATABASE IF EXISTS %s;', $wf, $wf );
-                $this->mysqlQuery( $q );
+                $q = sprintf('DROP DATABASE IF EXISTS %s;', $wf, $wf);
+                $this->mysqlQuery($q);
             }
 
             // CREATE databases wf_workflow, rb_workflow and rp_workflow
-            $q = sprintf( 'CREATE DATABASE IF NOT EXISTS %s;', $wf, $wf );
-            $this->mysqlQuery( $q );
+            $q = sprintf('CREATE DATABASE IF NOT EXISTS %s;', $wf, $wf);
+            $this->mysqlQuery($q);
 
             // CREATE users and GRANT Privileges
-            $wf_workpace = $wf;
+            $wf_workspace = $wf;
             $wfGrantUser = uniqid('wf_');
-            $rb_workpace = $wf;
-            $rp_workpace = $wf;
+            $rb_workspace = $wf;
+            $rp_workspace = $wf;
             if (!$userLogged) {
-                $wfPass = G::generate_password( 15 );
-                $this->setGrantPrivilegesMySQL( $wfGrantUser, $wfPass, $wf, $db_hostname );
-                $this->setGrantPrivilegesMySQL( $wfGrantUser, $wfPass, $wf, $db_hostname );
-                $this->setGrantPrivilegesMySQL( $wfGrantUser, $wfPass, $wf, $db_hostname );
+                $wfPass = G::generate_password(15);
+                $this->setGrantPrivilegesMySQL($wfGrantUser, $wfPass, $wf, $db_hostname);
+                $this->setGrantPrivilegesMySQL($wfGrantUser, $wfPass, $wf, $db_hostname);
+                $this->setGrantPrivilegesMySQL($wfGrantUser, $wfPass, $wf, $db_hostname);
             } else {
                 $wfPass = $db_password;
                 $rbPass = $db_password;
@@ -783,40 +790,40 @@ class InstallerModule extends Controller
             $pathSharedSites = $pathShared;
             $path_site = $pathShared . "/sites/" . $workspace . "/";
 
-            @mkdir( $path_site, 0777, true );
-            @mkdir( $path_site . "files/", 0777, true );
-            @mkdir( $path_site . "mailTemplates/", 0777, true );
-            @mkdir( $path_site . "public/", 0777, true );
-            @mkdir( $path_site . "reports/", 0777, true );
-            @mkdir( $path_site . "xmlForms", 0777, true );
+            @mkdir($path_site, 0777, true);
+            @mkdir($path_site . "files/", 0777, true);
+            @mkdir($path_site . "mailTemplates/", 0777, true);
+            @mkdir($path_site . "public/", 0777, true);
+            @mkdir($path_site . "reports/", 0777, true);
+            @mkdir($path_site . "xmlForms", 0777, true);
 
             $db_file = $path_site . 'db.php';
             $dbText = "<?php\n";
-            $dbText .= sprintf( "// Processmaker configuration\n" );
-            $dbText .= sprintf( "  define ('DB_ADAPTER',     '%s' );\n", 'mysql' );
-            $dbText .= sprintf( "  define ('DB_HOST',        '%s' );\n", $db_host );
-            $dbText .= sprintf( "  define ('DB_NAME',        '%s' );\n", $wf_workpace );
-            $dbText .= sprintf( "  define ('DB_USER',        '%s' );\n", $wfGrantUser );
-            $dbText .= sprintf( "  define ('DB_PASS',        '%s' );\n", $wfPass );
-            $dbText .= sprintf( "  define ('DB_RBAC_HOST',   '%s' );\n", $db_host );
-            $dbText .= sprintf( "  define ('DB_RBAC_NAME',   '%s' );\n", $wf_workpace );
-            $dbText .= sprintf( "  define ('DB_RBAC_USER',   '%s' );\n", $wfGrantUser );
-            $dbText .= sprintf( "  define ('DB_RBAC_PASS',   '%s' );\n", $wfPass );
-            $dbText .= sprintf( "  define ('DB_REPORT_HOST', '%s' );\n", $db_host );
-            $dbText .= sprintf( "  define ('DB_REPORT_NAME', '%s' );\n", $wf_workpace );
-            $dbText .= sprintf( "  define ('DB_REPORT_USER', '%s' );\n", $wfGrantUser );
-            $dbText .= sprintf( "  define ('DB_REPORT_PASS', '%s' );\n", $wfPass );
+            $dbText .= sprintf("// Processmaker configuration\n");
+            $dbText .= sprintf("  define ('DB_ADAPTER',     '%s' );\n", 'mysql');
+            $dbText .= sprintf("  define ('DB_HOST',        '%s' );\n", $db_host);
+            $dbText .= sprintf("  define ('DB_NAME',        '%s' );\n", $wf_workspace);
+            $dbText .= sprintf("  define ('DB_USER',        '%s' );\n", $wfGrantUser);
+            $dbText .= sprintf("  define ('DB_PASS',        '%s' );\n", $wfPass);
+            $dbText .= sprintf("  define ('DB_RBAC_HOST',   '%s' );\n", $db_host);
+            $dbText .= sprintf("  define ('DB_RBAC_NAME',   '%s' );\n", $wf_workspace);
+            $dbText .= sprintf("  define ('DB_RBAC_USER',   '%s' );\n", $wfGrantUser);
+            $dbText .= sprintf("  define ('DB_RBAC_PASS',   '%s' );\n", $wfPass);
+            $dbText .= sprintf("  define ('DB_REPORT_HOST', '%s' );\n", $db_host);
+            $dbText .= sprintf("  define ('DB_REPORT_NAME', '%s' );\n", $wf_workspace);
+            $dbText .= sprintf("  define ('DB_REPORT_USER', '%s' );\n", $wfGrantUser);
+            $dbText .= sprintf("  define ('DB_REPORT_PASS', '%s' );\n", $wfPass);
 
             if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
                 $dbText .= "\n";
-                $dbText .= "  define ('PARTNER_FLAG', " . ((defined('PARTNER_FLAG')) ? PARTNER_FLAG : ((isset($_REQUEST['PARTNER_FLAG'])) ? $_REQUEST['PARTNER_FLAG']:'false')) . ");\n";
+                $dbText .= "  define ('PARTNER_FLAG', " . ((defined('PARTNER_FLAG')) ? PARTNER_FLAG : ((isset($_REQUEST['PARTNER_FLAG'])) ? $_REQUEST['PARTNER_FLAG'] : 'false')) . ");\n";
                 if ($this->systemName != '') {
                     $dbText .= "  define ('SYSTEM_NAME', '" . $this->systemName . "');\n";
                 }
             }
 
-            $this->installLog( G::LoadTranslation('ID_CREATING', SYS_LANG, Array($db_file) ));
-            file_put_contents( $db_file, $dbText );
+            $this->installLog(G::LoadTranslation('ID_CREATING', SYS_LANG, array($db_file)));
+            file_put_contents($db_file, $dbText);
 
             /*----------------------------------********---------------------------------*/
             //Generate the env.ini file
@@ -829,85 +836,88 @@ class InstallerModule extends Controller
 
             //Generate the databases.php file
             $databases_file = $path_site . 'databases.php';
-            $dbData = sprintf( "\$dbAdapter    = '%s';\n", 'mysql' );
-            $dbData .= sprintf( "\$dbHost       = '%s';\n", $db_host );
-            $dbData .= sprintf( "\$dbName       = '%s';\n", $wf_workpace );
-            $dbData .= sprintf( "\$dbUser       = '%s';\n", $wf );
-            $dbData .= sprintf( "\$dbPass       = '%s';\n", $wfPass );
-            $dbData .= sprintf( "\$dbRbacHost   = '%s';\n", $db_host );
-            $dbData .= sprintf( "\$dbRbacName   = '%s';\n", $wf_workpace );
-            $dbData .= sprintf( "\$dbRbacUser   = '%s';\n", $wf );
-            $dbData .= sprintf( "\$dbRbacPass   = '%s';\n", $wfPass );
-            $dbData .= sprintf( "\$dbReportHost = '%s';\n", $db_host );
-            $dbData .= sprintf( "\$dbReportName = '%s';\n", $wf_workpace );
-            $dbData .= sprintf( "\$dbReportUser = '%s';\n", $wf );
-            $dbData .= sprintf( "\$dbReportPass = '%s';\n", $wfPass );
-            $databasesText = str_replace( '{dbData}', $dbData, @file_get_contents( PATH_HOME . 'engine/templates/installer/databases.tpl' ) );
+            $dbData = sprintf("\$dbAdapter    = '%s';\n", 'mysql');
+            $dbData .= sprintf("\$dbHost       = '%s';\n", $db_host);
+            $dbData .= sprintf("\$dbName       = '%s';\n", $wf_workspace);
+            $dbData .= sprintf("\$dbUser       = '%s';\n", $wf);
+            $dbData .= sprintf("\$dbPass       = '%s';\n", $wfPass);
+            $dbData .= sprintf("\$dbRbacHost   = '%s';\n", $db_host);
+            $dbData .= sprintf("\$dbRbacName   = '%s';\n", $wf_workspace);
+            $dbData .= sprintf("\$dbRbacUser   = '%s';\n", $wf);
+            $dbData .= sprintf("\$dbRbacPass   = '%s';\n", $wfPass);
+            $dbData .= sprintf("\$dbReportHost = '%s';\n", $db_host);
+            $dbData .= sprintf("\$dbReportName = '%s';\n", $wf_workspace);
+            $dbData .= sprintf("\$dbReportUser = '%s';\n", $wf);
+            $dbData .= sprintf("\$dbReportPass = '%s';\n", $wfPass);
+            $databasesText = str_replace('{dbData}', $dbData, @file_get_contents(PATH_HOME . 'engine/templates/installer/databases.tpl'));
 
-            $this->installLog( G::LoadTranslation('ID_CREATING', SYS_LANG, Array($databases_file) ));
-            file_put_contents( $databases_file, $databasesText );
+            $this->installLog(G::LoadTranslation('ID_CREATING', SYS_LANG, array($databases_file)));
+            file_put_contents($databases_file, $databasesText);
 
             // Execute scripts to create and populates databases
-            $query = sprintf( "USE %s;", $wf_workpace );
-            $this->mysqlQuery( $query );
+            $query = sprintf("USE %s;", $wf_workspace);
+            $this->mysqlQuery($query);
 
-            $this->mysqlFileQuery( PATH_RBAC_HOME . 'engine/data/mysql/schema.sql' );
-            $this->mysqlFileQuery( PATH_RBAC_HOME . 'engine/data/mysql/insert.sql' );
+            $this->mysqlFileQuery(PATH_RBAC_HOME . 'engine/data/mysql/schema.sql');
+            $this->mysqlFileQuery(PATH_RBAC_HOME . 'engine/data/mysql/insert.sql');
 
-            $query = sprintf( "USE %s;", $wf_workpace );
-            $this->mysqlQuery( $query );
-            $this->mysqlFileQuery( PATH_HOME . 'engine/data/mysql/schema.sql' );
-            $this->mysqlFileQuery( PATH_HOME . 'engine/data/mysql/insert.sql' );
+            $query = sprintf("USE %s;", $wf_workspace);
+            $this->mysqlQuery($query);
+            $this->mysqlFileQuery(PATH_HOME . 'engine/data/mysql/schema.sql');
+            $this->mysqlFileQuery(PATH_HOME . 'engine/data/mysql/insert.sql');
 
 
             if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
                 $this->setPartner();
-                //$this->setConfiguration();
             }
 
             // Create the triggers
-            if (file_exists( PATH_HOME . 'engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql' ) && file_exists( PATH_HOME . 'engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql' ) && file_exists( PATH_HOME . 'engine/methods/setup/setupSchemas/triggerApplicationUpdate.sql' ) && file_exists( PATH_HOME . 'engine/methods/setup/setupSchemas/triggerApplicationDelete.sql' ) && file_exists( PATH_HOME . 'engine/methods/setup/setupSchemas/triggerContentUpdate.sql' )) {
-                $this->mysqlQuery( @file_get_contents( PATH_HOME . 'engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql' ) );
-                $this->mysqlQuery( @file_get_contents( PATH_HOME . 'engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql' ) );
-                $this->mysqlQuery( @file_get_contents( PATH_HOME . 'engine/methods/setup/setupSchemas/triggerApplicationUpdate.sql' ) );
-                $this->mysqlQuery( @file_get_contents( PATH_HOME . 'engine/methods/setup/setupSchemas/triggerApplicationDelete.sql' ) );
-                $this->mysqlQuery(@file_get_contents(PATH_HOME . "engine/methods/setup/setupSchemas/triggerSubApplicationInsert.sql"));
-                $this->mysqlQuery( @file_get_contents( PATH_HOME . 'engine/methods/setup/setupSchemas/triggerContentUpdate.sql' ) );
+            if (file_exists(PATH_HOME . 'engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql') &&
+                file_exists(PATH_HOME . 'engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql') &&
+                file_exists(PATH_HOME . 'engine/methods/setup/setupSchemas/triggerApplicationUpdate.sql') &&
+                file_exists(PATH_HOME . 'engine/methods/setup/setupSchemas/triggerApplicationDelete.sql') &&
+                file_exists(PATH_HOME . 'engine/methods/setup/setupSchemas/triggerContentUpdate.sql')) {
+                $this->mysqlQuery($this->file_get_contents_utf8(PATH_HOME . 'engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql'));
+                $this->mysqlQuery($this->file_get_contents_utf8(PATH_HOME . 'engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql'));
+                $this->mysqlQuery($this->file_get_contents_utf8(PATH_HOME . 'engine/methods/setup/setupSchemas/triggerApplicationUpdate.sql'));
+                $this->mysqlQuery($this->file_get_contents_utf8(PATH_HOME . 'engine/methods/setup/setupSchemas/triggerApplicationDelete.sql'));
+                $this->mysqlQuery($this->file_get_contents_utf8(PATH_HOME . "engine/methods/setup/setupSchemas/triggerSubApplicationInsert.sql"));
+                $this->mysqlQuery($this->file_get_contents_utf8(PATH_HOME . 'engine/methods/setup/setupSchemas/triggerContentUpdate.sql'));
 
-                $this->mysqlQuery( "INSERT INTO `CONFIGURATION` (
+                $this->mysqlQuery("INSERT INTO `CONFIGURATION` (
                             `CFG_UID`,
                             `CFG_VALUE`
                            )
                            VALUES (
                              'APP_CACHE_VIEW_ENGINE',
-                             '" . mysql_real_escape_string( serialize( array ('LANG' => 'en','STATUS' => 'active'
-                ) ) ) . "'
-                           )" );
+                             '" . mysqli_real_escape_string(serialize(array('LANG' => 'en', 'STATUS' => 'active'
+                    ))) . "'
+                           )");
 
                 $this->mysqlQuery("INSERT INTO EMAIL_SERVER(MESS_UID, MESS_ENGINE) VALUES('" . \ProcessMaker\Util\Common::generateUID() . "', 'MAIL')");
             }
 
             // Change admin user
-            $query = sprintf( "USE %s;", $wf_workpace );
-            $this->mysqlQuery( $query );
+            $query = sprintf("USE %s;", $wf_workspace);
+            $this->mysqlQuery($query);
 
-            $query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_LASTNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, $adminUsername, G::encryptHash( $adminPassword ) );
-            $this->mysqlQuery( $query );
+            $query = sprintf("UPDATE USERS SET USR_USERNAME = '%s', USR_LASTNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, $adminUsername, G::encryptHash($adminPassword));
+            $this->mysqlQuery($query);
 
-            $query = sprintf( "UPDATE RBAC_USERS SET USR_USERNAME = '%s', USR_LASTNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, $adminUsername, G::encryptHash( $adminPassword ) );
-            $this->mysqlQuery( $query );
+            $query = sprintf("UPDATE RBAC_USERS SET USR_USERNAME = '%s', USR_LASTNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, $adminUsername, G::encryptHash($adminPassword));
+            $this->mysqlQuery($query);
 
             // Write the paths_installed.php file (contains all the information configured so far)
-            if (! file_exists( FILE_PATHS_INSTALLED )) {
-                $sh = G::encryptOld( filemtime( PATH_GULLIVER . '/class.g.php' ) );
-                $h = G::encrypt( $db_hostname . $sh . $db_username . $sh . $db_password, $sh );
+            if (!file_exists(FILE_PATHS_INSTALLED)) {
+                $sh = G::encryptOld(filemtime(PATH_GULLIVER . '/class.g.php'));
+                $h = G::encrypt($db_hostname . $sh . $db_username . $sh . $db_password, $sh);
                 $dbText = "<?php\n";
-                $dbText .= sprintf( "  define('PATH_DATA',         '%s');\n", $pathShared );
-                $dbText .= sprintf( "  define('PATH_C',            '%s');\n", $pathShared . 'compiled/' );
-                $dbText .= sprintf( "  define('HASH_INSTALLATION', '%s');\n", $h );
-                $dbText .= sprintf( "  define('SYSTEM_HASH',       '%s');\n", $sh );
-                $this->installLog( G::LoadTranslation('ID_CREATING', SYS_LANG, Array(FILE_PATHS_INSTALLED) ));
-                file_put_contents( FILE_PATHS_INSTALLED, $dbText );
+                $dbText .= sprintf("  define('PATH_DATA',         '%s');\n", $pathShared);
+                $dbText .= sprintf("  define('PATH_C',            '%s');\n", $pathShared . 'compiled/');
+                $dbText .= sprintf("  define('HASH_INSTALLATION', '%s');\n", $h);
+                $dbText .= sprintf("  define('SYSTEM_HASH',       '%s');\n", $sh);
+                $this->installLog(G::LoadTranslation('ID_CREATING', SYS_LANG, array(FILE_PATHS_INSTALLED)));
+                file_put_contents(FILE_PATHS_INSTALLED, $dbText);
             }
 
             /**
@@ -919,42 +929,42 @@ class InstallerModule extends Controller
             define( 'SYS_SYS', $workspace );
             config(["system.workspace" => $workspace]);
 
-            require_once ("propel/Propel.php");
+            require_once("propel/Propel.php");
 
-            Propel::init( PATH_CORE . "config/databases.php" );
-            $con = Propel::getConnection( 'workflow' );
+            Propel::init(PATH_CORE . "config/databases.php");
+            $con = Propel::getConnection('workflow');
 
-            require_once ('classes/model/AppCacheView.php');
+            require_once('classes/model/AppCacheView.php');
             $lang = 'en';
 
             //setup the appcacheview object, and the path for the sql files
             $appCache = new AppCacheView();
 
-            $appCache->setPathToAppCacheFiles( PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP );
+            $appCache->setPathToAppCacheFiles(PATH_METHODS . 'setup' . PATH_SEP . 'setupSchemas' . PATH_SEP);
 
             //Update APP_DELEGATION.DEL_LAST_INDEX data
             $res = $appCache->updateAppDelegationDelLastIndex($lang, true);
 
             //APP_DELEGATION INSERT
-            $res = $appCache->triggerAppDelegationInsert( $lang, true );
+            $res = $appCache->triggerAppDelegationInsert($lang, true);
 
             //APP_DELEGATION Update
-            $res = $appCache->triggerAppDelegationUpdate( $lang, true );
+            $res = $appCache->triggerAppDelegationUpdate($lang, true);
 
             //APPLICATION UPDATE
-            $res = $appCache->triggerApplicationUpdate( $lang, true );
+            $res = $appCache->triggerApplicationUpdate($lang, true);
 
             //APPLICATION DELETE
-            $res = $appCache->triggerApplicationDelete( $lang, true );
+            $res = $appCache->triggerApplicationDelete($lang, true);
 
             //SUB_APPLICATION INSERT
             $res = $appCache->triggerSubApplicationInsert($lang, false);
 
             //CONTENT UPDATE
-            $res = $appCache->triggerContentUpdate( $lang, true );
+            $res = $appCache->triggerContentUpdate($lang, true);
 
             //build using the method in AppCacheView Class
-            $res = $appCache->fillAppCacheView( $lang );
+            $res = $appCache->fillAppCacheView($lang);
 
             //end AppCacheView Build
 
@@ -963,7 +973,7 @@ class InstallerModule extends Controller
             $envFile = PATH_CONFIG . 'env.ini';
 
             // getting configuration from env.ini
-            $sysConf = System::getSystemConfiguration( $envFile );
+            $sysConf = System::getSystemConfiguration($envFile);
 
             $langUri = 'en';
             if (isset($sysConf['default_lang'])) {
@@ -977,7 +987,7 @@ class InstallerModule extends Controller
 
             $updatedConf['default_lang'] = $langUri;
             $updatedConf['default_skin'] = $skinUri;
-            $info->uri =  PATH_SEP . 'sys' . $_REQUEST['workspace'] . PATH_SEP . $langUri . PATH_SEP . $skinUri . PATH_SEP . 'login' . PATH_SEP . 'login';
+            $info->uri = PATH_SEP . 'sys' . $_REQUEST['workspace'] . PATH_SEP . $langUri . PATH_SEP . $skinUri . PATH_SEP . 'login' . PATH_SEP . 'login';
 
             //register PMDesigner Client
             $http = (G::is_https() == true) ? 'https' : 'http';
@@ -994,47 +1004,47 @@ class InstallerModule extends Controller
 
             // inserting the outh_client
             if (!$userLogged) {
-                $query = sprintf( "USE %s;", $wf );
+                $query = sprintf("USE %s;", $wf);
             } else {
-                $query = sprintf( "USE %s;", trim( $_REQUEST['wfDatabase']) );
+                $query = sprintf("USE %s;", trim($_REQUEST['wfDatabase']));
             }
-            $this->mysqlQuery( $query );
-            $query = ( "INSERT INTO OAUTH_CLIENTS (CLIENT_ID,CLIENT_SECRET,CLIENT_NAME,CLIENT_DESCRIPTION,CLIENT_WEBSITE,REDIRECT_URI,USR_UID ) VALUES
+            $this->mysqlQuery($query);
+            $query = ("INSERT INTO OAUTH_CLIENTS (CLIENT_ID,CLIENT_SECRET,CLIENT_NAME,CLIENT_DESCRIPTION,CLIENT_WEBSITE,REDIRECT_URI,USR_UID ) VALUES
                 ('x-pm-local-client','179ad45c6ce2cb97cf1029e212046e81','PM Web Designer','ProcessMaker Web Designer App','www.processmaker.com','" . $endpoint . "','00000000000000000000000000000001' )");
-            $this->mysqlQuery( $query );
+            $this->mysqlQuery($query);
 
             $indexFileUpdated = true;
             if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
                 $this->buildParternExtras($adminUsername, $adminPassword, $_REQUEST['workspace'], $langUri, $skinUri);
             } else {
                 try {
-                    G::update_php_ini( $envFile, $updatedConf );
+                    G::update_php_ini($envFile, $updatedConf);
                 } catch (Exception $e) {
                     $info->result = false;
-                    $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, Array($envFile));
+                    $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, array($envFile));
                     $info->message .= G::LoadTranslation('ID_PROCESSMAKER_UI_NOT_INSTALL');
-                    $this->installLog( G::LoadTranslation('ID_INSTALL_BUT_ERROR', SYS_LANG, Array('env.ini')));
+                    $this->installLog(G::LoadTranslation('ID_INSTALL_BUT_ERROR', SYS_LANG, array('env.ini')));
                     return $info;
                 }
 
                 try {
                     // update the main index file
-                    $indexFileUpdated = System::updateIndexFile(array('lang' => 'en','skin' => $updatedConf['default_skin']));
+                    $indexFileUpdated = System::updateIndexFile(array('lang' => 'en', 'skin' => $updatedConf['default_skin']));
                 } catch (Exception $e) {
                     $info->result = false;
-                    $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, Array(PATH_HTML . "index.html."));
+                    $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, array(PATH_HTML . "index.html."));
                     $info->message .= G::LoadTranslation('ID_PROCESSMAKER_UI_NOT_INSTALL');
-                    $this->installLog( G::LoadTranslation('ID_INSTALL_BUT_ERROR', SYS_LANG, Array('index.html')));
+                    $this->installLog(G::LoadTranslation('ID_INSTALL_BUT_ERROR', SYS_LANG, array('index.html')));
                     return $info;
                 }
             }
 
-            $this->installLog( G::LoadTranslation('ID_INDEX_FILE_UPDATED', SYS_LANG, Array($indexFileUpdated, $sysConf['default_lang'],$sysConf['default_skin'])));
-            $this->installLog( G::LoadTranslation('ID_INSTALL_SUCESS') );
+            $this->installLog(G::LoadTranslation('ID_INDEX_FILE_UPDATED', SYS_LANG, array($indexFileUpdated, $sysConf['default_lang'], $sysConf['default_skin'])));
+            $this->installLog(G::LoadTranslation('ID_INSTALL_SUCESS'));
 
             $info->result = true;
             $info->message = G::LoadTranslation('ID_INSTALL_SUCESS');
-            $info->messageFinish = G::LoadTranslation('ID_PROCESSMAKER_SUCCESS_INSTALLED', SYS_LANG, Array($workspace));;
+            $info->messageFinish = G::LoadTranslation('ID_PROCESSMAKER_SUCCESS_INSTALLED', SYS_LANG, array($workspace));;
         } catch (Exception $e) {
             $info->canRedirect = false;
             $info->result = false;
@@ -1043,184 +1053,184 @@ class InstallerModule extends Controller
         return $info;
     }
 
-    public function createMSSQLWorkspace ()
+    public function createMSSQLWorkspace()
     {
-
         $filter = new InputFilter();
-        ini_set( 'max_execution_time', '0' );
+        ini_set('max_execution_time', '0');
 
         $info = new stdClass();
         $info->result = false;
         $info->message = '';
 
-        $db_hostname = trim( $_REQUEST['db_hostname'] );
+        $db_hostname = trim($_REQUEST['db_hostname']);
         $db_hostname = $filter->validateInput($db_hostname);
-        $db_port = trim( $_REQUEST['db_port'] );
+        $db_port = trim($_REQUEST['db_port']);
         $db_port = $filter->validateInput($db_port);
-        $db_username = trim( $_REQUEST['db_username'] );
+        $db_username = trim($_REQUEST['db_username']);
         $db_username = $filter->validateInput($db_username);
         $db_password = urlencode(trim($_REQUEST['db_password']));
         $db_password = urldecode($filter->validateInput($db_password));
-        $wf = trim( $_REQUEST['wfDatabase'] );
-        $rb = trim( $_REQUEST['wfDatabase'] );
-        $rp = trim( $_REQUEST['wfDatabase'] );
-        $workspace = trim( $_REQUEST['workspace'] );
-        $pathConfig = trim( $_REQUEST['pathConfig'] );
-        $pathLanguages = trim( $_REQUEST['pathLanguages'] );
-        $pathPlugins = trim( $_REQUEST['pathPlugins'] );
-        $pathShared = trim( $_REQUEST['pathShared'] );
-        $pathXmlforms = trim( $_REQUEST['pathXmlforms'] );
-        $adminPassword = trim( $_REQUEST['adminPassword'] );
-        $adminUsername = trim( $_REQUEST['adminUsername'] );
+        $wf = trim($_REQUEST['wfDatabase']);
+        $rb = trim($_REQUEST['wfDatabase']);
+        $rp = trim($_REQUEST['wfDatabase']);
+        $workspace = trim($_REQUEST['workspace']);
+        $pathConfig = trim($_REQUEST['pathConfig']);
+        $pathLanguages = trim($_REQUEST['pathLanguages']);
+        $pathPlugins = trim($_REQUEST['pathPlugins']);
+        $pathShared = trim($_REQUEST['pathShared']);
+        $pathXmlforms = trim($_REQUEST['pathXmlforms']);
+        $adminPassword = trim($_REQUEST['adminPassword']);
+        $adminUsername = trim($_REQUEST['adminUsername']);
         $deleteDB = ($_REQUEST['deleteDB'] == 'true');
 
-        if (substr( $pathShared, - 1 ) != '/') {
+        if (substr($pathShared, -1) != '/') {
             $pathShared .= '/';
         }
 
-        $this->installLog( '-------------------------------------------' );
-        $this->installLog( G::LoadTranslation('ID_CREATING_WORKSPACE', SYS_LANG, Array($workspace) ) );
+        $this->installLog('-------------------------------------------');
+        $this->installLog(G::LoadTranslation('ID_CREATING_WORKSPACE', SYS_LANG, array($workspace)));
 
         try {
             $db_host = ($db_port != '' && $db_port != 1433) ? $db_hostname . ':' . $db_port : $db_hostname;
-            $this->link = @mssql_connect( $db_host, $db_username, $db_password );
-            $this->installLog( G::LoadTranslation('ID_CONNECT_TO_SERVER', SYS_LANG, Array( $db_hostname, $db_port, $db_username )) );
+            $this->link = @mssql_connect($db_host, $db_username, $db_password);
+            $this->installLog(G::LoadTranslation('ID_CONNECT_TO_SERVER', SYS_LANG, array($db_hostname, $db_port, $db_username)));
 
-            $this->mssqlQuery( 'USE [master]' );
+            $this->mssqlQuery('USE [master]');
 
             // DROP databases wf_workflow, rb_workflow and rp_workflow
             if ($deleteDB) {
-                $q = sprintf( "IF EXISTS (SELECT name FROM sys.databases WHERE name='%s' ) DROP DATABASE %s", $wf, $wf );
-                $this->mssqlQuery( $q );
+                $q = sprintf("IF EXISTS (SELECT name FROM sys.databases WHERE name='%s' ) DROP DATABASE %s", $wf, $wf);
+                $this->mssqlQuery($q);
             }
 
             // CREATE databases wf_workflow, rb_workflow and rp_workflow
-            $q = sprintf( "IF NOT EXISTS (SELECT * FROM sys.databases WHERE name='%s' ) CREATE DATABASE %s", $wf, $wf );
-            $this->mssqlQuery( $q );
+            $q = sprintf("IF NOT EXISTS (SELECT * FROM sys.databases WHERE name='%s' ) CREATE DATABASE %s", $wf, $wf);
+            $this->mssqlQuery($q);
 
             //CREATE users and GRANT Privileges
-            $wfPass = G::generate_password( 15 );
-            $this->setGrantPrivilegesMSSQL( $wf, $wfPass, $wf );
+            $wfPass = G::generate_password(15);
+            $this->setGrantPrivilegesMSSQL($wf, $wfPass, $wf);
 
             //Generate the db.php file and folders
             $path_site = $pathShared . "/sites/" . $workspace . "/";
             $db_file = $path_site . "db.php";
-            mkdir( $path_site, 0777, true );
-            @mkdir( $path_site . "files/", 0777, true );
-            @mkdir( $path_site . "mailTemplates/", 0777, true );
-            @mkdir( $path_site . "public/", 0777, true );
-            @mkdir( $path_site . "reports/", 0777, true );
-            @mkdir( $path_site . "xmlForms", 0777, true );
+            mkdir($path_site, 0777, true);
+            @mkdir($path_site . "files/", 0777, true);
+            @mkdir($path_site . "mailTemplates/", 0777, true);
+            @mkdir($path_site . "public/", 0777, true);
+            @mkdir($path_site . "reports/", 0777, true);
+            @mkdir($path_site . "xmlForms", 0777, true);
 
             $dbText = "<?php\n";
-            $dbText .= sprintf( "// Processmaker configuration\n" );
-            $dbText .= sprintf( "  define ('DB_ADAPTER',     '%s' );\n", 'mssql' );
-            $dbText .= sprintf( "  define ('DB_HOST',        '%s' );\n", $db_host );
-            $dbText .= sprintf( "  define ('DB_NAME',        '%s' );\n", $wf );
-            $dbText .= sprintf( "  define ('DB_USER',        '%s' );\n", $wf );
-            $dbText .= sprintf( "  define ('DB_PASS',        '%s' );\n", $wfPass );
-            $dbText .= sprintf( "  define ('DB_RBAC_HOST',   '%s' );\n", $db_host );
-            $dbText .= sprintf( "  define ('DB_RBAC_NAME',   '%s' );\n", $wf );
-            $dbText .= sprintf( "  define ('DB_RBAC_USER',   '%s' );\n", $wf );
-            $dbText .= sprintf( "  define ('DB_RBAC_PASS',   '%s' );\n", $wfPass );
-            $dbText .= sprintf( "  define ('DB_REPORT_HOST', '%s' );\n", $db_host );
-            $dbText .= sprintf( "  define ('DB_REPORT_NAME', '%s' );\n", $wf );
-            $dbText .= sprintf( "  define ('DB_REPORT_USER', '%s' );\n", $wf );
-            $dbText .= sprintf( "  define ('DB_REPORT_PASS', '%s' );\n", $wfPass );
+            $dbText .= sprintf("// Processmaker configuration\n");
+            $dbText .= sprintf("  define ('DB_ADAPTER',     '%s' );\n", 'mssql');
+            $dbText .= sprintf("  define ('DB_HOST',        '%s' );\n", $db_host);
+            $dbText .= sprintf("  define ('DB_NAME',        '%s' );\n", $wf);
+            $dbText .= sprintf("  define ('DB_USER',        '%s' );\n", $wf);
+            $dbText .= sprintf("  define ('DB_PASS',        '%s' );\n", $wfPass);
+            $dbText .= sprintf("  define ('DB_RBAC_HOST',   '%s' );\n", $db_host);
+            $dbText .= sprintf("  define ('DB_RBAC_NAME',   '%s' );\n", $wf);
+            $dbText .= sprintf("  define ('DB_RBAC_USER',   '%s' );\n", $wf);
+            $dbText .= sprintf("  define ('DB_RBAC_PASS',   '%s' );\n", $wfPass);
+            $dbText .= sprintf("  define ('DB_REPORT_HOST', '%s' );\n", $db_host);
+            $dbText .= sprintf("  define ('DB_REPORT_NAME', '%s' );\n", $wf);
+            $dbText .= sprintf("  define ('DB_REPORT_USER', '%s' );\n", $wf);
+            $dbText .= sprintf("  define ('DB_REPORT_PASS', '%s' );\n", $wfPass);
             if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
                 $dbText .= "\n";
-                $dbText .= "  define ('PARTNER_FLAG', " . ((defined('PARTNER_FLAG')) ? PARTNER_FLAG : ((isset($_REQUEST['PARTNER_FLAG'])) ? $_REQUEST['PARTNER_FLAG']:'false')) . ");\n";
+                $dbText .= "  define ('PARTNER_FLAG', " . ((defined('PARTNER_FLAG')) ? PARTNER_FLAG : ((isset($_REQUEST['PARTNER_FLAG'])) ? $_REQUEST['PARTNER_FLAG'] : 'false')) . ");\n";
                 if ($this->systemName != '') {
                     $dbText .= "  define ('SYSTEM_NAME', '" . $this->systemName . "');\n";
                 }
             }
 
-            $this->installLog( G::LoadTranslation('ID_CREATING', SYS_LANG, Array($db_file) ));
-            file_put_contents( $db_file, $dbText );
+            $this->installLog(G::LoadTranslation('ID_CREATING', SYS_LANG, array($db_file)));
+            file_put_contents($db_file, $dbText);
 
             // Generate the databases.php file
             $databases_file = $path_site . 'databases.php';
-            $dbData = sprintf( "\$dbAdapter    = '%s';\n", 'mssql' );
-            $dbData .= sprintf( "\$dbHost       = '%s';\n", $db_host );
-            $dbData .= sprintf( "\$dbName       = '%s';\n", $wf );
-            $dbData .= sprintf( "\$dbUser       = '%s';\n", $wf );
-            $dbData .= sprintf( "\$dbPass       = '%s';\n", $wfPass );
-            $dbData .= sprintf( "\$dbRbacHost   = '%s';\n", $db_host );
-            $dbData .= sprintf( "\$dbRbacName   = '%s';\n", $wf );
-            $dbData .= sprintf( "\$dbRbacUser   = '%s';\n", $wf );
-            $dbData .= sprintf( "\$dbRbacPass   = '%s';\n", $wfPass );
-            $dbData .= sprintf( "\$dbReportHost = '%s';\n", $db_host );
-            $dbData .= sprintf( "\$dbReportName = '%s';\n", $wf );
-            $dbData .= sprintf( "\$dbReportUser = '%s';\n", $wf );
-            $dbData .= sprintf( "\$dbReportPass = '%s';\n", $wfPass );
-            $databasesText = str_replace( '{dbData}', $dbData, @file_get_contents( PATH_HOME . 'engine/templates/installer/databases.tpl' ) );
+            $dbData = sprintf("\$dbAdapter    = '%s';\n", 'mssql');
+            $dbData .= sprintf("\$dbHost       = '%s';\n", $db_host);
+            $dbData .= sprintf("\$dbName       = '%s';\n", $wf);
+            $dbData .= sprintf("\$dbUser       = '%s';\n", $wf);
+            $dbData .= sprintf("\$dbPass       = '%s';\n", $wfPass);
+            $dbData .= sprintf("\$dbRbacHost   = '%s';\n", $db_host);
+            $dbData .= sprintf("\$dbRbacName   = '%s';\n", $wf);
+            $dbData .= sprintf("\$dbRbacUser   = '%s';\n", $wf);
+            $dbData .= sprintf("\$dbRbacPass   = '%s';\n", $wfPass);
+            $dbData .= sprintf("\$dbReportHost = '%s';\n", $db_host);
+            $dbData .= sprintf("\$dbReportName = '%s';\n", $wf);
+            $dbData .= sprintf("\$dbReportUser = '%s';\n", $wf);
+            $dbData .= sprintf("\$dbReportPass = '%s';\n", $wfPass);
+            $databasesText = str_replace('{dbData}', $dbData, @file_get_contents(PATH_HOME . 'engine/templates/installer/databases.tpl'));
 
-            $this->installLog( G::LoadTranslation('ID_CREATING', SYS_LANG, Array($databases_file) ));
-            file_put_contents( $databases_file, $databasesText );
+            $this->installLog(G::LoadTranslation('ID_CREATING', SYS_LANG, array($databases_file)));
+            file_put_contents($databases_file, $databasesText);
 
             //execute scripts to create and populates databases
-            $query = sprintf( "USE %s;", $wf );
-            $this->mssqlQuery( $query );
+            $query = sprintf("USE %s;", $wf);
+            $this->mssqlQuery($query);
 
-            $this->mssqlFileQuery( PATH_RBAC_HOME . 'engine/data/mssql/schema.sql' );
-            $this->mssqlFileQuery( PATH_RBAC_HOME . 'engine/data/mssql/insert.sql' );
+            $this->mssqlFileQuery(PATH_RBAC_HOME . 'engine/data/mssql/schema.sql');
+            $this->mssqlFileQuery(PATH_RBAC_HOME . 'engine/data/mssql/insert.sql');
 
-            $query = sprintf( "USE %s;", $wf );
-            $this->mssqlQuery( $query );
-            $this->mssqlFileQuery( PATH_HOME . 'engine/data/mssql/schema.sql' );
-            $this->mssqlFileQuery( PATH_HOME . 'engine/data/mssql/insert.sql' );
+            $query = sprintf("USE %s;", $wf);
+            $this->mssqlQuery($query);
+            $this->mssqlFileQuery(PATH_HOME . 'engine/data/mssql/schema.sql');
+            $this->mssqlFileQuery(PATH_HOME . 'engine/data/mssql/insert.sql');
 
             // Create the triggers
-            if (file_exists( PATH_HOME . 'engine/plugins/enterprise/data/triggerAppDelegationInsert.sql' ) && file_exists( PATH_HOME . 'engine/plugins/enterprise/data/triggerAppDelegationUpdate.sql' ) && file_exists( PATH_HOME . 'engine/plugins/enterprise/data/triggerApplicationUpdate.sql' ) && file_exists( PATH_HOME . 'engine/plugins/enterprise/data/triggerApplicationDelete.sql' ) && file_exists( PATH_HOME . 'engine/plugins/enterprise/data/triggerContentUpdate.sql' )) {
-                $this->mssqlQuery( @file_get_contents( PATH_HOME . 'engine/plugins/enterprise/data/triggerAppDelegationInsert.sql' ) );
-                $this->mssqlQuery( @file_get_contents( PATH_HOME . 'engine/plugins/enterprise/data/triggerAppDelegationUpdate.sql' ) );
-                $this->mssqlQuery( @file_get_contents( PATH_HOME . 'engine/plugins/enterprise/data/triggerApplicationUpdate.sql' ) );
-                $this->mssqlQuery( @file_get_contents( PATH_HOME . 'engine/plugins/enterprise/data/triggerApplicationDelete.sql' ) );
+            if (file_exists(PATH_HOME . 'engine/plugins/enterprise/data/triggerAppDelegationInsert.sql') && file_exists(PATH_HOME . 'engine/plugins/enterprise/data/triggerAppDelegationUpdate.sql') && file_exists(PATH_HOME . 'engine/plugins/enterprise/data/triggerApplicationUpdate.sql') && file_exists(PATH_HOME . 'engine/plugins/enterprise/data/triggerApplicationDelete.sql') && file_exists(PATH_HOME . 'engine/plugins/enterprise/data/triggerContentUpdate.sql')) {
+                $this->mssqlQuery(@file_get_contents(PATH_HOME . 'engine/plugins/enterprise/data/triggerAppDelegationInsert.sql'));
+                $this->mssqlQuery(@file_get_contents(PATH_HOME . 'engine/plugins/enterprise/data/triggerAppDelegationUpdate.sql'));
+                $this->mssqlQuery(@file_get_contents(PATH_HOME . 'engine/plugins/enterprise/data/triggerApplicationUpdate.sql'));
+                $this->mssqlQuery(@file_get_contents(PATH_HOME . 'engine/plugins/enterprise/data/triggerApplicationDelete.sql'));
                 $this->mysqlQuery(@file_get_contents(PATH_HOME . "engine/methods/setup/setupSchemas/triggerSubApplicationInsert.sql"));
-                $this->mssqlQuery( @file_get_contents( PATH_HOME . 'engine/plugins/enterprise/data/triggerContentUpdate.sql' ) );
-                $this->mssqlQuery( "INSERT INTO CONFIGURATION (
+                $this->mssqlQuery(@file_get_contents(PATH_HOME . 'engine/plugins/enterprise/data/triggerContentUpdate.sql'));
+                $this->mssqlQuery("INSERT INTO CONFIGURATION (
                             CFG_UID,
                             CFG_VALUE
                            )
                            VALUES (
                              'APP_CACHE_VIEW_ENGINE',
-                             '" . addslashes( serialize( array ('LANG' => 'en','STATUS' => 'active'
-                ) ) ) . "'
-                           )" );
+                             '" . addslashes(serialize(array('LANG' => 'en', 'STATUS' => 'active'
+                    ))) . "'
+                           )");
 
                 $this->mssqlQuery("INSERT INTO EMAIL_SERVER(MESS_UID, MESS_ENGINE) VALUES('" . \ProcessMaker\Util\Common::generateUID() . "','MAIL')");
             }
 
             //change admin user
-            $query = sprintf( "USE %s;", $wf );
-            $this->mssqlQuery( $query );
+            $query = sprintf("USE %s;", $wf);
+            $this->mssqlQuery($query);
 
-            $query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, G::encryptHash( $adminPassword ) );
-            $this->mssqlQuery( $query );
+            $query = sprintf("UPDATE USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, G::encryptHash($adminPassword));
+            $this->mssqlQuery($query);
 
-            $query = sprintf( "USE %s;", $wf );
-            $this->mssqlQuery( $query );
+            $query = sprintf("USE %s;", $wf);
+            $this->mssqlQuery($query);
 
-            $query = sprintf( "UPDATE RBAC_USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, G::encryptHash( $adminPassword ) );
-            $this->mssqlQuery( $query );
+            $query = sprintf("UPDATE RBAC_USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, G::encryptHash($adminPassword));
+            $this->mssqlQuery($query);
 
             // Write the paths_installed.php file (contains all the information configured so far)
-            if (! file_exists( FILE_PATHS_INSTALLED )) {
-                $sh = G::encryptOld( filemtime( PATH_GULLIVER . '/class.g.php' ) );
-                $h = G::encrypt( $db_hostname . $sh . $db_username . $sh . $db_password . '1', $sh );
+            if (!file_exists(FILE_PATHS_INSTALLED)) {
+                $sh = G::encryptOld(filemtime(PATH_GULLIVER . '/class.g.php'));
+                $h = G::encrypt($db_hostname . $sh . $db_username . $sh . $db_password . '1', $sh);
                 $dbText = "<?php\n";
-                $dbText .= sprintf( "  define ('PATH_DATA',        '%s' );\n", $pathShared );
-                $dbText .= sprintf( "  define ('PATH_C',           '%s' );\n", $pathShared . 'compiled/' );
-                $dbText .= sprintf( "  define ('HASH_INSTALLATION', '%s' );\n", $h );
-                $dbText .= sprintf( "  define ('SYSTEM_HASH',       '%s' );\n", $sh );
-                $this->installLog( G::LoadTranslation('ID_CREATING', SYS_LANG, Array(FILE_PATHS_INSTALLED) ));
-                file_put_contents( FILE_PATHS_INSTALLED, $dbText );
+                $dbText .= sprintf("  define ('PATH_DATA',        '%s' );\n", $pathShared);
+                $dbText .= sprintf("  define ('PATH_C',           '%s' );\n", $pathShared . 'compiled/');
+                $dbText .= sprintf("  define ('HASH_INSTALLATION', '%s' );\n", $h);
+                $dbText .= sprintf("  define ('SYSTEM_HASH',       '%s' );\n", $sh);
+                $this->installLog(G::LoadTranslation('ID_CREATING', SYS_LANG, array(FILE_PATHS_INSTALLED)));
+                file_put_contents(FILE_PATHS_INSTALLED, $dbText);
             }
-            $this->installLog( G::LoadTranslation('ID_INSTALL_SUCESS') );
+            $this->installLog(G::LoadTranslation('ID_INSTALL_SUCESS'));
             $info->result = true;
             $info->message = G::LoadTranslation('ID_INSTALL_SUCESS');
             $info->url = '/sys' . $_REQUEST['workspace'] . '/en/neoclassic/login/login';
-            $info->messageFinish = G::LoadTranslation('ID_PROCESSMAKER_SUCCESS_INSTALLED', SYS_LANG, Array($workspace));;
+            $info->messageFinish = G::LoadTranslation('ID_PROCESSMAKER_SUCCESS_INSTALLED', SYS_LANG, array($workspace));
+            ;
         } catch (Exception $e) {
             $info->result = false;
             $info->message = $e->getMessage();
@@ -1228,10 +1238,10 @@ class InstallerModule extends Controller
         return $info;
     }
 
-    public function getSystemName ($siteShared)
+    public function getSystemName($siteShared)
     {
         $systemName = '';
-        if (substr( $siteShared, - 1 ) != '/') {
+        if (substr($siteShared, -1) != '/') {
             $siteShared .= '/';
         }
 
@@ -1244,11 +1254,11 @@ class InstallerModule extends Controller
         return $systemName;
     }
 
-    public function getEngines ()
+    public function getEngines()
     {
-        $this->setResponseType( 'json' );
-        $engines = array ();
-        if (function_exists( 'mysql_query' )) {
+        $this->setResponseType('json');
+        $engines = array();
+        if (function_exists('mysqli_query')) {
             $engine = new stdclass();
             $engine->id = 'mysql';
             $engine->label = 'MySQL';
@@ -1266,50 +1276,49 @@ class InstallerModule extends Controller
         return $engines;
     }
 
-    public function checkDatabases ()
+    public function checkDatabases()
     {
-
         $filter = new InputFilter();
-        $this->setResponseType( 'json' );
+        $this->setResponseType('json');
         $info = new stdclass();
 
-        if ($_REQUEST['db_engine'] == 'mysql') {
-            $db_hostname = $filter->validateInput($_REQUEST['db_hostname']);
-            $db_username = $filter->validateInput($_REQUEST['db_username']);
-            $db_password = urlencode($_REQUEST['db_password']);
-            $db_password = urldecode($filter->validateInput($db_password));
-            $db_port     = $filter->validateInput($_REQUEST['db_port']);
-            if($db_port != "3306"){
-                $db_hostname = $db_hostname.":".$db_port;
-            }
-            $link = @mysql_connect( $db_hostname, $db_username, $db_password );
-            $wfDatabase = $filter->validateInput($_REQUEST['wfDatabase'], 'nosql');
-            $query = "show databases like '%s' ";
-            $query = $filter->preventSqlInjection( $query, array($wfDatabase) );
-            $dataset = @mysql_query( $query, $link );
-            $info->wfDatabaseExists = (@mysql_num_rows( $dataset ) > 0);
-        } else if ($_REQUEST['db_engine'] == 'mssql') {
-            $link = @mssql_connect( $db_hostname, $db_username, $db_password );
-            $wfDatabase = $filter->validateInput($_REQUEST['wfDatabase'], 'nosql');
-            $query = "select * from sys.databases where name = '%s' ";
-            $query = $filter->preventSqlInjection( $query, array($wfDatabase) );
-            $dataset = @mssql_query( $query , $link );
-            $info->wfDatabaseExists = (@mssql_num_rows( $dataset ) > 0);
-        } else if ($_REQUEST['db_engine'] == 'sqlsrv') {
-            $arguments = array("UID" => $db_username, "PWD" => $db_password);
-            $link = @sqlsrv_connect( $db_hostname, $arguments);
-            $wfDatabase = $filter->validateInput($_REQUEST['wfDatabase'], 'nosql');
-            $query = "select * from sys.databases where name = '%s' ";
-            $query = $filter->preventSqlInjection( $query, array($wfDatabase) );
-            $dataset = @sqlsrv_query( $link, $query );
-            $info->wfDatabaseExists = (@sqlsrv_num_rows( $dataset ) > 0);
-        } else {
-            $link = @mssql_connect( $db_hostname, $db_username, $db_password );
-            $wfDatabase = $filter->validateInput($_REQUEST['wfDatabase'], 'nosql');
-            $query = "select * from sys.databases where name = '%s' ";
-            $query = $filter->preventSqlInjection( $query, array($wfDatabase) );
-            $dataset = @mssql_query( $query , $link );
-            $info->wfDatabaseExists = (@mssql_num_rows( $dataset ) > 0);
+        $db_hostname = $filter->validateInput($_REQUEST['db_hostname']);
+        $db_username = $filter->validateInput($_REQUEST['db_username']);
+        $db_password = urlencode($_REQUEST['db_password']);
+        $db_password = urldecode($filter->validateInput($db_password));
+        $db_port = $filter->validateInput($_REQUEST['db_port']);
+
+        switch ($_REQUEST['db_engine']) {
+            case 'mysql':
+                if ($db_port !== '3306') {
+                    $db_hostname = $db_hostname . ':' . $db_port;
+                }
+                $wfDatabase = $filter->validateInput($_REQUEST['wfDatabase'], 'nosql');
+                $link = mysqli_connect($db_hostname, $db_username, $db_password, $wfDatabase);
+                $query = "show databases like '%s' ";
+                $query = $filter->preventSqlInjection($query, array($wfDatabase), $link);
+                $dataSet = mysqli_query($link, $query);
+                $info->wfDatabaseExists = (mysqli_num_rows($dataSet) > 0);
+                break;
+            case 'mssql':
+                $link = @mssql_connect($db_hostname, $db_username, $db_password);
+                $wfDatabase = $filter->validateInput($_REQUEST['wfDatabase'], 'nosql');
+                $query = "select * from sys.databases where name = '%s' ";
+                $query = $filter->preventSqlInjection($query, array($wfDatabase));
+                $dataSet = @mssql_query($query, $link);
+                $info->wfDatabaseExists = (@mssql_num_rows($dataSet) > 0);
+                break;
+            case 'sqlsrv':
+                $arguments = array("UID" => $db_username, "PWD" => $db_password);
+                $link = @sqlsrv_connect($db_hostname, $arguments);
+                $wfDatabase = $filter->validateInput($_REQUEST['wfDatabase'], 'nosql');
+                $query = "select * from sys.databases where name = '%s' ";
+                $query = $filter->preventSqlInjection($query, array($wfDatabase));
+                $dataSet = @sqlsrv_query($link, $query);
+                $info->wfDatabaseExists = (@sqlsrv_num_rows($dataSet) > 0);
+                break;
+            default:
+                break;
         }
 
         $info->errMessage = G::LoadTranslation('ID_DATABASE_EXISTS_OVERWRITE');
@@ -1321,15 +1330,14 @@ class InstallerModule extends Controller
      * Privates functions section, non callable by http request
      */
 
-    private function testMySQLconnection()
+    private function testMySQLConnection()
     {
-
         $filter = new InputFilter();
         $info = new StdClass();
         $info->result = false;
         $info->message = '';
-        if (!function_exists("mysql_connect")) {
-            $info->message = G::LoadTranslation('ID_PHP_MYSQL_NOT _INSTALL');
+        if (!function_exists('mysqli_connect')) {
+            $info->message = G::LoadTranslation('ID_PHP_MYSQLI_NOT_INSTALL');
             return $info;
         }
         $dataRequest = $_REQUEST;
@@ -1340,28 +1348,28 @@ class InstallerModule extends Controller
         $db_password = urldecode($filter->validateInput($db_password));
         $fp = @fsockopen($db_hostname, $db_port, $errno, $errstr, 30);
         if (!$fp) {
-            $info->message .= G::LoadTranslation('ID_CONNECTION_ERROR', SYS_LANG, Array("$errstr ($errno)"));
+            $info->message .= G::LoadTranslation('ID_CONNECTION_ERROR', SYS_LANG, array("$errstr ($errno)"));
             return $info;
         }
 
-        $db_host = ($db_port != '' && $db_port != 1433) ? $db_hostname . ':' . $db_port : $db_hostname;
+        $db_host = ($db_port !== '' && $db_port !== 1433) ? $db_hostname . ':' . $db_port : $db_hostname;
 
-        $link = @mysql_connect($db_host, $db_username, $db_password);
-        if (!$link) {
+        $link = new mysqli($db_host, $db_username, $db_password);
+        if ($link->connect_error) {
             $info->message .= G::LoadTranslation('ID_MYSQL_CREDENTIALS_WRONG');
             return $info;
         }
         $db_username = $filter->validateInput($db_username, 'nosql');
         $db_hostname = $filter->validateInput($db_hostname, 'nosql');
         $query = "SELECT * FROM `information_schema`.`USER_PRIVILEGES` where (GRANTEE = \"'%s'@'%s'\" OR GRANTEE = \"'%s'@'%%'\") ";
-        $query = $filter->preventSqlInjection($query, array($db_username, $db_hostname, $db_username));
-        $res = @mysql_query($query, $link);
-        $row = @mysql_fetch_array($res);
+        $query = $filter->preventSqlInjection($query, array($db_username, $db_hostname, $db_username), $link);
+        $res = $link->query($query);
+        $row = $res->fetch_array();
         $hasSuper = is_array($row);
-        @mysql_free_result($res);
-        @mysql_close($link);
+        $res->free();
+        $link->close();
         if (!$hasSuper) {
-            $info->message .= G::LoadTranslation('ID_CONNECTION_ERROR_PRIVILEGE', SYS_LANG, Array($db_username));
+            $info->message .= G::LoadTranslation('ID_CONNECTION_ERROR_PRIVILEGE', SYS_LANG, array($db_username));
             return $info;
         }
         $info->message .= G::LoadTranslation('ID_MYSQL_SUCCESS_CONNECT');
@@ -1369,9 +1377,8 @@ class InstallerModule extends Controller
         return $info;
     }
 
-    private function testMSSQLconnection()
+    private function testMSSQLConnection()
     {
-
         $filter = new InputFilter();
         $info = new stdClass();
         $info->result = false;
@@ -1390,7 +1397,7 @@ class InstallerModule extends Controller
 
         $fp = @fsockopen($db_hostname, $db_port, $errno, $errstr, 30);
         if (!$fp) {
-            $info->message .= G::LoadTranslation('ID_CONNECTION_ERROR', SYS_LANG, Array("$errstr ($errno)"));
+            $info->message .= G::LoadTranslation('ID_CONNECTION_ERROR', SYS_LANG, array("$errstr ($errno)"));
             return $info;
         }
 
@@ -1438,7 +1445,7 @@ class InstallerModule extends Controller
         mssql_free_result($res);
 
         if (!($hasSysAdmin || ($hasSecurityAdmin && $hasDbCreator))) {
-            $info->message .= G::LoadTranslation('ID_CONNECTION_ERROR_SECURITYADMIN', SYS_LANG, Array($db_username));
+            $info->message .= G::LoadTranslation('ID_CONNECTION_ERROR_SECURITYADMIN', SYS_LANG, array($db_username));
             return $info;
         }
 
@@ -1469,16 +1476,16 @@ class InstallerModule extends Controller
                     $dataFile = pathinfo($value);
                     $nameSkinTmp = $dataFile['filename'];
 
-                    $tar = new Archive_Tar( $value );
+                    $tar = new Archive_Tar($value);
 
                     $pathSkinTmp = $pathSkinPartner . 'tmp' . PATH_SEP;
                     G::rm_dir($pathSkinTmp);
                     G::verifyPath($pathSkinTmp, true);
-                    chmod( $pathSkinTmp, 0777);
+                    chmod($pathSkinTmp, 0777);
                     $tar->extract($pathSkinTmp);
 
                     $pathSkinName = $pathSkinTmp . $nameSkinTmp . PATH_SEP;
-                    chmod( $pathSkinName, 0777);
+                    chmod($pathSkinName, 0777);
                     G::verifyPath(PATH_CORE . 'skinEngine' . PATH_SEP . 'tmp', true);
                     $skinClassic = PATH_CORE . 'skinEngine' . PATH_SEP . 'tmp' . PATH_SEP;
 
@@ -1496,42 +1503,42 @@ class InstallerModule extends Controller
         }
     }
 
-    function copyFile($fromDir, $toDir, $chmod=0777)
+    public function copyFile($fromDir, $toDir, $chmod = 0777)
     {
         $errors = array();
         $messages = array();
 
-        if (!is_writable($toDir))  {
-            $errors[]='target '.$toDir.' is not writable';
+        if (!is_writable($toDir)) {
+            $errors[] = 'target ' . $toDir . ' is not writable';
         }
         if (!is_dir($toDir)) {
-            $errors[]='target '.$toDir.' is not a directory';
+            $errors[] = 'target ' . $toDir . ' is not a directory';
         }
         if (!is_dir($fromDir)) {
-            $errors[]='source '.$fromDir.' is not a directory';
+            $errors[] = 'source ' . $fromDir . ' is not a directory';
         }
         if (!empty($errors)) {
             return false;
         }
 
-        $exceptions = array ('.','..');
+        $exceptions = array('.', '..');
         $handle = opendir($fromDir);
-        while (false !== ($item=readdir($handle))) {
-            if (!in_array($item,$exceptions)) {
-                $from = str_replace('//','/',$fromDir.'/'.$item);
-                $to = str_replace('//','/',$toDir.'/'.$item);
+        while (false !== ($item = readdir($handle))) {
+            if (!in_array($item, $exceptions)) {
+                $from = str_replace('//', '/', $fromDir . '/' . $item);
+                $to = str_replace('//', '/', $toDir . '/' . $item);
                 if (is_file($from)) {
-                    if (@copy($from,$to)) {
-                        chmod($to,$chmod);
-                        touch($to,filemtime($from));
+                    if (@copy($from, $to)) {
+                        chmod($to, $chmod);
+                        touch($to, filemtime($from));
                     }
                 }
 
                 if (is_dir($from)) {
                     if (@mkdir($to)) {
-                        chmod($to,$chmod);
+                        chmod($to, $chmod);
                     }
-                    $this->copyFile($from,$to,$chmod);
+                    $this->copyFile($from, $to, $chmod);
                 }
             }
         }
@@ -1548,14 +1555,13 @@ class InstallerModule extends Controller
         );
 
         $value = serialize($value);
-        $query = "INSERT INTO CONFIGURATION (CFG_UID, CFG_VALUE) VALUES ('ENVIRONMENT_SETTINGS', '".mysql_real_escape_string($value)."')";
+        $query = "INSERT INTO CONFIGURATION (CFG_UID, CFG_VALUE) VALUES ('ENVIRONMENT_SETTINGS', '" . mysqli_real_escape_string($this->link, $value) . "')";
 
         $this->mysqlQuery($query);
     }
 
     public function buildParternExtras($username, $password, $workspace, $lang, $skinName)
     {
-
         $filter = new InputFilter();
         ini_set('max_execution_time', '0');
         ini_set('memory_limit', '256M');
@@ -1570,7 +1576,7 @@ class InstallerModule extends Controller
         }
 
         // create session
-        $cookiefile =  sys_get_temp_dir() . PATH_SEP . 'curl-session';
+        $cookiefile = sys_get_temp_dir() . PATH_SEP . 'curl-session';
 
         $fp = fopen($cookiefile, "w");
         fclose($fp);
@@ -1607,7 +1613,7 @@ class InstallerModule extends Controller
         $postData = array();
         // File to upload/post
 
-        $postData['form[LANGUAGE_FILENAME]'] = "@".PATH_CORE."content/translations/processmaker.$lang.po";
+        $postData['form[LANGUAGE_FILENAME]'] = "@" . PATH_CORE . "content/translations/processmaker.$lang.po";
         curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/{$skinName}/setup/languages_Import");
         curl_setopt($ch, CURLOPT_HEADER, 0);
         curl_setopt($ch, CURLOPT_VERBOSE, 0);
@@ -1629,7 +1635,7 @@ class InstallerModule extends Controller
         $ch = curl_init();
         $postData = array();
 
-        $skins = glob(PATH_CORE."data/partner/*.tar");
+        $skins = glob(PATH_CORE . "data/partner/*.tar");
         if (count($skins) > 0) {
             $skin = $skins[0];
 
@@ -1638,7 +1644,7 @@ class InstallerModule extends Controller
             $postData['option'] = "standardupload";
             $postData['action'] = "importSkin";
             // File to upload/post
-            $postData['uploadedFile'] = "@".$skin;
+            $postData['uploadedFile'] = "@" . $skin;
 
             curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/{$skinName}/setup/skin_Ajax");
             curl_setopt($ch, CURLOPT_HEADER, 0);
@@ -1662,7 +1668,7 @@ class InstallerModule extends Controller
         $ch = curl_init();
         $postData = array();
         // resolv the plugin name
-        $plugins = glob(PATH_CORE."plugins/*.tar");
+        $plugins = glob(PATH_CORE . "plugins/*.tar");
         if (count($plugins) > 0) {
             $pluginName = $plugins[0];
 
@@ -1691,35 +1697,35 @@ class InstallerModule extends Controller
             define("PATH_PM_ENTERPRISE", PATH_CORE . "/plugins/enterprise/");
         }
         set_include_path(PATH_PM_ENTERPRISE . PATH_SEPARATOR . get_include_path());
-        require_once ('classes/model/AddonsManager.php');
+        require_once('classes/model/AddonsManager.php');
 
-        $plugins = glob(PATH_CORE."plugins/*.php");
+        $plugins = glob(PATH_CORE . "plugins/*.php");
         foreach ($plugins as $value) {
             $dataPlugin = pathinfo($value);
             $namePlugin = $dataPlugin['filename'];
             if ($value != 'enterprise') {
-                $db_hostname = trim( $_REQUEST['db_hostname'] );
+                $db_hostname = trim($_REQUEST['db_hostname']);
                 $db_hostname = $filter->validateInput($db_hostname);
-                $db_port = trim( $_REQUEST['db_port'] );
+                $db_port = trim($_REQUEST['db_port']);
                 $db_port = $filter->validateInput($db_port);
-                $db_username = trim( $_REQUEST['db_username'] );
+                $db_username = trim($_REQUEST['db_username']);
                 $db_username = $filter->validateInput($db_username);
                 $db_password = urlencode(trim($_REQUEST['db_password']));
                 $db_password = urldecode($filter->validateInput($db_password));
-                $wf = trim( $_REQUEST['wfDatabase'] );
+                $wf = trim($_REQUEST['wfDatabase']);
                 $wf = $filter->validateInput($wf);
 
                 $db_host = ($db_port != '' && $db_port != 3306) ? $db_hostname . ':' . $db_port : $db_hostname;
 
-                $link = @mysql_connect( $db_host, $db_username, $db_password );
-                @mysql_select_db($wf, $link);
-                $res = mysql_query( "SELECT STORE_ID FROM ADDONS_MANAGER WHERE ADDON_NAME = '" . $namePlugin . "'", $link );
-                if ($row = mysql_fetch_array( $res )) {
+                $link = mysqli_connect($db_host, $db_username, $db_password, $wf);
+                mysqli_select_db($link, $wf);
+                $res = mysqli_query($link, "SELECT STORE_ID FROM ADDONS_MANAGER WHERE ADDON_NAME = '" . $namePlugin . "'");
+                if ($row = mysqli_fetch_array($res)) {
                     $ch = curl_init();
                     $postData = array();
                     $postData['action'] = "enable";
-                    $postData['addon']  = $namePlugin;
-                    $postData['store']  = $row['STORE_ID'];
+                    $postData['addon'] = $namePlugin;
+                    $postData['store'] = $row['STORE_ID'];
 
                     curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/{$skinName}/enterprise/addonsStoreAction");
                     curl_setopt($ch, CURLOPT_HEADER, 0);
diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index ffd25c19b..7c16fc4f9 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -152,7 +152,7 @@ class adminProxy extends HttpProxyController
             try {
                 $uRole = $oRoles->loadByCode($row['USR_ROLE']);
             } catch (exception $oError) {
-                $uRole['ROL_NAME'] = G::loadTranslation( 'ID_DELETED' );
+                $uRole['ROL_NAME'] = G::loadTranslation('ID_DELETED');
             }
             $row['USR_ROLE_ID'] = $row['USR_ROLE'];
             $row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['USR_ROLE']) : $uRole['USR_ROLE'];
@@ -178,11 +178,11 @@ class adminProxy extends HttpProxyController
         $oldName = isset($_POST['oldName'])? $_POST['oldName']:'';
         $uid = isset($_POST['uid'])? $_POST['uid']:'';
 
-        switch ($_POST['action']){
+        switch ($_POST['action']) {
             case 'calendarName':
-                require_once ('classes/model/CalendarDefinition.php');
+                require_once('classes/model/CalendarDefinition.php');
                 $oCalendar  = new CalendarDefinition();
-                $aCalendars = $oCalendar->getCalendarList(false,true);
+                $aCalendars = $oCalendar->getCalendarList(false, true);
                 $aCalendarDefinitions = end($aCalendars);
                 
                 foreach ($aCalendarDefinitions as $aDefinitions) {
@@ -193,7 +193,6 @@ class adminProxy extends HttpProxyController
                     }
                     
                     if (isset($aDefinitions['CALENDAR_NAME'])) {
-                        
                         if ($aDefinitions['CALENDAR_UID'] != $uid) {
                             if ($aDefinitions['CALENDAR_NAME'] == $_POST['name']) {
                                 $validated = false;
@@ -312,7 +311,6 @@ class adminProxy extends HttpProxyController
         $data['success'] = true;
         $data['optionAuthS'] = htmlspecialchars($params->optionAuthS);
         return $data;
-
     }
 
     /**
@@ -415,7 +413,7 @@ class adminProxy extends HttpProxyController
             $passwdHide = '';
         }
 
-        $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
+        $passwdDec = G::decrypt($passwd, 'EMAILENCRYPT');
         $auxPass = explode('hash:', $passwdDec);
         if (count($auxPass) > 1) {
             if (count($auxPass) == 2) {
@@ -498,7 +496,7 @@ class adminProxy extends HttpProxyController
                             if (strtoupper($UseSecureCon) == 'TLS') {
                                 $smtp->Hello($hello);
                             }
-                            if ($smtp->Authenticate($user, $passwd) ) {
+                            if ($smtp->Authenticate($user, $passwd)) {
                                 $this->success = true;
                             } else {
                                 if (strtoupper($UseSecureCon) == 'TLS') {
@@ -671,7 +669,7 @@ class adminProxy extends HttpProxyController
 
             $aFields['MESS_PASSWORD_HIDDEN'] = '';
             $passwd = $aFields['MESS_PASSWORD'];
-            $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
+            $passwdDec = G::decrypt($passwd, 'EMAILENCRYPT');
             $auxPass = explode('hash:', $passwdDec);
             if (count($auxPass) > 1) {
                 if (count($auxPass) == 2) {
@@ -685,7 +683,7 @@ class adminProxy extends HttpProxyController
 
             if ($aFields['MESS_PASSWORD'] != '') {
                 $aFields['MESS_PASSWORD'] = 'hash:'.$aFields['MESS_PASSWORD'];
-                $aFields['MESS_PASSWORD'] = G::encrypt($aFields['MESS_PASSWORD'],'EMAILENCRYPT');
+                $aFields['MESS_PASSWORD'] = G::encrypt($aFields['MESS_PASSWORD'], 'EMAILENCRYPT');
             }
 
             $aFields['MESS_ENABLED']             = isset($_POST['EnableEmailNotifications']) ? $_POST['EnableEmailNotifications'] : '';
@@ -718,7 +716,7 @@ class adminProxy extends HttpProxyController
 
             if ($oConfiguration->exists($CfgUid, $ObjUid, $ProUid, $UsrUid, $AppUid)) {
                 $oConfiguration->update(
-                    array (
+                    array(
                       'CFG_UID'   => 'Emails',
                       'OBJ_UID'   => '',
                       'CFG_VALUE' => serialize($aFields),
@@ -758,12 +756,12 @@ class adminProxy extends HttpProxyController
     public function loadFields()
     {
         $oConfiguration = new Configurations();
-        $oConfiguration->loadConfig($x, 'Emails','','','','');
+        $oConfiguration->loadConfig($x, 'Emails', '', '', '', '');
         $fields = $oConfiguration->aConfig;
         if (count($fields) > 0) {
             $this->success = (count($fields) > 0);
             $passwd = $fields['MESS_PASSWORD'];
-            $passwdDec = G::decrypt($passwd,'EMAILENCRYPT');
+            $passwdDec = G::decrypt($passwd, 'EMAILENCRYPT');
             $auxPass = explode('hash:', $passwdDec);
             if (count($auxPass) > 1) {
                 if (count($auxPass) == 2) {
@@ -790,9 +788,9 @@ class adminProxy extends HttpProxyController
         $aPhotoSelect = $upload->getNameLogo($_SESSION['USER_LOGGED']);
         $sPhotoSelect = trim($aPhotoSelect['DEFAULT_LOGO_NAME']);
         $check        = '';
-        $ainfoSite    = explode("/",$_SERVER["REQUEST_URI"]);
+        $ainfoSite    = explode("/", $_SERVER["REQUEST_URI"]);
         $dir          = PATH_DATA . "sites" . PATH_SEP . str_replace("sys", "", $ainfoSite[1]) . PATH_SEP . "files/logos";
-        G::mk_dir ( $dir );
+        G::mk_dir($dir);
         $i      = 0;
         $images = array();
 
@@ -804,7 +802,7 @@ class adminProxy extends HttpProxyController
                         $extention      = explode(".", $file);
                         $aImageProp     = getimagesize($dir . '/' . $file, $info);
                         $sfileExtention = strtoupper($extention[count($extention)-1]);
-                        if ( in_array($sfileExtention, array('JPG', 'JPEG', 'PNG', 'GIF') ) ) {
+                        if (in_array($sfileExtention, array('JPG', 'JPEG', 'PNG', 'GIF'))) {
                             $check   = (!strcmp($file, $sPhotoSelect)) ? '/images/toadd.png' : '/images/delete.png';
                             $onclick = (strcmp($file, $sPhotoSelect)) ? "onclick ='deleteLogo(\" $file \");return false;'" : '';
                             if ($i == 0) {
@@ -905,8 +903,18 @@ class adminProxy extends HttpProxyController
             }
         }
         $img_new = imagecreatetruecolor($tmp_width, $tmp_height);
-        imagecopyresampled($img_new, $img_src, 0, 0, 0, 0,
-                           $tmp_width, $tmp_height, $img_width, $img_height);
+        imagecopyresampled(
+            $img_new,
+            $img_src,
+            0,
+            0,
+            0,
+            0,
+                           $tmp_width,
+            $tmp_height,
+            $img_width,
+            $img_height
+        );
 
         // create temporary thumbnail and locate on the server
         $thumb = $thumb_path."thumb_".$img_file;
@@ -953,19 +961,43 @@ class adminProxy extends HttpProxyController
             $x_src     = ($thumb_width - $square_size) / 2;
             $y_src     = 0;
             $img_final = imagecreatetruecolor($square_size, $square_size);
-            imagecopy($img_final, $img_thumb_square, 0, 0,
-                      $x_src, $y_src, $square_size, $square_size);
+            imagecopy(
+                $img_final,
+                $img_thumb_square,
+                0,
+                0,
+                      $x_src,
+                $y_src,
+                $square_size,
+                $square_size
+            );
         } elseif ($thumb_height > $thumb_width) {
             // landscape
             $x_src = 0;
             $y_src = ($thumb_height - $square_size) / 2;
             $img_final = imagecreatetruecolor($square_size, $square_size);
-            imagecopy($img_final, $img_thumb_square, 0, 0,
-                      $x_src, $y_src, $square_size, $square_size);
+            imagecopy(
+                $img_final,
+                $img_thumb_square,
+                0,
+                0,
+                      $x_src,
+                $y_src,
+                $square_size,
+                $square_size
+            );
         } else {
             $img_final = imagecreatetruecolor($square_size, $square_size);
-            imagecopy($img_final, $img_thumb_square, 0, 0,
-                    0, 0, $square_size, $square_size);
+            imagecopy(
+                $img_final,
+                $img_thumb_square,
+                0,
+                0,
+                    0,
+                0,
+                $square_size,
+                $square_size
+            );
         }
 
         switch ($img_type) {
@@ -1000,7 +1032,7 @@ class adminProxy extends HttpProxyController
         $_FILES = $filter->xssFilterHard($_FILES);
         
         $ainfoSite = explode("/", $_SERVER["REQUEST_URI"]);
-        $dir       = PATH_DATA."sites".PATH_SEP.str_replace("sys","",$ainfoSite[1]).PATH_SEP."files/logos";
+        $dir       = PATH_DATA."sites".PATH_SEP.str_replace("sys", "", $ainfoSite[1]).PATH_SEP."files/logos";
         global $_FILES;
 
         //| 0-> non fail
@@ -1029,7 +1061,7 @@ class adminProxy extends HttpProxyController
         $files_img_type = $_FILES['img']['type'];
 
         if (in_array($files_img_type, $allowedType)) {
-             // max upload file is 500 KB
+            // max upload file is 500 KB
             if ($_FILES['img']['size'] <= 500000) {
                 $formf     = $_FILES['img'];
                 $namefile  = $formf['name'];
@@ -1061,7 +1093,7 @@ class adminProxy extends HttpProxyController
                         $failed = "3";
                     }
                     $u = self::hashunlink;
-                    $u ($dir . '/tmp' . $fileName);
+                    $u($dir . '/tmp' . $fileName);
                 } catch (Exception $e) {
                     $failed = "3";
                 }
@@ -1071,9 +1103,9 @@ class adminProxy extends HttpProxyController
         } elseif ($files_img_type != '') {
             $failed = "1";
         }
-        $uploaded = $filter->validateInput($uploaded,'int');
+        $uploaded = $filter->validateInput($uploaded, 'int');
         $files_img_type = $filter->xssFilterHard($files_img_type);
-        $failed = $filter->validateInput($failed,'int');
+        $failed = $filter->validateInput($failed, 'int');
         $resp = array(
             'success'   => true,
             'failed'    => $failed,
@@ -1106,7 +1138,7 @@ class adminProxy extends HttpProxyController
         $arrayImg   = explode(";", $_POST['selectLogo']);
         foreach ($arrayImg as $imgname) {
             if ($imgname != "") {
-                if ( strcmp($imgname, self::getNameCurrentLogo()) == 0 ) {
+                if (strcmp($imgname, self::getNameCurrentLogo()) == 0) {
                     echo '{success: true}';
                     exit();
                 }
@@ -1136,12 +1168,12 @@ class adminProxy extends HttpProxyController
         $arrayImg   = explode(";", $_POST['images']);
         foreach ($arrayImg as $imgname) {
             if ($imgname != "") {
-                if ( strcmp($imgname, self::getNameCurrentLogo()) != 0 ) {
+                if (strcmp($imgname, self::getNameCurrentLogo()) != 0) {
                     if (file_exists($dir . '/' . $imgname)) {
-                        unlink ($dir . '/' . $imgname);
+                        unlink($dir . '/' . $imgname);
                     }
                     if (file_exists($dir . '/tmp' . $imgname)) {
-                        unlink ($dir . '/tmp' . $imgname);
+                        unlink($dir . '/tmp' . $imgname);
                     }
                     G::auditLog("DeleteLogo", "File Name: ".$imgname);
                 } else {
@@ -1201,7 +1233,7 @@ class adminProxy extends HttpProxyController
                 case 'restoreLogo':
                     $snameLogo = $_GET['NAMELOGO'];
                     $oConf = new Configurations;
-                    $aConf = Array(
+                    $aConf = array(
                       'WORKSPACE_LOGO_NAME' => '',
                       'DEFAULT_LOGO_NAME'   => ''
                     );
@@ -1215,7 +1247,7 @@ class adminProxy extends HttpProxyController
         } catch (Exception $oException) {
             $token = strtotime("now");
             PMException::registerErrorLog($oException, $token);
-            G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
+            G::outRes(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)));
             die;
         }
         exit();
@@ -1257,7 +1289,7 @@ class adminProxy extends HttpProxyController
                         $extention      = explode(".", $file);
                         $aImageProp     = getimagesize($dir . '/' . $file, $info);
                         $sfileExtention = strtoupper($extention[count($extention)-1]);
-                        if ( in_array($sfileExtention, array('JPG', 'JPEG', 'PNG', 'GIF') ) ) {
+                        if (in_array($sfileExtention, array('JPG', 'JPEG', 'PNG', 'GIF'))) {
                             $dir1 = $dir . PATH_SEP . $file;
                             $dir2 = $newDir . PATH_SEP . $file;
                             copy($dir1, $dir2);
@@ -1297,7 +1329,7 @@ class adminProxy extends HttpProxyController
             $filter = new InputFilter();
             $dir = $filter->validateInput($dir, "path");
         
-            copy($dir,$newDir);
+            copy($dir, $newDir);
             self::showLogo($newDir);
             die;
         }
@@ -1338,14 +1370,13 @@ class adminProxy extends HttpProxyController
         $result = array();
 
         try {
-
             $pmRestClient = OauthClientsPeer::retrieveByPK('x-pm-local-client');
             if (! empty($pmRestClient)) {
                 $pmRestClient->delete();
             }
 
             $http = G::is_https() ? 'https' : 'http';
-            $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en';
+            $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
             $host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
 
             $endpoint = sprintf(
@@ -1376,14 +1407,14 @@ class adminProxy extends HttpProxyController
         return $result;
     }
 
-    public function generateInfoSupport ()
+    public function generateInfoSupport()
     {
         require_once (PATH_CONTROLLERS . "InstallerModule.php");
         $params = array ();
 
-        $oServerConf = &ServerConf::getSingleton();
+        $oServerConf = ServerConf::getSingleton();
         $pluginRegistry = PluginRegistry::loadSingleton();
-        $licenseManager = &PmLicenseManager::getSingleton();
+        $licenseManager = PmLicenseManager::getSingleton();
 
         //License Information:
         $activeLicense = $licenseManager->getActiveLicense();
@@ -1399,11 +1430,11 @@ class adminProxy extends HttpProxyController
         //Operative System version (Linux, Windows)
         try {
             $os = '';
-            if (file_exists( '/etc/redhat-release' )) {
-                $fnewsize = filesize( '/etc/redhat-release' );
-                $fp = fopen( '/etc/redhat-release', 'r' );
-                $os = trim( fread( $fp, $fnewsize ) );
-                fclose( $fp );
+            if (file_exists('/etc/redhat-release')) {
+                $fnewsize = filesize('/etc/redhat-release');
+                $fp = fopen('/etc/redhat-release', 'r');
+                $os = trim(fread($fp, $fnewsize));
+                fclose($fp);
             }
             $os .= " (" . PHP_OS . ")";
         } catch (Exception $e) {
@@ -1426,7 +1457,12 @@ class adminProxy extends HttpProxyController
         $installer = new InstallerModule();
         $systemInfo = $installer->getSystemInfo();
         try {
-            $params['mysql'] = mysql_get_server_info();
+            $con = Propel::getConnection('workflow');
+            $con = $con->getResource();
+
+            $output = mysqli_get_server_info($con);
+            preg_match('@[0-9]+\.[0-9]+\.[0-9]+@', $output, $version);
+            $params['mysql'] = $version[0];
         } catch (Exception $e) {
             $params['mysql'] = '';
         }
@@ -1439,19 +1475,19 @@ class adminProxy extends HttpProxyController
         $params['serverSoftwareVersion'] = System::getServerVersion();
 
         //Installed Plugins (license info?)
-        $arrayAddon = array ();
+        $arrayAddon = array();
 
-        if (file_exists( PATH_DATA_SITE . "ee" )) {
-            $arrayAddon = unserialize( trim( file_get_contents( PATH_DATA_SITE . "ee" ) ) );
+        if (file_exists(PATH_DATA_SITE . "ee")) {
+            $arrayAddon = unserialize(trim(file_get_contents(PATH_DATA_SITE . "ee")));
         }
 
         $plugins = array();
         foreach ($arrayAddon as $addon) {
-            $sFileName = substr( $addon["sFilename"], 0, strpos( $addon["sFilename"], "-" ) );
+            $sFileName = substr($addon["sFilename"], 0, strpos($addon["sFilename"], "-"));
 
-            if (file_exists( PATH_PLUGINS . $sFileName . ".php" )) {
+            if (file_exists(PATH_PLUGINS . $sFileName . ".php")) {
                 $plugin = array();
-                $addonDetails = $pluginRegistry->getPluginDetails( $sFileName . ".php" );
+                $addonDetails = $pluginRegistry->getPluginDetails($sFileName . ".php");
                 $plugin['name'] = $addonDetails->getNamespace();
                 $plugin['description'] = $addonDetails->getDescription();
                 $plugin['version'] = $addonDetails->getVersion();
@@ -1462,14 +1498,14 @@ class adminProxy extends HttpProxyController
         $params['pl'] = $plugins;
 
         //Number of Users registered in PM. Including LDAP users and PM users.
-        require_once ("classes/model/RbacUsers.php");
-        $criteria = new Criteria( "rbac" );
-        $criteria->addSelectColumn( RbacUsersPeer::USR_AUTH_TYPE );
-        $criteria->addSelectColumn( "COUNT(".RbacUsersPeer::USR_UID . ") AS USERS_NUMBER" );
-        $criteria->add( RbacUsersPeer::USR_UID, null, Criteria::ISNOTNULL );
+        require_once("classes/model/RbacUsers.php");
+        $criteria = new Criteria("rbac");
+        $criteria->addSelectColumn(RbacUsersPeer::USR_AUTH_TYPE);
+        $criteria->addSelectColumn("COUNT(".RbacUsersPeer::USR_UID . ") AS USERS_NUMBER");
+        $criteria->add(RbacUsersPeer::USR_UID, null, Criteria::ISNOTNULL);
         $criteria->addGroupByColumn(RbacUsersPeer::USR_AUTH_TYPE);
-        $rs = RbacUsersPeer::doSelectRS( $criteria );
-        $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $rs = RbacUsersPeer::doSelectRS($criteria);
+        $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $users = array('local' => 0);
         while ($rs->next()) {
             $row = $rs->getRow();
@@ -1487,12 +1523,12 @@ class adminProxy extends HttpProxyController
         $params['c'] = $maxNumber - 1;
 
         //Number of active processes.
-        $criteria = new Criteria( "workflow" );
-        $criteria->addSelectColumn( ProcessPeer::PRO_STATUS );
-        $criteria->addSelectColumn( "COUNT(PROCESS.PRO_UID) AS NUMBER_PROCESS" );
+        $criteria = new Criteria("workflow");
+        $criteria->addSelectColumn(ProcessPeer::PRO_STATUS);
+        $criteria->addSelectColumn("COUNT(PROCESS.PRO_UID) AS NUMBER_PROCESS");
         $criteria->addGroupByColumn(ProcessPeer::PRO_STATUS);
-        $rs = UsersPeer::doSelectRS( $criteria );
-        $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $rs = UsersPeer::doSelectRS($criteria);
+        $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $process = array();
         while ($rs->next()) {
             $row = $rs->getRow();
@@ -1551,4 +1587,4 @@ class adminProxy extends HttpProxyController
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php
index d1fee5cda..44772077b 100644
--- a/workflow/engine/controllers/designer.php
+++ b/workflow/engine/controllers/designer.php
@@ -21,7 +21,6 @@ class Designer extends Controller
 
     public function __construct()
     {
-
     }
 
     /**
@@ -43,7 +42,7 @@ class Designer extends Controller
         $distribution = 0;
 
         /*----------------------------------********---------------------------------*/
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
+        $licensedFeatures = PMLicensedFeatures::getSingleton();
         if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) {
             $consolidated = 1;
         }
diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php
index 33bac845e..4feb31204 100644
--- a/workflow/engine/controllers/home.php
+++ b/workflow/engine/controllers/home.php
@@ -28,28 +28,28 @@ class Home extends Controller
     /**
      * Check the if the user has permissions over functions
      */
-    public function call ($name)
+    public function call($name)
     {
         global $RBAC;
         $RBAC->allows(basename(__FILE__), $name);
         parent::call($name);
     }
 
-    public function __construct ()
+    public function __construct()
     {
         // setting client browser information
         $this->clientBrowser = G::getBrowser();
 
         // getting the ux type from user o group conf.
-        $this->userUxType = isset( $_SESSION['user_experience'] ) ? $_SESSION['user_experience'] : 'SIMPLIFIED';
-        $this->lastSkin = isset( $_SESSION['user_last_skin'] ) ? $_SESSION['user_last_skin'] : 'neoclassic';
-        $this->userUxBaseTemplate = (is_dir( PATH_CUSTOM_SKINS . 'uxs' )) ? PATH_CUSTOM_SKINS . 'simplified' . PATH_SEP . 'templates' : 'home';
+        $this->userUxType = isset($_SESSION['user_experience']) ? $_SESSION['user_experience'] : 'SIMPLIFIED';
+        $this->lastSkin = isset($_SESSION['user_last_skin']) ? $_SESSION['user_last_skin'] : 'neoclassic';
+        $this->userUxBaseTemplate = (is_dir(PATH_CUSTOM_SKINS . 'uxs')) ? PATH_CUSTOM_SKINS . 'simplified' . PATH_SEP . 'templates' : 'home';
 
-        if (isset( $_SESSION['USER_LOGGED'] ) && ! empty( $_SESSION['USER_LOGGED'] )) {
-            $this->userUid = isset( $_SESSION['USER_LOGGED'] ) ? $_SESSION['USER_LOGGED'] : null;
-            $this->userName = isset( $_SESSION['USR_USERNAME'] ) ? $_SESSION['USR_USERNAME'] : '';
-            $this->userFullName = isset( $_SESSION['USR_FULLNAME'] ) ? $_SESSION['USR_FULLNAME'] : '';
-            $this->userRolName = isset( $_SESSION['USR_ROLENAME'] ) ? $_SESSION['USR_ROLENAME'] : '';
+        if (isset($_SESSION['USER_LOGGED']) && ! empty($_SESSION['USER_LOGGED'])) {
+            $this->userUid = isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : null;
+            $this->userName = isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '';
+            $this->userFullName = isset($_SESSION['USR_FULLNAME']) ? $_SESSION['USR_FULLNAME'] : '';
+            $this->userRolName = isset($_SESSION['USR_ROLENAME']) ? $_SESSION['USR_ROLENAME'] : '';
 
             $users = new Users();
             $users = $users->load($this->userUid);
@@ -57,34 +57,34 @@ class Home extends Controller
         }
     }
 
-    public function login ($httpData)
+    public function login($httpData)
     {
         //start new session
         @session_destroy();
         session_start();
         session_regenerate_id();
 
-        $data = isset( $httpData->d ) ? unserialize( base64_decode( $httpData->d ) ) : '';
+        $data = isset($httpData->d) ? unserialize(base64_decode($httpData->d)) : '';
         $template = $this->clientBrowser['name'] == 'msie' ? 'login_ie' : 'login_standard';
         $skin = $this->clientBrowser['name'] == 'msie' ? $this->lastSkin : 'simplified';
 
-        if (! is_array( $data )) {
-            $data = array (
+        if (! is_array($data)) {
+            $data = array(
                 'u' => '',
                 'p' => '',
                 'm' => ''
             );
         }
 
-        $this->setVar( 'msg', $data['m'] );
-        $this->setVar( 'usr', $data['u'] );
-        $this->setVar( 'pwd', $data['p'] );
-        $this->setVar('timeZoneFailed',  (isset($data['timeZoneFailed']))?  $data['timeZoneFailed'] : 0);
-        $this->setVar('userTimeZone',    (isset($data['userTimeZone']))?    $data['userTimeZone'] : '');
+        $this->setVar('msg', $data['m']);
+        $this->setVar('usr', $data['u']);
+        $this->setVar('pwd', $data['p']);
+        $this->setVar('timeZoneFailed', (isset($data['timeZoneFailed']))?  $data['timeZoneFailed'] : 0);
+        $this->setVar('userTimeZone', (isset($data['userTimeZone']))?    $data['userTimeZone'] : '');
         $this->setVar('browserTimeZone', (isset($data['browserTimeZone']))? $data['browserTimeZone'] : '');
-        $this->setVar( 'skin', $skin );
+        $this->setVar('skin', $skin);
 
-        $this->setView( $this->userUxBaseTemplate . PATH_SEP . $template );
+        $this->setView($this->userUxBaseTemplate . PATH_SEP . $template);
         $this->render();
     }
 
@@ -94,26 +94,26 @@ class Home extends Controller
      * @param string $httpData (opional)
      */
 
-    public function index ($httpData)
+    public function index($httpData)
     {
         if ($this->userUxType == 'SINGLE') {
-            $this->indexSingle( $httpData );
+            $this->indexSingle($httpData);
             return;
         }
 
         $userProperty = new UsersProperties();
         $process = new Process();
         $case = new Cases();
-        $sysConf = System::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
+        $sysConf = System::getSystemConfiguration(PATH_CONFIG . 'env.ini');
 
         //Get ProcessStatistics Info
         $start = 0;
         $limit = '';
 
-        $proData = $process->getAllProcesses( $start, $limit, null, null, false, true );
-        $processList = $case->getStartCasesPerType( $_SESSION['USER_LOGGED'], 'category' );
+        $proData = $process->getAllProcesses($start, $limit, null, null, false, true);
+        $processList = $case->getStartCasesPerType($_SESSION['USER_LOGGED'], 'category');
 
-        $processesList = array ();
+        $processesList = array();
 
         foreach ($processList as $key => $valueProcess) {
             foreach ($proData as $keyPro => $valuePro) {
@@ -126,18 +126,18 @@ class Home extends Controller
             }
         }
 
-        $switchLink = $userProperty->getUserLocation( $_SESSION['USER_LOGGED'], SYS_LANG );
+        $switchLink = $userProperty->getUserLocation($_SESSION['USER_LOGGED'], SYS_LANG);
 
         if (!isset($_COOKIE['workspaceSkin'])) {
-            if (substr( $sysConf['default_skin'], 0, 2 ) == 'ux') {
+            if (substr($sysConf['default_skin'], 0, 2) == 'ux') {
                 $_SESSION['_defaultUserLocation'] = $switchLink;
                 $switchLink = '/sys' . config("system.workspace") . '/' . SYS_LANG . '/' . $sysConf['default_skin'] . '/main';
             }
         }
 
-        $oServerConf = & ServerConf::getSingleton();
+        $oServerConf = ServerConf::getSingleton();
 
-        if ($oServerConf->isRtl( SYS_LANG )) {
+        if ($oServerConf->isRtl(SYS_LANG)) {
             $swRtl = 1;
         } else {
             $swRtl = 0;
@@ -147,13 +147,13 @@ class Home extends Controller
         global $G_TMP_MENU;
 
         $mnu = new Menu();
-        $mnu->load( 'simplified' );
-        $arrayMnuOption = array ();
-        $mnuNewCase = array ();
+        $mnu->load('simplified');
+        $arrayMnuOption = array();
+        $mnuNewCase = array();
 
-        if (! empty( $mnu->Options )) {
+        if (! empty($mnu->Options)) {
             foreach ($mnu->Options as $index => $value) {
-                $option = array ('id' => $mnu->Id[$index],'url' => $mnu->Options[$index],'label' => $mnu->Labels[$index],'icon' => $mnu->Icons[$index],'class' => $mnu->ElementClass[$index]
+                $option = array('id' => $mnu->Id[$index],'url' => $mnu->Options[$index],'label' => $mnu->Labels[$index],'icon' => $mnu->Icons[$index],'class' => $mnu->ElementClass[$index]
                 );
 
                 if ($mnu->Id[$index] != 'S_NEW_CASE') {
@@ -164,30 +164,29 @@ class Home extends Controller
             }
         }
 
-        $this->setView( $this->userUxBaseTemplate . PATH_SEP . 'index' );
+        $this->setView($this->userUxBaseTemplate . PATH_SEP . 'index');
 
-        $this->setVar( 'usrUid', $this->userUid );
-        $this->setVar( 'userName', $this->userName );
-        $this->setVar( 'processList', $processesList );
-        $this->setVar( 'canStartCase', $case->canStartCase( $_SESSION['USER_LOGGED'] ) );
-        $this->setVar( 'userUxType', $this->userUxType );
-        $this->setVar( 'clientBrowser', $this->clientBrowser['name'] );
-        $this->setVar( 'switchLink', $switchLink );
-        $this->setVar( 'arrayMnuOption', $arrayMnuOption );
-        $this->setVar( 'mnuNewCase', $mnuNewCase );
-        $this->setVar( 'rtl', $swRtl );
+        $this->setVar('usrUid', $this->userUid);
+        $this->setVar('userName', $this->userName);
+        $this->setVar('processList', $processesList);
+        $this->setVar('canStartCase', $case->canStartCase($_SESSION['USER_LOGGED']));
+        $this->setVar('userUxType', $this->userUxType);
+        $this->setVar('clientBrowser', $this->clientBrowser['name']);
+        $this->setVar('switchLink', $switchLink);
+        $this->setVar('arrayMnuOption', $arrayMnuOption);
+        $this->setVar('mnuNewCase', $mnuNewCase);
+        $this->setVar('rtl', $swRtl);
 
         $this->render();
     }
 
-    public function indexSingle ($httpData)
+    public function indexSingle($httpData)
     {
         $step = new Step();
 
         $solrEnabled = false;
 
         if (($solrConf = System::solrEnv()) !== false) {
-
             $ApplicationSolrIndex = new AppSolr(
                 $solrConf["solr_enabled"],
                 $solrConf["solr_host"],
@@ -198,7 +197,7 @@ class Home extends Controller
                 //Check if there are missing records to reindex and reindex them
                 $ApplicationSolrIndex->synchronizePendingApplications();
                 $solrEnabled = true;
-            } else{
+            } else {
                 $solrEnabled = false;
             }
         }
@@ -206,16 +205,15 @@ class Home extends Controller
         if ($solrEnabled) {
             $cases = $ApplicationSolrIndex->getAppGridData($this->userUid, 0, 1, 'todo');
         } else {
-
             $apps = new Applications();
 
-            $cases = $apps->getAll( $this->userUid, 0, 1, 'todo' );
+            $cases = $apps->getAll($this->userUid, 0, 1, 'todo');
         }
 
-        if (! isset( $cases['data'][0] )) {
+        if (! isset($cases['data'][0])) {
             //the current user has not any aplication to do
-            $this->setView( $this->userUxBaseTemplate . PATH_SEP . 'indexSingle' );
-            $this->setVar( 'default_url', $this->userUxBaseTemplate . "/" . 'error?no=2' );
+            $this->setView($this->userUxBaseTemplate . PATH_SEP . 'indexSingle');
+            $this->setVar('default_url', $this->userUxBaseTemplate . "/" . 'error?no=2');
             $this->render();
             exit();
         }
@@ -226,25 +224,25 @@ class Home extends Controller
         $_SESSION['PROCESS'] = $lastApp['PRO_UID'];
         $_SESSION['TASK'] = $lastApp['TAS_UID'];
 
-        $steps = $apps->getSteps( $lastApp['APP_UID'], $lastApp['DEL_INDEX'], $lastApp['TAS_UID'], $lastApp['PRO_UID'] );
-        $lastStep = array_pop( $steps );
-        $lastStep['title'] = G::LoadTranslation( 'ID_FINISH' );
+        $steps = $apps->getSteps($lastApp['APP_UID'], $lastApp['DEL_INDEX'], $lastApp['TAS_UID'], $lastApp['PRO_UID']);
+        $lastStep = array_pop($steps);
+        $lastStep['title'] = G::LoadTranslation('ID_FINISH');
         $steps[] = $lastStep;
 
-        $this->setView( $this->userUxBaseTemplate . PATH_SEP . 'indexSingle' );
+        $this->setView($this->userUxBaseTemplate . PATH_SEP . 'indexSingle');
 
-        $this->setVar( 'usrUid', $this->userUid );
-        $this->setVar( 'userName', $this->userName );
-        $this->setVar( 'steps', $steps );
-        $this->setVar( 'default_url', "cases/cases_Open?APP_UID={$lastApp['APP_UID']}&DEL_INDEX={$lastApp['DEL_INDEX']}&action=todo" );
+        $this->setVar('usrUid', $this->userUid);
+        $this->setVar('userName', $this->userName);
+        $this->setVar('steps', $steps);
+        $this->setVar('default_url', "cases/cases_Open?APP_UID={$lastApp['APP_UID']}&DEL_INDEX={$lastApp['DEL_INDEX']}&action=todo");
 
         $this->render();
     }
 
-    public function appList ($httpData)
+    public function appList($httpData)
     {
         // setting default list applications types [default: todo]
-        $httpData->t = isset( $httpData->t ) ? $httpData->t : 'todo';
+        $httpData->t = isset($httpData->t) ? $httpData->t : 'todo';
 
         // setting main list title
         switch ($httpData->t) {
@@ -258,34 +256,34 @@ class Home extends Controller
                 $title = G::LoadTranslation("ID_UNASSIGNED_INBOX");
                 break;
             default:
-                $title = ucwords( $httpData->t );
+                $title = ucwords($httpData->t);
                 break;
         }
 
         // getting apps data
-        $cases = $this->getAppsData( $httpData->t );
+        $cases = $this->getAppsData($httpData->t);
 
         // settings html template
-        $this->setView( $this->userUxBaseTemplate . PATH_SEP . 'appList' );
+        $this->setView($this->userUxBaseTemplate . PATH_SEP . 'appList');
 
         // settings vars and rendering
-        $this->setVar( 'cases', $cases['data'] );
-        $this->setVar( 'title', $title );
-        $this->setVar( 'noPerms', G::LoadTranslation( 'ID_CASES_NOTES_NO_PERMISSIONS' ));
-        $this->setVar( 'appListStart', $this->appListLimit );
-        $this->setVar( 'appListLimit', 10 );
-        $this->setVar( 'listType', $httpData->t );
+        $this->setVar('cases', $cases['data']);
+        $this->setVar('title', $title);
+        $this->setVar('noPerms', G::LoadTranslation('ID_CASES_NOTES_NO_PERMISSIONS'));
+        $this->setVar('appListStart', $this->appListLimit);
+        $this->setVar('appListLimit', 10);
+        $this->setVar('listType', $httpData->t);
 
         $this->render();
     }
 
-    public function appAdvancedSearch ($httpData)
+    public function appAdvancedSearch($httpData)
     {
         $title = G::LoadTranslation("ID_ADVANCEDSEARCH");
         $httpData->t = 'search';
 
         // settings html template
-        $this->setView( $this->userUxBaseTemplate . PATH_SEP . 'appListSearch' );
+        $this->setView($this->userUxBaseTemplate . PATH_SEP . 'appListSearch');
 
         // get data
         $process = (isset($httpData->process)) ? $httpData->process : null;
@@ -324,44 +322,44 @@ class Home extends Controller
         $arraySearch = array($process,  $status,  $search, $category, $user, $dateFrom, $dateTo );
 
         // settings vars and rendering
-        $this->setVar( 'statusValues', $this->getStatusArray( $httpData->t, $this->userUid) );
-        $this->setVar( 'categoryValues', $this->getCategoryArray() );
-        $this->setVar( 'allUsersValues', $this->getAllUsersArray( 'search' ) );
-        $this->setVar( 'categoryTitle', G::LoadTranslation("ID_CATEGORY") );
-        $this->setVar( 'processTitle', G::LoadTranslation("ID_PROCESS") );
-        $this->setVar( 'statusTitle', G::LoadTranslation("ID_STATUS") );
-        $this->setVar( 'searchTitle', G::LoadTranslation("ID_SEARCH") );
-        $this->setVar( 'userTitle', G::LoadTranslation("ID_USER") );
-        $this->setVar( 'fromTitle', G::LoadTranslation("ID_DELEGATE_DATE_FROM") );
-        $this->setVar( 'toTitle', G::LoadTranslation("ID_DELEGATE_DATE_TO") );
-        $this->setVar( 'filterTitle', G::LoadTranslation("ID_FILTER") );
-        $this->setVar( 'arraySearch', $arraySearch );
+        $this->setVar('statusValues', $this->getStatusArray($httpData->t, $this->userUid));
+        $this->setVar('categoryValues', $this->getCategoryArray());
+        $this->setVar('allUsersValues', $this->getAllUsersArray('search'));
+        $this->setVar('categoryTitle', G::LoadTranslation("ID_CATEGORY"));
+        $this->setVar('processTitle', G::LoadTranslation("ID_PROCESS"));
+        $this->setVar('statusTitle', G::LoadTranslation("ID_STATUS"));
+        $this->setVar('searchTitle', G::LoadTranslation("ID_SEARCH"));
+        $this->setVar('userTitle', G::LoadTranslation("ID_USER"));
+        $this->setVar('fromTitle', G::LoadTranslation("ID_DELEGATE_DATE_FROM"));
+        $this->setVar('toTitle', G::LoadTranslation("ID_DELEGATE_DATE_TO"));
+        $this->setVar('filterTitle', G::LoadTranslation("ID_FILTER"));
+        $this->setVar('arraySearch', $arraySearch);
 
-        $this->setVar( 'cases', $cases['data'] );
-        $this->setVar( 'title', $title );
-        $this->setVar( 'noPerms', G::LoadTranslation( 'ID_CASES_NOTES_NO_PERMISSIONS' ));
-        $this->setVar( 'appListStart', $this->appListLimit );
-        $this->setVar( 'appListLimit', 10 );
-        $this->setVar( 'listType', $httpData->t );
+        $this->setVar('cases', $cases['data']);
+        $this->setVar('title', $title);
+        $this->setVar('noPerms', G::LoadTranslation('ID_CASES_NOTES_NO_PERMISSIONS'));
+        $this->setVar('appListStart', $this->appListLimit);
+        $this->setVar('appListLimit', 10);
+        $this->setVar('listType', $httpData->t);
 
-        $this->setVar( 'processCurrentTitle', $processTitle );
-        $this->setVar( 'userCurrentName', $userName );
-        $this->setVar( 'currentUserLabel', G::LoadTranslation( "ID_ALL_USERS" ) );
-        $this->setVar( 'allProcessLabel', G::LoadTranslation("ID_ALL_PROCESS") );
+        $this->setVar('processCurrentTitle', $processTitle);
+        $this->setVar('userCurrentName', $userName);
+        $this->setVar('currentUserLabel', G::LoadTranslation("ID_ALL_USERS"));
+        $this->setVar('allProcessLabel', G::LoadTranslation("ID_ALL_PROCESS"));
 
         $this->render();
     }
 
-    public function getApps ($httpData)
+    public function getApps($httpData)
     {
-        $cases = $this->getAppsData( $httpData->t, $httpData->start, $httpData->limit );
+        $cases = $this->getAppsData($httpData->t, $httpData->start, $httpData->limit);
 
-        $this->setView( $this->userUxBaseTemplate . PATH_SEP . 'applications' );
-        $this->setVar( 'cases', $cases['data'] );
+        $this->setView($this->userUxBaseTemplate . PATH_SEP . 'applications');
+        $this->setVar('cases', $cases['data']);
         $this->render();
     }
 
-    public function getAppsData (
+    public function getAppsData(
         $type,
         $start = null,
         $limit = null,
@@ -375,13 +373,12 @@ class Home extends Controller
         $callback = null,
         $dir = 'DESC',
         $sort = "APP_CACHE_VIEW.APP_NUMBER",
-        $category = null)
-    {
-
+        $category = null
+    ) {
         $appNotes = new AppNotes();
 
-        $start = empty( $start ) ? $this->appListStart : $start;
-        $limit = empty( $limit ) ? $this->appListLimit : $limit;
+        $start = empty($start) ? $this->appListStart : $start;
+        $limit = empty($limit) ? $this->appListLimit : $limit;
 
         $notesStart = 0;
         $notesLimit = 4;
@@ -412,7 +409,6 @@ class Home extends Controller
         ) &&
         (($solrConf = System::solrEnv()) !== false)
         ) {
-
             $ApplicationSolrIndex = new AppSolr(
                 $solrConf["solr_enabled"],
                 $solrConf["solr_host"],
@@ -423,7 +419,7 @@ class Home extends Controller
                 //Check if there are missing records to reindex and reindex them
                 $ApplicationSolrIndex->synchronizePendingApplications();
                 $solrEnabled = true;
-            } else{
+            } else {
                 $solrEnabled = false;
             }
         }
@@ -494,19 +490,18 @@ class Home extends Controller
                     $cases = $list->getList($listType, $dataList);
                 }
             } else {
-            /*----------------------------------********---------------------------------*/
+                /*----------------------------------********---------------------------------*/
                 $case = new \ProcessMaker\BusinessModel\Cases();
                 $cases = $case->getList($dataList);
                 foreach ($cases['data'] as &$value) {
                     $value = array_change_key_case($value, CASE_UPPER);
                 }
-            /*----------------------------------********---------------------------------*/
+                /*----------------------------------********---------------------------------*/
             }
             /*----------------------------------********---------------------------------*/
-
         }
 
-        if(empty($cases) && $type == 'search') {
+        if (empty($cases) && $type == 'search') {
             $case = new \ProcessMaker\BusinessModel\Cases();
             $cases = $case->getCasesSearch($dataList);
             foreach ($cases['data'] as &$value) {
@@ -514,22 +509,22 @@ class Home extends Controller
             }
         }
 
-        if(!isset($cases['totalCount'])){
+        if (!isset($cases['totalCount'])) {
             $cases['totalCount'] = $cases['total'];
         }
 
         // formating & complitting apps data with 'Notes'
         foreach ($cases['data'] as $i => $row) {
             // Formatting
-            $appTitle = str_replace( '#', '', $row['APP_TITLE'] );
+            $appTitle = str_replace('#', '', $row['APP_TITLE']);
 
-            if (is_numeric( $appTitle )) {
-                $cases['data'][$i]['APP_TITLE'] = G::LoadTranslation( 'ID_CASE' ) . ' ' . $appTitle;
+            if (is_numeric($appTitle)) {
+                $cases['data'][$i]['APP_TITLE'] = G::LoadTranslation('ID_CASE') . ' ' . $appTitle;
             }
 
-            if (isset( $row['DEL_DELEGATE_DATE'] )) {
+            if (isset($row['DEL_DELEGATE_DATE'])) {
                 $conf = new Configurations();
-                $generalConfCasesList = $conf->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
+                $generalConfCasesList = $conf->getConfiguration('ENVIRONMENT_SETTINGS', '');
                 $cases['data'][$i]['DEL_DELEGATE_DATE'] = '';
                 if (!empty(config("system.workspace"))) {
                     if (isset( $generalConfCasesList['casesListDateFormat'] ) && ! empty( $generalConfCasesList['casesListDateFormat'] )) {
@@ -540,8 +535,8 @@ class Home extends Controller
                     $cases['data'][$i]['DEL_DELEGATE_DATE'] = $conf->getSystemDate($row['DEL_DELEGATE_DATE']);
                 }
             }
-            if (isset( $row['APP_DEL_PREVIOUS_USER'] )) {
-                $cases['data'][$i]['APP_DEL_PREVIOUS_USER'] = ucwords( $row['APP_DEL_PREVIOUS_USER'] );
+            if (isset($row['APP_DEL_PREVIOUS_USER'])) {
+                $cases['data'][$i]['APP_DEL_PREVIOUS_USER'] = ucwords($row['APP_DEL_PREVIOUS_USER']);
             }
             // Completting with Notes
             $notes = $appNotes->getNotesList($row['APP_UID'], '', $notesStart, $notesLimit);
@@ -555,10 +550,10 @@ class Home extends Controller
         return $cases;
     }
 
-    public function startCase ($httpData)
+    public function startCase($httpData)
     {
         $case = new Cases();
-        $aData = $case->startCase( $httpData->id, $_SESSION['USER_LOGGED'] );
+        $aData = $case->startCase($httpData->id, $_SESSION['USER_LOGGED']);
 
         $_SESSION['APPLICATION'] = $aData['APPLICATION'];
         $_SESSION['INDEX'] = $aData['INDEX'];
@@ -568,16 +563,16 @@ class Home extends Controller
         $_SESSION['CASES_REFRESH'] = true;
 
         $oCase = new Cases();
-        $aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
+        $aNextStep = $oCase->getNextStep($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION']);
         $aNextStep['PAGE'] = '../cases/cases_Open?APP_UID=' . $aData['APPLICATION'] . '&DEL_INDEX=' . $aData['INDEX'] . '&action=draft';
         $_SESSION['BREAKSTEP']['NEXT_STEP'] = $aNextStep;
 
-        $this->redirect( $aNextStep['PAGE'] );
+        $this->redirect($aNextStep['PAGE']);
     }
 
-    public function error ($httpData)
+    public function error($httpData)
     {
-        $httpData->no = isset( $httpData->no ) ? $httpData->no : 0;
+        $httpData->no = isset($httpData->no) ? $httpData->no : 0;
 
         switch ($httpData->no) {
             case 2:
@@ -587,11 +582,11 @@ class Home extends Controller
                 $tpl = $this->userUxBaseTemplate . PATH_SEP . 'error';
         }
 
-        $this->setView( $tpl );
+        $this->setView($tpl);
         $this->render();
     }
 
-    function getUserArray($action, $userUid, $search = null)
+    public function getUserArray($action, $userUid, $search = null)
     {
         $conf = new Configurations();
         $confEnvSetting = $conf->getFormats();
@@ -613,7 +608,8 @@ class Home extends Controller
                 if (!empty($search)) {
                     $cUsers->add(
                         $cUsers->getNewCriterion(UsersPeer::USR_FIRSTNAME, '%' . $search . '%', Criteria::LIKE)->addOr(
-                        $cUsers->getNewCriterion(UsersPeer::USR_LASTNAME, '%' . $search . '%', Criteria::LIKE))
+                        $cUsers->getNewCriterion(UsersPeer::USR_LASTNAME, '%' . $search . '%', Criteria::LIKE)
+                        )
                     );
                 }
                 $oDataset = UsersPeer::doSelectRS($cUsers);
@@ -637,63 +633,63 @@ class Home extends Controller
         return $users;
     }
 
-    function getCategoryArray ()
+    public function getCategoryArray()
     {
         $category = array();
-        $category[] = array ("",G::LoadTranslation( "ID_ALL_CATEGORIES" ));
+        $category[] = array("",G::LoadTranslation("ID_ALL_CATEGORIES"));
 
-        $criteria = new Criteria( 'workflow' );
-        $criteria->addSelectColumn( ProcessCategoryPeer::CATEGORY_UID );
-        $criteria->addSelectColumn( ProcessCategoryPeer::CATEGORY_NAME );
-        $dataset = ProcessCategoryPeer::doSelectRS( $criteria );
-        $dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $criteria = new Criteria('workflow');
+        $criteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_UID);
+        $criteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_NAME);
+        $dataset = ProcessCategoryPeer::doSelectRS($criteria);
+        $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $dataset->next();
 
         while ($row = $dataset->getRow()) {
-            $category[] = array ($row['CATEGORY_UID'],$row['CATEGORY_NAME']);
+            $category[] = array($row['CATEGORY_UID'],$row['CATEGORY_NAME']);
             $dataset->next();
         }
         return $category;
     }
 
-    function getAllUsersArray ($action)
+    public function getAllUsersArray($action)
     {
         global $oAppCache;
-        $users = array ();
-        $users[] = array ("CURRENT_USER",G::LoadTranslation( "ID_CURRENT_USER" ));
-        $users[] = array ("",G::LoadTranslation( "ID_ALL_USERS" ));
+        $users = array();
+        $users[] = array("CURRENT_USER",G::LoadTranslation("ID_CURRENT_USER"));
+        $users[] = array("",G::LoadTranslation("ID_ALL_USERS"));
 
         if ($action == 'to_reassign') {
             //now get users, just for the Search action
             $cUsers = $oAppCache->getToReassignListCriteria(null);
-            $cUsers->addSelectColumn( AppCacheViewPeer::USR_UID );
+            $cUsers->addSelectColumn(AppCacheViewPeer::USR_UID);
 
             if (g::MySQLSintaxis()) {
-                $cUsers->addGroupByColumn( AppCacheViewPeer::USR_UID );
+                $cUsers->addGroupByColumn(AppCacheViewPeer::USR_UID);
             }
 
-            $cUsers->addAscendingOrderByColumn( AppCacheViewPeer::APP_CURRENT_USER );
-            $oDataset = AppCacheViewPeer::doSelectRS( $cUsers );
-            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $cUsers->addAscendingOrderByColumn(AppCacheViewPeer::APP_CURRENT_USER);
+            $oDataset = AppCacheViewPeer::doSelectRS($cUsers);
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
             while ($aRow = $oDataset->getRow()) {
-                $users[] = array ($aRow['USR_UID'],$aRow['APP_CURRENT_USER']);
+                $users[] = array($aRow['USR_UID'],$aRow['APP_CURRENT_USER']);
                 $oDataset->next();
             }
         }
         return $users;
     }
 
-    function getStatusArray ($action, $userUid)
+    public function getStatusArray($action, $userUid)
     {
         $status = array();
         $aStatus = Application::$app_status_values;
         $status[] = array('', G::LoadTranslation('ID_ALL_STATUS'));
         foreach ($aStatus as $key => $value) {
             if ($action == 'search') {
-                $status[] =  array ($value, G::LoadTranslation( 'ID_CASES_STATUS_' . $key ));
+                $status[] =  array($value, G::LoadTranslation('ID_CASES_STATUS_' . $key));
             } else {
-                $status[] =  array ($key, G::LoadTranslation( 'ID_CASES_STATUS_' . $key ));
+                $status[] =  array($key, G::LoadTranslation('ID_CASES_STATUS_' . $key));
             }
         }
         return $status;
@@ -724,8 +720,8 @@ class Home extends Controller
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         while ($aRow = $oDataset->getRow()) {
-          $processes[] = array($aRow["PRO_ID"], $aRow["PRO_TITLE"]);
-          $oDataset->next();
+            $processes[] = array($aRow["PRO_ID"], $aRow["PRO_TITLE"]);
+            $oDataset->next();
         }
 
         return ($processes);
@@ -765,4 +761,3 @@ class Home extends Controller
         print G::json_encode($users);
     }
 }
-
diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php
index 2c4d4ad25..77aab5c40 100644
--- a/workflow/engine/controllers/main.php
+++ b/workflow/engine/controllers/main.php
@@ -15,23 +15,23 @@ class Main extends Controller
     private $memcache;
     private $conf;
 
-    public function __construct ()
+    public function __construct()
     {
-        $this->memcache = & PMmemcached::getSingleton( !empty(config("system.workspace")) ? config("system.workspace") : '' );
+        $this->memcache = PMmemcached::getSingleton( !empty(config("system.workspace")) ? config("system.workspace") : '' );
 
-        define( 'ERROR_EXCEPTION', 1 );
-        define( 'INFO_EXCEPTION', 3 );
-        define( 'WARNING_EXCEPTION', 2 );
+        define('ERROR_EXCEPTION', 1);
+        define('INFO_EXCEPTION', 3);
+        define('WARNING_EXCEPTION', 2);
 
         //$this->setDebug(true);
     }
 
-    function index ($httpData)
+    public function index($httpData)
     {
         global $RBAC;
-        $RBAC->requirePermissions( 'PM_LOGIN' );
+        $RBAC->requirePermissions('PM_LOGIN');
         $meta = new stdClass();
-        $showSystemInfo = $RBAC->userCanAccess( 'PM_SETUP' ) == 1;
+        $showSystemInfo = $RBAC->userCanAccess('PM_SETUP') == 1;
 
         // setting variables for template
         $this->setVar( 'logo_company', $this->getCompanyLogo() );
@@ -46,59 +46,60 @@ class Main extends Controller
         // license notification
         $expireInLabel = '';
 
-        require_once ("classes" . PATH_SEP . "class.pmLicenseManager.php");
-        $pmLicenseManager = &PmLicenseManager::getSingleton();
+        require_once("classes" . PATH_SEP . "class.pmLicenseManager.php");
+        $pmLicenseManager = PmLicenseManager::getSingleton();
         $expireIn = $pmLicenseManager->getExpireIn();
         $expireInLabel = $pmLicenseManager->getExpireInLabel();
 
-        $this->setVar( 'licenseNotification', $expireInLabel );
+        $this->setVar('licenseNotification', $expireInLabel);
 
         // setting variables on javascript env.
-        $this->setJSVar( 'meta', array ('menu' => $this->getMenu()
-        ) );
+        $this->setJSVar('meta', array('menu' => $this->getMenu()
+        ));
 
         $activeTab = 0;
-        if (isset( $_SESSION['_defaultUserLocation'] )) {
-            $activeTab = $this->resolveUrlToTabIndex( $_SESSION['_defaultUserLocation'] );
+        if (isset($_SESSION['_defaultUserLocation'])) {
+            $activeTab = $this->resolveUrlToTabIndex($_SESSION['_defaultUserLocation']);
         }
 
-        if (isset( $_GET['st'] )) {
-            $activeTab = $this->getActiveTab( $_GET['st'] );
-            unset( $_GET['st'] );
+        if (isset($_GET['st'])) {
+            $activeTab = $this->getActiveTab($_GET['st']);
+            unset($_GET['st']);
         }
 
-        $this->setJSVar( 'activeTab', $activeTab );
-        $this->setJSVar( 'urlAddGetParams', $this->getUrlGetParams() );
-        $this->setJSVar( 'showSystemInfo', $showSystemInfo );
+        $this->setJSVar('activeTab', $activeTab);
+        $this->setJSVar('urlAddGetParams', $this->getUrlGetParams());
+        $this->setJSVar('showSystemInfo', $showSystemInfo);
 
-        $switchInterface = isset( $_SESSION['user_experience'] ) && $_SESSION['user_experience'] == 'SWITCHABLE';
+        $switchInterface = isset($_SESSION['user_experience']) && $_SESSION['user_experience'] == 'SWITCHABLE';
 
         if (($flyNotify = $this->getFlyNotify()) !== false) {
-            $this->setJSVar( 'flyNotify', $flyNotify );
+            $this->setJSVar('flyNotify', $flyNotify);
         }
 
-        $this->setJSVar( 'switchInterface', $switchInterface );
+        $this->setJSVar('switchInterface', $switchInterface);
 
-        $this->includeExtJSLib( 'ux/ux.menu' );
-        $this->includeExtJS( 'main/index' );
-        $this->setLayout( 'pm-modern' );
-        $this->afterLoad( $httpData );
+        $this->includeExtJSLib('ux/ux.menu');
+        $this->includeExtJS('main/index');
+        $this->setLayout('pm-modern');
+        $this->afterLoad($httpData);
 
         $this->render();
     }
 
-    function screamFileUpgrades () {
-        G::streamFile( PATH_DATA . 'log/upgrades.log', true );
+    public function screamFileUpgrades()
+    {
+        G::streamFile(PATH_DATA . 'log/upgrades.log', true);
     }
 
-    function getSystemInfo ()
+    public function getSystemInfo()
     {
-        $this->setResponseType( 'json' );
+        $this->setResponseType('json');
         $infoList = $this->_getSystemInfo();
-        $data = array ();
+        $data = array();
 
         foreach ($infoList as $row) {
-            $data[] = array ('label' => $row[0],'value' => $row[1],'section' => $row[2]
+            $data[] = array('label' => $row[0],'value' => $row[1],'section' => $row[2]
             );
         }
         return $data;
@@ -107,37 +108,37 @@ class Main extends Controller
     /**
      * Login
      */
-    public function login ()
+    public function login()
     {
         $this->conf = new Configurations();
 
         // getting posibles errors passed by GET method
         $this->getInUrlError();
 
-        if (! isset( $_SESSION['G_MESSAGE'] )) {
+        if (! isset($_SESSION['G_MESSAGE'])) {
             $_SESSION['G_MESSAGE'] = '';
         }
-        if (! isset( $_SESSION['G_MESSAGE_TYPE'] )) {
+        if (! isset($_SESSION['G_MESSAGE_TYPE'])) {
             $_SESSION['G_MESSAGE_TYPE'] = '';
         }
 
         $msg = $_SESSION['G_MESSAGE'];
         $msgType = $_SESSION['G_MESSAGE_TYPE'];
 
-        if (! isset( $_SESSION['FAILED_LOGINS'] )) {
+        if (! isset($_SESSION['FAILED_LOGINS'])) {
             $_SESSION['FAILED_LOGINS'] = 0;
         }
         $sFailedLogins = $_SESSION['FAILED_LOGINS'];
 
-        if (isset( $_SESSION['USER_LOGGED'] )) {
+        if (isset($_SESSION['USER_LOGGED'])) {
             //close the session, if the current session_id was used in PM.
-            $oCriteria = new Criteria( 'workflow' );
-            $oCriteria->add( LoginLogPeer::LOG_SID, session_id() );
-            $oCriteria->add( LoginLogPeer::USR_UID, isset( $_SESSION['USER_LOGGED'] ) ? $_SESSION['USER_LOGGED'] : '-' );
-            $oCriteria->add( LoginLogPeer::LOG_STATUS, 'ACTIVE' );
-            $oCriteria->add( LoginLogPeer::LOG_END_DATE, null, Criteria::ISNULL );
-            $oDataset = LoginLogPeer::doSelectRS( $oCriteria );
-            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->add(LoginLogPeer::LOG_SID, session_id());
+            $oCriteria->add(LoginLogPeer::USR_UID, isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : '-');
+            $oCriteria->add(LoginLogPeer::LOG_STATUS, 'ACTIVE');
+            $oCriteria->add(LoginLogPeer::LOG_END_DATE, null, Criteria::ISNULL);
+            $oDataset = LoginLogPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
             $aRow = $oDataset->getRow();
             if ($aRow) {
@@ -149,20 +150,20 @@ class Main extends Controller
                     $aLog['LOG_IP'] = $aRow['LOG_IP'];
                     $aLog['LOG_SID'] = session_id();
                     $aLog['LOG_INIT_DATE'] = $aRow['LOG_INIT_DATE'];
-                    $aLog['LOG_END_DATE'] = date( 'Y-m-d H:i:s' );
+                    $aLog['LOG_END_DATE'] = date('Y-m-d H:i:s');
                     $aLog['LOG_CLIENT_HOSTNAME'] = $aRow['LOG_CLIENT_HOSTNAME'];
                     $aLog['USR_UID'] = $aRow['USR_UID'];
-                    $weblog->update( $aLog );
+                    $weblog->update($aLog);
                 }
             }
             //remove memcached session
-            $this->memcache->delete( 'rbacSession' . session_id() );
+            $this->memcache->delete('rbacSession' . session_id());
         } else {
             // Execute SSO trigger
             $pluginRegistry = PluginRegistry::loadSingleton();
-            if (defined( 'PM_SINGLE_SIGN_ON' )) {
-                if ($pluginRegistry->existsTrigger( PM_SINGLE_SIGN_ON )) {
-                    if ($pluginRegistry->executeTriggers( PM_SINGLE_SIGN_ON, null )) {
+            if (defined('PM_SINGLE_SIGN_ON')) {
+                if ($pluginRegistry->existsTrigger(PM_SINGLE_SIGN_ON)) {
+                    if ($pluginRegistry->executeTriggers(PM_SINGLE_SIGN_ON, null)) {
                         // Start new session
                         @session_destroy();
                         session_start();
@@ -171,7 +172,7 @@ class Main extends Controller
                         $result = $this->authentication();
                         if ($result->success) {
                             // Redirect to landing page for the user
-                            G::header( 'Location: ' . $result->url );
+                            G::header('Location: ' . $result->url);
                             die();
                         }
                     }
@@ -186,10 +187,10 @@ class Main extends Controller
         session_start();
         session_regenerate_id();
 
-        if (strlen( $msg ) > 0) {
+        if (strlen($msg) > 0) {
             $_SESSION['G_MESSAGE'] = $msg;
         }
-        if (strlen( $msgType ) > 0) {
+        if (strlen($msgType) > 0) {
             $_SESSION['G_MESSAGE_TYPE'] = $msgType;
         }
         $_SESSION['FAILED_LOGINS'] = $sFailedLogins;
@@ -198,80 +199,80 @@ class Main extends Controller
 
         $sflag = 0;
 
-        if (($nextBeatDate = $this->memcache->get( 'nextBeatDate' )) === false) {
+        if (($nextBeatDate = $this->memcache->get('nextBeatDate')) === false) {
             //get the serverconf singleton, and check if we can send the heartbeat
-            $oServerConf = & ServerConf::getSingleton();
-            $sflag = $oServerConf->getHeartbeatProperty( 'HB_OPTION', 'HEART_BEAT_CONF' );
-            $sflag = (trim( $sflag ) != '') ? $sflag : '1';
+            $oServerConf = ServerConf::getSingleton();
+            $sflag = $oServerConf->getHeartbeatProperty('HB_OPTION', 'HEART_BEAT_CONF');
+            $sflag = (trim($sflag) != '') ? $sflag : '1';
             //get date of next beat
-            $nextBeatDate = $oServerConf->getHeartbeatProperty( 'HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF' );
-            $this->memcache->set( 'nextBeatDate', $nextBeatDate, 1 * 3600 );
+            $nextBeatDate = $oServerConf->getHeartbeatProperty('HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF');
+            $this->memcache->set('nextBeatDate', $nextBeatDate, 1 * 3600);
         } else {
             $sflag = '1';
         }
 
-        if (($sflag == '1') && ((strtotime( "now" ) > $nextBeatDate) || is_null( $nextBeatDate ))) {
+        if (($sflag == '1') && ((strtotime("now") > $nextBeatDate) || is_null($nextBeatDate))) {
             //To do: we need to change to ExtJs
-            $this->setJSVar( 'flagHeartBeat', 1 );
+            $this->setJSVar('flagHeartBeat', 1);
         } else {
-            $this->setJSVar( 'flagHeartBeat', 0 );
+            $this->setJSVar('flagHeartBeat', 0);
         }
 
-        if (($flagGettingStarted = $this->memcache->get( 'flagGettingStarted' )) === false) {
+        if (($flagGettingStarted = $this->memcache->get('flagGettingStarted')) === false) {
             require_once 'classes/model/Configuration.php';
             $oConfiguration = new Configuration();
-            $oCriteria = new Criteria( 'workflow' );
-            $oCriteria->add( ConfigurationPeer::CFG_UID, 'getStarted' );
-            $oCriteria->add( ConfigurationPeer::OBJ_UID, '' );
-            $oCriteria->add( ConfigurationPeer::CFG_VALUE, '1' );
-            $oCriteria->add( ConfigurationPeer::PRO_UID, '' );
-            $oCriteria->add( ConfigurationPeer::USR_UID, '' );
-            $oCriteria->add( ConfigurationPeer::APP_UID, '' );
-            $flagGettingStarted = ConfigurationPeer::doCount( $oCriteria );
-            $this->memcache->set( 'flagGettingStarted', $flagGettingStarted, 8 * 3600 );
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->add(ConfigurationPeer::CFG_UID, 'getStarted');
+            $oCriteria->add(ConfigurationPeer::OBJ_UID, '');
+            $oCriteria->add(ConfigurationPeer::CFG_VALUE, '1');
+            $oCriteria->add(ConfigurationPeer::PRO_UID, '');
+            $oCriteria->add(ConfigurationPeer::USR_UID, '');
+            $oCriteria->add(ConfigurationPeer::APP_UID, '');
+            $flagGettingStarted = ConfigurationPeer::doCount($oCriteria);
+            $this->memcache->set('flagGettingStarted', $flagGettingStarted, 8 * 3600);
         }
 
-        $this->setJSVar( 'flagGettingStarted', ($flagGettingStarted == 0) );
+        $this->setJSVar('flagGettingStarted', ($flagGettingStarted == 0));
 
         $oConf = new Configurations();
-        $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
+        $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
 
-        $flagForgotPassword = isset( $oConf->aConfig['login_enableForgotPassword'] ) ? $oConf->aConfig['login_enableForgotPassword'] : 'off';
+        $flagForgotPassword = isset($oConf->aConfig['login_enableForgotPassword']) ? $oConf->aConfig['login_enableForgotPassword'] : 'off';
 
-        $this->includeExtJSLib( 'ux/virtualkeyboard' );
-        $this->includeExtJS( 'main/login' );
-        $this->setView( 'main/login' );
+        $this->includeExtJSLib('ux/virtualkeyboard');
+        $this->includeExtJS('main/login');
+        $this->setView('main/login');
 
-        $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
+        $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
 
-        $forgotPasswd = isset( $oConf->aConfig['login_enableForgotPassword'] ) ? $oConf->aConfig['login_enableForgotPassword'] : false;
-        $virtualKeyboad = isset( $oConf->aConfig['login_enableVirtualKeyboard'] ) ? $oConf->aConfig['login_enableVirtualKeyboard'] : false;
-        $defaultLanguaje = isset( $oConf->aConfig['login_defaultLanguage'] ) ? $oConf->aConfig['login_defaultLanguage'] : 'en';
+        $forgotPasswd = isset($oConf->aConfig['login_enableForgotPassword']) ? $oConf->aConfig['login_enableForgotPassword'] : false;
+        $virtualKeyboad = isset($oConf->aConfig['login_enableVirtualKeyboard']) ? $oConf->aConfig['login_enableVirtualKeyboard'] : false;
+        $defaultLanguaje = isset($oConf->aConfig['login_defaultLanguage']) ? $oConf->aConfig['login_defaultLanguage'] : 'en';
 
-        $this->setJSVar( 'forgotPasswd', $forgotPasswd );
-        $this->setJSVar( 'virtualKeyboad', $virtualKeyboad );
+        $this->setJSVar('forgotPasswd', $forgotPasswd);
+        $this->setJSVar('virtualKeyboad', $virtualKeyboad);
 
-        $this->setJSVar( 'languages', $availableLangArray );
-        $this->setJSVar( 'defaultLang', $defaultLanguaje );
+        $this->setJSVar('languages', $availableLangArray);
+        $this->setJSVar('defaultLang', $defaultLanguaje);
 
         //binding G::SendTemporalMessage() to Ext.msgBoxSlider.msgTopCenter()
         if (($flyNotify = $this->getFlyNotify()) !== false) {
-            $this->setJSVar( 'flyNotify', $flyNotify );
+            $this->setJSVar('flyNotify', $flyNotify);
         }
 
         //binding G::SendTemporalMessage() to Ext.msgBoxSlider.msgTopCenter()
-        if (isset( $_GET['u'] )) {
-            $this->setJSVar( 'urlRequested', urldecode( $_GET['u'] ) );
+        if (isset($_GET['u'])) {
+            $this->setJSVar('urlRequested', urldecode($_GET['u']));
         }
 
-        $this->setVar( 'logo_company', $this->getCompanyLogo() );
-        $this->setVar( 'pmos_version', System::getVersion() );
+        $this->setVar('logo_company', $this->getCompanyLogo());
+        $this->setVar('pmos_version', System::getVersion());
 
-        $footerText = 'Copyright &copy; 2003-' . date( 'Y' ) . ' Colosa, Inc. All rights reserved.';
+        $footerText = 'Copyright &copy; 2003-' . date('Y') . ' Colosa, Inc. All rights reserved.';
         $adviseText = 'Supplied free of charge with no support, certification, warranty,
             maintenance nor indemnity by Colosa and its Certified Partners. ';
-        $this->setVar( 'footer_text', $footerText );
-        $this->setVar( 'advise_text', $adviseText );
+        $this->setVar('footer_text', $footerText);
+        $this->setVar('advise_text', $adviseText);
         $loginScript = $this->getHeadPublisher()->getExtJsLibraries();
         $loginScript .= $this->getHeadPublisher()->getExtJsScripts();
         $this->setVar("login_script", $loginScript);
@@ -286,53 +287,52 @@ class Main extends Controller
     /**
      * SysLogin
      */
-    public function sysLogin ()
+    public function sysLogin()
     {
-
-        Propel::init( PATH_CORE . "config/databases.php" );
-        Creole::registerDriver( 'dbarray', 'creole.contrib.DBArrayConnection' );
+        Propel::init(PATH_CORE . "config/databases.php");
+        Creole::registerDriver('dbarray', 'creole.contrib.DBArrayConnection');
 
         // getting posibles errors passed by GET method
         $this->getInUrlError();
 
         $availableWorkspace = $this->getWorkspacesAvailable();
-        $availableWorkspaceList = array ();
+        $availableWorkspaceList = array();
 
         foreach ($availableWorkspace as $ws) {
-            $availableWorkspaceList[] = array ($ws,$ws
+            $availableWorkspaceList[] = array($ws,$ws
             );
         }
 
-        $aField['LOGIN_VERIFY_MSG'] = G::loadTranslation( 'LOGIN_VERIFY_MSG' );
+        $aField['LOGIN_VERIFY_MSG'] = G::loadTranslation('LOGIN_VERIFY_MSG');
 
         //Get Server Configuration
-        $oServerConf = & ServerConf::getSingleton();
+        $oServerConf = ServerConf::getSingleton();
 
         $availableLangArray = $this->getLanguagesList();
 
-        $this->includeExtJSLib( 'ux/virtualkeyboard' );
-        $this->setJSVar( 'sysLang', SYS_LANG );
-        $this->includeExtJS( 'main/sysLogin' );
+        $this->includeExtJSLib('ux/virtualkeyboard');
+        $this->setJSVar('sysLang', SYS_LANG);
+        $this->includeExtJS('main/sysLogin');
 
-        $this->setVar( 'logo_company', $this->getCompanyLogo() );
-        $this->setVar( 'pmos_version', System::getVersion() );
+        $this->setVar('logo_company', $this->getCompanyLogo());
+        $this->setVar('pmos_version', System::getVersion());
 
-        $footerText = G::LoadTranslation('ID_COPYRIGHT_FROM') . date( 'Y' ) . G::LoadTranslation('ID_COPYRIGHT_COL');
+        $footerText = G::LoadTranslation('ID_COPYRIGHT_FROM') . date('Y') . G::LoadTranslation('ID_COPYRIGHT_COL');
         $adviseText = G::LoadTranslation('ID_COLOSA_AND_CERTIFIED_PARTNERS');
-        $this->setVar( 'footer_text', $footerText );
-        $this->setVar( 'advise_text', $adviseText );
+        $this->setVar('footer_text', $footerText);
+        $this->setVar('advise_text', $adviseText);
 
         //binding G::SendTemporalMessage() to Ext.msgBoxSlider.msgTopCenter()
         if (($flyNotify = $this->getFlyNotify()) !== false) {
-            $this->setJSVar( 'flyNotify', $flyNotify );
+            $this->setJSVar('flyNotify', $flyNotify);
         }
 
-        $this->setJSVar( 'languages', $availableLangArray );
-        $this->setJSVar( 'workspaces', $availableWorkspaceList );
-        $this->setJSVar( 'wsPrivate', $oServerConf->getProperty( 'LOGIN_NO_WS' ) );
+        $this->setJSVar('languages', $availableLangArray);
+        $this->setJSVar('workspaces', $availableWorkspaceList);
+        $this->setJSVar('wsPrivate', $oServerConf->getProperty('LOGIN_NO_WS'));
 
-        $this->setJSVar( 'defaultLang', 'en' );
-        $this->setJSVar( 'defaultWS', '' );
+        $this->setJSVar('defaultLang', 'en');
+        $this->setJSVar('defaultWS', '');
 
         $loginScript = $this->getHeadPublisher()->getExtJsLibraries();
         $loginScript .= $this->getHeadPublisher()->getExtJsScripts();
@@ -345,56 +345,56 @@ class Main extends Controller
         $this->render();
     }
 
-    public function forgotPassword ($httpData)
+    public function forgotPassword($httpData)
     {
-        $this->setResponseType( 'json' );
+        $this->setResponseType('json');
         global $RBAC;
 
         $rbacUser = new RbacUsers();
         $user = new Users();
 
         try {
-            $userData = $rbacUser->getByUsername( $httpData->username );
+            $userData = $rbacUser->getByUsername($httpData->username);
 
             if (! $userData) {
-                $msg = G::LoadTranslation( 'ID_USER' ) . ' <b>' . $httpData->username . '</b> ' . G::LoadTranslation( 'ID_IS_NOT_REGISTERED' );
-                throw new Exception( $msg );
+                $msg = G::LoadTranslation('ID_USER') . ' <b>' . $httpData->username . '</b> ' . G::LoadTranslation('ID_IS_NOT_REGISTERED');
+                throw new Exception($msg);
             }
 
-            if (trim( $userData['USR_EMAIL'] ) != trim( $httpData->email )) {
-                $msg = G::LoadTranslation( 'ID_EMAIL_DOES_NOT_MATCH_FOR_USER' ) . ' <b>' . $httpData->username . '</b>';
-                throw new Exception( $msg );
+            if (trim($userData['USR_EMAIL']) != trim($httpData->email)) {
+                $msg = G::LoadTranslation('ID_EMAIL_DOES_NOT_MATCH_FOR_USER') . ' <b>' . $httpData->username . '</b>';
+                throw new Exception($msg);
             }
 
             $newPass = G::generate_password();
 
             $aData['USR_UID'] = $userData['USR_UID'];
-            $aData['USR_PASSWORD'] = Bootstrap::hashPassword( $newPass );
+            $aData['USR_PASSWORD'] = Bootstrap::hashPassword($newPass);
 
-            $rbacUser->update( $aData );
-            $user->update( $aData );
+            $rbacUser->update($aData);
+            $user->update($aData);
 
-            $subject = G::loadTranslation( 'ID_PROCESSMAKER_FORGOT_PASSWORD_SERVICE' );
+            $subject = G::loadTranslation('ID_PROCESSMAKER_FORGOT_PASSWORD_SERVICE');
 
-            $template = new TemplatePower( PATH_TPL . 'main/forgotPassword.tpl' );
+            $template = new TemplatePower(PATH_TPL . 'main/forgotPassword.tpl');
             $template->prepare();
-            $template->assign( 'server', $_SERVER['SERVER_NAME'] );
+            $template->assign('server', $_SERVER['SERVER_NAME']);
 
-            $template->assign( 'serviceMsg', G::loadTranslation( 'ID_PROCESSMAKER_FORGOT_PASSWORD_SERVICE' ) );
-            $template->assign( 'content', G::loadTranslation( 'ID_PASSWORD_CHANGED_SUCCESSFULLY' ) );
-            $template->assign( 'passwd', $newPass );
-            $template->assign( 'poweredBy', G::loadTranslation( 'ID_PROCESSMAKER_SLOGAN1' ) );
-            $template->assign( 'versionLabel', G::loadTranslation( 'ID_VERSION' ) );
-            $template->assign( 'version', System::getVersion() );
-            $template->assign( 'visit', G::loadTranslation( 'ID_VISIT' ) );
+            $template->assign('serviceMsg', G::loadTranslation('ID_PROCESSMAKER_FORGOT_PASSWORD_SERVICE'));
+            $template->assign('content', G::loadTranslation('ID_PASSWORD_CHANGED_SUCCESSFULLY'));
+            $template->assign('passwd', $newPass);
+            $template->assign('poweredBy', G::loadTranslation('ID_PROCESSMAKER_SLOGAN1'));
+            $template->assign('versionLabel', G::loadTranslation('ID_VERSION'));
+            $template->assign('version', System::getVersion());
+            $template->assign('visit', G::loadTranslation('ID_VISIT'));
 
-            $template->assign( 'footer', '' );
+            $template->assign('footer', '');
             $body = $template->getOutputContent();
 
-            G::sendMail( '', 'ProcessMaker Service', $httpData->email, $subject, $body );
+            G::sendMail('', 'ProcessMaker Service', $httpData->email, $subject, $body);
 
             $result->success = true;
-            $result->message = G::LoadTranslation( 'ID_NEW_PASSWORD_SENT' );
+            $result->message = G::LoadTranslation('ID_NEW_PASSWORD_SENT');
         } catch (Exception $e) {
             $result->success = false;
             $result->message = $e->getMessage();
@@ -407,7 +407,7 @@ class Main extends Controller
      * Private Functions *
      * *
      */
-    private function getMenu ()
+    private function getMenu()
     {
         global $G_MAIN_MENU;
         global $G_SUB_MENU;
@@ -421,37 +421,37 @@ class Main extends Controller
         $G_ID_MENU_SELECTED = 'BPMN';
 
         $oMenu = new Menu();
-        $menus = $oMenu->generateArrayForTemplate( $G_MAIN_MENU, 'SelectedMenu', 'mainMenu', $G_MENU_SELECTED, $G_ID_MENU_SELECTED );
+        $menus = $oMenu->generateArrayForTemplate($G_MAIN_MENU, 'SelectedMenu', 'mainMenu', $G_MENU_SELECTED, $G_ID_MENU_SELECTED);
 
         foreach ($menus as $i => $menu) {
-            if (strpos( $menu['target'], 'cases/main' ) !== false) {
-                $menus[$i]['target'] = str_replace( 'cases/main', 'cases/main_init', $menus[$i]['target'] );
+            if (strpos($menu['target'], 'cases/main') !== false) {
+                $menus[$i]['target'] = str_replace('cases/main', 'cases/main_init', $menus[$i]['target']);
             }
-            if (strpos( $menu['target'], 'processes/main' ) !== false) {
-                $menus[$i]['target'] = str_replace( 'processes/main', 'processes/mainInit', $menus[$i]['target'] );
+            if (strpos($menu['target'], 'processes/main') !== false) {
+                $menus[$i]['target'] = str_replace('processes/main', 'processes/mainInit', $menus[$i]['target']);
             }
-            if (strpos( $menu['target'], 'setup/main' ) !== false) {
-                $menus[$i]['target'] = str_replace( 'setup/main', 'setup/main_init', $menus[$i]['target'] );
+            if (strpos($menu['target'], 'setup/main') !== false) {
+                $menus[$i]['target'] = str_replace('setup/main', 'setup/main_init', $menus[$i]['target']);
             }
-            if (strpos( $menu['target'], 'dashboard/main' ) !== false) {
-                $menus[$i]['target'] = str_replace( 'dashboard/main', 'dashboard', $menus[$i]['target'] );
+            if (strpos($menu['target'], 'dashboard/main') !== false) {
+                $menus[$i]['target'] = str_replace('dashboard/main', 'dashboard', $menus[$i]['target']);
             }
-            $menus[$i]['elementclass'] = preg_replace( array ('/class=/','/"/'
-            ), array ('',''
-            ), $menus[$i]['elementclass'] );
+            $menus[$i]['elementclass'] = preg_replace(array('/class=/','/"/'
+            ), array('',''
+            ), $menus[$i]['elementclass']);
         }
         return $menus;
     }
 
-    private function resolveUrlToTabIndex ($url)
+    private function resolveUrlToTabIndex($url)
     {
-        if (strpos( $url, 'cases/main' ) !== false) {
+        if (strpos($url, 'cases/main') !== false) {
             $activeTab = 0;
-        } elseif (strpos( $url, 'processes/main' ) !== false) {
+        } elseif (strpos($url, 'processes/main') !== false) {
             $activeTab = 1;
-        } elseif (strpos( $url, 'dashboard/main' ) !== false) {
+        } elseif (strpos($url, 'dashboard/main') !== false) {
             $activeTab = 2;
-        } elseif (strpos( $url, 'setup/main' ) !== false) {
+        } elseif (strpos($url, 'setup/main') !== false) {
             $activeTab = 3;
         } else {
             $activeTab = 0;
@@ -460,24 +460,24 @@ class Main extends Controller
         return $activeTab;
     }
 
-    private function getCompanyLogo ()
+    private function getCompanyLogo()
     {
         $sCompanyLogo = '/images/processmaker2.logo2.png';
 
         if (!empty(config("system.workspace"))) {
             if (($aFotoSelect = $this->memcache->get( 'aFotoSelect' )) === false) {
                 $oLogoR = new ReplacementLogo();
-                $aFotoSelect = $oLogoR->getNameLogo( (isset( $_SESSION['USER_LOGGED'] )) ? $_SESSION['USER_LOGGED'] : '' );
-                $this->memcache->set( 'aFotoSelect', $aFotoSelect, 1 * 3600 );
+                $aFotoSelect = $oLogoR->getNameLogo((isset($_SESSION['USER_LOGGED'])) ? $_SESSION['USER_LOGGED'] : '');
+                $this->memcache->set('aFotoSelect', $aFotoSelect, 1 * 3600);
             }
-            if (is_array( $aFotoSelect )) {
-                $sFotoSelect = trim( $aFotoSelect['DEFAULT_LOGO_NAME'] );
-                $sWspaceSelect = trim( $aFotoSelect['WORKSPACE_LOGO_NAME'] );
+            if (is_array($aFotoSelect)) {
+                $sFotoSelect = trim($aFotoSelect['DEFAULT_LOGO_NAME']);
+                $sWspaceSelect = trim($aFotoSelect['WORKSPACE_LOGO_NAME']);
             }
         }
-        if (class_exists( 'ProcessMaker\Plugins\PluginRegistry' )) {
+        if (class_exists('ProcessMaker\Plugins\PluginRegistry')) {
             $oPluginRegistry = PluginRegistry::loadSingleton();
-            $logoPlugin = $oPluginRegistry->getCompanyLogo( $sCompanyLogo );
+            $logoPlugin = $oPluginRegistry->getCompanyLogo($sCompanyLogo);
             if ($logoPlugin != '/images/processmaker2.logo2.png') {
                 $sCompanyLogo = $logoPlugin;
             } elseif (isset( $sFotoSelect ) && $sFotoSelect != '' && ! (strcmp( $sWspaceSelect, config("system.workspace") ))) {
@@ -488,67 +488,67 @@ class Main extends Controller
         return $sCompanyLogo;
     }
 
-    public function getLanguagesList ()
+    public function getLanguagesList()
     {
         $Translations = new Translation;
         $translationsTable = $Translations->getTranslationEnvironments();
 
-        if (($languagesList = $this->memcache->get( 'languagesList' )) === false) {
-            $languagesList = array ();
+        if (($languagesList = $this->memcache->get('languagesList')) === false) {
+            $languagesList = array();
 
             foreach ($translationsTable as $locale) {
                 $LANG_ID = $locale['LOCALE'];
 
                 if ($locale['COUNTRY'] != '.') {
-                    $LANG_NAME = $locale['LANGUAGE'] . ' (' . (ucwords( strtolower( $locale['COUNTRY'] ) )) . ')';
+                    $LANG_NAME = $locale['LANGUAGE'] . ' (' . (ucwords(strtolower($locale['COUNTRY']))) . ')';
                 } else {
                     $LANG_NAME = $locale['LANGUAGE'];
                 }
 
-                $languagesList[] = array ($LANG_ID,$LANG_NAME
+                $languagesList[] = array($LANG_ID,$LANG_NAME
                 );
             }
-            $this->memcache->set( 'languagesList', $languagesList, 1 * 3600 );
+            $this->memcache->set('languagesList', $languagesList, 1 * 3600);
         }
 
         return $languagesList;
     }
 
-    private function getWorkspacesAvailable ()
+    private function getWorkspacesAvailable()
     {
-        $oServerConf = & ServerConf::getSingleton();
+        $oServerConf = ServerConf::getSingleton();
         $dir = PATH_DB;
-        $filesArray = array ();
-        if (file_exists( $dir )) {
-            if ($handle = opendir( $dir )) {
-                while (false !== ($file = readdir( $handle ))) {
+        $filesArray = array();
+        if (file_exists($dir)) {
+            if ($handle = opendir($dir)) {
+                while (false !== ($file = readdir($handle))) {
                     if (($file != ".") && ($file != "..")) {
-                        if (file_exists( PATH_DB . $file . '/db.php' )) {
-                            if (! $oServerConf->isWSDisabled( $file )) {
+                        if (file_exists(PATH_DB . $file . '/db.php')) {
+                            if (! $oServerConf->isWSDisabled($file)) {
                                 $filesArray[] = $file;
                             }
                         }
                     }
                 }
-                closedir( $handle );
+                closedir($handle);
             }
         }
-        sort( $filesArray, SORT_STRING );
+        sort($filesArray, SORT_STRING);
         return $filesArray;
     }
 
-    private function getUserRole ()
+    private function getUserRole()
     {
         global $RBAC;
-        $rolCode = str_replace( '_', ' ', $RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE'] );
+        $rolCode = str_replace('_', ' ', $RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE']);
         $rolUid = $RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_UID'];
 
-        $oCriteria1 = new Criteria( 'workflow' );
-        $oCriteria1->add( ContentPeer::CON_CATEGORY, 'ROL_NAME' );
-        $oCriteria1->add( ContentPeer::CON_ID, $rolUid );
-        $oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG );
-        $oDataset1 = ContentPeer::doSelectRS( $oCriteria1 );
-        $oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oCriteria1 = new Criteria('workflow');
+        $oCriteria1->add(ContentPeer::CON_CATEGORY, 'ROL_NAME');
+        $oCriteria1->add(ContentPeer::CON_ID, $rolUid);
+        $oCriteria1->add(ContentPeer::CON_LANG, SYS_LANG);
+        $oDataset1 = ContentPeer::doSelectRS($oCriteria1);
+        $oDataset1->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset1->next();
         $aRow = $oDataset1->getRow();
         $rolName = $aRow['CON_VALUE'];
@@ -559,19 +559,19 @@ class Main extends Controller
     /**
      * binding G::SendTemporalMessage() to Javascript routine Ext.msgBoxSlider.msgTopCenter()
      */
-    private function getFlyNotify ()
+    private function getFlyNotify()
     {
-        if (! isset( $_SESSION['G_MESSAGE'] )) {
+        if (! isset($_SESSION['G_MESSAGE'])) {
             return false;
         }
 
-        $flyNotify['title'] = isset( $_SESSION['G_MESSAGE_TITLE'] ) ? $_SESSION['G_MESSAGE_TITLE'] : '';
+        $flyNotify['title'] = isset($_SESSION['G_MESSAGE_TITLE']) ? $_SESSION['G_MESSAGE_TITLE'] : '';
         $flyNotify['text'] = $_SESSION['G_MESSAGE'];
 
-        unset( $_SESSION['G_MESSAGE'] );
-        if (isset( $_SESSION['G_MESSAGE_TYPE'] )) {
+        unset($_SESSION['G_MESSAGE']);
+        if (isset($_SESSION['G_MESSAGE_TYPE'])) {
             $flyNotify['type'] = $_SESSION['G_MESSAGE_TYPE'];
-            unset( $_SESSION['G_MESSAGE_TYPE'] );
+            unset($_SESSION['G_MESSAGE_TYPE']);
         } else {
             $flyNotify['type'] = '';
         }
@@ -581,22 +581,22 @@ class Main extends Controller
                 case 'alert':
                 case 'warning':
                 case 'tmp-warning':
-                    $flyNotify['title'] = G::loadTranslation( 'ID_WARNING' );
+                    $flyNotify['title'] = G::loadTranslation('ID_WARNING');
                     break;
                 case 'error':
                 case 'tmp-error':
-                    $flyNotify['title'] = G::loadTranslation( 'ID_ERROR' );
+                    $flyNotify['title'] = G::loadTranslation('ID_ERROR');
                     break;
                 case 'tmp-info':
                 case 'info':
-                    $flyNotify['title'] = G::loadTranslation( 'ID_INFO' );
+                    $flyNotify['title'] = G::loadTranslation('ID_INFO');
                     break;
                 case 'success':
                 case 'ok':
-                    $flyNotify['title'] = G::loadTranslation( 'ID_SUCCESS' );
+                    $flyNotify['title'] = G::loadTranslation('ID_SUCCESS');
                     break;
             }
-            $flyNotify['title'] = strtoupper( $flyNotify['title'] );
+            $flyNotify['title'] = strtoupper($flyNotify['title']);
         }
         //TODO make dinamic
         $flyNotify['time'] = 5;
@@ -605,18 +605,18 @@ class Main extends Controller
         return $this->flyNotify;
     }
 
-    private function setFlyNotify ($type, $title, $text, $time = 5)
+    private function setFlyNotify($type, $title, $text, $time = 5)
     {
-        $this->flyNotify = array ('type' => $type,'title' => $title,'text' => $text,'time' => $time
+        $this->flyNotify = array('type' => $type,'title' => $title,'text' => $text,'time' => $time
         );
 
         $_SESSION['G_MESSAGE'] = $text;
         $_SESSION['G_MESSAGE_TYPE'] = $type;
     }
 
-    private function getInUrlError ()
+    private function getInUrlError()
     {
-        if (isset( $_GET['errno'] )) {
+        if (isset($_GET['errno'])) {
             switch ($_GET['errno']) {
                 case '1':
                     $trnLabel = 'ID_USER_HAVENT_RIGHTS_PAGE';
@@ -628,13 +628,13 @@ class Main extends Controller
                     $trnLabel = 'ID_USER_HAVENT_RIGHTS_PAGE';
                     break;
             }
-            $this->setFlyNotify( 'error', 'ERROR', G::loadTranslation( $trnLabel ) );
+            $this->setFlyNotify('error', 'ERROR', G::loadTranslation($trnLabel));
         }
     }
 
-    private function getActiveTab ($activeTab)
+    private function getActiveTab($activeTab)
     {
-        if (! is_numeric( $activeTab )) {
+        if (! is_numeric($activeTab)) {
             switch ($activeTab) {
                 case 'home':
                     $activeTab = 0;
@@ -658,48 +658,47 @@ class Main extends Controller
         return $activeTab;
     }
 
-    private function getUrlGetParams ()
+    private function getUrlGetParams()
     {
         $urlGetParams = '';
         foreach ($_GET as $key => $value) {
             $urlGetParams .= $urlGetParams == '' ? $key : "&" . $key;
-            $urlGetParams .= trim( $value ) != '' ? '=' . $value : '';
+            $urlGetParams .= trim($value) != '' ? '=' . $value : '';
         }
         return $urlGetParams;
     }
 
-    private function getUserFullName ()
+    private function getUserFullName()
     {
-        return isset( $_SESSION['USR_FULLNAME'] ) ? $_SESSION['USR_FULLNAME'] : '';
+        return isset($_SESSION['USR_FULLNAME']) ? $_SESSION['USR_FULLNAME'] : '';
     }
 
-    private function _getSystemInfo ()
+    private function _getSystemInfo()
     {
-
-        if (getenv( 'HTTP_CLIENT_IP' )) {
-            $ip = getenv( 'HTTP_CLIENT_IP' );
+        if (getenv('HTTP_CLIENT_IP')) {
+            $ip = getenv('HTTP_CLIENT_IP');
         } else {
-            if (getenv( 'HTTP_X_FORWARDED_FOR' )) {
-                $ip = getenv( 'HTTP_X_FORWARDED_FOR' );
+            if (getenv('HTTP_X_FORWARDED_FOR')) {
+                $ip = getenv('HTTP_X_FORWARDED_FOR');
             } else {
-                $ip = getenv( 'REMOTE_ADDR' );
+                $ip = getenv('REMOTE_ADDR');
             }
         }
 
         $redhat = '';
-        if (file_exists( '/etc/redhat-release' )) {
-            $fnewsize = filesize( '/etc/redhat-release' );
-            $fp = fopen( '/etc/redhat-release', 'r' );
-            $redhat = trim( fread( $fp, $fnewsize ) );
-            fclose( $fp );
+        if (file_exists('/etc/redhat-release')) {
+            $fnewsize = filesize('/etc/redhat-release');
+            $fp = fopen('/etc/redhat-release', 'r');
+            $redhat = trim(fread($fp, $fnewsize));
+            fclose($fp);
         }
 
         $redhat .= " (" . PHP_OS . ")";
-        if (defined( "DB_HOST" )) {
-            $dbNetView = new Net( DB_HOST );
-            $dbNetView->loginDbServer( DB_USER, DB_PASS );
+        if (defined("DB_HOST")) {
+            $dbNetView = new Net(DB_HOST);
+            $dbNetView->loginDbServer(DB_USER, DB_PASS);
 
-            $dbConns = new DbConnections( '' );
+            $dbConns = new DbConnections('');
             $availdb = '';
             foreach ($dbConns->getDbServicesAvailables() as $key => $val) {
                 if ($availdb != '') {
@@ -709,7 +708,7 @@ class Main extends Controller
             }
 
             try {
-                $sMySQLVersion = $dbNetView->getDbServerVersion( DB_ADAPTER );
+                $sMySQLVersion = $dbNetView->getDbServerVersion(DB_ADAPTER);
             } catch (Exception $oException) {
                 $sMySQLVersion = '?????';
             }
@@ -725,7 +724,7 @@ class Main extends Controller
             $pmuiVer = $mafeVer = $pmdynaformVer = "(unknown)";
         }
 
-        $sysSection = G::loadTranslation('ID_SYSTEM_INFO' );
+        $sysSection = G::loadTranslation('ID_SYSTEM_INFO');
         $pmSection = G::LoadTranslation('ID_PROCESS_INFORMATION');
 
         $properties = array ();
@@ -738,76 +737,76 @@ class Main extends Controller
         if (defined('SYSTEM_NAME')) {
             $systemName = SYSTEM_NAME;
         }
-        $properties[] = array ($systemName. ' Ver.', System::getVersion() . $ee, $pmSection);
+        $properties[] = array($systemName. ' Ver.', System::getVersion() . $ee, $pmSection);
         $properties[] = array("PMUI JS Lib. Ver.", $pmuiVer, $pmSection);
         $properties[] = array("MAFE JS Lib. Ver.", $mafeVer, $pmSection);
         $properties[] = array("PM Dynaform JS Lib. Ver.", $pmdynaformVer, $pmSection);
 
         if (file_exists(PATH_DATA. 'log/upgrades.log')) {
-            $properties[] = array (G::LoadTranslation('ID_UPGRADES_PATCHES'), '<a href="#" onclick="showUpgradedLogs(); return false;">' . G::LoadTranslation( 'ID_UPGRADE_VIEW_LOG') . '</a>' ,$pmSection);
+            $properties[] = array(G::LoadTranslation('ID_UPGRADES_PATCHES'), '<a href="#" onclick="showUpgradedLogs(); return false;">' . G::LoadTranslation('ID_UPGRADE_VIEW_LOG') . '</a>' ,$pmSection);
         } else {
-            $properties[] = array (G::LoadTranslation('ID_UPGRADES_PATCHES'), G::LoadTranslation( 'ID_UPGRADE_NEVER_UPGRADE') ,$pmSection);
+            $properties[] = array(G::LoadTranslation('ID_UPGRADES_PATCHES'), G::LoadTranslation('ID_UPGRADE_NEVER_UPGRADE') ,$pmSection);
         }
 
-        $properties[] = array (G::LoadTranslation('ID_OPERATING_SYSTEM') ,$redhat,$sysSection
+        $properties[] = array(G::LoadTranslation('ID_OPERATING_SYSTEM') ,$redhat,$sysSection
         );
-        $properties[] = array (G::LoadTranslation('ID_TIME_ZONE') ,(defined( 'TIME_ZONE' )) ? TIME_ZONE : "Unknown",$sysSection
+        $properties[] = array(G::LoadTranslation('ID_TIME_ZONE') ,(defined('TIME_ZONE')) ? TIME_ZONE : "Unknown",$sysSection
         );
-        $properties[] = array (G::LoadTranslation('ID_WEB_SERVER') ,getenv( 'SERVER_SOFTWARE' ),$sysSection
+        $properties[] = array(G::LoadTranslation('ID_WEB_SERVER') ,getenv('SERVER_SOFTWARE'),$sysSection
         );
-        $properties[] = array (G::LoadTranslation('ID_SERVER_NAME') ,getenv( 'SERVER_NAME' ),$pmSection
+        $properties[] = array(G::LoadTranslation('ID_SERVER_NAME') ,getenv('SERVER_NAME'),$pmSection
         );
-        $properties[] = array (G::LoadTranslation('ID_SERVER_IP') ,$this->lookup( $ip ),$sysSection
+        $properties[] = array(G::LoadTranslation('ID_SERVER_IP') ,$this->lookup($ip),$sysSection
         );
-        $properties[] = array (G::LoadTranslation('ID_PHP_VERSION') ,phpversion(),$sysSection
+        $properties[] = array(G::LoadTranslation('ID_PHP_VERSION') ,phpversion(),$sysSection
         );
 
-        if (defined( "DB_HOST" )) {
-            $properties[] = array (G::LoadTranslation('ID_DATABASE') ,$dbNetView->dbName( DB_ADAPTER ) . ' (Version ' . $sMySQLVersion . ')',$pmSection
+        if (defined("DB_HOST")) {
+            $properties[] = array(G::LoadTranslation('ID_DATABASE') ,$dbNetView->dbName(DB_ADAPTER) . ' (Version ' . $sMySQLVersion . ')',$pmSection
             );
-            $properties[] = array (G::LoadTranslation('ID_DATABASE_SERVER') ,DB_HOST,$pmSection
+            $properties[] = array(G::LoadTranslation('ID_DATABASE_SERVER') ,DB_HOST,$pmSection
             );
-            $properties[] = array (G::LoadTranslation('ID_DATABASE_NAME') ,DB_NAME,$pmSection
+            $properties[] = array(G::LoadTranslation('ID_DATABASE_NAME') ,DB_NAME,$pmSection
             );
-            $properties[] = array (G::LoadTranslation('ID_AVAILABLE_DB') ,$availdb,$sysSection
+            $properties[] = array(G::LoadTranslation('ID_AVAILABLE_DB') ,$availdb,$sysSection
             );
         } else {
-            $properties[] = array (G::LoadTranslation('ID_DATABASE') ,"Not defined",$pmSection
+            $properties[] = array(G::LoadTranslation('ID_DATABASE') ,"Not defined",$pmSection
             );
-            $properties[] = array (G::LoadTranslation('ID_DATABASE_SERVER') ,"Not defined",$pmSection
+            $properties[] = array(G::LoadTranslation('ID_DATABASE_SERVER') ,"Not defined",$pmSection
             );
-            $properties[] = array (G::LoadTranslation('ID_DATABASE_NAME') ,"Not defined",$pmSection
+            $properties[] = array(G::LoadTranslation('ID_DATABASE_NAME') ,"Not defined",$pmSection
             );
-            $properties[] = array (G::LoadTranslation('ID_AVAILABLE_DB') ,"Not defined",$sysSection
+            $properties[] = array(G::LoadTranslation('ID_AVAILABLE_DB') ,"Not defined",$sysSection
             );
         }
 
         $properties[] = array ( G::LoadTranslation('ID_WORKSPACE') ,!empty(config("system.workspace")) ? config("system.workspace") : "Not defined",$pmSection
         );
 
-        $properties[] = array ( G::LoadTranslation('ID_SERVER_PROTOCOL') ,getenv( 'SERVER_PROTOCOL' ),$sysSection
+        $properties[] = array( G::LoadTranslation('ID_SERVER_PROTOCOL') ,getenv('SERVER_PROTOCOL'),$sysSection
         );
-        $properties[] = array ( G::LoadTranslation('ID_SERVER_PORT') ,getenv( 'SERVER_PORT' ),$sysSection
+        $properties[] = array( G::LoadTranslation('ID_SERVER_PORT') ,getenv('SERVER_PORT'),$sysSection
         );
         //$sysSection[] = array('Remote Host', getenv ('REMOTE_HOST'), $sysSection);
-        $properties[] = array ( G::LoadTranslation('ID_SERVER_NAME') , getenv( 'SERVER_ADDR' ),$sysSection
+        $properties[] = array( G::LoadTranslation('ID_SERVER_NAME') , getenv('SERVER_ADDR'),$sysSection
         );
-        $properties[] = array ( G::LoadTranslation('ID_USER_BROWSER') , getenv( 'HTTP_USER_AGENT' ),$sysSection
+        $properties[] = array( G::LoadTranslation('ID_USER_BROWSER') , getenv('HTTP_USER_AGENT'),$sysSection
         );
 
         return $properties;
     }
 
-    private function lookup ($target)
+    private function lookup($target)
     {
         global $ntarget;
         $msg = $target . ' => ';
         //if (eregi ('[a-zA-Z]', $target))
-        if (preg_match( '[a-zA-Z]', $target )) {
+        if (preg_match('[a-zA-Z]', $target)) {
             //Made compatible to PHP 5.3
-            $ntarget = gethostbyname( $target );
+            $ntarget = gethostbyname($target);
         } else {
-            $ntarget = gethostbyaddr( $target );
+            $ntarget = gethostbyaddr($target);
         }
         $msg .= $ntarget;
         return ($msg);
@@ -816,11 +815,10 @@ class Main extends Controller
     /**
      * Execute common reoutes after index() action load
      */
-    private function afterLoad ($httpData)
+    private function afterLoad($httpData)
     {
-        if (isset( $httpData->i18 ) || isset( $httpData->i18n )) {
+        if (isset($httpData->i18) || isset($httpData->i18n)) {
             $_SESSION['DEV_FLAG'] = true;
         }
     }
 }
-
diff --git a/workflow/engine/controllers/pmGmail.php b/workflow/engine/controllers/pmGmail.php
index 49c4c3bfa..b038e07e5 100644
--- a/workflow/engine/controllers/pmGmail.php
+++ b/workflow/engine/controllers/pmGmail.php
@@ -18,8 +18,6 @@ class pmGmail extends Controller
         $httpData->serviceDriveStatus = !empty($httpData->serviceDriveStatus) ? $httpData->serviceDriveStatus == 1 ? true : false : false;
 
         if ($httpData->serviceGmailStatus || $httpData->serviceDriveStatus) {
-
-
             $pmGoogle->setServiceGmailStatus($httpData->serviceGmailStatus);
             $pmGoogle->setServiceDriveStatus($httpData->serviceDriveStatus);
 
@@ -58,7 +56,7 @@ class pmGmail extends Controller
     {
         try {
             $this->includeExtJS('admin/pmGmail');
-            if (!empty ($_SESSION['__PMGMAIL_ERROR__'])) {
+            if (!empty($_SESSION['__PMGMAIL_ERROR__'])) {
                 $this->setJSVar('__PMGMAIL_ERROR__', $_SESSION['__PMGMAIL_ERROR__']);
                 unset($_SESSION['__PMGMAIL_ERROR__']);
             }
@@ -70,7 +68,7 @@ class pmGmail extends Controller
             $disableGmail = true;
             $disableDrive = true;
 
-            $licensedFeatures = &PMLicensedFeatures::getSingleton();
+            $licensedFeatures = PMLicensedFeatures::getSingleton();
             if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
                 $disableGmail = false;
             }
diff --git a/workflow/engine/controllers/strategicDashboard.php b/workflow/engine/controllers/strategicDashboard.php
index 80bb1d0c7..b0c994b4a 100644
--- a/workflow/engine/controllers/strategicDashboard.php
+++ b/workflow/engine/controllers/strategicDashboard.php
@@ -19,14 +19,14 @@ class StrategicDashboard extends Controller
     private $usrUnitCost;
 
     // Class constructor
-    public function __construct ()
+    public function __construct()
     {
         global $RBAC;
 
-        $licensedFeatures = & PMLicensedFeatures::getSingleton();
+        $licensedFeatures = PMLicensedFeatures::getSingleton();
         if (!$licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=')) {
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die;
         }
         $this->usrId = $RBAC->aUserInfo['USER_INFO']['USR_UID'];
@@ -70,8 +70,7 @@ class StrategicDashboard extends Controller
         $result = '$';
         if (isset($user['USR_UNIT_COST']) && !empty($user['USR_UNIT_COST'])) {
             $result = $user['USR_UNIT_COST'];
-        }
-        else {
+        } else {
             $processModel = new Process();
             $processList = $processModel->getAllConfiguredCurrencies();
             $defaultProcessCurrency = '';
@@ -124,74 +123,72 @@ class StrategicDashboard extends Controller
 
     // Functions for the StrategicDashboards
 
-    public function dashboardList ()
+    public function dashboardList()
     {
         try {
-            $this->includeExtJS( 'strategicDashboard/dashboardList' );
-            if (isset( $_SESSION['__StrategicDashboard_ERROR__'] )) {
-                $this->setJSVar( '__StrategicDashboard_ERROR__', $_SESSION['__StrategicDashboard_ERROR__'] );
-                unset( $_SESSION['__StrategicDashboard_ERROR__'] );
+            $this->includeExtJS('strategicDashboard/dashboardList');
+            if (isset($_SESSION['__StrategicDashboard_ERROR__'])) {
+                $this->setJSVar('__StrategicDashboard_ERROR__', $_SESSION['__StrategicDashboard_ERROR__']);
+                unset($_SESSION['__StrategicDashboard_ERROR__']);
             }
-            $this->setView( 'strategicDashboard/dashboardList' );
+            $this->setView('strategicDashboard/dashboardList');
 
-            $this->setJSVar('urlProxy',$this->urlProxy);
-            $this->setJSVar('credentials',$this->clientToken);
-            G::RenderPage( 'publish', 'extJs' );
+            $this->setJSVar('urlProxy', $this->urlProxy);
+            $this->setJSVar('credentials', $this->clientToken);
+            G::RenderPage('publish', 'extJs');
         } catch (Exception $error) {
             $_SESSION['__DASHBOARD_ERROR__'] = $error->getMessage();
             die();
         }
     }
 
-    public function formDashboard ($data)
+    public function formDashboard($data)
     {
         try {
-
-            $this->includeExtJS( 'strategicDashboard/formDashboard', true, true );
-            $this->setView( 'strategicDashboard/formDashboard' );
+            $this->includeExtJS('strategicDashboard/formDashboard', true, true);
+            $this->setView('strategicDashboard/formDashboard');
 
             $this->setJSVar('DAS_UID', '');
-            $this->setJSVar('urlProxy',$this->urlProxy);
-            $this->setJSVar('credentials',$this->clientToken);
+            $this->setJSVar('urlProxy', $this->urlProxy);
+            $this->setJSVar('credentials', $this->clientToken);
 
-            G::RenderPage( 'publish', 'extJs' );
+            G::RenderPage('publish', 'extJs');
             return null;
         } catch (Exception $error) {
             $_SESSION['__DASHBOARD_ERROR__'] = $error->getMessage();
-            G::header( 'Location: dashboardList' );
+            G::header('Location: dashboardList');
             die();
         }
     }
 
-    public function formEditDashboard ($data)
+    public function formEditDashboard($data)
     {
         try {
-
-            $this->includeExtJS( 'strategicDashboard/formDashboard', true, true );
-            $this->setView( 'strategicDashboard/formDashboard' );
+            $this->includeExtJS('strategicDashboard/formDashboard', true, true);
+            $this->setView('strategicDashboard/formDashboard');
 
             $dasUid = isset($_REQUEST['DAS_UID']) ? $_REQUEST['DAS_UID'] : '';
             $this->setJSVar('DAS_UID', $dasUid);
-            $this->setJSVar('urlProxy',$this->urlProxy);
-            $this->setJSVar('credentials',$this->clientToken);
+            $this->setJSVar('urlProxy', $this->urlProxy);
+            $this->setJSVar('credentials', $this->clientToken);
 
-            G::RenderPage( 'publish', 'extJs' );
+            G::RenderPage('publish', 'extJs');
             return null;
         } catch (Exception $error) {
             $_SESSION['__DASHBOARD_ERROR__'] = $error->getMessage();
-            G::header( 'Location: dashboardList' );
+            G::header('Location: dashboardList');
             die();
         }
     }
 
-    public function viewDashboard ()
+    public function viewDashboard()
     {
         try {
-            if (isset( $_SESSION['__StrategicDashboard_ERROR__'] )) {
-                $this->setJSVar( '__StrategicDashboard_ERROR__', $_SESSION['__StrategicDashboard_ERROR__'] );
-                unset( $_SESSION['__StrategicDashboard_ERROR__'] );
+            if (isset($_SESSION['__StrategicDashboard_ERROR__'])) {
+                $this->setJSVar('__StrategicDashboard_ERROR__', $_SESSION['__StrategicDashboard_ERROR__']);
+                unset($_SESSION['__StrategicDashboard_ERROR__']);
             }
-            $this->setView( 'strategicDashboard/viewDashboard' );
+            $this->setView('strategicDashboard/viewDashboard');
 
             $this->setVar('urlProxy', $this->urlProxy);
             $this->setVar('SYS_SYS', config("system.workspace"));
@@ -199,7 +196,7 @@ class StrategicDashboard extends Controller
             $this->setVar('credentials', $this->clientToken);
             $this->setVar('unitCost', $this->usrUnitCost);
 
-			$translation = $this->getTranslations();
+            $translation = $this->getTranslations();
             $this->setVar('translation', $translation);
             $this->render();
         } catch (Exception $error) {
@@ -208,16 +205,16 @@ class StrategicDashboard extends Controller
         }
     }
 
-    public function viewDashboardIE ()
+    public function viewDashboardIE()
     {
         try {
-            $this->setView( 'strategicDashboard/viewDashboardIE' );
+            $this->setView('strategicDashboard/viewDashboardIE');
             $this->setVar('urlProxy', $this->urlProxy);
             $this->setVar('usrId', $this->usrId);
             $this->setVar('credentials', $this->clientToken);
             $this->setVar('unitCost', $this->usrUnitCost);
 
-			$translation = $this->getTranslations();
+            $translation = $this->getTranslations();
             $this->setVar('translation', $translation);
             $this->render();
         } catch (Exception $error) {
@@ -227,59 +224,60 @@ class StrategicDashboard extends Controller
         }
     }
 
-	private function getTranslations() {
-		$translation = array();
-		$translation['ID_MANAGERS_DASHBOARDS'] = G::LoadTranslation( 'ID_MANAGERS_DASHBOARDS');
-		$translation['ID_PRO_EFFICIENCY_INDEX'] = G::LoadTranslation( 'ID_PRO_EFFICIENCY_INDEX');
-		$translation['ID_EFFICIENCY_USER'] = G::LoadTranslation( 'ID_EFFICIENCY_USER');
-		$translation['ID_COMPLETED_CASES'] = G::LoadTranslation( 'ID_COMPLETED_CASES');
-		$translation['ID_WELL_DONE'] = G::LoadTranslation( 'ID_WELL_DONE');
-		$translation['ID_NUMBER_CASES'] = G::LoadTranslation( 'ID_NUMBER_CASES');
-		$translation['ID_EFFICIENCY_INDEX'] = G::LoadTranslation( 'ID_EFFICIENCY_INDEX');
-		$translation['ID_INEFFICIENCY_COST'] = G::LoadTranslation( 'ID_INEFFICIENCY_COST');
-		$translation['ID_EFFICIENCY_COST'] = G::LoadTranslation( 'ID_EFFICIENCY_COST');
-		$translation['ID_RELATED_PROCESS'] = G::LoadTranslation( 'ID_RELATED_PROCESS');
-		$translation['ID_RELATED_GROUPS'] = G::LoadTranslation( 'ID_RELATED_GROUPS');
-		$translation['ID_RELATED_TASKS'] = G::LoadTranslation( 'ID_RELATED_TASKS');
-		$translation['ID_RELATED_USERS'] = G::LoadTranslation( 'ID_RELATED_USERS');
-		$translation['ID_GRID_PAGE_NO_DASHBOARD_MESSAGE'] = G::LoadTranslation( 'ID_GRID_PAGE_NO_DASHBOARD_MESSAGE');
-		$translation['ID_PROCESS_TASKS'] = G::LoadTranslation( 'ID_PROCESS_TASKS');
-		$translation['ID_TIME_HOURS'] = G::LoadTranslation( 'ID_TIME_HOURS');
-		$translation['ID_GROUPS'] = G::LoadTranslation( 'ID_GROUPS');
-		$translation['ID_COSTS'] = G::LoadTranslation( 'ID_COSTS');
-		$translation['ID_TASK'] = G::LoadTranslation( 'ID_TASK');
-		$translation['ID_USER'] = G::LoadTranslation( 'ID_USER');
-		$translation['ID_YEAR'] = G::LoadTranslation( 'ID_YEAR');
-		$translation['ID_USERS'] = G::LoadTranslation( 'ID_USERS');
-		$translation['ID_USERS'] = G::LoadTranslation( 'ID_USERS');
-		$translation['ID_OVERDUE'] = G::LoadTranslation( 'ID_OVERDUE');
-		$translation['ID_AT_RISK'] = G::LoadTranslation( 'ID_AT_RISK');
-		$translation['ID_ON_TIME'] = G::LoadTranslation( 'ID_ON_TIME');
-		$translation['ID_NO_INEFFICIENT_PROCESSES'] = G::LoadTranslation('ID_NO_INEFFICIENT_PROCESSES');
-		$translation['ID_NO_INEFFICIENT_TASKS'] = G::LoadTranslation('ID_NO_INEFFICIENT_TASKS');
-		$translation['ID_NO_INEFFICIENT_USER_GROUPS'] = G::LoadTranslation('ID_NO_INEFFICIENT_USER_GROUPS');
-		$translation['ID_NO_INEFFICIENT_USERS'] = G::LoadTranslation('ID_NO_INEFFICIENT_USERS');
-		$translation['ID_DISPLAY_EMPTY'] = G::LoadTranslation('ID_DISPLAY_EMPTY');
-		$translation['ID_INBOX_EMPTY'] = G::LoadTranslation('ID_INBOX_EMPTY');
-		$translation['ID_INDICATOR'] = G::LoadTranslation('ID_INDICATOR');
-		$translation['ID_PERIODICITY'] = G::LoadTranslation('ID_PERIODICITY');
-		$translation['ID_MONTH'] = G::LoadTranslation('ID_MONTH');
-		$translation['ID_QUARTER'] = G::LoadTranslation('ID_QUARTER');
-		$translation['ID_SEMESTER'] = G::LoadTranslation('ID_SEMESTER');
-		$translation['ID_TO'] = G::LoadTranslation('ID_TO');
-		$translation['ID_FROM'] = G::LoadTranslation('ID_FROM');
-		$translation['ID_MONTH_ABB_1'] = G::LoadTranslation('ID_MONTH_ABB_1');
-		$translation['ID_MONTH_ABB_2'] = G::LoadTranslation('ID_MONTH_ABB_2');
-		$translation['ID_MONTH_ABB_3'] = G::LoadTranslation('ID_MONTH_ABB_3');
-		$translation['ID_MONTH_ABB_4'] = G::LoadTranslation('ID_MONTH_ABB_4');
-		$translation['ID_MONTH_ABB_5'] = G::LoadTranslation('ID_MONTH_ABB_5');
-		$translation['ID_MONTH_ABB_6'] = G::LoadTranslation('ID_MONTH_ABB_6');
-		$translation['ID_MONTH_ABB_7'] = G::LoadTranslation('ID_MONTH_ABB_7');
-		$translation['ID_MONTH_ABB_8'] = G::LoadTranslation('ID_MONTH_ABB_8');
-		$translation['ID_MONTH_ABB_9'] = G::LoadTranslation('ID_MONTH_ABB_9');
-		$translation['ID_MONTH_ABB_10'] = G::LoadTranslation('ID_MONTH_ABB_10');
-		$translation['ID_MONTH_ABB_11'] = G::LoadTranslation('ID_MONTH_ABB_11');
-		$translation['ID_MONTH_ABB_12'] = G::LoadTranslation('ID_MONTH_ABB_12');
-		return $translation;
-	}
+    private function getTranslations()
+    {
+        $translation = array();
+        $translation['ID_MANAGERS_DASHBOARDS'] = G::LoadTranslation('ID_MANAGERS_DASHBOARDS');
+        $translation['ID_PRO_EFFICIENCY_INDEX'] = G::LoadTranslation('ID_PRO_EFFICIENCY_INDEX');
+        $translation['ID_EFFICIENCY_USER'] = G::LoadTranslation('ID_EFFICIENCY_USER');
+        $translation['ID_COMPLETED_CASES'] = G::LoadTranslation('ID_COMPLETED_CASES');
+        $translation['ID_WELL_DONE'] = G::LoadTranslation('ID_WELL_DONE');
+        $translation['ID_NUMBER_CASES'] = G::LoadTranslation('ID_NUMBER_CASES');
+        $translation['ID_EFFICIENCY_INDEX'] = G::LoadTranslation('ID_EFFICIENCY_INDEX');
+        $translation['ID_INEFFICIENCY_COST'] = G::LoadTranslation('ID_INEFFICIENCY_COST');
+        $translation['ID_EFFICIENCY_COST'] = G::LoadTranslation('ID_EFFICIENCY_COST');
+        $translation['ID_RELATED_PROCESS'] = G::LoadTranslation('ID_RELATED_PROCESS');
+        $translation['ID_RELATED_GROUPS'] = G::LoadTranslation('ID_RELATED_GROUPS');
+        $translation['ID_RELATED_TASKS'] = G::LoadTranslation('ID_RELATED_TASKS');
+        $translation['ID_RELATED_USERS'] = G::LoadTranslation('ID_RELATED_USERS');
+        $translation['ID_GRID_PAGE_NO_DASHBOARD_MESSAGE'] = G::LoadTranslation('ID_GRID_PAGE_NO_DASHBOARD_MESSAGE');
+        $translation['ID_PROCESS_TASKS'] = G::LoadTranslation('ID_PROCESS_TASKS');
+        $translation['ID_TIME_HOURS'] = G::LoadTranslation('ID_TIME_HOURS');
+        $translation['ID_GROUPS'] = G::LoadTranslation('ID_GROUPS');
+        $translation['ID_COSTS'] = G::LoadTranslation('ID_COSTS');
+        $translation['ID_TASK'] = G::LoadTranslation('ID_TASK');
+        $translation['ID_USER'] = G::LoadTranslation('ID_USER');
+        $translation['ID_YEAR'] = G::LoadTranslation('ID_YEAR');
+        $translation['ID_USERS'] = G::LoadTranslation('ID_USERS');
+        $translation['ID_USERS'] = G::LoadTranslation('ID_USERS');
+        $translation['ID_OVERDUE'] = G::LoadTranslation('ID_OVERDUE');
+        $translation['ID_AT_RISK'] = G::LoadTranslation('ID_AT_RISK');
+        $translation['ID_ON_TIME'] = G::LoadTranslation('ID_ON_TIME');
+        $translation['ID_NO_INEFFICIENT_PROCESSES'] = G::LoadTranslation('ID_NO_INEFFICIENT_PROCESSES');
+        $translation['ID_NO_INEFFICIENT_TASKS'] = G::LoadTranslation('ID_NO_INEFFICIENT_TASKS');
+        $translation['ID_NO_INEFFICIENT_USER_GROUPS'] = G::LoadTranslation('ID_NO_INEFFICIENT_USER_GROUPS');
+        $translation['ID_NO_INEFFICIENT_USERS'] = G::LoadTranslation('ID_NO_INEFFICIENT_USERS');
+        $translation['ID_DISPLAY_EMPTY'] = G::LoadTranslation('ID_DISPLAY_EMPTY');
+        $translation['ID_INBOX_EMPTY'] = G::LoadTranslation('ID_INBOX_EMPTY');
+        $translation['ID_INDICATOR'] = G::LoadTranslation('ID_INDICATOR');
+        $translation['ID_PERIODICITY'] = G::LoadTranslation('ID_PERIODICITY');
+        $translation['ID_MONTH'] = G::LoadTranslation('ID_MONTH');
+        $translation['ID_QUARTER'] = G::LoadTranslation('ID_QUARTER');
+        $translation['ID_SEMESTER'] = G::LoadTranslation('ID_SEMESTER');
+        $translation['ID_TO'] = G::LoadTranslation('ID_TO');
+        $translation['ID_FROM'] = G::LoadTranslation('ID_FROM');
+        $translation['ID_MONTH_ABB_1'] = G::LoadTranslation('ID_MONTH_ABB_1');
+        $translation['ID_MONTH_ABB_2'] = G::LoadTranslation('ID_MONTH_ABB_2');
+        $translation['ID_MONTH_ABB_3'] = G::LoadTranslation('ID_MONTH_ABB_3');
+        $translation['ID_MONTH_ABB_4'] = G::LoadTranslation('ID_MONTH_ABB_4');
+        $translation['ID_MONTH_ABB_5'] = G::LoadTranslation('ID_MONTH_ABB_5');
+        $translation['ID_MONTH_ABB_6'] = G::LoadTranslation('ID_MONTH_ABB_6');
+        $translation['ID_MONTH_ABB_7'] = G::LoadTranslation('ID_MONTH_ABB_7');
+        $translation['ID_MONTH_ABB_8'] = G::LoadTranslation('ID_MONTH_ABB_8');
+        $translation['ID_MONTH_ABB_9'] = G::LoadTranslation('ID_MONTH_ABB_9');
+        $translation['ID_MONTH_ABB_10'] = G::LoadTranslation('ID_MONTH_ABB_10');
+        $translation['ID_MONTH_ABB_11'] = G::LoadTranslation('ID_MONTH_ABB_11');
+        $translation['ID_MONTH_ABB_12'] = G::LoadTranslation('ID_MONTH_ABB_12');
+        return $translation;
+    }
 }
diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql
index f1a51944b..66143c197 100644
--- a/workflow/engine/data/mysql/insert.sql
+++ b/workflow/engine/data/mysql/insert.sql
@@ -1435,7 +1435,7 @@ INSERT INTO ISO_SUBDIVISION (IC_UID,IS_UID,IS_NAME)  VALUES
 ('US', 'WV', 'West Virginia' ) ,
 ('US', 'WY', 'Wyoming' ) ;
 
-INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES 
+INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID)  VALUES
 ('AD','','',' ','') ,
 ('AD','ALV','Andorra la Vella',' ','') ,
 ('AD','CAN','Canillo',' ','') ,
@@ -60381,7 +60381,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MYSQL','en','MySQL Support','2014-01-15') ,
 ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_OPENSSL','en','OpenSSL Version (*)','2014-01-15') ,
 ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_OPENSSL_OPTIONAL','en','Open SSL is optional','2014-01-15') ,
-( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_PHP','en','PHP recommended version 5.6 or higher (7.0 not supported)','2016-06-29') ,
+( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_PHP','en','PHP recommended version 5.6 or higher','2017-11-29') ,
 ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_SOAP','en','Soap Support','2014-01-15') ,
 ( 'LABEL','ID_PROCESSMAKER_SLOGAN1','en','This Business Process is Powered By ProcessMaker','2014-01-15') ,
 ( 'LABEL','ID_PROCESSMAKER_SUCCESS_INSTALLED','en','ProcessMaker was successfully installed<br/>Workspace <b>" {0} " </b> was installed correctly.','2014-01-15') ,
@@ -61566,4 +61566,3 @@ INSERT INTO ADDONS_MANAGER (ADDON_DESCRIPTION,ADDON_ID,ADDON_NAME,ADDON_NICK,ADD
 
 INSERT INTO APP_SEQUENCE (ID) VALUES 
 ('0');
-
diff --git a/workflow/engine/menus/cases.php b/workflow/engine/menus/cases.php
index a5d7d8eff..0e71af4ce 100644
--- a/workflow/engine/menus/cases.php
+++ b/workflow/engine/menus/cases.php
@@ -31,65 +31,115 @@ global $RBAC;
 global $G_TMP_MENU;
 
 $G_TMP_MENU->AddIdRawOption('FOLDERS', '', G::LoadTranslation('ID_CASES_MENU_FOLDERS'), '', '', 'blockHeader');
-$G_TMP_MENU->AddIdRawOption('CASES_START_CASE', 'casesStartPage?action=startCase',
-G::LoadTranslation('ID_NEW_CASE'), '');
+$G_TMP_MENU->AddIdRawOption(
+    'CASES_START_CASE',
+    'casesStartPage?action=startCase',
+G::LoadTranslation('ID_NEW_CASE'),
+    ''
+);
 
 /*----------------------------------********---------------------------------*/
-$licensedFeatures = & PMLicensedFeatures::getSingleton();
+$licensedFeatures = PMLicensedFeatures::getSingleton();
 if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) {
-    $G_TMP_MENU->AddIdRawOption('CONSOLIDATED_CASES', 'casesConsolidatedListExtJs?action=consolidated',
-        G::LoadTranslation('ID_BATCH_ROUTING'), '');
+    $G_TMP_MENU->AddIdRawOption(
+        'CONSOLIDATED_CASES',
+        'casesConsolidatedListExtJs?action=consolidated',
+        G::LoadTranslation('ID_BATCH_ROUTING'),
+        ''
+    );
 }
 /*----------------------------------********---------------------------------*/
 
-$G_TMP_MENU->AddIdRawOption('CASES_INBOX', 'casesListExtJs?action=todo', G::LoadTranslation('ID_INBOX'),
-    'icon-cases-inbox.png');
-$G_TMP_MENU->AddIdRawOption('CASES_DRAFT', 'casesListExtJs?action=draft', G::LoadTranslation('ID_DRAFT'),
-    'mail-mark-task.png'  );
-$G_TMP_MENU->AddIdRawOption('CASES_SENT', 'casesListExtJs?action=sent', G::LoadTranslation('ID_SENT'),
-    'icon-cases-outbox.png');
-$G_TMP_MENU->AddIdRawOption('CASES_SELFSERVICE', 'casesListExtJs?action=selfservice',
-    G::LoadTranslation('ID_UNASSIGNED'),'rotate_cw.png');
-$G_TMP_MENU->AddIdRawOption('CASES_PAUSED', 'casesListExtJs?action=paused', G::LoadTranslation('ID_PAUSED'),
-    'mail-queue.png');
+$G_TMP_MENU->AddIdRawOption(
+    'CASES_INBOX',
+    'casesListExtJs?action=todo',
+    G::LoadTranslation('ID_INBOX'),
+    'icon-cases-inbox.png'
+);
+$G_TMP_MENU->AddIdRawOption(
+    'CASES_DRAFT',
+    'casesListExtJs?action=draft',
+    G::LoadTranslation('ID_DRAFT'),
+    'mail-mark-task.png'
+);
+$G_TMP_MENU->AddIdRawOption(
+    'CASES_SENT',
+    'casesListExtJs?action=sent',
+    G::LoadTranslation('ID_SENT'),
+    'icon-cases-outbox.png'
+);
+$G_TMP_MENU->AddIdRawOption(
+    'CASES_SELFSERVICE',
+    'casesListExtJs?action=selfservice',
+    G::LoadTranslation('ID_UNASSIGNED'),
+    'rotate_cw.png'
+);
+$G_TMP_MENU->AddIdRawOption(
+    'CASES_PAUSED',
+    'casesListExtJs?action=paused',
+    G::LoadTranslation('ID_PAUSED'),
+    'mail-queue.png'
+);
 
 $G_TMP_MENU->AddIdRawOption('SEARCHS', '', G::LoadTranslation('ID_CASES_MENU_SEARCH'), '', '', 'blockHeader');
 
 if ($RBAC->userCanAccess('PM_ALLCASES') == 1) {
-    $G_TMP_MENU->AddIdRawOption('CASES_SEARCH', 'casesListExtJs?action=search',
-        G::LoadTranslation('ID_ADVANCEDSEARCH'), 'system-search.png'    );
+    $G_TMP_MENU->AddIdRawOption(
+        'CASES_SEARCH',
+        'casesListExtJs?action=search',
+        G::LoadTranslation('ID_ADVANCEDSEARCH'),
+        'system-search.png'
+    );
 }
 
 $G_TMP_MENU->AddIdRawOption('ADMIN', '', G::LoadTranslation('ID_CASES_MENU_ADMIN'), '', '', 'blockHeader');
 if ($RBAC->userCanAccess('PM_SUPERVISOR') == 1) {
-    $G_TMP_MENU->AddIdRawOption('CASES_TO_REVISE', 'casesListExtJs?action=to_revise',
-        G::LoadTranslation('ID_TO_REVISE'), 'document-review.png');
+    $G_TMP_MENU->AddIdRawOption(
+        'CASES_TO_REVISE',
+        'casesListExtJs?action=to_revise',
+        G::LoadTranslation('ID_TO_REVISE'),
+        'document-review.png'
+    );
 }
 
 if ($RBAC->userCanAccess('PM_REASSIGNCASE') == 1 || $RBAC->userCanAccess('PM_REASSIGNCASE_SUPERVISOR') == 1) {
-    $G_TMP_MENU->AddIdRawOption('CASES_TO_REASSIGN', 'casesListExtJs?action=to_reassign',
-        G::LoadTranslation('ID_TO_REASSIGN'), 'reassing.png' );
+    $G_TMP_MENU->AddIdRawOption(
+        'CASES_TO_REASSIGN',
+        'casesListExtJs?action=to_reassign',
+        G::LoadTranslation('ID_TO_REASSIGN'),
+        'reassing.png'
+    );
 }
 
 if ($RBAC->userCanAccess('PM_FOLDERS_VIEW') == 1) {
-    $G_TMP_MENU->AddIdRawOption('CASES_FOLDERS', 'casesStartPage?action=documents', G::LoadTranslation('ID_FOLDERS'),
-        'folderV2.gif', '', 'blockHeaderNoChild' );
+    $G_TMP_MENU->AddIdRawOption(
+        'CASES_FOLDERS',
+        'casesStartPage?action=documents',
+        G::LoadTranslation('ID_FOLDERS'),
+        'folderV2.gif',
+        '',
+        'blockHeaderNoChild'
+    );
 }
 
 
 //Load Other registered Dashboards (From plugins)
 $oPluginRegistry = PluginRegistry::loadSingleton();
 /** @var \ProcessMaker\Plugins\Interfaces\DashboardPage[] $dashBoardPages */
-$dashBoardPages = $oPluginRegistry->getDashboardPages ();
+$dashBoardPages = $oPluginRegistry->getDashboardPages();
 if (count($dashBoardPages)>0) {
     $G_TMP_MENU->AddIdRawOption('PLUGINS', '', G::LoadTranslation('ID_PLUGINS'), '', '', 'blockHeader');
     foreach ($dashBoardPages as $key => $tabInfo) {
         $tabNameSpace=$tabInfo->getNamespace();
         $tabName=$tabInfo->getName();
-        $tabIcon=str_replace("ICON_","",$tabInfo->getIcon());
+        $tabIcon=str_replace("ICON_", "", $tabInfo->getIcon());
         if ($tabName!= "") {
-            $G_TMP_MENU->AddIdRawOption($tabIcon, 'casesStartPage?action='.$tabNameSpace.'-'.$tabName,
-                ucwords(strtolower($tabName)), '');
+            $G_TMP_MENU->AddIdRawOption(
+                $tabIcon,
+                'casesStartPage?action='.$tabNameSpace.'-'.$tabName,
+                ucwords(strtolower($tabName)),
+                ''
+            );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/workflow/engine/menus/processmaker.php b/workflow/engine/menus/processmaker.php
index 52ba1ade9..95e40e09f 100644
--- a/workflow/engine/menus/processmaker.php
+++ b/workflow/engine/menus/processmaker.php
@@ -1,67 +1,67 @@
-<?php
-/**
- * processmaker.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- *
- */
-
-
-/*************************************
- *  ---= Processmaker main menu=---
- *************************************/
-
-global $G_TMP_MENU;
-global $RBAC;
-
-// HOME MODULE
-if ($RBAC->userCanAccess('PM_CASES') == 1) {
-  $G_TMP_MENU->AddIdRawOption('CASES', 'cases/main', G::LoadTranslation('ID_HOME'), '', '', '', 'x-pm-home');
-}
-
-// DESIGNER MODULE
-if ($RBAC->userCanAccess('PM_FACTORY') == 1 ) {
-  $G_TMP_MENU->AddIdRawOption('PROCESSES', 'processes/main', G::LoadTranslation('ID_DESIGNER'), '', '', '', 'x-pm-designer');
-}
-
-// DASHBOARD MODULE
-if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) {
-  $G_TMP_MENU->AddIdRawOption('DASHBOARD', 'dashboard/main', G::LoadTranslation('ID_DASHBOARD'), '', '', '', 'x-pm-dashboard');
-}
-
-/*----------------------------------********---------------------------------*/
-if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) {
-    $licensedFeatures = & PMLicensedFeatures::getSingleton();
-    if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=') ) {
-        $G_TMP_MENU->AddIdRawOption('DASHBOARD+', 'strategicDashboard/main', G::LoadTranslation('ID_STRATEGIC_DASHBOARD'), '', '', '', 'x-pm-dashboard');
-    }
-}
-/*----------------------------------********---------------------------------*/
-
-// ADMIN MODULE
-if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1) {
-  $G_TMP_MENU->AddIdRawOption('SETUP', 'setup/main', strtolower(G::LoadTranslation('ID_SETUP')), '', '', '', 'x-pm-setup');
-}
-
-
-// PLUGINS MENUS
-if( file_exists(PATH_CORE . 'menus/plugin.php') ) {
-  require_once(PATH_CORE . 'menus/plugin.php');
-}
+<?php
+/**
+ * processmaker.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ *
+ */
+
+
+/*************************************
+ *  ---= Processmaker main menu=---
+ *************************************/
+
+global $G_TMP_MENU;
+global $RBAC;
+
+// HOME MODULE
+if ($RBAC->userCanAccess('PM_CASES') == 1) {
+    $G_TMP_MENU->AddIdRawOption('CASES', 'cases/main', G::LoadTranslation('ID_HOME'), '', '', '', 'x-pm-home');
+}
+
+// DESIGNER MODULE
+if ($RBAC->userCanAccess('PM_FACTORY') == 1) {
+    $G_TMP_MENU->AddIdRawOption('PROCESSES', 'processes/main', G::LoadTranslation('ID_DESIGNER'), '', '', '', 'x-pm-designer');
+}
+
+// DASHBOARD MODULE
+if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) {
+    $G_TMP_MENU->AddIdRawOption('DASHBOARD', 'dashboard/main', G::LoadTranslation('ID_DASHBOARD'), '', '', '', 'x-pm-dashboard');
+}
+
+/*----------------------------------********---------------------------------*/
+if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) {
+    $licensedFeatures = PMLicensedFeatures::getSingleton();
+    if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=')) {
+        $G_TMP_MENU->AddIdRawOption('DASHBOARD+', 'strategicDashboard/main', G::LoadTranslation('ID_STRATEGIC_DASHBOARD'), '', '', '', 'x-pm-dashboard');
+    }
+}
+/*----------------------------------********---------------------------------*/
+
+// ADMIN MODULE
+if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1) {
+    $G_TMP_MENU->AddIdRawOption('SETUP', 'setup/main', strtolower(G::LoadTranslation('ID_SETUP')), '', '', '', 'x-pm-setup');
+}
+
+
+// PLUGINS MENUS
+if (file_exists(PATH_CORE . 'menus/plugin.php')) {
+    require_once(PATH_CORE . 'menus/plugin.php');
+}
diff --git a/workflow/engine/menus/setup.php b/workflow/engine/menus/setup.php
index f0173beef..638958001 100644
--- a/workflow/engine/menus/setup.php
+++ b/workflow/engine/menus/setup.php
@@ -1,307 +1,308 @@
-<?php
-/**
- * setup.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- *
- */
-
-use ProcessMaker\Plugins\PluginRegistry;
-
-global $G_TMP_MENU;
-global $RBAC;
-$partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
-
-/*----------------------------------********---------------------------------*/
-$conf = new Configurations();
-$sAudit = $conf->getConfiguration('AUDIT_LOG', 'log');
-$licensedFeatures = &PMLicensedFeatures::getSingleton();
-/*----------------------------------********---------------------------------*/
-if ($RBAC->userCanAccess('PM_SETUP') === 1) {
-    $pmSetupPermission = true;
-    if ($RBAC->userCanAccess('PM_SETUP_LOGO') === 1) {
-        $G_TMP_MENU->AddIdRawOption(
-            'LOGO', '../admin/pmLogo',
-            G::LoadTranslation('ID_LOGO'),
-            'icon-pmlogo.png', '','settings'
-        );
-    }
-    if ($RBAC->userCanAccess('PM_SETUP_EMAIL') === 1) {
-        $G_TMP_MENU->AddIdRawOption(
-            "EMAIL_SERVER", "../emailServer/emailServer",
-            G::LoadTranslation("ID_EMAIL_SERVER_TITLE"),
-            "icon-email-settings1.png", "", "settings"
-        );
-    }
-    if ($RBAC->userCanAccess('PM_SETUP_CALENDAR') === 1) {
-        $G_TMP_MENU->AddIdRawOption(
-            'CALENDAR', 'calendarList',
-            G::LoadTranslation('ID_CALENDAR'),
-            'icon-calendar.png', '', 'settings'
-        );
-    }
-    if ($RBAC->userCanAccess('PM_SETUP_PROCESS_CATEGORIES') === 1) {
-        $G_TMP_MENU->AddIdRawOption(
-            'PROCESS_CATEGORY', '../processCategory/processCategoryList',
-            G::LoadTranslation('ID_PROCESS_CATEGORY'),
-            "rules.png", '', 'settings'
-        );
-    }
-}
-
-if ($RBAC->userCanAccess('PM_SETUP') === 1) {
-    if ($RBAC->userCanAccess('PM_SETUP_SKIN') === 1) {
-        $G_TMP_MENU->AddIdRawOption(
-            'SKINS', 'skinsList',
-            G::LoadTranslation('ID_SKINS'),
-            'icon-skins.png', '', 'settings'
-        );
-    }
-    if (!$partnerFlag) {
-        /**
-         * Remove heartbeat config from core, it will probably be used again 
-         * when the functionality will be redesigned.
-         */
-        if ($RBAC->userCanAccess('PM_SETUP_HEART_BEAT') === 1 && false) {
-            $G_TMP_MENU->AddIdRawOption(
-                'HEARTBEAT', 'processHeartBeatConfig',
-                G::LoadTranslation('ID_HEARTBEAT_CONFIG'),
-                "heartBeat.jpg", '', 'settings'
-            );
-        }
-    }
-    if ($RBAC->userCanAccess('PM_SETUP_ENVIRONMENT') === 1) {
-        $G_TMP_MENU->AddIdRawOption(
-            'ENVIRONMENT_SETTINGS', 'environmentSettings',
-            G::LoadTranslation('ID_ENVIRONMENT_SETTINGS'),
-            "", '', 'settings'
-        );
-    }
-}
-
-if ($RBAC->userCanAccess('PM_SETUP') === 1) {
-    if ($RBAC->userCanAccess('PM_SETUP_CLEAR_CACHE') === 1) {
-        $G_TMP_MENU->AddIdRawOption(
-            'CLEAR_CACHE', 'clearCompiled',
-            G::LoadTranslation('ID_CLEAR_CACHE'),
-            'icon-rebuild-clean.png', "", 'settings'
-        );
-    }
-    if ($RBAC->userCanAccess('PM_SETUP_PM_TABLES') === 1) {
-        $G_TMP_MENU->AddIdRawOption(
-            'PM_TABLES', '../pmTables',
-            G::LoadTranslation('ID_ADDITIONAL_TABLES'),
-            'icon-tables.png', '', 'settings'
-        );
-    }
-    if ($RBAC->userCanAccess('PM_SETUP_LOGIN') === 1) {
-        $G_TMP_MENU->AddIdRawOption(
-            'LOGIN', 'loginSettings',
-            G::LoadTranslation('LOGIN'),
-            "", '', 'settings'
-        );
-    }
-    if ($RBAC->userCanAccess('PM_SETUP_DASHBOARDS') === 1) {
-        $G_TMP_MENU->AddIdRawOption(
-            'DASHBOARD', '../DashboardModule/dashletsList',
-            ucfirst(G::LoadTranslation('ID_DASHBOARD')),
-            '', '', 'settings'
-        );
-        /*----------------------------------********---------------------------------*/
-        if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=')) {
-            $G_TMP_MENU->AddIdRawOption(
-                'STRATEGIC_DASHBOARD', '../strategicDashboard/dashboardList',
-                ucfirst(G::LoadTranslation('ID_STRATEGIC_DASHBOARD')),
-                '', '', 'settings'
-            );
-        }
-        if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-            $G_TMP_MENU->AddIdRawOption(
-                'PMGMAIL', '../pmGmail/formPMGmail',
-                ucfirst(G::LoadTranslation('ID_PMGMAIL')),
-                '', '', 'settings'
-            );
-        }
-        /*----------------------------------********---------------------------------*/
-    }
-}
-//tools options
-if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') === 1) {
-    if ($RBAC->userCanAccess('PM_SETUP_LANGUAGE') === 1) {
-        $G_TMP_MENU->AddIdRawOption(
-            'LANGUAGES', 'languages',
-            G::LoadTranslation('ID_LANGUAGES'),
-            'icon-language.png','', 'settings'
-        );
-    }
-    if ($RBAC->userCanAccess('PM_SETUP_CASES_LIST_CACHE_BUILDER') === 1) {
-        $G_TMP_MENU->AddIdRawOption(
-            'APPCACHEVIEW_SETUP', '../setup/appCacheViewConf',
-            G::LoadTranslation('ID_APPCACHE_SETUP'),
-            "", '', 'settings'
-        );
-    }
-    if (!$partnerFlag) {
-        if ($RBAC->userCanAccess('PM_SETUP_PLUGINS') === 1) {
-            $G_TMP_MENU->AddIdRawOption(
-                'PLUGINS', 'pluginsMain',
-                G::LoadTranslation('ID_PLUGINS_MANAGER'),
-                'icon-plugins.png', '', 'plugins'
-            );
-        }
-    }
-}
-
-//users options
-if ($RBAC->userCanAccess('PM_USERS') === 1) {
-    $G_TMP_MENU->AddIdRawOption('USERS', '../users/users_List', G::LoadTranslation('ID_USERS_LIST'),
-        'icon-webservices.png', '', 'users');
-    $G_TMP_MENU->AddIdRawOption('GROUPS', '../groups/groups', G::LoadTranslation('ID_GROUPS'), '', '', 'users');
-    $G_TMP_MENU->AddIdRawOption(
-        'DEPARTAMENTS', '../departments/departments',
-        G::LoadTranslation('ID_DEPARTMENTS_USERS'),
-        '', '', 'users'
-    );
-    $G_TMP_MENU->AddIdRawOption('ROLES', '../roles/roles_List',
-        G::LoadTranslation('ID_ROLES'),
-        '', '', 'users'
-    );
-}
-
-if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') === 1 && $RBAC->userCanAccess('PM_USERS') === 1 && $RBAC->userCanAccess
-    ('PM_SETUP_USERS_AUTHENTICATION_SOURCES') === 1) {
-    $G_TMP_MENU->AddIdRawOption(
-        'AUTHSOURCES', '../authSources/authSources_List',
-        G::LoadTranslation('ID_AUTH_SOURCES'),
-        '', '', 'users'
-    );
-    $G_TMP_MENU->AddIdRawOption('UX', '../admin/uxList', G::LoadTranslation('ID_USER_EXPERIENCE'), '', '', 'users');
-    $G_TMP_MENU->AddIdRawOption('SYSTEM', '../admin/system', G::LoadTranslation('ID_SYSTEM'), '', '', 'settings');
-    $G_TMP_MENU->AddIdRawOption(
-        'INFORMATION', '../setup/systemInfo?option=processInfo',
-        G::LoadTranslation('ID_SYSTEM_INFO'),
-        '', '', 'settings'
-    );
-}
-
-if ($RBAC->userCanAccess('PM_SETUP') === 1 && $RBAC->userCanAccess('PM_SETUP_LOGS') === 1) {
-    $G_TMP_MENU->AddIdRawOption('EVENT', '../events/eventList', G::LoadTranslation('ID_EVENTS_CLASSIC'), '', '', 'logs');
-    $G_TMP_MENU->AddIdRawOption(
-        'LOG_CASE_SCHEDULER', '../cases/cases_Scheduler_Log',
-        G::LoadTranslation('ID_CASE_SCHEDULER_CLASSIC'),
-        "icon-logs-list.png", '', 'logs'
-    );
-    $G_TMP_MENU->AddIdRawOption("CRON", "../setup/cron", G::LoadTranslation("ID_CRON_ACTIONS"), null, null, 'logs');
-    $G_TMP_MENU->AddIdRawOption(
-        'EMAILS', '../mails/emailList',
-        ucfirst(strtolower(G::LoadTranslation('ID_EMAILS'))),
-        '', '', 'logs'
-    );
-    /*----------------------------------********---------------------------------*/
-    if (isset($sAudit) && $sAudit !== false && $licensedFeatures->verifyfeature
-        ('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')
-    ) {
-        $G_TMP_MENU->AddIdRawOption(
-            'AUDIT_LOG', '../setup/auditLog',
-            ucfirst(G::LoadTranslation('ID_AUDITLOG_DISPLAY')),
-            '', '', 'logs'
-        );
-    }
-    /*----------------------------------********---------------------------------*/
-}
-
-if ($RBAC->userCanAccess('PM_SETUP') === 1) {
-    $G_TMP_MENU->AddIdRawOption(
-        'PM_REQUIREMENTS', '../setup/systemInfo',
-        G::LoadTranslation('ID_PROCESSMAKER_REQUIREMENTS_CHECK'),
-        '', '', 'settings'
-    );
-    $G_TMP_MENU->AddIdRawOption(
-        'PHP_INFO', '../setup/systemInfo?option=php',
-        G::LoadTranslation('ID_PHP_INFO'),
-        '','', 'settings'
-    );
-    /*----------------------------------********---------------------------------*/
-    if ($licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) {
-        $G_TMP_MENU->AddIdRawOption(
-            "AUDIT_LOG", "auditLogConfig",
-            G::LoadTranslation("ID_AUDITLOG_DISPLAY"),
-            "", "","settings"
-        );
-    }
-    /*----------------------------------********---------------------------------*/
-}
-/*----------------------------------********---------------------------------*/
-if (!file_exists(PATH_DATA_SITE . "plugin.singleton")) {
-    require_once PATH_CORE . 'methods' . PATH_SEP . 'enterprise' . PATH_SEP . 'enterprise.php';
-    $enterprise = new enterprisePlugin('enterprise');
-    $enterprise->enable();
-    $enterprise->setup();
-}
-$pmLicenseManagerO = &PmLicenseManager::getSingleton();
-$licenseStatusInfo = $pmLicenseManagerO->getCurrentLicenseStatus();
-$licStatusMsg = null;
-
-if ((isset($pmLicenseManagerO->plan)) && ($pmLicenseManagerO->plan != "")) {
-    $lines = explode(" - ", $pmLicenseManagerO->plan);
-    if (isset($lines[0])) {
-        $licStatusMsg .= "<br><i><small>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $lines[0] . "</small></i>";
-    }
-    if ((isset($lines[1])) && ($lines[1] != $lines[0])) {
-        $licStatusMsg .= "<br><i><small>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $lines[1] . "</small></i>";
-    }
-}
-
-if ($licenseStatusInfo["message"] != "") {
-    $licStatusMsg = "&nbsp;<font color=\"red\">(" . $licenseStatusInfo["message"] . ")</font>";
-}
-/*----------------------------------********---------------------------------*/
-if ($RBAC->userCanAccess('PM_SETUP') == 1) {
-    /*----------------------------------********---------------------------------*/
-    $G_TMP_MENU->AddIdRawOption(
-        'PMENTERPRISE', '../enterprise/addonsStore',
-        G::LoadTranslation('ID_MENU_NAME') . $licStatusMsg,
-        '', '', 'plugins'
-    );
-    if ($RBAC->userCanAccess('PM_SETUP_CUSTOM_CASES_LIST') == 1) {
-        $G_TMP_MENU->AddIdRawOption(
-            'CASES_LIST_SETUP', '../cases/casesListSetup',
-            G::LoadTranslation('ID_CUSTOM_CASES_LISTS'),
-            '', '', 'settings');
-    }
-    /*----------------------------------********---------------------------------*/
-}
-
-/*----------------------------------********---------------------------------*/
-$pluginRegistry = PluginRegistry::loadSingleton();
-$status = $pluginRegistry->getStatusPlugin('actionsByEmail');
-
-if ((string)($status) !== 'enabled' &&
-    $licensedFeatures->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=') &&
-    $RBAC->userCanAccess('PM_SETUP_LOGS') == 1
-) {
-    $G_TMP_MENU->AddIdRawOption(
-        'PM_ACTIONS_BY_EMAIL_LOGS',
-        '../actionsByEmail/ActionByEmail.php',
-        G::LoadTranslation("ID_ACTIONS_BY_EMAIL_LOG"),
-        '', '', 'logs'
-    );
-}
-/*----------------------------------********---------------------------------*/
+<?php
+/**
+ * setup.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ *
+ */
+
+use ProcessMaker\Plugins\PluginRegistry;
+
+global $G_TMP_MENU;
+global $RBAC;
+$partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
+
+/*----------------------------------********---------------------------------*/
+$conf = new Configurations();
+$sAudit = $conf->getConfiguration('AUDIT_LOG', 'log');
+$licensedFeatures = PMLicensedFeatures::getSingleton();
+/*----------------------------------********---------------------------------*/
+if ($RBAC->userCanAccess('PM_SETUP') === 1) {
+    $pmSetupPermission = true;
+    if ($RBAC->userCanAccess('PM_SETUP_LOGO') === 1) {
+        $G_TMP_MENU->AddIdRawOption(
+            'LOGO', '../admin/pmLogo',
+            G::LoadTranslation('ID_LOGO'),
+            'icon-pmlogo.png', '', 'settings'
+        );
+    }
+    if ($RBAC->userCanAccess('PM_SETUP_EMAIL') === 1) {
+        $G_TMP_MENU->AddIdRawOption(
+            "EMAIL_SERVER", "../emailServer/emailServer",
+            G::LoadTranslation("ID_EMAIL_SERVER_TITLE"),
+            "icon-email-settings1.png", "", "settings"
+        );
+    }
+    if ($RBAC->userCanAccess('PM_SETUP_CALENDAR') === 1) {
+        $G_TMP_MENU->AddIdRawOption(
+            'CALENDAR', 'calendarList',
+            G::LoadTranslation('ID_CALENDAR'),
+            'icon-calendar.png', '', 'settings'
+        );
+    }
+    if ($RBAC->userCanAccess('PM_SETUP_PROCESS_CATEGORIES') === 1) {
+        $G_TMP_MENU->AddIdRawOption(
+            'PROCESS_CATEGORY', '../processCategory/processCategoryList',
+            G::LoadTranslation('ID_PROCESS_CATEGORY'),
+            "rules.png", '', 'settings'
+        );
+    }
+}
+
+if ($RBAC->userCanAccess('PM_SETUP') === 1) {
+    if ($RBAC->userCanAccess('PM_SETUP_SKIN') === 1) {
+        $G_TMP_MENU->AddIdRawOption(
+            'SKINS', 'skinsList',
+            G::LoadTranslation('ID_SKINS'),
+            'icon-skins.png', '', 'settings'
+        );
+    }
+    if (!$partnerFlag) {
+        /**
+         * Remove heartbeat config from core, it will probably be used again
+         * when the functionality will be redesigned.
+         */
+        if ($RBAC->userCanAccess('PM_SETUP_HEART_BEAT') === 1 && false) {
+            $G_TMP_MENU->AddIdRawOption(
+                'HEARTBEAT', 'processHeartBeatConfig',
+                G::LoadTranslation('ID_HEARTBEAT_CONFIG'),
+                "heartBeat.jpg", '', 'settings'
+            );
+        }
+    }
+    if ($RBAC->userCanAccess('PM_SETUP_ENVIRONMENT') === 1) {
+        $G_TMP_MENU->AddIdRawOption(
+            'ENVIRONMENT_SETTINGS', 'environmentSettings',
+            G::LoadTranslation('ID_ENVIRONMENT_SETTINGS'),
+            "", '', 'settings'
+        );
+    }
+}
+
+if ($RBAC->userCanAccess('PM_SETUP') === 1) {
+    if ($RBAC->userCanAccess('PM_SETUP_CLEAR_CACHE') === 1) {
+        $G_TMP_MENU->AddIdRawOption(
+            'CLEAR_CACHE', 'clearCompiled',
+            G::LoadTranslation('ID_CLEAR_CACHE'),
+            'icon-rebuild-clean.png', "", 'settings'
+        );
+    }
+    if ($RBAC->userCanAccess('PM_SETUP_PM_TABLES') === 1) {
+        $G_TMP_MENU->AddIdRawOption(
+            'PM_TABLES', '../pmTables',
+            G::LoadTranslation('ID_ADDITIONAL_TABLES'),
+            'icon-tables.png', '', 'settings'
+        );
+    }
+    if ($RBAC->userCanAccess('PM_SETUP_LOGIN') === 1) {
+        $G_TMP_MENU->AddIdRawOption(
+            'LOGIN', 'loginSettings',
+            G::LoadTranslation('LOGIN'),
+            "", '', 'settings'
+        );
+    }
+    if ($RBAC->userCanAccess('PM_SETUP_DASHBOARDS') === 1) {
+        $G_TMP_MENU->AddIdRawOption(
+            'DASHBOARD', '../DashboardModule/dashletsList',
+            ucfirst(G::LoadTranslation('ID_DASHBOARD')),
+            '', '', 'settings'
+        );
+        /*----------------------------------********---------------------------------*/
+        if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=')) {
+            $G_TMP_MENU->AddIdRawOption(
+                'STRATEGIC_DASHBOARD', '../strategicDashboard/dashboardList',
+                ucfirst(G::LoadTranslation('ID_STRATEGIC_DASHBOARD')),
+                '', '', 'settings'
+            );
+        }
+        if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
+            $G_TMP_MENU->AddIdRawOption(
+                'PMGMAIL', '../pmGmail/formPMGmail',
+                ucfirst(G::LoadTranslation('ID_PMGMAIL')),
+                '', '', 'settings'
+            );
+        }
+        /*----------------------------------********---------------------------------*/
+    }
+}
+//tools options
+if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') === 1) {
+    if ($RBAC->userCanAccess('PM_SETUP_LANGUAGE') === 1) {
+        $G_TMP_MENU->AddIdRawOption(
+            'LANGUAGES', 'languages',
+            G::LoadTranslation('ID_LANGUAGES'),
+            'icon-language.png', '', 'settings'
+        );
+    }
+    if ($RBAC->userCanAccess('PM_SETUP_CASES_LIST_CACHE_BUILDER') === 1) {
+        $G_TMP_MENU->AddIdRawOption(
+            'APPCACHEVIEW_SETUP', '../setup/appCacheViewConf',
+            G::LoadTranslation('ID_APPCACHE_SETUP'),
+            "", '', 'settings'
+        );
+    }
+    if (!$partnerFlag) {
+        if ($RBAC->userCanAccess('PM_SETUP_PLUGINS') === 1) {
+            $G_TMP_MENU->AddIdRawOption(
+                'PLUGINS', 'pluginsMain',
+                G::LoadTranslation('ID_PLUGINS_MANAGER'),
+                'icon-plugins.png', '', 'plugins'
+            );
+        }
+    }
+}
+
+//users options
+if ($RBAC->userCanAccess('PM_USERS') === 1) {
+    $G_TMP_MENU->AddIdRawOption('USERS', '../users/users_List', G::LoadTranslation('ID_USERS_LIST'),
+        'icon-webservices.png', '', 'users');
+    $G_TMP_MENU->AddIdRawOption('GROUPS', '../groups/groups', G::LoadTranslation('ID_GROUPS'), '', '', 'users');
+    $G_TMP_MENU->AddIdRawOption(
+        'DEPARTAMENTS', '../departments/departments',
+        G::LoadTranslation('ID_DEPARTMENTS_USERS'),
+        '', '', 'users'
+    );
+    $G_TMP_MENU->AddIdRawOption('ROLES', '../roles/roles_List',
+        G::LoadTranslation('ID_ROLES'),
+        '', '', 'users'
+    );
+}
+
+if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') === 1 && $RBAC->userCanAccess('PM_USERS') === 1 && $RBAC->userCanAccess
+    ('PM_SETUP_USERS_AUTHENTICATION_SOURCES') === 1) {
+    $G_TMP_MENU->AddIdRawOption(
+        'AUTHSOURCES', '../authSources/authSources_List',
+        G::LoadTranslation('ID_AUTH_SOURCES'),
+        '', '', 'users'
+    );
+    $G_TMP_MENU->AddIdRawOption('UX', '../admin/uxList', G::LoadTranslation('ID_USER_EXPERIENCE'), '', '', 'users');
+    $G_TMP_MENU->AddIdRawOption('SYSTEM', '../admin/system', G::LoadTranslation('ID_SYSTEM'), '', '', 'settings');
+    $G_TMP_MENU->AddIdRawOption(
+        'INFORMATION', '../setup/systemInfo?option=processInfo',
+        G::LoadTranslation('ID_SYSTEM_INFO'),
+        '', '', 'settings'
+    );
+}
+
+if ($RBAC->userCanAccess('PM_SETUP') === 1 && $RBAC->userCanAccess('PM_SETUP_LOGS') === 1) {
+    $G_TMP_MENU->AddIdRawOption('EVENT', '../events/eventList', G::LoadTranslation('ID_EVENTS_CLASSIC'), '', '',
+        'logs');
+    $G_TMP_MENU->AddIdRawOption(
+        'LOG_CASE_SCHEDULER', '../cases/cases_Scheduler_Log',
+        G::LoadTranslation('ID_CASE_SCHEDULER_CLASSIC'),
+        "icon-logs-list.png", '', 'logs'
+    );
+    $G_TMP_MENU->AddIdRawOption("CRON", "../setup/cron", G::LoadTranslation("ID_CRON_ACTIONS"), null, null, 'logs');
+    $G_TMP_MENU->AddIdRawOption(
+        'EMAILS', '../mails/emailList',
+        ucfirst(strtolower(G::LoadTranslation('ID_EMAILS'))),
+        '', '', 'logs'
+    );
+    /*----------------------------------********---------------------------------*/
+    if (isset($sAudit) && $sAudit !== false && $licensedFeatures->verifyfeature
+        ('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')
+    ) {
+        $G_TMP_MENU->AddIdRawOption(
+            'AUDIT_LOG', '../setup/auditLog',
+            ucfirst(G::LoadTranslation('ID_AUDITLOG_DISPLAY')),
+            '', '', 'logs'
+        );
+    }
+    /*----------------------------------********---------------------------------*/
+}
+
+if ($RBAC->userCanAccess('PM_SETUP') === 1) {
+    $G_TMP_MENU->AddIdRawOption(
+        'PM_REQUIREMENTS', '../setup/systemInfo',
+        G::LoadTranslation('ID_PROCESSMAKER_REQUIREMENTS_CHECK'),
+        '', '', 'settings'
+    );
+    $G_TMP_MENU->AddIdRawOption(
+        'PHP_INFO', '../setup/systemInfo?option=php',
+        G::LoadTranslation('ID_PHP_INFO'),
+        '', '', 'settings'
+    );
+    /*----------------------------------********---------------------------------*/
+    if ($licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) {
+        $G_TMP_MENU->AddIdRawOption(
+            "AUDIT_LOG", "auditLogConfig",
+            G::LoadTranslation("ID_AUDITLOG_DISPLAY"),
+            "", "", "settings"
+        );
+    }
+    /*----------------------------------********---------------------------------*/
+}
+/*----------------------------------********---------------------------------*/
+if (!file_exists(PATH_DATA_SITE . "plugin.singleton")) {
+    require_once PATH_CORE . 'methods' . PATH_SEP . 'enterprise' . PATH_SEP . 'enterprise.php';
+    $enterprise = new enterprisePlugin('enterprise');
+    $enterprise->enable();
+    $enterprise->setup();
+}
+$pmLicenseManagerO = PmLicenseManager::getSingleton();
+$licenseStatusInfo = $pmLicenseManagerO->getCurrentLicenseStatus();
+$licStatusMsg = null;
+
+if ((isset($pmLicenseManagerO->plan)) && ($pmLicenseManagerO->plan != "")) {
+    $lines = explode(" - ", $pmLicenseManagerO->plan);
+    if (isset($lines[0])) {
+        $licStatusMsg .= "<br><i><small>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $lines[0] . "</small></i>";
+    }
+    if ((isset($lines[1])) && ($lines[1] != $lines[0])) {
+        $licStatusMsg .= "<br><i><small>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $lines[1] . "</small></i>";
+    }
+}
+
+if ($licenseStatusInfo["message"] != "") {
+    $licStatusMsg = "&nbsp;<font color=\"red\">(" . $licenseStatusInfo["message"] . ")</font>";
+}
+/*----------------------------------********---------------------------------*/
+if ($RBAC->userCanAccess('PM_SETUP') == 1) {
+    /*----------------------------------********---------------------------------*/
+    $G_TMP_MENU->AddIdRawOption(
+        'PMENTERPRISE', '../enterprise/addonsStore',
+        G::LoadTranslation('ID_MENU_NAME') . $licStatusMsg,
+        '', '', 'plugins'
+    );
+    if ($RBAC->userCanAccess('PM_SETUP_CUSTOM_CASES_LIST') == 1) {
+        $G_TMP_MENU->AddIdRawOption(
+            'CASES_LIST_SETUP', '../cases/casesListSetup',
+            G::LoadTranslation('ID_CUSTOM_CASES_LISTS'),
+            '', '', 'settings');
+    }
+    /*----------------------------------********---------------------------------*/
+}
+
+/*----------------------------------********---------------------------------*/
+$pluginRegistry = PluginRegistry::loadSingleton();
+$status = $pluginRegistry->getStatusPlugin('actionsByEmail');
+
+if ((string)($status) !== 'enabled' &&
+    $licensedFeatures->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=') &&
+    $RBAC->userCanAccess('PM_SETUP_LOGS') == 1
+) {
+    $G_TMP_MENU->AddIdRawOption(
+        'PM_ACTIONS_BY_EMAIL_LOGS',
+        '../actionsByEmail/ActionByEmail.php',
+        G::LoadTranslation("ID_ACTIONS_BY_EMAIL_LOG"),
+        '', '', 'logs'
+    );
+}
+/*----------------------------------********---------------------------------*/
diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php
index 66908f22a..fdaabe8b4 100644
--- a/workflow/engine/methods/appFolder/appFolderAjax.php
+++ b/workflow/engine/methods/appFolder/appFolderAjax.php
@@ -6,42 +6,42 @@ $filter = new InputFilter();
 $_POST = $filter->xssFilterHard($_POST);
 $_GET = $filter->xssFilterHard($_GET);
 $_REQUEST = $filter->xssFilterHard($_REQUEST);
-if (! isset ($_SESSION ['USER_LOGGED'])) {
+if (! isset($_SESSION ['USER_LOGGED'])) {
     $res ['success'] = false;
     $res ['error'] = G::LoadTranslation('ID_LOGIN_AGAIN');
     $res ['login'] = true;
-    print G::json_encode ($res);
-    die ();
+    print G::json_encode($res);
+    die();
 }
 
 $search = isset($_REQUEST ['search']) ? $_REQUEST ['search'] : null;
 
-if (isset ($_REQUEST ['action']) && isset($_REQUEST['sort']) && isset($_REQUEST['dir'])) {
+if (isset($_REQUEST ['action']) && isset($_REQUEST['sort']) && isset($_REQUEST['dir'])) {
     sortContent();
 }
 
 
-if (! isset ($_REQUEST ['action'])) {
+if (! isset($_REQUEST ['action'])) {
     $res ['success'] = false;
     $res ['message'] = 'You may request an action';
-    print G::json_encode ($res);
-    die ();
+    print G::json_encode($res);
+    die();
 }
 
 $_REQUEST['action'] = ($_REQUEST['action'] == 'rename') ? 'renameFolder' : $_REQUEST['action'];
 
-if (! function_exists ($_REQUEST['action']) || !G::isUserFunction($_REQUEST['action'])) {
+if (! function_exists($_REQUEST['action']) || !G::isUserFunction($_REQUEST['action'])) {
     $res ['success'] = false;
     $res ['message'] = 'The requested action does not exist';
-    print G::json_encode ($res);
-    die ();
+    print G::json_encode($res);
+    die();
 }
 
 if (($_REQUEST['action']) != 'renameFolder') {
     $functionName = $_REQUEST ['action'];
-    $functionParams = isset ($_REQUEST ['params']) ? $_REQUEST ['params'] : array ();
+    $functionParams = isset($_REQUEST ['params']) ? $_REQUEST ['params'] : array();
 
-    $functionName ($functionParams);
+    $functionName($functionParams);
 } else {
     if (!isset($_REQUEST['item']) ||
             !isset($_REQUEST['newitemname']) ||
@@ -49,7 +49,7 @@ if (($_REQUEST['action']) != 'renameFolder') {
         exit();
     }
     $functionName = 'renameFolder';
-    $functionParams = isset ($_REQUEST ['params']) ? $_REQUEST ['params'] : array ();
+    $functionParams = isset($_REQUEST ['params']) ? $_REQUEST ['params'] : array();
     $oldname = $_REQUEST ['item'];
     $newname = $_REQUEST ['newitemname'];
     $oUid = $_REQUEST ['selitems'];
@@ -60,7 +60,7 @@ if (($_REQUEST['action']) != 'renameFolder') {
         $uid = $oUid;
     }
 
-    renameFolder ($oldname, $newname, $uid);
+    renameFolder($oldname, $newname, $uid);
 }
 
 /////////////////////////////////////////////
@@ -69,7 +69,7 @@ function renameFolder($oldname, $newname, $uid)
 {
     $folder = new AppFolder();
     //Clean Folder name (delete spaces...)
-    $newname = trim( $newname );
+    $newname = trim($newname);
 
     $fields = array();
 
@@ -79,7 +79,7 @@ function renameFolder($oldname, $newname, $uid)
 
     $folder->update($fields);
 
-    $msgLabel= G::LoadTranslation ('ID_EDIT_SUCCESSFULLY');
+    $msgLabel= G::LoadTranslation('ID_EDIT_SUCCESSFULLY');
     echo "{action: '', error:'error',message: '$msgLabel', success: 'success',folderUID: 'root'}";
 }
 
@@ -91,26 +91,26 @@ function renameFolder($oldname, $newname, $uid)
 **/
 function delete()
 {
-    include_once ("classes/model/AppDocument.php");
-    include_once ("classes/model/AppFolder.php");
+    include_once("classes/model/AppDocument.php");
+    include_once("classes/model/AppFolder.php");
 
     switch ($_REQUEST['option']) {
         case 'documents':
             deleteDocuments($_REQUEST['selitems'], $_REQUEST['option']);
             break;
         case 'directory':
-            $oAppFoder    = new AppFolder ();
-            $oAppDocument = new AppDocument ();
+            $oAppFoder    = new AppFolder();
+            $oAppDocument = new AppDocument();
             $aDocuments   = $oAppDocument->getDocumentsinFolders($_REQUEST['item']);
 
             if (count($aDocuments) > 0) {
                 deleteDocuments($aDocuments, $_REQUEST['option']);
             }
 
-            $oAppFoder->remove($_REQUEST['item'],'');
+            $oAppFoder->remove($_REQUEST['item'], '');
             break;
     }
-    $msgLabel= G::LoadTranslation ('ID_DELETED_SUCCESSFULLY');
+    $msgLabel= G::LoadTranslation('ID_DELETED_SUCCESSFULLY');
     echo "{action: '', error:'error',message: '$msgLabel', success: 'success',folderUID: 'root'}";
 }
 
@@ -123,16 +123,16 @@ function delete()
 **/
 function deleteDocuments($aDocuments, $opt)
 {
-    include_once ("classes/model/AppDocument.php");
-    $oAppDocument = new AppDocument ();
+    include_once("classes/model/AppDocument.php");
+    $oAppDocument = new AppDocument();
     foreach ($aDocuments as $key => $val) {
         if ($opt == 'documents') {
-            list($sFileUID,$docVersion) = explode('_',$val);
+            list($sFileUID, $docVersion) = explode('_', $val);
         } else {
             $sFileUID   = $val['sAppDocUid'];
             $docVersion = $val['iVersion'];
         }
-        $oAppDocument->remove($sFileUID,$docVersion);
+        $oAppDocument->remove($sFileUID, $docVersion);
     }
     return true;
 }
@@ -247,7 +247,7 @@ function expandNode()
             $tempTree ['is_readable'] =true;
             $tempTree ['is_deletable'] =true;
 
-            if ((isset($_POST['option']) )&& ($_POST['option'] == "gridDocuments")) {
+            if ((isset($_POST['option']))&& ($_POST['option'] == "gridDocuments")) {
                 $tempTree ['icon'] = "/images/documents/extension/folder.png";
             }
             //$tempTree ['leaf'] = true;
@@ -351,7 +351,7 @@ function expandNode()
             $tempTree ['appDocComment'] = $tempTree ['qtip'] = $obj['APP_DOC_COMMENT'];
             $tempTree ['appDocFileName'] = $obj['APP_DOC_FILENAME'];
             if (isset($obj['APP_NUMBER'])) {
-                $tempTree ['appLabel'] = sprintf("%s '%s' (%s)",$obj['APP_NUMBER'],$obj['APP_TITLE'],$obj['STATUS']);
+                $tempTree ['appLabel'] = sprintf("%s '%s' (%s)", $obj['APP_NUMBER'], $obj['APP_TITLE'], $obj['STATUS']);
             } else {
                 $tempTree ['appLabel'] = "No case related";
             }
@@ -374,7 +374,7 @@ function expandNode()
             $tempTree ['deletelabel'] = $obj['DELETE_LABEL'];
 
             if ((isset($obj['DOWNLOAD_LABEL'])) && ($obj['DOWNLOAD_LABEL']!="")) {
-                $labelgen=strtoupper(str_replace(".","",$obj['DOWNLOAD_LABEL']));
+                $labelgen=strtoupper(str_replace(".", "", $obj['DOWNLOAD_LABEL']));
                 $tempTree ['downloadLabel'.$labelgen] = $obj['DOWNLOAD_LABEL'];
                 $tempTree ['downloadLink'.$labelgen] = $obj['DOWNLOAD_LINK'];
             }
@@ -382,7 +382,7 @@ function expandNode()
             $tempTree ['downloadLink'] = $obj['DOWNLOAD_LINK'];
 
             if ((isset($obj['DOWNLOAD_LABEL1'])) && ($obj['DOWNLOAD_LABEL1']!="")) {
-                $labelgen=strtoupper(str_replace(".","",$obj['DOWNLOAD_LABEL1']));
+                $labelgen=strtoupper(str_replace(".", "", $obj['DOWNLOAD_LABEL1']));
                 $tempTree ['downloadLabel'.$labelgen] = $obj['DOWNLOAD_LABEL1'];
                 $tempTree ['downloadLink'.$labelgen] = $obj['DOWNLOAD_LINK1'];
             }
@@ -575,7 +575,7 @@ function sortContent()
             $tempTree ['is_readable'] =true;
             $tempTree ['is_deletable'] =true;
 
-            if ((isset($_POST['option']) )&& ($_POST['option'] == "gridDocuments")) {
+            if ((isset($_POST['option']))&& ($_POST['option'] == "gridDocuments")) {
                 $tempTree ['icon'] = "/images/documents/extension/folder.png";
             }
             $processListTree [] = $tempTree;
@@ -614,7 +614,7 @@ function sortContent()
             $tempTree ['appDocComment'] = $tempTree ['qtip'] = $obj['APP_DOC_COMMENT'];
             $tempTree ['appDocFileName'] = $obj['APP_DOC_FILENAME'];
             if (isset($obj['APP_NUMBER'])) {
-                $tempTree ['appLabel'] = sprintf("%s '%s' (%s)",$obj['APP_NUMBER'],$obj['APP_TITLE'],$obj['STATUS']);
+                $tempTree ['appLabel'] = sprintf("%s '%s' (%s)", $obj['APP_NUMBER'], $obj['APP_TITLE'], $obj['STATUS']);
             } else {
                 $tempTree ['appLabel'] = "No case related";
             }
@@ -637,7 +637,7 @@ function sortContent()
             $tempTree ['deletelabel'] = $obj['DELETE_LABEL'];
 
             if ((isset($obj['DOWNLOAD_LABEL'])) && ($obj['DOWNLOAD_LABEL']!="")) {
-                $labelgen=strtoupper(str_replace(".","",$obj['DOWNLOAD_LABEL']));
+                $labelgen=strtoupper(str_replace(".", "", $obj['DOWNLOAD_LABEL']));
                 $tempTree ['downloadLabel'.$labelgen] = $obj['DOWNLOAD_LABEL'];
                 $tempTree ['downloadLink'.$labelgen] = $obj['DOWNLOAD_LINK'];
             }
@@ -645,7 +645,7 @@ function sortContent()
             $tempTree ['downloadLink'] = $obj['DOWNLOAD_LINK'];
 
             if ((isset($obj['DOWNLOAD_LABEL1'])) && ($obj['DOWNLOAD_LABEL1']!="")) {
-                $labelgen=strtoupper(str_replace(".","",$obj['DOWNLOAD_LABEL1']));
+                $labelgen=strtoupper(str_replace(".", "", $obj['DOWNLOAD_LABEL1']));
                 $tempTree ['downloadLabel'.$labelgen] = $obj['DOWNLOAD_LABEL1'];
                 $tempTree ['downloadLink'.$labelgen] = $obj['DOWNLOAD_LINK1'];
             }
@@ -737,15 +737,15 @@ function sortContent()
 function openPMFolder()
 {
     $WIDTH_PANEL = 350;
-    $folderContent = $oPMFolder->getFolderList ($_POST ['folderID'] != '0' ?
+    $folderContent = $oPMFolder->getFolderList($_POST ['folderID'] != '0' ?
         $_POST ['folderID'] == 'NA' ? "" : $_POST ['folderID'] : $rootFolder);
     //krumo($folderContent);
-    if (! is_array ($folderContent)) {
+    if (! is_array($folderContent)) {
         echo $folderContent;
-        exit ();
+        exit();
     }
 
-    $tree = new PmTree ();
+    $tree = new PmTree();
     $tree->name = 'DMS';
     $tree->nodeType = "blank";
 
@@ -776,7 +776,7 @@ function openPMFolder()
         <div id="child_{$obj['FOLDER_UID']}"></div>
         GHTML;
 
-        $ch = & $tree->addChild ($key, $htmlGroup, array ('nodeType' => 'child'));
+        $ch = $tree->addChild ($key, $htmlGroup, array ('nodeType' => 'child'));
         $ch->point = ' ';
         }
         $RowClass = ($i % 2 == 0) ? 'Row1' : 'Row2';
@@ -795,64 +795,80 @@ function openPMFolder()
         <div id="child_NA"></div>
 GHTML;
 
-        $ch = & $tree->addChild ($key, $htmlGroup, array ('nodeType' => 'child'));
+        $ch = $tree->addChild($key, $htmlGroup, array('nodeType' => 'child'));
         $ch->point = ' ';
     }
 
-    print ($tree->render ()) ;
-
+    print($tree->render()) ;
 }
 
 function getPMFolderContent()
 {
     $swSearch = false;
 
-    if (isset ($_POST ['folderID'])) {
+    if (isset($_POST ['folderID'])) {
         //Render content of a folder
         $folderID = $_POST ['folderID'] != '0' ? $_POST ['folderID'] == 'NA' ? "" : $_POST ['folderID'] : $rootFolder;
-        $folderContent = $oPMFolder->getFolderContent ($folderID);
+        $folderContent = $oPMFolder->getFolderContent($folderID);
     } else {
         // Perform a Search
         $swSearch = true;
-        $folderContent = $oPMFolder->getFolderContent (null, array (), $_POST ['searchKeyword'], $_POST ['type']);
+        $folderContent = $oPMFolder->getFolderContent(null, array(), $_POST ['searchKeyword'], $_POST ['type']);
     }
-    array_unshift ($folderContent, array ('id' => 'char'));
-    if (! is_array ($folderContent)) {
+    array_unshift($folderContent, array('id' => 'char'));
+    if (! is_array($folderContent)) {
         echo $folderContent;
-        exit ();
+        exit();
     }
 
     $_DBArray ['PM_FOLDER_DOC'] = $folderContent;
     $_SESSION ['_DBArray'] = $_DBArray;
 
-    $c = new Criteria ('dbarray');
-    $c->setDBArrayTable ('PM_FOLDER_DOC');
-    $c->addAscendingOrderByColumn ('id');
-    $G_PUBLISH = new Publisher ();
+    $c = new Criteria('dbarray');
+    $c->setDBArrayTable('PM_FOLDER_DOC');
+    $c->addAscendingOrderByColumn('id');
+    $G_PUBLISH = new Publisher();
 
     $labelFolderAddFile = "";
     $labelFolderAddFolder = "";
-    if ($RBAC->userCanAccess ('PM_FOLDERS_ADD_FILE') == 1) {
-        $labelFolderAddFile = G::LoadTranslation ('ID_ATTACH');
+    if ($RBAC->userCanAccess('PM_FOLDERS_ADD_FILE') == 1) {
+        $labelFolderAddFile = G::LoadTranslation('ID_ATTACH');
     }
-    if ($RBAC->userCanAccess ('PM_FOLDERS_ADD_FOLDER') == 1) {
-        $labelFolderAddFolder = G::LoadTranslation ('ID_NEW_FOLDER');
+    if ($RBAC->userCanAccess('PM_FOLDERS_ADD_FOLDER') == 1) {
+        $labelFolderAddFolder = G::LoadTranslation('ID_NEW_FOLDER');
     }
 
     if (! $swSearch) {
-        $G_PUBLISH->AddContent ('propeltable', 'paged-table', 'appFolder/appFolderDocumentList',
-            $c, array ('folderID' => $_POST ['folderID'] != '0' ? $_POST ['folderID'] == 'NA' ?
+        $G_PUBLISH->AddContent(
+            'propeltable',
+            'paged-table',
+            'appFolder/appFolderDocumentList',
+            $c,
+            array('folderID' => $_POST ['folderID'] != '0' ? $_POST ['folderID'] == 'NA' ?
             "/" : $_POST ['folderID'] : $rootFolder, 'labelFolderAddFile' => $labelFolderAddFile,
-            'labelFolderAddFolder' => $labelFolderAddFolder));
-        $G_PUBLISH->AddContent ('xmlform', 'xmlform', 'appFolder/appFolderDocumentListHeader', '',
-            array (), 'appFolderList?folderID=' . $_POST ['folderID']);
+            'labelFolderAddFolder' => $labelFolderAddFolder)
+        );
+        $G_PUBLISH->AddContent(
+            'xmlform',
+            'xmlform',
+            'appFolder/appFolderDocumentListHeader',
+            '',
+            array(),
+            'appFolderList?folderID=' . $_POST ['folderID']
+        );
     } else {
-        $G_PUBLISH->AddContent ('propeltable', 'paged-table', 'appFolder/appFolderDocumentListSearch', $c, array ());
-        $G_PUBLISH->AddContent ('xmlform', 'xmlform', 'appFolder/appFolderDocumentListHeader', '', array (),
-            'appFolderList?folderID=/');
+        $G_PUBLISH->AddContent('propeltable', 'paged-table', 'appFolder/appFolderDocumentListSearch', $c, array());
+        $G_PUBLISH->AddContent(
+            'xmlform',
+            'xmlform',
+            'appFolder/appFolderDocumentListHeader',
+            '',
+            array(),
+            'appFolderList?folderID=/'
+        );
     }
 
-    G::RenderPage ('publish', 'raw');
+    G::RenderPage('publish', 'raw');
 }
 
 function getPMFolderTags()
@@ -863,12 +879,12 @@ function getPMFolderTags()
 
     $rootFolder = "/";
     $folderID = $_POST ['rootFolder'] != '0' ? $_POST ['rootFolder'] == 'NA' ? "" : $_POST ['rootFolder'] : $rootFolder;
-    $tags = $oPMFolder->getFolderTags ($folderID);
+    $tags = $oPMFolder->getFolderTags($folderID);
     $minimum_count = 0;
     $maximum_count = 0;
-    if ((is_array ($tags)) && (count ($tags) > 0)) {
-        $minimum_count = min (array_values ($tags));
-        $maximum_count = max (array_values ($tags));
+    if ((is_array($tags)) && (count($tags) > 0)) {
+        $minimum_count = min(array_values($tags));
+        $maximum_count = max(array_values($tags));
     }
     $spread = $maximum_count - $minimum_count;
 
@@ -877,19 +893,18 @@ function getPMFolderTags()
     }
 
     $cloud_html = '';
-    $cloud_tags = array (); // create an array to hold tag code
+    $cloud_tags = array(); // create an array to hold tag code
     foreach ($tags as $tag => $count) {
         $href = "#";
         //$href="?q="$tag;
         $size = $min_font_size + ($count - $minimum_count) * ($max_font_size - $min_font_size) / $spread;
-        $cloud_tags [] = '<a style="font-size: ' . floor ($size) . 'px' . '" class="tag_cloud" href="' . $href .
+        $cloud_tags [] = '<a style="font-size: ' . floor($size) . 'px' . '" class="tag_cloud" href="' . $href .
             '" onClick="getPMFolderSearchResult(\'' . $tag . '\',\'TAG\')"' . ' title="\'' . $tag .
-            '\' returned a count of ' . $count . '">' . htmlspecialchars (stripslashes ($tag)) . '</a>';
+            '\' returned a count of ' . $count . '">' . htmlspecialchars(stripslashes($tag)) . '</a>';
     }
-    $cloud_html = join ("\n", $cloud_tags) . "\n";
+    $cloud_html = join("\n", $cloud_tags) . "\n";
 
     print "$cloud_html";
-
 }
 
 function uploadDocument()
@@ -1113,11 +1128,11 @@ function uploadDocument()
     //         $uploadDocumentComponent["items"][]=$itemA;
 
     $finalResponse=G::json_encode($uploadDocumentComponent);
-    $finalResponse=str_replace("URL_SCRIPT","../appFolder/appFolderAjax.php",$finalResponse);
+    $finalResponse=str_replace("URL_SCRIPT", "../appFolder/appFolderAjax.php", $finalResponse);
     foreach ($functionsToReplace as $key => $originalFunction) {
-        $finalResponse=str_replace('"'.$key.'"',$originalFunction,$finalResponse);
+        $finalResponse=str_replace('"'.$key.'"', $originalFunction, $finalResponse);
     }
-    echo ($finalResponse);
+    echo($finalResponse);
 }
 function copyAction()
 {
@@ -1130,21 +1145,21 @@ function moveAction()
 
 function findChilds($uidFolder, $path, $arrayPath)
 {
-    $Criteria = new Criteria ();
-    $Criteria->addSelectColumn ( AppFolderPeer::FOLDER_UID );
-    $Criteria->addSelectColumn ( AppFolderPeer::FOLDER_PARENT_UID );
-    $Criteria->addSelectColumn ( AppFolderPeer::FOLDER_NAME );
-    $Criteria->addSelectColumn ( AppFolderPeer::FOLDER_CREATE_DATE );
-    $Criteria->addSelectColumn ( AppFolderPeer::FOLDER_UPDATE_DATE );
+    $Criteria = new Criteria();
+    $Criteria->addSelectColumn(AppFolderPeer::FOLDER_UID);
+    $Criteria->addSelectColumn(AppFolderPeer::FOLDER_PARENT_UID);
+    $Criteria->addSelectColumn(AppFolderPeer::FOLDER_NAME);
+    $Criteria->addSelectColumn(AppFolderPeer::FOLDER_CREATE_DATE);
+    $Criteria->addSelectColumn(AppFolderPeer::FOLDER_UPDATE_DATE);
 
     $Criteria->add(AppFolderPeer::FOLDER_PARENT_UID, $uidFolder);
     $Criteria->addAscendingOrderByColumn(AppFolderPeer::FOLDER_NAME);
 
-    $rs = appFolderPeer::doSelectRS ( $Criteria );
-    $rs->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
+    $rs = appFolderPeer::doSelectRS($Criteria);
+    $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
-    $folderResult = array ();
-    $appFoder = new AppFolder ();
+    $folderResult = array();
+    $appFoder = new AppFolder();
     while ($rs->next()) {
         $row = $rs->getRow();
         $path = ($uidFolder != '/')? $path : '';
@@ -1156,7 +1171,7 @@ function findChilds($uidFolder, $path, $arrayPath)
 }
 function copyMoveAction($type)
 {
-    $oPMFolder = new AppFolder ();
+    $oPMFolder = new AppFolder();
 
     $dir=$_REQUEST['dir'];
     $paths = array();
@@ -1165,7 +1180,7 @@ function copyMoveAction($type)
     $folderSelected = $oPMFolder->load($dir);
 
     $root = array("/","/");
-    array_unshift ($folderResult, $root);
+    array_unshift($folderResult, $root);
     $folderResultSel = array();
     foreach ($folderResult as $key => $value) {
         $count = strlen($value[1]);
@@ -1286,10 +1301,10 @@ function copyMoveAction($type)
 
     $finalResponse=G::json_encode($copyDialog);
     foreach ($functionsToReplace as $key => $originalFunction) {
-        $finalResponse=str_replace('"'.$key.'"',$originalFunction,$finalResponse);
+        $finalResponse=str_replace('"'.$key.'"', $originalFunction, $finalResponse);
     }
-    $finalResponse=str_replace("URL_SCRIPT","../appFolder/appFolderAjax.php",$finalResponse);
-    echo ($finalResponse);
+    $finalResponse=str_replace("URL_SCRIPT", "../appFolder/appFolderAjax.php", $finalResponse);
+    echo($finalResponse);
 }
 
 function copyExecute()
@@ -1310,27 +1325,32 @@ function copyMoveExecute($type)
 function documentVersionHistory()
 {
     $folderID = $_POST ['folderID'] != '0' ? $_POST ['folderID'] == 'NA' ? "" : $_POST ['folderID'] : $rootFolder;
-    $folderContent = $oPMFolder->getFolderContent ($folderID, array ($_POST ['appDocId']));
+    $folderContent = $oPMFolder->getFolderContent($folderID, array($_POST ['appDocId']));
 
-    array_unshift ($folderContent, array ('id' => 'char'));
-    if (! is_array ($folderContent)) {
+    array_unshift($folderContent, array('id' => 'char'));
+    if (! is_array($folderContent)) {
         echo $folderContent;
-        exit ();
+        exit();
     }
 
     $_DBArray ['PM_FOLDER_DOC_HISTORY'] = $folderContent;
     $_SESSION ['_DBArray'] = $_DBArray;
 
-    $c = new Criteria ('dbarray');
-    $c->setDBArrayTable ('PM_FOLDER_DOC_HISTORY');
-    $c->addAscendingOrderByColumn ('id');
-    $G_PUBLISH = new Publisher ();
+    $c = new Criteria('dbarray');
+    $c->setDBArrayTable('PM_FOLDER_DOC_HISTORY');
+    $c->addAscendingOrderByColumn('id');
+    $G_PUBLISH = new Publisher();
 
-    $G_PUBLISH->AddContent ('propeltable', 'paged-table', 'appFolder/appFolderDocumentListHistory', $c,
-        array ('folderID' => $_POST ['folderID'] != '0' ? $_POST ['folderID'] == 'NA' ?
-        "/" : $_POST ['folderID'] : $rootFolder));
+    $G_PUBLISH->AddContent(
+        'propeltable',
+        'paged-table',
+        'appFolder/appFolderDocumentListHistory',
+        $c,
+        array('folderID' => $_POST ['folderID'] != '0' ? $_POST ['folderID'] == 'NA' ?
+        "/" : $_POST ['folderID'] : $rootFolder)
+    );
 
-    G::RenderPage ('publish', 'raw');
+    G::RenderPage('publish', 'raw');
 }
 
 function overwriteFile($node, $fileName)
@@ -1340,7 +1360,7 @@ function overwriteFile($node, $fileName)
     $appDocument = new AppDocument();
     $pMFolder = new AppFolder();
     $user = ($RBAC->userCanAccess('PM_ALLCASES') == 1) ? '' : $_SESSION['USER_LOGGED'];
-    $folderContentObj = $pMFolder->getFolderContent ($node, array(), null, null, '', '', $user);
+    $folderContentObj = $pMFolder->getFolderContent($node, array(), null, null, '', '', $user);
     foreach ($folderContentObj['documents'] as $key => $value) {
         if ($folderContentObj['documents'][$key]['APP_DOC_FILENAME'] == $fileName) {
             $appDocument->remove(trim($folderContentObj['documents'][$key]['APP_DOC_UID']), $folderContentObj['documents'][$key]['DOC_VERSION']);
@@ -1351,7 +1371,7 @@ function overwriteFile($node, $fileName)
 
 function copyMoveExecuteTree($uidFolder, $newUidFolder)
 {
-    $appFoder = new AppFolder ();
+    $appFoder = new AppFolder();
     $folderContent = $appFoder->getFolderContent($uidFolder);
     $folderOrigin = $appFoder->getFolderStructure($uidFolder);
 
@@ -1361,15 +1381,15 @@ function copyMoveExecuteTree($uidFolder, $newUidFolder)
 
     $FolderParentUid = trim($newUidFolder);//$form['FOLDER_PARENT_UID'];
     $FolderName = $folderOrigin[$uidFolder]['NAME'];
-    $newFolderContent = $appFoder->createFolder ($FolderName, $FolderParentUid, "new");
+    $newFolderContent = $appFoder->createFolder($FolderName, $FolderParentUid, "new");
 
     $appDocument = new AppDocument();
     if ($_REQUEST['action'] == 'moveExecute') {
-        $appFoder->remove($uidFolder,$folderOrigin[$uidFolder]['PARENT']);
+        $appFoder->remove($uidFolder, $folderOrigin[$uidFolder]['PARENT']);
     }
     $action = $_REQUEST['action'];
     foreach ($folderContent['documents'] as $keys => $value) {
-        $docInfo = $appDocument->load($value['APP_DOC_UID'],$value['DOC_VERSION']);
+        $docInfo = $appDocument->load($value['APP_DOC_UID'], $value['DOC_VERSION']);
         $docInfo['FOLDER_UID'] = $newFolderContent['folderUID'];
         $docInfo['APP_DOC_CREATE_DATE'] = date('Y-m-d H:i:s');
         $docInfo['APP_DOC_STATUS'] = 'ACTIVE';
@@ -1391,8 +1411,8 @@ function copyMoveExecuteTree($uidFolder, $newUidFolder)
             $arrayPathFromFile = G::getPathFromFileUID($docInfo["APP_UID"], $docUid);
             $newFile = $arrayPathFromFile[0] . PATH_SEP . $arrayPathFromFile[1] . "_" . $docInfo["DOC_VERSION"] . "." . $extension;
 
-            if(!file_exists($path . $arrayPathFromFile[0])) {
-                mkdir( $path . $arrayPathFromFile[0], 0777, true );
+            if (!file_exists($path . $arrayPathFromFile[0])) {
+                mkdir($path . $arrayPathFromFile[0], 0777, true);
             }
 
             copy($path . $originFile, $path . $newFile);
@@ -1403,9 +1423,9 @@ function copyMoveExecuteTree($uidFolder, $newUidFolder)
     return $newFolderContent['folderUID'];
 }
 
-function checkTree ($uidOriginFolder, $uidNewFolder)
+function checkTree($uidOriginFolder, $uidNewFolder)
 {
-    $appFoder = new AppFolder ();
+    $appFoder = new AppFolder();
     $newFoldercontent = copyMoveExecuteTree($uidOriginFolder, $uidNewFolder);
     $listfolder = $appFoder->getFolderList($uidOriginFolder);
 
@@ -1490,7 +1510,7 @@ function uploadExternalDocument()
                 $oAppDocument = new AppDocument();
                 if (isset($_POST['selitems']) && is_array($_POST['selitems'])) {
                     foreach ($_POST['selitems'] as $docId) {
-                        $arrayDocId = explode ('_',$docId);
+                        $arrayDocId = explode('_', $docId);
                         $docInfo=$oAppDocument->load($arrayDocId[0]);
                         $docInfo['FOLDER_UID'] =  $_POST['new_dir'];
                         $docInfo['APP_DOC_CREATE_DATE'] = date('Y-m-d H:i:s');
@@ -1539,9 +1559,9 @@ function uploadExternalDocument()
             $oFolder=new AppFolder();
             if ($docUid!=-1) {
                 //krumo("jhl");
-                $folderId=$oFolder->createFromPath($aID['INP_DOC_DESTINATION_PATH'],$appId);
+                $folderId=$oFolder->createFromPath($aID['INP_DOC_DESTINATION_PATH'], $appId);
                 //Tags
-                $fileTags=$oFolder->parseTags($aID['INP_DOC_TAGS'],$appId);
+                $fileTags=$oFolder->parseTags($aID['INP_DOC_TAGS'], $appId);
             } else {
                 $folderId=$folderId;
                 $fileTags="EXTERNAL";
@@ -1624,9 +1644,9 @@ function uploadExternalDocument()
 
                 //Plugin Hook PM_UPLOAD_DOCUMENT for upload document
                 $oPluginRegistry = PluginRegistry::loadSingleton();
-                if ($oPluginRegistry->existsTrigger (PM_UPLOAD_DOCUMENT) && class_exists ('uploadDocumentData')) {
+                if ($oPluginRegistry->existsTrigger(PM_UPLOAD_DOCUMENT) && class_exists('uploadDocumentData')) {
                     $oData['APP_UID']   = $appId;
-                    $documentData = new uploadDocumentData (
+                    $documentData = new uploadDocumentData(
                         $appId,
                         $_SESSION['USER_LOGGED'],
                         $sPathName . $sFileName,
@@ -1666,7 +1686,7 @@ function uploadExternalDocument()
 
 function newFolder()
 {
-    $oPMFolder = new AppFolder ();
+    $oPMFolder = new AppFolder();
     //G::pr($_POST);
     if ($_POST ['dir']=="") {
         $_POST ['dir']="/";
@@ -1674,11 +1694,11 @@ function newFolder()
     if ($_POST ['dir']=="root") {
         $_POST ['dir']="/";
     }
-    $folderStructure = $oPMFolder->getFolderStructure ($_POST ['dir']);
+    $folderStructure = $oPMFolder->getFolderStructure($_POST ['dir']);
     //G::pr($folderStructure);
     $folderPath = $folderStructure ['PATH'];
     $parentUid = $_POST ['dir'];
-    $folderUid = G::GenerateUniqueID ();
+    $folderUid = G::GenerateUniqueID();
 
     $formNewFolder=array();
 
@@ -1774,15 +1794,14 @@ function newFolder()
 
     $response=G::json_encode($formNewFolder);
     //This will add the functions to the Json response without quotes!
-    $response=str_replace('"handlerCreate"',$handlerCreate,$response);
-    $response=str_replace('"handlerCancel"',$handlerCancel,$response);
+    $response=str_replace('"handlerCreate"', $handlerCreate, $response);
+    $response=str_replace('"handlerCancel"', $handlerCancel, $response);
     print_r($response);
-
 }
 
 function appFolderSave()
 {
-    $oPMFolder = new AppFolder ();
+    $oPMFolder = new AppFolder();
     $form = $_POST['form'];
     $FolderUid = $form['FOLDER_UID'];
     $FolderParentUid = $form['FOLDER_PARENT_UID'];
@@ -1793,29 +1812,34 @@ function appFolderSave()
     $response['error']="error";
     $response['message']="error";
     $response['success']=false;
-    $folderCreateResponse = $oPMFolder->createFolder ($FolderName, $FolderParentUid, "new");
+    $folderCreateResponse = $oPMFolder->createFolder($FolderName, $FolderParentUid, "new");
 
-    $response=array_merge($response,$folderCreateResponse);
+    $response=array_merge($response, $folderCreateResponse);
 
     print_r(G::json_encode($response));
 }
 
 function documentInfo()
 {
-    $oFolder = new AppFolder ();
-    $Fields = $oPMFolder->getCompleteDocumentInfo ($_POST ['appId'], $_POST ['appDocId'], $_POST ['docVersion'],
-        $_POST ['docID'], $_POST ['usrUid']);
-    $G_PUBLISH = new Publisher ();
+    $oFolder = new AppFolder();
+    $Fields = $oPMFolder->getCompleteDocumentInfo(
+        $_POST ['appId'],
+        $_POST ['appDocId'],
+        $_POST ['docVersion'],
+        $_POST ['docID'],
+        $_POST ['usrUid']
+    );
+    $G_PUBLISH = new Publisher();
 
-    $G_PUBLISH->AddContent ('xmlform', 'xmlform', 'appFolder/appFolderDocumentInfo', '', $Fields, '');
-    G::RenderPage ('publish', 'raw');
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'appFolder/appFolderDocumentInfo', '', $Fields, '');
+    G::RenderPage('publish', 'raw');
 }
 
 function documentdelete()
 {
-    include_once ("classes/model/AppDocument.php");
-    $oAppDocument = new AppDocument ();
-    $oAppDocument->remove($_POST['sFileUID'],$_POST['docVersion']);
+    include_once("classes/model/AppDocument.php");
+    $oAppDocument = new AppDocument();
+    $oAppDocument->remove($_POST['sFileUID'], $_POST['docVersion']);
     /*we need to delete fisicaly the file use the follow code
      $appId= "00000000000000000000000000000000";
      $sPathName = PATH_DOCUMENT . $appId . PATH_SEP;
@@ -1824,16 +1848,15 @@ function documentdelete()
 
 function deletePMFolder()
 {
-    include_once ("classes/model/AppFolder.php");
-    $oAppFoder = new AppFolder ();
-    $oAppFoder->remove($_POST['sFileUID'],$_POST['rootfolder']);
-
+    include_once("classes/model/AppFolder.php");
+    $oAppFoder = new AppFolder();
+    $oAppFoder->remove($_POST['sFileUID'], $_POST['rootfolder']);
 }
 
 function getMime($fileName)
 {
     $fileName=basename($fileName);
-    $fileNameA=explode(".",$fileName);
+    $fileNameA=explode(".", $fileName);
     $return['description']=G::LoadTranslation("MIME_DES_FILE");
     $return['icon']="/images/documents/extension/document.png";
     if (count($fileNameA)>1) {
@@ -1915,7 +1938,7 @@ function extPathName($p_path, $p_addtrailingslash = false)
         }
 
         // Check if UNC path
-        $unc = substr($retval,0,2) == '\\\\' ? 1 : 0;
+        $unc = substr($retval, 0, 2) == '\\\\' ? 1 : 0;
 
         // Remove double \\
         $retval = str_replace('\\\\', '\\', $retval);
@@ -1933,10 +1956,10 @@ function extPathName($p_path, $p_addtrailingslash = false)
         }
 
         // Check if UNC path
-        $unc = substr($retval,0,2) == '//' ? 1 : 0;
+        $unc = substr($retval, 0, 2) == '//' ? 1 : 0;
 
         // Remove double //
-        $retval = str_replace('//','/',$retval);
+        $retval = str_replace('//', '/', $retval);
 
         // If UNC path, we have to add one / in front or everything breaks!
         if ($unc == 1) {
diff --git a/workflow/engine/methods/authSources/authSourcesSynchronize.php b/workflow/engine/methods/authSources/authSourcesSynchronize.php
index d9ce964e6..0be1f274c 100644
--- a/workflow/engine/methods/authSources/authSourcesSynchronize.php
+++ b/workflow/engine/methods/authSources/authSourcesSynchronize.php
@@ -49,7 +49,7 @@ if (!isset($_REQUEST["tab"])) {
 
 $authenticationSource = array("AUTH_SOURCE_UID" => $_REQUEST["authUid"], "CURRENT_TAB" => ($_REQUEST["tab"] == "synchronizeDepartments" ? 0 : 1));
 
-$oHeadPublisher =& headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript("authSources/authSourcesSynchronize", false);
 $oHeadPublisher->addContent("authSources/authSourcesSynchronize");
 $oHeadPublisher->assign("AUTHENTICATION_SOURCE", $authenticationSource);
@@ -58,4 +58,3 @@ global $G_PUBLISH;
 
 $G_PUBLISH = new Publisher();
 G::RenderPage("publish", "extJs");
-
diff --git a/workflow/engine/methods/authSources/authSourcesSynchronizeAjax.php b/workflow/engine/methods/authSources/authSourcesSynchronizeAjax.php
index f97356c89..886190c3d 100644
--- a/workflow/engine/methods/authSources/authSourcesSynchronizeAjax.php
+++ b/workflow/engine/methods/authSources/authSourcesSynchronizeAjax.php
@@ -34,7 +34,6 @@ class treeNode extends stdclass
 }
 
 try {
-
     $json = new Services_JSON();
     header("Content-Type: application/json;");
 
@@ -46,8 +45,8 @@ try {
             global $baseDN;
 
             $ldapAdvanced = getLDAPAdvanceInstance($_REQUEST["authUid"]);
-            $RBAC =& RBAC::getSingleton();
-            $authenticationSource  = $RBAC->authSourcesObj->load($_REQUEST["authUid"]);
+            $RBAC = RBAC::getSingleton();
+            $authenticationSource = $RBAC->authSourcesObj->load($_REQUEST["authUid"]);
             $baseDN = $authenticationSource["AUTH_SOURCE_BASE_DN"];
             $departments = $ldapAdvanced->searchDepartments();
             $terminatedOu = $ldapAdvanced->getTerminatedOu();
@@ -55,11 +54,11 @@ try {
             die($json->encode($nodes));
             break;
         case "saveDepartments":
-            $depsToCheck = ($_REQUEST['departmentsDN'] != '')? explode('|', $_REQUEST['departmentsDN']) : [];
+            $depsToCheck = ($_REQUEST['departmentsDN'] != '') ? explode('|', $_REQUEST['departmentsDN']) : [];
             $depsToCheck = array_map("urldecode", $depsToCheck);
             $depsToUncheck = getDepartmentsToUncheck($depsToCheck);
-            $RBAC =& RBAC::getSingleton();
-            $authenticationSource  = $RBAC->authSourcesObj->load($_REQUEST["authUid"]);
+            $RBAC = RBAC::getSingleton();
+            $authenticationSource = $RBAC->authSourcesObj->load($_REQUEST["authUid"]);
             $ldapAdvanced = getLDAPAdvanceInstance($_REQUEST["authUid"]);
 
             foreach ($depsToCheck as $departmentDn) {
@@ -82,9 +81,10 @@ try {
                             $parentUid == ''
                         ) {
                             $response = new stdClass();
-                            $response->status  = 'ERROR';
+                            $response->status = 'ERROR';
                             $response->message = G::LoadTranslation(
-                                'ID_DEPARTMENT_CHECK_PARENT_DEPARTMENT', [$parentDn, $departmentTitle]
+                                'ID_DEPARTMENT_CHECK_PARENT_DEPARTMENT',
+                                [$parentDn, $departmentTitle]
                             );
 
                             echo $json->encode($response);
@@ -95,15 +95,15 @@ try {
                     $department = new Department();
 
                     $departmentUid = $department->create([
-                        'DEP_TITLE'    => stripslashes($departmentTitle),
-                        'DEP_PARENT'   => $parentUid,
-                        'DEP_LDAP_DN'  => $departmentDn,
+                        'DEP_TITLE' => stripslashes($departmentTitle),
+                        'DEP_PARENT' => $parentUid,
+                        'DEP_LDAP_DN' => $departmentDn,
                         'DEP_REF_CODE' => ''
                     ]);
 
                     if ($departmentUid === false) {
                         $response = new stdClass();
-                        $response->status  = 'ERROR';
+                        $response->status = 'ERROR';
                         $response->message = G::LoadTranslation('ID_DEPARTMENT_ERROR_CREATE');
 
                         echo $json->encode($response);
@@ -159,8 +159,8 @@ try {
             $groupsToCheck = explode("|", $_REQUEST["groupsDN"]);
             $groupsToCheck = array_map("urldecode", $groupsToCheck);
             $groupsToUncheck = getGroupsToUncheck($groupsToCheck);
-            $RBAC =& RBAC::getSingleton();
-            $authenticationSource  = $RBAC->authSourcesObj->load($_REQUEST["authUid"]);
+            $RBAC = RBAC::getSingleton();
+            $authenticationSource = $RBAC->authSourcesObj->load($_REQUEST["authUid"]);
             $ldapAdvanced = getLDAPAdvanceInstance($_REQUEST["authUid"]);
 
             foreach ($groupsToCheck as $groupDN) {
@@ -185,7 +185,7 @@ try {
 
                 if ($groupUID == "") {
                     $group = new Groupwf();
-                    $row["GRP_TITLE"]   = stripslashes($groupTitle);
+                    $row["GRP_TITLE"] = stripslashes($groupTitle);
                     $row["GRP_LDAP_DN"] = $groupDN;
                     $groupUID = $group->create($row);
 
@@ -234,7 +234,7 @@ try {
 
 function getLDAPAdvanceInstance($authUid)
 {
-    $RBAC = &RBAC::getSingleton();
+    $RBAC = RBAC::getSingleton();
     $ldapAdvanced = new LdapAdvanced();
     $ldapAdvanced->sAuthSource = $authUid;
     $ldapAdvanced->sSystem = $RBAC->sSystem;
@@ -300,7 +300,7 @@ function lookForChildrenDeps($parent)
         $departmentUid = $ldapAdvanced->getDepUidIfExistsDN($department["DEP_DN"]);
 
         if ($departmentUid != "") {
-            $departmentObject->text .= " (" . ((isset($arrayDepartmentNumberOfUsersFromDb[$departmentUid]))? $arrayDepartmentNumberOfUsersFromDb[$departmentUid] : 0) . ")";
+            $departmentObject->text .= " (" . ((isset($arrayDepartmentNumberOfUsersFromDb[$departmentUid])) ? $arrayDepartmentNumberOfUsersFromDb[$departmentUid] : 0) . ")";
             $departmentObject->checked = true;
         } else {
             $departmentObject->checked = false;
@@ -394,7 +394,7 @@ function lookForChildrenGroups()
         $groupUid = $ldapAdvanced->getGrpUidIfExistsDN($group["GRP_DN"]);
 
         if ($groupUid != "") {
-            $groupObject->text .= " (" . ((isset($arrayGroupNumberOfUsersFromDb[$groupUid]))? $arrayGroupNumberOfUsersFromDb[$groupUid] : 0) . ")";
+            $groupObject->text .= " (" . ((isset($arrayGroupNumberOfUsersFromDb[$groupUid])) ? $arrayGroupNumberOfUsersFromDb[$groupUid] : 0) . ")";
             $groupObject->checked = true;
         } else {
             $groupObject->checked = false;
@@ -450,9 +450,10 @@ function custom_ldap_explode_dn($dn)
     unset($result["count"]);
 
     foreach ($result as $key => $value) {
-        $result[$key] = addcslashes(preg_replace("/\\\([0-9A-Fa-f]{2})/e", "''.chr(hexdec('\\1')).''", $value), '<>,"');
+        $result[$key] = addcslashes(preg_replace("/\\\([0-9A-Fa-f]{2})/", function ($m) {
+            return chr(hexdec($m[1]));
+        }, $value), '<>,"');
     }
 
-    return($result);
+    return $result;
 }
-
diff --git a/workflow/engine/methods/authSources/authSources_Edit.php b/workflow/engine/methods/authSources/authSources_Edit.php
index 8681546f8..ad8aa00e3 100644
--- a/workflow/engine/methods/authSources/authSources_Edit.php
+++ b/workflow/engine/methods/authSources/authSources_Edit.php
@@ -1,128 +1,126 @@
-<?php
-/**
- * authSources_Edit.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2011 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- */
-
-global $RBAC;
-if ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-    G::header( 'location: ../login/login' );
-    die();
-}
-
-if (! isset( $_GET['sUID'] )) {
-    G::SendTemporalMessage( 'ID_ERROR_OBJECT_NOT_EXISTS', 'error', 'labels' );
-    G::header( 'location: authSources_List' );
-    die();
-}
-
-if ($_GET['sUID'] == '') {
-    G::SendTemporalMessage( 'ID_ERROR_OBJECT_NOT_EXISTS', 'error', 'labels' );
-    G::header( 'location: authSources_List' );
-    die();
-}
-
-$G_MAIN_MENU = 'processmaker';
-$G_SUB_MENU = 'users';
-$G_ID_MENU_SELECTED = 'USERS';
-$G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES';
-
-$fields = $RBAC->getAuthSource( $_GET['sUID'] );
-
-if (is_array( $fields['AUTH_SOURCE_DATA'] )) {
-    foreach ($fields['AUTH_SOURCE_DATA'] as $field => $value) {
-        $fields[$field] = $value;
-    }
-}
-$fields['AUTH_SOURCE_SHOWGRID_FLAG'] = 0;
-if (isset($fields['AUTH_SOURCE_DATA']['AUTH_SOURCE_SHOWGRID']) && $fields['AUTH_SOURCE_DATA']['AUTH_SOURCE_SHOWGRID'] == 'on') {
-    $fields["AUTH_SOURCE_SHOWGRID_FLAG"] = 1;
-}
-unset( $fields['AUTH_SOURCE_DATA'] );
-
-$textAttribute = '';
-if (isset($fields['AUTH_SOURCE_GRID_ATTRIBUTE']) && count($fields['AUTH_SOURCE_GRID_ATTRIBUTE'])) {
-    foreach ($fields['AUTH_SOURCE_GRID_ATTRIBUTE'] as $value) {
-        $textAttribute .= '|' . $value['attributeLdap'] . '/' . $value['attributeUser'];
-    }
-}
-$fields['AUTH_SOURCE_GRID_TEXT'] = $textAttribute;
-
-//fixing a problem with dropdown with int values,
-//the problem : the value was integer, but the dropdown was expecting a string value, and they returns always the first item of dropdown
-if (isset( $fields['AUTH_SOURCE_ENABLED_TLS'] )) {
-    $fields['AUTH_SOURCE_ENABLED_TLS'] = sprintf( '%d', $fields['AUTH_SOURCE_ENABLED_TLS'] );
-}
-if (isset( $fields['AUTH_ANONYMOUS'] )) {
-    $fields['AUTH_ANONYMOUS'] = sprintf( '%d', $fields['AUTH_ANONYMOUS'] );
-}
-
-$G_PUBLISH = new Publisher();
-if ($fields['AUTH_SOURCE_PROVIDER'] == 'ldap') {
-    $oHeadPublisher = & headPublisher::getSingleton();
-    $oHeadPublisher->addExtJsScript( 'authSources/authSourcesEdit', false );
-    $oHeadPublisher->assign( 'sUID', $_GET['sUID'] );
-    G::RenderPage( 'publish', 'extJs' );
-} else {
-    if (file_exists( PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml' )) {
-        $pluginEnabled = 1;
-
-        if ($pluginEnabled == 1) {
-
-            $data = executeQuery("DESCRIBE USERS");
-            $fieldSet = array("USR_UID", "USR_USERNAME", "USR_PASSWORD", "USR_CREATE_DATE", "USR_UPDATE_DATE", "USR_COUNTRY", "USR_CITY", "USR_LOCATION", "DEP_UID", "USR_RESUME", "USR_ROLE", "USR_REPORTS_TO", "USR_REPLACED_BY", "USR_UX");
-            $attributes = null;
-
-            foreach ($data as $value) {
-                if (!(in_array($value["Field"], $fieldSet))) {
-                    $attributes = $attributes . $value["Field"] . "|";
-                }
-            }
-
-            $fields["AUTH_SOURCE_ATTRIBUTE_IDS"] = $attributes;
-            if (file_exists(PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Flag')) {
-                $oHeadPublisher = & headPublisher::getSingleton ();
-
-                $oHeadPublisher->assign("Fields", $fields);
-                $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/library', false, true );
-                $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/ldapAdvancedForm', false, true );
-                $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/ldapAdvancedList', false, true );
-                G::RenderPage ('publish', 'extJs');
-                die();
-            }
-            $G_PUBLISH->AddContent("xmlform", "xmlform", 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit', '', $fields, '../authSources/authSources_Save');
-        } else {
-            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', array ('MESSAGE' => G::LoadTranslation( 'ID_AUTH_SOURCE_MISSING' )
-            ) );
-        }
-    } else {
-        if (file_exists( PATH_XMLFORM . 'authSources/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml' )) {
-            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'authSources/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit', '', $fields, '../authSources/authSources_Save' );
-        } else {
-            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', array ('MESSAGE' => 'File: ' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml' . ' not exists.'
-            ) );
-        }
-    }
-
-    G::RenderPage("publish", "blank");
-}
-
+<?php
+/**
+ * authSources_Edit.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2011 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+global $RBAC;
+if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1) {
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+    G::header('location: ../login/login');
+    die();
+}
+
+if (! isset($_GET['sUID'])) {
+    G::SendTemporalMessage('ID_ERROR_OBJECT_NOT_EXISTS', 'error', 'labels');
+    G::header('location: authSources_List');
+    die();
+}
+
+if ($_GET['sUID'] == '') {
+    G::SendTemporalMessage('ID_ERROR_OBJECT_NOT_EXISTS', 'error', 'labels');
+    G::header('location: authSources_List');
+    die();
+}
+
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'users';
+$G_ID_MENU_SELECTED = 'USERS';
+$G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES';
+
+$fields = $RBAC->getAuthSource($_GET['sUID']);
+
+if (is_array($fields['AUTH_SOURCE_DATA'])) {
+    foreach ($fields['AUTH_SOURCE_DATA'] as $field => $value) {
+        $fields[$field] = $value;
+    }
+}
+$fields['AUTH_SOURCE_SHOWGRID_FLAG'] = 0;
+if (isset($fields['AUTH_SOURCE_DATA']['AUTH_SOURCE_SHOWGRID']) && $fields['AUTH_SOURCE_DATA']['AUTH_SOURCE_SHOWGRID'] == 'on') {
+    $fields["AUTH_SOURCE_SHOWGRID_FLAG"] = 1;
+}
+unset($fields['AUTH_SOURCE_DATA']);
+
+$textAttribute = '';
+if (isset($fields['AUTH_SOURCE_GRID_ATTRIBUTE']) && count($fields['AUTH_SOURCE_GRID_ATTRIBUTE'])) {
+    foreach ($fields['AUTH_SOURCE_GRID_ATTRIBUTE'] as $value) {
+        $textAttribute .= '|' . $value['attributeLdap'] . '/' . $value['attributeUser'];
+    }
+}
+$fields['AUTH_SOURCE_GRID_TEXT'] = $textAttribute;
+
+//fixing a problem with dropdown with int values,
+//the problem : the value was integer, but the dropdown was expecting a string value, and they returns always the first item of dropdown
+if (isset($fields['AUTH_SOURCE_ENABLED_TLS'])) {
+    $fields['AUTH_SOURCE_ENABLED_TLS'] = sprintf('%d', $fields['AUTH_SOURCE_ENABLED_TLS']);
+}
+if (isset($fields['AUTH_ANONYMOUS'])) {
+    $fields['AUTH_ANONYMOUS'] = sprintf('%d', $fields['AUTH_ANONYMOUS']);
+}
+
+$G_PUBLISH = new Publisher();
+if ($fields['AUTH_SOURCE_PROVIDER'] == 'ldap') {
+    $oHeadPublisher = headPublisher::getSingleton();
+    $oHeadPublisher->addExtJsScript('authSources/authSourcesEdit', false);
+    $oHeadPublisher->assign('sUID', $_GET['sUID']);
+    G::RenderPage('publish', 'extJs');
+} else {
+    if (file_exists(PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml')) {
+        $pluginEnabled = 1;
+
+        if ($pluginEnabled == 1) {
+            $data = executeQuery("DESCRIBE USERS");
+            $fieldSet = array("USR_UID", "USR_USERNAME", "USR_PASSWORD", "USR_CREATE_DATE", "USR_UPDATE_DATE", "USR_COUNTRY", "USR_CITY", "USR_LOCATION", "DEP_UID", "USR_RESUME", "USR_ROLE", "USR_REPORTS_TO", "USR_REPLACED_BY", "USR_UX");
+            $attributes = null;
+
+            foreach ($data as $value) {
+                if (!(in_array($value["Field"], $fieldSet))) {
+                    $attributes = $attributes . $value["Field"] . "|";
+                }
+            }
+
+            $fields["AUTH_SOURCE_ATTRIBUTE_IDS"] = $attributes;
+            if (file_exists(PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Flag')) {
+                $oHeadPublisher = headPublisher::getSingleton();
+
+                $oHeadPublisher->assign("Fields", $fields);
+                $oHeadPublisher->addExtJsScript(PATH_TPL. 'ldapAdvanced/library', false, true);
+                $oHeadPublisher->addExtJsScript(PATH_TPL. 'ldapAdvanced/ldapAdvancedForm', false, true);
+                $oHeadPublisher->addExtJsScript(PATH_TPL. 'ldapAdvanced/ldapAdvancedList', false, true);
+                G::RenderPage('publish', 'extJs');
+                die();
+            }
+            $G_PUBLISH->AddContent("xmlform", "xmlform", 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit', '', $fields, '../authSources/authSources_Save');
+        } else {
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', array('MESSAGE' => G::LoadTranslation('ID_AUTH_SOURCE_MISSING')
+            ));
+        }
+    } else {
+        if (file_exists(PATH_XMLFORM . 'authSources/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml')) {
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'authSources/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit', '', $fields, '../authSources/authSources_Save');
+        } else {
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', array('MESSAGE' => 'File: ' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml' . ' not exists.'
+            ));
+        }
+    }
+
+    G::RenderPage("publish", "blank");
+}
diff --git a/workflow/engine/methods/authSources/authSources_List.php b/workflow/engine/methods/authSources/authSources_List.php
index fa691a4e5..404556efa 100644
--- a/workflow/engine/methods/authSources/authSources_List.php
+++ b/workflow/engine/methods/authSources/authSources_List.php
@@ -1,54 +1,53 @@
-<?php
-/**
- * authSources_List.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- */
-
-global $RBAC;
-if ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-    G::header( 'location: ../login/login' );
-    die();
-}
-
-$c = new Configurations();
-$configPage = $c->getConfiguration( 'authSourcesList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
-$Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
-$G_MAIN_MENU = 'processmaker';
-$G_SUB_MENU = 'users';
-$G_ID_MENU_SELECTED = 'USERS';
-$G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES';
-
-$G_PUBLISH = new Publisher();
-$licensedFeatures = & PMLicensedFeatures::getSingleton();
-
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( 'authSources/authSourcesList', false ); //adding a javascript file .js
-/*----------------------------------********---------------------------------*/
-if ($licensedFeatures->verifyfeature('sywN09PSzh1MVdOajZBdnhMbFhCSnpNT1lLTEFwVklmOTE=')) {
-    $oHeadPublisher->addExtJsScript( 'authSources/authSourcesListSyn', false ); //adding a javascript file .js
-}
-/*----------------------------------********---------------------------------*/
-$oHeadPublisher->addContent( 'authSources/authSourcesList' ); //adding a html file  .html.
-$oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
-$oHeadPublisher->assign( 'CONFIG', $Config );
-G::RenderPage( 'publish', 'extJs' );
-
+<?php
+/**
+ * authSources_List.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+global $RBAC;
+if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1) {
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+    G::header('location: ../login/login');
+    die();
+}
+
+$c = new Configurations();
+$configPage = $c->getConfiguration('authSourcesList', 'pageSize', '', $_SESSION['USER_LOGGED']);
+$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'users';
+$G_ID_MENU_SELECTED = 'USERS';
+$G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES';
+
+$G_PUBLISH = new Publisher();
+$licensedFeatures = PMLicensedFeatures::getSingleton();
+
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('authSources/authSourcesList', false); //adding a javascript file .js
+/*----------------------------------********---------------------------------*/
+if ($licensedFeatures->verifyfeature('sywN09PSzh1MVdOajZBdnhMbFhCSnpNT1lLTEFwVklmOTE=')) {
+    $oHeadPublisher->addExtJsScript('authSources/authSourcesListSyn', false); //adding a javascript file .js
+}
+/*----------------------------------********---------------------------------*/
+$oHeadPublisher->addContent('authSources/authSourcesList'); //adding a html file  .html.
+$oHeadPublisher->assign('FORMATS', $c->getFormats());
+$oHeadPublisher->assign('CONFIG', $Config);
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/authSources/authSources_New.php b/workflow/engine/methods/authSources/authSources_New.php
index 33bb2afa7..cff544da2 100644
--- a/workflow/engine/methods/authSources/authSources_New.php
+++ b/workflow/engine/methods/authSources/authSources_New.php
@@ -1,78 +1,77 @@
-<?php
-/**
- * authSources_New.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2011 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- */
-
-global $RBAC;
-if ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-    G::header( 'location: ../login/login' );
-    die();
-}
-
-$G_MAIN_MENU = 'processmaker';
-$G_SUB_MENU = 'users';
-$G_ID_MENU_SELECTED = 'USERS';
-$G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES';
-
-$fields = array ('AUTH_SOURCE_PROVIDER' => $_REQUEST['AUTH_SOURCE_PROVIDER']);
-
-$G_PUBLISH = new Publisher();
-if (file_exists( PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml' )) {
-    $pluginEnabled = 1;
-    if ($pluginEnabled == 1) {
-        //The attributes the users
-
-        $data = executeQuery("DESCRIBE USERS");
-        $fieldSet = array("USR_UID", "USR_USERNAME", "USR_PASSWORD", "USR_CREATE_DATE", "USR_UPDATE_DATE", "USR_COUNTRY", "USR_CITY", "USR_LOCATION", "DEP_UID", "USR_RESUME", "USR_ROLE", "USR_REPORTS_TO", "USR_REPLACED_BY", "USR_UX");
-        $attributes = null;
-
-        foreach ($data as $value) {
-            if (!(in_array($value["Field"], $fieldSet))) {
-                $attributes = $attributes . $value["Field"] . "|";
-            }
-        }
-        $fields["AUTH_SOURCE_ATTRIBUTE_IDS"] = $attributes;
-        if (file_exists(PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Flag')) {
-            $oHeadPublisher = & headPublisher::getSingleton ();
-            
-            $oHeadPublisher->assign("Fields", $fields);
-            $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/library', false, true );
-            $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/ldapAdvancedForm', false, true );
-            $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/ldapAdvancedList', false, true );
-            G::RenderPage ('publish', 'extJs');
-            die();
-        }
-        $G_PUBLISH->AddContent("xmlform", "xmlform", 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit', '', $fields, '../authSources/authSources_Save');
-    } else {
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', array ('MESSAGE' => G::LoadTranslation( 'ID_AUTH_SOURCE_MISSING' )) );
-    }
-} else {
-    if (file_exists( PATH_XMLFORM . 'authSources/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml' )) {
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'authSources/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit', '', $fields, '../authSources/authSources_Save' );
-    } else {
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', array ('MESSAGE' => 'File: ' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml' . ' not exists.') );
-    }
-}
-
-G::RenderPage("publish", "blank");
-
+<?php
+/**
+ * authSources_New.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2011 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+global $RBAC;
+if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1) {
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+    G::header('location: ../login/login');
+    die();
+}
+
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'users';
+$G_ID_MENU_SELECTED = 'USERS';
+$G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES';
+
+$fields = array('AUTH_SOURCE_PROVIDER' => $_REQUEST['AUTH_SOURCE_PROVIDER']);
+
+$G_PUBLISH = new Publisher();
+if (file_exists(PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml')) {
+    $pluginEnabled = 1;
+    if ($pluginEnabled == 1) {
+        //The attributes the users
+
+        $data = executeQuery("DESCRIBE USERS");
+        $fieldSet = array("USR_UID", "USR_USERNAME", "USR_PASSWORD", "USR_CREATE_DATE", "USR_UPDATE_DATE", "USR_COUNTRY", "USR_CITY", "USR_LOCATION", "DEP_UID", "USR_RESUME", "USR_ROLE", "USR_REPORTS_TO", "USR_REPLACED_BY", "USR_UX");
+        $attributes = null;
+
+        foreach ($data as $value) {
+            if (!(in_array($value["Field"], $fieldSet))) {
+                $attributes = $attributes . $value["Field"] . "|";
+            }
+        }
+        $fields["AUTH_SOURCE_ATTRIBUTE_IDS"] = $attributes;
+        if (file_exists(PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Flag')) {
+            $oHeadPublisher = headPublisher::getSingleton();
+            
+            $oHeadPublisher->assign("Fields", $fields);
+            $oHeadPublisher->addExtJsScript(PATH_TPL. 'ldapAdvanced/library', false, true);
+            $oHeadPublisher->addExtJsScript(PATH_TPL. 'ldapAdvanced/ldapAdvancedForm', false, true);
+            $oHeadPublisher->addExtJsScript(PATH_TPL. 'ldapAdvanced/ldapAdvancedList', false, true);
+            G::RenderPage('publish', 'extJs');
+            die();
+        }
+        $G_PUBLISH->AddContent("xmlform", "xmlform", 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit', '', $fields, '../authSources/authSources_Save');
+    } else {
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', array('MESSAGE' => G::LoadTranslation('ID_AUTH_SOURCE_MISSING')));
+    }
+} else {
+    if (file_exists(PATH_XMLFORM . 'authSources/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml')) {
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'authSources/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit', '', $fields, '../authSources/authSources_Save');
+    } else {
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', array('MESSAGE' => 'File: ' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml' . ' not exists.'));
+    }
+}
+
+G::RenderPage("publish", "blank");
diff --git a/workflow/engine/methods/authSources/authSources_SearchUsers.php b/workflow/engine/methods/authSources/authSources_SearchUsers.php
index 072e39d05..4c1489cf6 100644
--- a/workflow/engine/methods/authSources/authSources_SearchUsers.php
+++ b/workflow/engine/methods/authSources/authSources_SearchUsers.php
@@ -1,74 +1,72 @@
-<?php
-/**
- * authSources_SearchUsers.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- */
-global $RBAC;
-if ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-    G::header( 'location: ../login/login' );
-    die();
-}
-
-$G_MAIN_MENU = 'processmaker';
-$G_SUB_MENU = 'users';
-$G_ID_MENU_SELECTED = 'USERS';
-$G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES';
-
-$G_PUBLISH = new Publisher();
-$fields = $RBAC->getAuthSource( $_GET['sUID'] );
-if (file_exists( PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml' )) {
-    $pluginEnabled = 0;
-    /*----------------------------------********---------------------------------*/
-    $licensedFeatures = & PMLicensedFeatures::getSingleton();
-    if ($licensedFeatures->verifyfeature('sywN09PSzh1MVdOajZBdnhMbFhCSnpNT1lLTEFwVklmOTE=')) {
-      $pluginEnabled = 1;
-    }
-    /*----------------------------------********---------------------------------*/
-    if ($pluginEnabled == 0) {
-       $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', array ('MESSAGE' => G::LoadTranslation( 'ID_AUTH_SOURCE_FEATURE_MISSING' ) ) );
-       G::RenderPage( 'publish', 'blank' );
-    } else {
-
-        $c = new Configurations();
-        $configPage = $c->getConfiguration('additionalTablesList', 'pageSize','',$_SESSION['USER_LOGGED']);
-        $Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
-
-        $oHeadPublisher = & headPublisher::getSingleton ();
-
-        $oHeadPublisher->assign("FORMATS", $c->getFormats());
-        $oHeadPublisher->assign("CONFIG", $Config);
-
-        if (file_exists(PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Flag')) {
-            $oHeadPublisher = & headPublisher::getSingleton ();
-
-            $oHeadPublisher->assign("Fields", $fields);
-            $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/library', false, true );
-            $oHeadPublisher->addExtJsScript (PATH_TPL. 'ldapAdvanced/ldapAdvancedSearch', false, true );
-            G::RenderPage ('publish', 'extJs');
-            die();
-        }
-    }
-}
-
-$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'authSources/authSources_SearchUsers', '', array ('AUTH_SOURCE_UID' => $_GET['sUID']), '../authSources/authSources_ImportUsers' );
-G::RenderPage( 'publish', 'blank' );
-
+<?php
+/**
+ * authSources_SearchUsers.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ */
+global $RBAC;
+if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1) {
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+    G::header('location: ../login/login');
+    die();
+}
+
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'users';
+$G_ID_MENU_SELECTED = 'USERS';
+$G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES';
+
+$G_PUBLISH = new Publisher();
+$fields = $RBAC->getAuthSource($_GET['sUID']);
+if (file_exists(PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Edit.xml')) {
+    $pluginEnabled = 0;
+    /*----------------------------------********---------------------------------*/
+    $licensedFeatures = PMLicensedFeatures::getSingleton();
+    if ($licensedFeatures->verifyfeature('sywN09PSzh1MVdOajZBdnhMbFhCSnpNT1lLTEFwVklmOTE=')) {
+        $pluginEnabled = 1;
+    }
+    /*----------------------------------********---------------------------------*/
+    if ($pluginEnabled == 0) {
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', array('MESSAGE' => G::LoadTranslation('ID_AUTH_SOURCE_FEATURE_MISSING') ));
+        G::RenderPage('publish', 'blank');
+    } else {
+        $c = new Configurations();
+        $configPage = $c->getConfiguration('additionalTablesList', 'pageSize', '', $_SESSION['USER_LOGGED']);
+        $Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
+
+        $oHeadPublisher = headPublisher::getSingleton();
+
+        $oHeadPublisher->assign("FORMATS", $c->getFormats());
+        $oHeadPublisher->assign("CONFIG", $Config);
+
+        if (file_exists(PATH_XMLFORM . 'ldapAdvanced/' . $fields['AUTH_SOURCE_PROVIDER'] . 'Flag')) {
+            $oHeadPublisher = headPublisher::getSingleton();
+
+            $oHeadPublisher->assign("Fields", $fields);
+            $oHeadPublisher->addExtJsScript(PATH_TPL. 'ldapAdvanced/library', false, true);
+            $oHeadPublisher->addExtJsScript(PATH_TPL. 'ldapAdvanced/ldapAdvancedSearch', false, true);
+            G::RenderPage('publish', 'extJs');
+            die();
+        }
+    }
+}
+
+$G_PUBLISH->AddContent('xmlform', 'xmlform', 'authSources/authSources_SearchUsers', '', array('AUTH_SOURCE_UID' => $_GET['sUID']), '../authSources/authSources_ImportUsers');
+G::RenderPage('publish', 'blank');
diff --git a/workflow/engine/methods/authSources/authSources_SelectType.php b/workflow/engine/methods/authSources/authSources_SelectType.php
index 437823ba8..b6a58c8e9 100644
--- a/workflow/engine/methods/authSources/authSources_SelectType.php
+++ b/workflow/engine/methods/authSources/authSources_SelectType.php
@@ -1,54 +1,53 @@
-<?php
-/**
- * authSources_SelectType.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2011 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- */
-global $RBAC;
-if ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-    G::header( 'location: ../login/login' );
-    die();
-}
-
-$G_MAIN_MENU = 'processmaker';
-$G_SUB_MENU = 'users';
-$G_ID_MENU_SELECTED = 'USERS';
-$G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES';
-
-$aAuthSourceTypes = array (array ('sType' => 'char','sLabel' => 'char'));
-$oDirectory = dir( PATH_RBAC . 'plugins' . PATH_SEP );
-while ($sObject = $oDirectory->read()) {
-    if (($sObject != '.') && ($sObject != '..') && ($sObject != '.svn') && ($sObject != 'ldap')) {
-        if (is_file( PATH_RBAC . 'plugins' . PATH_SEP . $sObject )) {
-            $sType = trim( str_replace( 'class.', '', str_replace( '.php', '', $sObject ) ) );
-            $aAuthSourceTypes[] = array ('sType' => $sType,'sLabel' => $sType );
-        }
-    }
-}
-global $_DBArray;
-$_DBArray['authSourceTypes'] = $aAuthSourceTypes;
-$_SESSION['_DBArray'] = $_DBArray;
-
-$G_PUBLISH = new Publisher();
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( 'authSources/authSourcesListNew', true ); //adding a javascript file .js
-G::RenderPage( 'publish', 'extJs' );
-
+<?php
+/**
+ * authSources_SelectType.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2011 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ */
+global $RBAC;
+if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1) {
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+    G::header('location: ../login/login');
+    die();
+}
+
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'users';
+$G_ID_MENU_SELECTED = 'USERS';
+$G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES';
+
+$aAuthSourceTypes = array(array('sType' => 'char','sLabel' => 'char'));
+$oDirectory = dir(PATH_RBAC . 'plugins' . PATH_SEP);
+while ($sObject = $oDirectory->read()) {
+    if (($sObject != '.') && ($sObject != '..') && ($sObject != '.svn') && ($sObject != 'ldap')) {
+        if (is_file(PATH_RBAC . 'plugins' . PATH_SEP . $sObject)) {
+            $sType = trim(str_replace('class.', '', str_replace('.php', '', $sObject)));
+            $aAuthSourceTypes[] = array('sType' => $sType,'sLabel' => $sType );
+        }
+    }
+}
+global $_DBArray;
+$_DBArray['authSourceTypes'] = $aAuthSourceTypes;
+$_SESSION['_DBArray'] = $_DBArray;
+
+$G_PUBLISH = new Publisher();
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('authSources/authSourcesListNew', true); //adding a javascript file .js
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/authSources/authSources_kindof.php b/workflow/engine/methods/authSources/authSources_kindof.php
index 6b48b8794..02010faaa 100644
--- a/workflow/engine/methods/authSources/authSources_kindof.php
+++ b/workflow/engine/methods/authSources/authSources_kindof.php
@@ -1,42 +1,41 @@
-<?php
-/**
- * authSources_SelectType.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2011 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- */
-global $RBAC;
-if ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-    G::header( 'location: ../login/login' );
-    die();
-}
-$G_MAIN_MENU = 'processmaker';
-$G_SUB_MENU = 'users';
-$G_ID_MENU_SELECTED = 'USERS';
-$G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES';
-
-$aAuthSourceTypes = array (array ('sType' => 'char','sLabel' => 'char'));
-$oDirectory = dir( PATH_RBAC . 'plugins' . PATH_SEP );
-$G_PUBLISH = new Publisher();
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( 'authSources/authSourceskindof', true ); //adding a javascript file .js
-$oHeadPublisher->assign( 'sprovider', $_GET['sprovider'] );
-G::RenderPage( 'publish', 'extJs' );
-
+<?php
+/**
+ * authSources_SelectType.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2011 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ */
+global $RBAC;
+if ($RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1) {
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+    G::header('location: ../login/login');
+    die();
+}
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'users';
+$G_ID_MENU_SELECTED = 'USERS';
+$G_ID_SUB_MENU_SELECTED = 'AUTH_SOURCES';
+
+$aAuthSourceTypes = array(array('sType' => 'char','sLabel' => 'char'));
+$oDirectory = dir(PATH_RBAC . 'plugins' . PATH_SEP);
+$G_PUBLISH = new Publisher();
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('authSources/authSourceskindof', true); //adding a javascript file .js
+$oHeadPublisher->assign('sprovider', $_GET['sprovider']);
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php
index 139b4911a..f508a759f 100644
--- a/workflow/engine/methods/cases/ajaxListener.php
+++ b/workflow/engine/methods/cases/ajaxListener.php
@@ -7,7 +7,7 @@ if (!isset($_SESSION['USER_LOGGED'])) {
     $responseObject->error = G::LoadTranslation('ID_LOGIN_AGAIN');
     $responseObject->success = true;
     $responseObject->lostSession = true;
-    print G::json_encode( $responseObject );
+    print G::json_encode($responseObject);
     die();
 }
 
@@ -15,19 +15,19 @@ $filter = new InputFilter();
 $_REQUEST = $filter->xssFilterHard($_REQUEST);
 $_POST = $filter->xssFilterHard($_POST);
 
-if(isset($_REQUEST['action']) && $_REQUEST['action'] == "verifySession" ) {
+if (isset($_REQUEST['action']) && $_REQUEST['action'] == "verifySession") {
     if (!isset($_SESSION['USER_LOGGED'])) {
         $response = new stdclass();
         $response->message = G::LoadTranslation('ID_LOGIN_AGAIN');
         $response->lostSession = true;
-        print G::json_encode( $response );
+        print G::json_encode($response);
         die();
     } else {
         $response = new stdclass();
 
         //Check if the user is a supervisor to this Process
-        GLOBAL $RBAC;
-        if($RBAC->userCanAccess('PM_REASSIGNCASE') == 1){
+        global $RBAC;
+        if ($RBAC->userCanAccess('PM_REASSIGNCASE') == 1) {
             $response->reassigncase = true;
             $response->message = '';
         } elseif ($RBAC->userCanAccess('PM_REASSIGNCASE_SUPERVISOR') == 1) {
@@ -40,13 +40,12 @@ if(isset($_REQUEST['action']) && $_REQUEST['action'] == "verifySession" ) {
             }
         }
 
-        print G::json_encode( $response );
+        print G::json_encode($response);
         die();
     }
 }
 class Ajax
 {
-
     public function getCaseMenu($params)
     {
         global $G_TMP_MENU;
@@ -57,13 +56,13 @@ class Ajax
         $oMenu = new Menu();
         $oMenu->load('caseOptions');
 
-        $menuOptions = Array();
+        $menuOptions = array();
         foreach ($oMenu->Options as $i => $action) {
-            $option = Array('id' => $oMenu->Id[$i], 'label' => $oMenu->Labels[$i], 'action' => $action);
+            $option = array('id' => $oMenu->Id[$i], 'label' => $oMenu->Labels[$i], 'action' => $action);
 
             switch ($option['id']) {
                 case 'STEPS':
-                    $option['options'] = Array();
+                    $option['options'] = array();
                     break;
                 case 'ACTIONS':
                     $option['options'] = $this->getActionOptions();
@@ -84,7 +83,7 @@ class Ajax
             $response = new stdclass();
             $response->message = G::LoadTranslation('ID_LOGIN_AGAIN');
             $response->lostSession = true;
-            print G::json_encode( $response );
+            print G::json_encode($response);
             die();
         }
 
@@ -131,16 +130,16 @@ class Ajax
 
     public function getInformationOptions()
     {
-        $options = Array();
-        $options[] = Array('text' => G::LoadTranslation('ID_PROCESS_MAP'), 'fn' => 'processMap');
-        $options[] = Array('text' => G::LoadTranslation('ID_PROCESS_INFORMATION'), 'fn' => 'processInformation');
-        $options[] = Array('text' => G::LoadTranslation('ID_TASK_INFORMATION'), 'fn' => 'taskInformation');
-        $options[] = Array('text' => G::LoadTranslation('ID_CASE_HISTORY'), 'fn' => 'caseHistory');
-        $options[] = Array('text' => G::LoadTranslation('ID_HISTORY_MESSAGE_CASE'), 'fn' => 'messageHistory');
-        $options[] = Array('text' => G::LoadTranslation('ID_DYNAFORMS'), 'fn' => 'dynaformHistory');
-        $options[] = Array('text' => G::LoadTranslation('ID_DYNAFORM_HISTORY'), 'fn' => 'changeLogHistory');
-        $options[] = Array('text' => G::LoadTranslation('ID_UPLOADED_DOCUMENTS'), 'fn' => 'uploadedDocuments');
-        $options[] = Array('text' => G::LoadTranslation('ID_GENERATED_DOCUMENTS'), 'fn' => 'generatedDocuments');
+        $options = array();
+        $options[] = array('text' => G::LoadTranslation('ID_PROCESS_MAP'), 'fn' => 'processMap');
+        $options[] = array('text' => G::LoadTranslation('ID_PROCESS_INFORMATION'), 'fn' => 'processInformation');
+        $options[] = array('text' => G::LoadTranslation('ID_TASK_INFORMATION'), 'fn' => 'taskInformation');
+        $options[] = array('text' => G::LoadTranslation('ID_CASE_HISTORY'), 'fn' => 'caseHistory');
+        $options[] = array('text' => G::LoadTranslation('ID_HISTORY_MESSAGE_CASE'), 'fn' => 'messageHistory');
+        $options[] = array('text' => G::LoadTranslation('ID_DYNAFORMS'), 'fn' => 'dynaformHistory');
+        $options[] = array('text' => G::LoadTranslation('ID_DYNAFORM_HISTORY'), 'fn' => 'changeLogHistory');
+        $options[] = array('text' => G::LoadTranslation('ID_UPLOADED_DOCUMENTS'), 'fn' => 'uploadedDocuments');
+        $options[] = array('text' => G::LoadTranslation('ID_GENERATED_DOCUMENTS'), 'fn' => 'generatedDocuments');
 
         return $options;
     }
@@ -159,54 +158,54 @@ class Ajax
         $oCase = new Cases();
         $aFields = $oCase->loadCase($_SESSION['APPLICATION'], $_SESSION['INDEX']);
 
-        GLOBAL $RBAC;
+        global $RBAC;
 
-        $options = Array();
+        $options = array();
 
         switch ($aFields['APP_STATUS']) {
             case 'DRAFT':
                 if (!AppDelay::isPaused($_SESSION['APPLICATION'], $_SESSION['INDEX'])) {
-                    $options[] = Array('text' => G::LoadTranslation('ID_PAUSED_CASE'), 'fn' => 'setUnpauseCaseDate');
+                    $options[] = array('text' => G::LoadTranslation('ID_PAUSED_CASE'), 'fn' => 'setUnpauseCaseDate');
                 } else {
-                    $options[] = Array('text' => G::LoadTranslation('ID_UNPAUSE'), 'fn' => 'unpauseCase');
+                    $options[] = array('text' => G::LoadTranslation('ID_UNPAUSE'), 'fn' => 'unpauseCase');
                 }
 
-                $options[] = Array('text' => G::LoadTranslation('ID_DELETE'), 'fn' => 'deleteCase');
+                $options[] = array('text' => G::LoadTranslation('ID_DELETE'), 'fn' => 'deleteCase');
 
                 if ($RBAC->userCanAccess('PM_REASSIGNCASE') == 1 || $RBAC->userCanAccess('PM_REASSIGNCASE_SUPERVISOR') == 1) {
                     if (!AppDelay::isPaused($_SESSION['APPLICATION'], $_SESSION['INDEX'])) {
-                        $options[] = Array('text' => G::LoadTranslation('ID_REASSIGN'), 'fn' => 'getUsersToReassign');
+                        $options[] = array('text' => G::LoadTranslation('ID_REASSIGN'), 'fn' => 'getUsersToReassign');
                     }
                 }
                 break;
             case 'TO_DO':
                 if (!AppDelay::isPaused($_SESSION['APPLICATION'], $_SESSION['INDEX'])) {
-                    $options[] = Array('text' => G::LoadTranslation('ID_PAUSED_CASE'), 'fn' => 'setUnpauseCaseDate');
+                    $options[] = array('text' => G::LoadTranslation('ID_PAUSED_CASE'), 'fn' => 'setUnpauseCaseDate');
                     if ($cant == 1) {
                         if ($RBAC->userCanAccess('PM_CANCELCASE') == 1) {
-                            $options[] = Array('text' => G::LoadTranslation('ID_CANCEL'), 'fn' => 'cancelCase');
+                            $options[] = array('text' => G::LoadTranslation('ID_CANCEL'), 'fn' => 'cancelCase');
                         } else {
-                            $options[] = Array('text' => G::LoadTranslation('ID_CANCEL'), 'fn' => 'cancelCase', 'hide' => 'hiden');
+                            $options[] = array('text' => G::LoadTranslation('ID_CANCEL'), 'fn' => 'cancelCase', 'hide' => 'hiden');
                         }
                     }
                 } else {
-                    $options[] = Array('text' => G::LoadTranslation('ID_UNPAUSE'), 'fn' => 'unpauseCase');
+                    $options[] = array('text' => G::LoadTranslation('ID_UNPAUSE'), 'fn' => 'unpauseCase');
                 }
                 if ($RBAC->userCanAccess('PM_REASSIGNCASE') == 1 || $RBAC->userCanAccess('PM_REASSIGNCASE_SUPERVISOR') == 1) {
                     if (!AppDelay::isPaused($_SESSION['APPLICATION'], $_SESSION['INDEX'])) {
-                        $options[] = Array('text' => G::LoadTranslation('ID_REASSIGN'), 'fn' => 'getUsersToReassign');
+                        $options[] = array('text' => G::LoadTranslation('ID_REASSIGN'), 'fn' => 'getUsersToReassign');
                     }
                 }
                 break;
             case 'CANCELLED':
-                $options[] = Array('text' => G::LoadTranslation('ID_REACTIVATE'), 'fn' => 'reactivateCase');
+                $options[] = array('text' => G::LoadTranslation('ID_REACTIVATE'), 'fn' => 'reactivateCase');
                 break;
         }
 
         if ($_SESSION["TASK"] != "" && $_SESSION["TASK"] != "-1") {
             $oTask = new Task();
             $tasksInParallel = explode('|', $_SESSION['TASK']);
-            $tasksInParallel = array_filter($tasksInParallel, function($value) {
+            $tasksInParallel = array_filter($tasksInParallel, function ($value) {
                 return !empty($value);
             });
             $nTasksInParallel = count($tasksInParallel);
@@ -218,7 +217,7 @@ class Ajax
             }
 
             if ($aTask['TAS_TYPE'] == 'ADHOC') {
-                $options[] = Array('text' => G::LoadTranslation('ID_ADHOC_ASSIGNMENT'), 'fn' => 'adhocAssignmentUsers');
+                $options[] = array('text' => G::LoadTranslation('ID_ADHOC_ASSIGNMENT'), 'fn' => 'adhocAssignmentUsers');
             }
         }
         return $options;
@@ -236,7 +235,7 @@ class Ajax
         $oTemplatePower->prepare();
         $G_PUBLISH = new Publisher();
         $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
-        $oHeadPublisher = & headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
 
         //$oHeadPublisher->addScriptfile('/jscore/processmap/core/processmap.js');
         $oHeadPublisher->addScriptCode('
@@ -329,7 +328,7 @@ class Ajax
             $response = new stdclass();
             $response->message = G::LoadTranslation('ID_LOGIN_AGAIN');
             $response->lostSession = true;
-            print G::json_encode( $response );
+            print G::json_encode($response);
             die();
         }
         $process = new Process();
@@ -346,7 +345,7 @@ class Ajax
         $conf = new Configurations();
         $conf->getFormats();
         $processData['PRO_CREATE_DATE'] = $conf->getSystemDate($processData['PRO_CREATE_DATE']);
-        print (G::json_encode($processData));
+        print(G::json_encode($processData));
     }
 
     public function getTaskInformation()
@@ -355,7 +354,7 @@ class Ajax
             $response = new stdclass();
             $response->message = G::LoadTranslation('ID_LOGIN_AGAIN');
             $response->lostSession = true;
-            print G::json_encode( $response );
+            print G::json_encode($response);
             die();
         }
 
@@ -367,14 +366,14 @@ class Ajax
 
         $taskData = \ProcessMaker\Util\DateTime::convertUtcToTimeZone($taskData);
 
-        print (G::json_encode($taskData));
+        print(G::json_encode($taskData));
     }
 
     public function caseHistory()
     {
         global $G_PUBLISH;
 
-        $oHeadPublisher = & headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         $conf = new Configurations();
         $oHeadPublisher->addExtJsScript('cases/caseHistory', true); //adding a javascript file .js
         $oHeadPublisher->addContent('cases/caseHistory'); //adding a html file  .html.
@@ -386,7 +385,7 @@ class Ajax
     {
         global $G_PUBLISH;
 
-        $oHeadPublisher = & headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         $conf = new Configurations();
         $oHeadPublisher->addExtJsScript('cases/caseMessageHistory', true); //adding a javascript file .js
         $oHeadPublisher->addContent('cases/caseMessageHistory'); //adding a html file  .html.
@@ -398,7 +397,7 @@ class Ajax
     {
         global $G_PUBLISH;
 
-        $oHeadPublisher = & headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         $conf = new Configurations();
         $oHeadPublisher->addExtJsScript('cases/caseHistoryDynaformPage', true); //adding a javascript file .js
         $oHeadPublisher->addContent('cases/caseHistoryDynaformPage'); //adding a html file  .html.
@@ -417,7 +416,7 @@ class Ajax
             $_SESSION['TASK']
         );
 
-        $oHeadPublisher = & headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         $conf = new Configurations();
         $oHeadPublisher->addExtJsScript('cases/caseChangeLog', true); //adding a javascript file .js
         $oHeadPublisher->addContent('cases/caseChangeLog'); //adding a html file  .html.
@@ -431,12 +430,12 @@ class Ajax
             $response = new stdclass();
             $response->message = G::LoadTranslation('ID_LOGIN_AGAIN');
             $response->lostSession = true;
-            print G::json_encode( $response );
+            print G::json_encode($response);
             die();
         }
         global $G_PUBLISH;
 
-        $oHeadPublisher = & headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         $conf = new Configurations();
         $oHeadPublisher->addExtJsScript('cases/casesUploadedDocumentsPage', true); //adding a javascript file .js
         $oHeadPublisher->addContent('cases/casesUploadedDocumentsPage'); //adding a html file  .html.
@@ -449,7 +448,7 @@ class Ajax
     {
         global $G_PUBLISH;
 
-        $oHeadPublisher = & headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         $conf = new Configurations();
         $oHeadPublisher->addExtJsScript('cases/casesUploadedDocumentsPage', true); //adding a javascript file .js
         $oHeadPublisher->addContent('cases/casesUploadedDocumentsPage'); //adding a html file  .html.
@@ -462,7 +461,7 @@ class Ajax
     {
         global $G_PUBLISH;
 
-        $oHeadPublisher = & headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         $conf = new Configurations();
         $oHeadPublisher->addExtJsScript('cases/casesGenerateDocumentPage', true); //adding a javascript file .js
         $oHeadPublisher->addContent('cases/casesGenerateDocumentPage'); //adding a html file  .html.
@@ -475,7 +474,7 @@ class Ajax
     {
         global $G_PUBLISH;
 
-        $oHeadPublisher = & headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         $conf = new Configurations();
         $oHeadPublisher->addExtJsScript('cases/casesGenerateDocumentPage', true); //adding a javascript file .js
         $oHeadPublisher->addContent('cases/casesGenerateDocumentPage'); //adding a html file  .html.
@@ -508,7 +507,7 @@ class Ajax
 
         // Save the note pause reason
         if ($_POST['NOTE_REASON'] != '') {
-            require_once ("classes/model/AppNotes.php");
+            require_once("classes/model/AppNotes.php");
             $appNotes = new AppNotes();
             $noteContent = addslashes($_POST['NOTE_REASON']);
             $appNotes->postNewNote($APP_UID, $_SESSION['USER_LOGGED'], $noteContent, $_POST['NOTIFY_PAUSE']);
@@ -531,11 +530,11 @@ class Ajax
             $response = new stdclass();
             $response->message = G::LoadTranslation('ID_LOGIN_AGAIN');
             $response->lostSession = true;
-            print G::json_encode( $response );
+            print G::json_encode($response);
             die();
         }
 
-        if(isset($_SESSION['TASK']) && $_SESSION['TASK'] != '-1'){
+        if (isset($_SESSION['TASK']) && $_SESSION['TASK'] != '-1') {
             $taskUid  = $_SESSION['TASK'];
         } else {
             $taskUid  = $_SESSION['CURRENT_TASK'];
@@ -578,13 +577,13 @@ class Ajax
         $TO_USR_UID = $_POST['USR_UID'];
         try {
             //Current users of OPEN DEL_INDEX thread
-            if(isset($_SESSION['APPLICATION']) && isset($_SESSION['INDEX'])){
+            if (isset($_SESSION['APPLICATION']) && isset($_SESSION['INDEX'])) {
                 $aCurUser = $oAppDel->getCurrentUsers($_SESSION['APPLICATION'], $_SESSION['INDEX']);
             }
             $flagReassign = true;
-            if(!empty($aCurUser)){
+            if (!empty($aCurUser)) {
                 foreach ($aCurUser as $key => $value) {
-                    if($value === $TO_USR_UID){
+                    if ($value === $TO_USR_UID) {
                         $flagReassign = false;
                     }
                 }
@@ -594,7 +593,7 @@ class Ajax
             }
 
             //If the currentUser is diferent to nextUser, create the thread
-            if($flagReassign){
+            if ($flagReassign) {
                 $cases->reassignCase($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], $TO_USR_UID);
             }
 
@@ -608,7 +607,7 @@ class Ajax
 
             // Save the note reassign reason
             if (isset($_POST['NOTE_REASON']) && $_POST['NOTE_REASON'] !== '') {
-                require_once ("classes/model/AppNotes.php");
+                require_once("classes/model/AppNotes.php");
                 $appNotes = new AppNotes();
                 $noteContent = addslashes($_POST['NOTE_REASON']);
                 $notifyReassign = $_POST['NOTIFY_REASSIGN'] === 'true' ? true: false;
@@ -641,7 +640,7 @@ class Ajax
 
             // Save the note pause reason
             if ($_REQUEST['NOTE_REASON'] != '') {
-                require_once ("classes/model/AppNotes.php");
+                require_once("classes/model/AppNotes.php");
                 $appNotes = new AppNotes();
                 $noteContent = addslashes($_REQUEST['NOTE_REASON']);
                 $appNotes->postNewNote($APP_UID, $_SESSION['USER_LOGGED'], $noteContent, $_REQUEST['NOTIFY_PAUSE']);
@@ -750,7 +749,7 @@ class Ajax
             $response = new stdclass();
             $response->message = G::LoadTranslation('ID_LOGIN_AGAIN');
             $response->lostSession = true;
-            print G::json_encode( $response );
+            print G::json_encode($response);
             die();
         }
         try {
@@ -770,8 +769,7 @@ class Ajax
             $result = new stdclass();
 
             $G_PUBLISH = new Publisher();
-            $G_PUBLISH->AddContent('view', 'cases/cases_DynaformHistory');
-            ?>
+            $G_PUBLISH->AddContent('view', 'cases/cases_DynaformHistory'); ?>
             <link rel="stylesheet" type="text/css" href="/css/classic.css" />
             <style type="text/css">
                 html {
@@ -948,22 +946,19 @@ class Ajax
             $a->printView();
         } else {
             $G_PUBLISH->AddContent("dynaform", "xmlform", $_SESSION["PROCESS"] . "/" . $_POST["DYN_UID"], "", $Fields["APP_DATA"], "", "", "view");
-        }
-        ?>
+        } ?>
 
         <script type="text/javascript">
 
         <?php
-        global $G_FORM;
-        ?>
+        global $G_FORM; ?>
 
             function loadForm_<?php echo $G_FORM->id; ?>(parametro1) {
             }
         </script>
 
         <?php
-        G::RenderPage("publish", "raw");
-        ?>
+        G::RenderPage("publish", "raw"); ?>
 
         <style type="text/css">
             html {
@@ -978,8 +973,7 @@ class Ajax
         <script type="text/javascript">
 
         <?php
-        global $G_FORM;
-        ?>
+        global $G_FORM; ?>
 
             function loadForm_<?php echo $G_FORM->id; ?>(parametro1) {
             }
diff --git a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
index 3a9cd1309..b8dfee900 100644
--- a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
+++ b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
@@ -9,7 +9,7 @@ $oCriteria = new Criteria("workflow");
 $oCriteria->add(CaseConsolidatedCorePeer::CON_STATUS, 'ACTIVE');
 $activeNumRows = CaseConsolidatedCorePeer::doCount($oCriteria);
 
-$headPublisher = &headPublisher::getSingleton();
+$headPublisher = headPublisher::getSingleton();
 $usrUid = $_SESSION["USER_LOGGED"];
 $conf = new Configurations();
 
@@ -115,7 +115,7 @@ if (count($arrayTabItem) > 0) {
     $headPublisher->assign("varSkin", SYS_SKIN);            //Sending the current Skin
     $headPublisher->assign("FORMATS", $conf->getFormats());
     $headPublisher->assign("urlProxy", $urlProxy);
-    $headPublisher->assign('credentials', $clientToken );
+    $headPublisher->assign('credentials', $clientToken);
 
     $oHeadPublisher->assign('isIE', Bootstrap::isIE());
 
@@ -177,7 +177,7 @@ function getProcessArray($action, $userUid)
 
 function getConsolidated()
 {
-    $caseColumns = array ();
+    $caseColumns = array();
     $caseColumns[] = array("header" =>"#",           "dataIndex" => "APP_NUMBER",            "width" => 45, "align" => "center");
     $caseColumns[] = array("header" =>"Case",        "dataIndex" => "APP_TITLE",             "width" => 150);
     $caseColumns[] = array("header" =>"UserUid",     "dataIndex" => "USR_UID",               "width" => 50, "hidden" => true, "hideable" => false);
@@ -269,4 +269,4 @@ function getAuthorizationCode($client)
     $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
 
     return $code;
-}
\ No newline at end of file
+}
diff --git a/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php b/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php
index 31e34b8fb..20cb870fa 100644
--- a/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php
@@ -21,23 +21,23 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
-$actionAjax = isset( $_REQUEST['actionAjax'] ) ? $_REQUEST['actionAjax'] : null;
+$actionAjax = isset($_REQUEST['actionAjax']) ? $_REQUEST['actionAjax'] : null;
 
-function casesShowOuputDocumentExist ($url)
+function casesShowOuputDocumentExist($url)
 {
-    $urlArray = explode( "?", $url );
+    $urlArray = explode("?", $url);
     $urlParametroString = $urlArray[1];
 
-    parse_str( $urlParametroString, $_GET );
+    parse_str($urlParametroString, $_GET);
 
-    require_once ("classes/model/AppDocumentPeer.php");
+    require_once("classes/model/AppDocumentPeer.php");
 
     $oAppDocument = new AppDocument();
-    $oAppDocument->Fields = $oAppDocument->load( $_GET['a'], (isset( $_GET['v'] )) ? $_GET['v'] : null );
+    $oAppDocument->Fields = $oAppDocument->load($_GET['a'], (isset($_GET['v'])) ? $_GET['v'] : null);
 
     $sAppDocUid = $oAppDocument->getAppDocUid();
-    $info = pathinfo( $oAppDocument->getAppDocFilename() );
-    if (! isset( $_GET['ext'] )) {
+    $info = pathinfo($oAppDocument->getAppDocFilename());
+    if (! isset($_GET['ext'])) {
         $ext = $info['extension'];
     } else {
         if ($_GET['ext'] != '') {
@@ -46,7 +46,7 @@ function casesShowOuputDocumentExist ($url)
             $ext = $info['extension'];
         }
     }
-    $ver = (isset( $_GET['v'] ) && $_GET['v'] != '') ? '_' . $_GET['v'] : '';
+    $ver = (isset($_GET['v']) && $_GET['v'] != '') ? '_' . $_GET['v'] : '';
 
     if (! $ver) {
         //This code is in the case the outputdocument won't be versioned
@@ -57,12 +57,12 @@ function casesShowOuputDocumentExist ($url)
     $realPath1 = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $info['basename'] . $ver . '.' . $ext;
     $realPath2 = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $info['basename'] . '.' . $ext;
     $sw_file_exists = false;
-    if (file_exists( $realPath )) {
+    if (file_exists($realPath)) {
         $sw_file_exists = true;
-    } elseif (file_exists( $realPath1 )) {
+    } elseif (file_exists($realPath1)) {
         $sw_file_exists = true;
         $realPath = $realPath1;
-    } elseif (file_exists( $realPath2 )) {
+    } elseif (file_exists($realPath2)) {
         $sw_file_exists = true;
         $realPath = $realPath2;
     }
@@ -76,39 +76,38 @@ function casesShowOuputDocumentExist ($url)
 
 if ($actionAjax == 'casesGenerateDocumentPage') {
     global $G_PUBLISH;
-    $oHeadPublisher = & headPublisher::getSingleton();
+    $oHeadPublisher = headPublisher::getSingleton();
 
     $conf = new Configurations();
-    $oHeadPublisher->addExtJsScript( 'cases/casesGenerateDocumentPage', true ); //adding a javascript file .js
-    $oHeadPublisher->addContent( 'cases/casesGenerateDocumentPage' ); //adding a html file  .html.
+    $oHeadPublisher->addExtJsScript('cases/casesGenerateDocumentPage', true); //adding a javascript file .js
+    $oHeadPublisher->addContent('cases/casesGenerateDocumentPage'); //adding a html file  .html.
     $oHeadPublisher->assign("FORMATS", $conf->getFormats());
-    $oHeadPublisher->assign( 'pageSize', $conf->getEnvSetting( 'casesListRowNumber' ) );
-    G::RenderPage( 'publish', 'extJs' );
+    $oHeadPublisher->assign('pageSize', $conf->getEnvSetting('casesListRowNumber'));
+    G::RenderPage('publish', 'extJs');
 }
 if ($actionAjax == 'generateDocumentGrid_Ajax') {
-
     global $G_PUBLISH;
     $oCase = new Cases();
 
-    $aProcesses = Array ();
+    $aProcesses = array();
 
     $G_PUBLISH = new Publisher();
-    $c = $oCase->getAllGeneratedDocumentsCriteria( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED'] );
+    $c = $oCase->getAllGeneratedDocumentsCriteria($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED']);
     if ($c->getDbName() == 'dbarray') {
-        $rs = ArrayBasePeer::doSelectRs( $c );
+        $rs = ArrayBasePeer::doSelectRs($c);
     } else {
-        $rs = GulliverBasePeer::doSelectRs( $c );
+        $rs = GulliverBasePeer::doSelectRs($c);
     }
 
-    $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
     $rs->next();
 
     $totalCount = 0;
     for ($j = 0; $j < $rs->getRecordCount(); $j ++) {
         $result = $rs->getRow();
 
-        $result["FILEDOCEXIST"] = casesShowOuputDocumentExist( $result["FILEDOC"] );
-        $result["FILEPDFEXIST"] = casesShowOuputDocumentExist( $result["FILEPDF"] );
+        $result["FILEDOCEXIST"] = casesShowOuputDocumentExist($result["FILEDOC"]);
+        $result["FILEPDFEXIST"] = casesShowOuputDocumentExist($result["FILEPDF"]);
 
         $aProcesses[] = $result;
 
@@ -120,19 +119,18 @@ if ($actionAjax == 'generateDocumentGrid_Ajax') {
 
     $conf = new Configurations();
     try {
-        $generalConfCasesList = $conf->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
+        $generalConfCasesList = $conf->getConfiguration('ENVIRONMENT_SETTINGS', '');
     } catch (Exception $e) {
-        $generalConfCasesList = array ();
+        $generalConfCasesList = array();
     }
     $dateFormat = "";
-    if (isset( $generalConfCasesList['casesListDateFormat'] ) && ! empty( $generalConfCasesList['casesListDateFormat'] )) {
+    if (isset($generalConfCasesList['casesListDateFormat']) && ! empty($generalConfCasesList['casesListDateFormat'])) {
         $dateFormat = $generalConfCasesList['casesListDateFormat'];
     }
     $newDir = '/tmp/test/directory';
-    $r = G::verifyPath( $newDir );
+    $r = G::verifyPath($newDir);
     $r->data = $aProcesses;
     $r->totalCount = $totalCount;
     $r->dataFormat = $dateFormat;
-    echo G::json_encode( $r );
+    echo G::json_encode($r);
 }
-
diff --git a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
index 8a1f11255..431102ce9 100644
--- a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php
@@ -28,34 +28,38 @@ $_GET = $filter->xssFilterHard($_GET);
 $_POST = $filter->xssFilterHard($_POST);
 $_REQUEST = $filter->xssFilterHard($_REQUEST);
 
-$actionAjax = isset( $_REQUEST['actionAjax'] ) ? $_REQUEST['actionAjax'] : null;
+$actionAjax = isset($_REQUEST['actionAjax']) ? $_REQUEST['actionAjax'] : null;
 
 if ($actionAjax == "historyDynaformPage") {
     global $G_PUBLISH;
-    $oHeadPublisher = & headPublisher::getSingleton();
+    $oHeadPublisher = headPublisher::getSingleton();
 
     $conf = new Configurations();
-    $oHeadPublisher->addExtJsScript( 'cases/caseHistoryDynaformPage', true ); //adding a javascript file .js
-    $oHeadPublisher->addContent( 'cases/caseHistoryDynaformPage' ); //adding a html file  .html.
-    $oHeadPublisher->assign( 'pageSize', $conf->getEnvSetting( 'casesListRowNumber' ) );
-    G::RenderPage( 'publish', 'extJs' );
+    $oHeadPublisher->addExtJsScript('cases/caseHistoryDynaformPage', true); //adding a javascript file .js
+    $oHeadPublisher->addContent('cases/caseHistoryDynaformPage'); //adding a html file  .html.
+    $oHeadPublisher->assign('pageSize', $conf->getEnvSetting('casesListRowNumber'));
+    G::RenderPage('publish', 'extJs');
 }
 if ($actionAjax == 'historyDynaformGrid_Ajax') {
-
     global $G_PUBLISH;
     $oCase = new Cases();
 
-    $aProcesses = Array ();
-    $c = $oCase->getallDynaformsCriteria( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['CURRENT_TASK'],
-        $_SESSION['USER_LOGGED'] , $_SESSION['INDEX']);
+    $aProcesses = array();
+    $c = $oCase->getallDynaformsCriteria(
+        $_SESSION['PROCESS'],
+        $_SESSION['APPLICATION'],
+        $_SESSION['CURRENT_TASK'],
+        $_SESSION['USER_LOGGED'],
+        $_SESSION['INDEX']
+    );
 
     if ($c->getDbName() == 'dbarray') {
-        $rs = ArrayBasePeer::doSelectRs( $c );
+        $rs = ArrayBasePeer::doSelectRs($c);
     } else {
-        $rs = GulliverBasePeer::doSelectRs( $c );
+        $rs = GulliverBasePeer::doSelectRs($c);
     }
 
-    $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
     $rs->next();
 
     for ($j = 0; $j < $rs->getRecordCount(); $j ++) {
@@ -66,13 +70,13 @@ if ($actionAjax == 'historyDynaformGrid_Ajax') {
     }
 
     $newDir = '/tmp/test/directory';
-    G::verifyPath( $newDir );
+    G::verifyPath($newDir);
 
     $r = new stdclass();
     $r->data = $aProcesses;
     $r->totalCount = 2;
 
-    echo G::json_encode( $r );
+    echo G::json_encode($r);
 }
 
 if ($actionAjax == 'showHistoryMessage') {
@@ -110,19 +114,16 @@ if ($actionAjax == 'showHistoryMessage') {
     $G_PUBLISH = new Publisher();
     $oCase = new Cases();
 
-    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_MessagesView', '', $oCase->getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] ) );
-
-    ?>
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_MessagesView', '', $oCase->getHistoryMessagesTrackerView($_POST['APP_UID'], $_POST['APP_MSG_UID'])); ?>
     <script language="javascript">
     <?php
-    global $G_FORM;
-    ?>
-          function loadForm_<?php echo $G_FORM->id;?>(parametro1) {
+    global $G_FORM; ?>
+          function loadForm_<?php echo $G_FORM->id; ?>(parametro1) {
           }
         </script>
     <?php
 
-    G::RenderPage( 'publish', 'raw' );
+    G::RenderPage('publish', 'raw');
 }
 
 if ($actionAjax == 'showDynaformListHistory') {
@@ -130,9 +131,7 @@ if ($actionAjax == 'showDynaformListHistory') {
     $_POST["APP_UID"] = $_REQUEST["APP_UID"];
     $_POST["DYN_UID"] = $_REQUEST["DYN_UID"];
     $_POST["PRO_UID"] = $_REQUEST["PRO_UID"];
-    $_POST["TAS_UID"] = $_REQUEST["TAS_UID"];
-
-    ?>
+    $_POST["TAS_UID"] = $_REQUEST["TAS_UID"]; ?>
     <link rel="stylesheet" type="text/css" href="/css/classic.css" />
     <style type="text/css">
     html {
@@ -341,13 +340,12 @@ if ($actionAjax == 'showDynaformListHistory') {
 
     require_once 'classes/model/AppHistory.php';
     $G_PUBLISH = new Publisher();
-    $G_PUBLISH->AddContent( 'view', 'cases/cases_DynaformHistory' );
+    $G_PUBLISH->AddContent('view', 'cases/cases_DynaformHistory');
 
-    G::RenderPage( 'publish', 'raw' );
+    G::RenderPage('publish', 'raw');
 }
 
 if ($actionAjax == 'dynaformChangeLogViewHistory') {
-
     ?>
     <link rel="stylesheet" type="text/css" href="/css/classic.css" />
     <style type="text/css">
@@ -395,8 +393,7 @@ if ($actionAjax == 'dynaformChangeLogViewHistory') {
         $a->printView();
     } else {
         $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view');
-    }
-    ?>
+    } ?>
 
     <script language="javascript">
     window.onload = function () {
@@ -412,14 +409,13 @@ if ($actionAjax == 'dynaformChangeLogViewHistory') {
 
     <script language="javascript">
     <?php
-    global $G_FORM;
-    ?>
-          function loadForm_<?php echo $G_FORM->id;?>(parametro1) {
+    global $G_FORM; ?>
+          function loadForm_<?php echo $G_FORM->id; ?>(parametro1) {
           }
     </script>
     <?php
 
-    G::RenderPage( 'publish', 'raw' );
+    G::RenderPage('publish', 'raw');
 }
 if ($actionAjax == 'historyDynaformGridPreview') {
     ?>
@@ -453,13 +449,12 @@ if ($actionAjax == 'historyDynaformGridPreview') {
 
     $G_PUBLISH = new Publisher();
     $oCase = new Cases();
-    $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+    $Fields = $oCase->loadCase($_SESSION['APPLICATION']);
     $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
     $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
     $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
     $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;';
-    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['DYNUIDPRINT'] = $_POST['DYN_UID'];
-    ?>
+    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['DYNUIDPRINT'] = $_POST['DYN_UID']; ?>
 
     <script language="javascript">
     window.onload = function () {
@@ -484,21 +479,18 @@ if ($actionAjax == 'historyDynaformGridPreview') {
         $a->printView();
     } else {
         $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view');
-    }
-    ?>
+    } ?>
     <script language="javascript">
 
     function popUp(URL, width, height, left, top, resizable) {
         window.open(URL, '', 'toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=1,resizable='+resizable+',width='+width+',height='+height+',left = '+left+',top = '+top+'');
     }
     <?php
-    global $G_FORM;
-    ?>
-    function loadForm_<?php echo $G_FORM->id;?>(parametro1) {
+    global $G_FORM; ?>
+    function loadForm_<?php echo $G_FORM->id; ?>(parametro1) {
     }
     </script>
     <?php
 
-    G::RenderPage( 'publish', 'blank' );
+    G::RenderPage('publish', 'blank');
 }
-
diff --git a/workflow/engine/methods/cases/casesListExtJs.php b/workflow/engine/methods/cases/casesListExtJs.php
index 6fd980d3b..e59ff6f58 100644
--- a/workflow/engine/methods/cases/casesListExtJs.php
+++ b/workflow/engine/methods/cases/casesListExtJs.php
@@ -6,11 +6,11 @@ use ProcessMaker\Plugins\PluginRegistry;
 unset($_SESSION['APPLICATION']);
 
 //get the action from GET or POST, default is todo
-$action = isset( $_GET['action'] ) ? $_GET['action'] : (isset( $_POST['action'] ) ? $_POST['action'] : 'todo');
+$action = isset($_GET['action']) ? $_GET['action'] : (isset($_POST['action']) ? $_POST['action'] : 'todo');
 $openApplicationUid = (isset($_GET['openApplicationUid']))? $_GET['openApplicationUid'] : null;
 
 /*----------------------------------********---------------------------------*/
-$filterAction = isset( $_GET['filterAction'] ) ? $_GET['filterAction'] : (isset( $_POST['filterAction'] ) ? $_POST['filterAction'] : '');
+$filterAction = isset($_GET['filterAction']) ? $_GET['filterAction'] : (isset($_POST['filterAction']) ? $_POST['filterAction'] : '');
 /*----------------------------------********---------------------------------*/
 
 //fix a previous inconsistency
@@ -59,32 +59,32 @@ switch ($action) {
 }
 /*----------------------------------********---------------------------------*/
 
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 // oHeadPublisher->setExtSkin( 'xtheme-blue');
 //get the configuration for this action
 $conf = new Configurations();
 try {
     // the setup for search is the same as the Sent (participated)
-    $confCasesList = $conf->getConfiguration( 'casesList', ($action == 'search' || $action == 'simple_search') ? 'search' : $action );
+    $confCasesList = $conf->getConfiguration('casesList', ($action == 'search' || $action == 'simple_search') ? 'search' : $action);
 
     $table = null;
     if (isset($confCasesList['PMTable'])) {
         $aditionalTable = new AdditionalTables();
         $table = $aditionalTable->load($confCasesList['PMTable']);
     }
-    $confCasesList = ($table != null) ? $confCasesList : array ();
+    $confCasesList = ($table != null) ? $confCasesList : array();
 
-    $generalConfCasesList = $conf->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
+    $generalConfCasesList = $conf->getConfiguration('ENVIRONMENT_SETTINGS', '');
 } catch (Exception $e) {
-    $confCasesList = array ();
-    $generalConfCasesList = array ();
+    $confCasesList = array();
+    $generalConfCasesList = array();
 }
 
 // reassign header configuration
 $confReassignList = getReassignList();
 
 // evaluates an action and the configuration for the list that will be rendered
-$config = getAdditionalFields( $action, $confCasesList );
+$config = getAdditionalFields($action, $confCasesList);
 
 $columns = $config['caseColumns'];
 $readerFields = $config['caseReaderFields'];
@@ -92,14 +92,14 @@ $reassignColumns = $confReassignList['caseColumns'];
 $reassignReaderFields = $confReassignList['caseReaderFields'];
 
 // if the general settings has been set the pagesize values are extracted from that record
-if (isset( $generalConfCasesList['casesListRowNumber'] ) && ! empty( $generalConfCasesList['casesListRowNumber'] )) {
-    $pageSize = intval( $generalConfCasesList['casesListRowNumber'] );
+if (isset($generalConfCasesList['casesListRowNumber']) && ! empty($generalConfCasesList['casesListRowNumber'])) {
+    $pageSize = intval($generalConfCasesList['casesListRowNumber']);
 } else {
-    $pageSize = intval( $config['rowsperpage'] );
+    $pageSize = intval($config['rowsperpage']);
 }
 
 // if the general settings has been set the dateFormat values are extracted from that record
-if (isset( $generalConfCasesList['casesListDateFormat'] ) && ! empty( $generalConfCasesList['casesListDateFormat'] )) {
+if (isset($generalConfCasesList['casesListDateFormat']) && ! empty($generalConfCasesList['casesListDateFormat'])) {
     $dateFormat = $generalConfCasesList['casesListDateFormat'];
 } else {
     $dateFormat = $config['dateformat'];
@@ -109,14 +109,14 @@ if ($action == 'draft') {
     //array_unshift ( $columns, array( 'header'=> '', 'width'=> 50, 'sortable'=> false, 'id'=> 'deleteLink' ) );
 }
 if ($action == 'selfservice') {
-    array_unshift( $columns, array ('header' => '','width' => 50,'sortable' => false,'id' => 'viewLink') );
+    array_unshift($columns, array('header' => '','width' => 50,'sortable' => false,'id' => 'viewLink'));
 }
 
 if ($action == 'paused') {
     //array_unshift ( $columns, array( 'header'=> '', 'width'=> 50, 'sortable'=> false, 'id'=> 'unpauseLink' ) );
 }
 
-$userUid = (isset( $_SESSION['USER_LOGGED'] ) && $_SESSION['USER_LOGGED'] != '') ? $_SESSION['USER_LOGGED'] : null;
+$userUid = (isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '') ? $_SESSION['USER_LOGGED'] : null;
 $oAppCache = new AppCacheView();
 $oAppCache->confCasesList = $confCasesList;
 $solrEnabled = 0;
@@ -164,8 +164,8 @@ $oHeadPublisher->assign('columnSearchValues', $columnToSearch); //Sending the li
 
 
 /*----------------------------------********---------------------------------*/
-$licensedFeatures = & PMLicensedFeatures::getSingleton();
-if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=') ) {
+$licensedFeatures = PMLicensedFeatures::getSingleton();
+if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=')) {
     $filterStatus[] = array('', G::LoadTranslation('ID_ALL_STATUS'));
     $filterStatus[] = array('ON_TIME', G::LoadTranslation('ID_ON_TIME'));
     $filterStatus[] = array('AT_RISK', G::LoadTranslation('ID_AT_RISK'));
@@ -186,15 +186,15 @@ if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjB
 
 //menu permissions
 $cnt = '';
-$reassignCase    = ($RBAC->userCanAccess( 'PM_REASSIGNCASE' ) == 1) ? 'true' : 'false';
-$reassignCaseSup = ($RBAC->userCanAccess( 'PM_REASSIGNCASE_SUPERVISOR' ) == 1) ? 'true':'false';
-$oHeadPublisher->assign( 'varReassignCase', $reassignCase );
-$oHeadPublisher->assign( 'varReassignCaseSupervisor', $reassignCaseSup );
+$reassignCase    = ($RBAC->userCanAccess('PM_REASSIGNCASE') == 1) ? 'true' : 'false';
+$reassignCaseSup = ($RBAC->userCanAccess('PM_REASSIGNCASE_SUPERVISOR') == 1) ? 'true':'false';
+$oHeadPublisher->assign('varReassignCase', $reassignCase);
+$oHeadPublisher->assign('varReassignCaseSupervisor', $reassignCaseSup);
 $c = new Configurations();
-$oHeadPublisher->addExtJsScript( 'app/main', true );
-$oHeadPublisher->addExtJsScript( 'cases/casesList', false ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'cases/casesListExtJs' ); //adding a html file  .html.
-$oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
+$oHeadPublisher->addExtJsScript('app/main', true);
+$oHeadPublisher->addExtJsScript('cases/casesList', false); //adding a javascript file .js
+$oHeadPublisher->addContent('cases/casesListExtJs'); //adding a html file  .html.
+$oHeadPublisher->assign('FORMATS', $c->getFormats());
 $oHeadPublisher->assign('extJsViewState', $oHeadPublisher->getExtJsViewState());
 $oHeadPublisher->assign('isIE', Bootstrap::isIE());
 $oHeadPublisher->assign('__OPEN_APPLICATION_UID__', $openApplicationUid);
@@ -202,39 +202,39 @@ $oHeadPublisher->assign('__OPEN_APPLICATION_UID__', $openApplicationUid);
 $oPluginRegistry = PluginRegistry::loadSingleton();
 $fromPlugin = $oPluginRegistry->getOpenReassignCallback();
 $jsFunction = false;
-if(sizeof($fromPlugin)) {
+if (sizeof($fromPlugin)) {
     /** @var \ProcessMaker\Plugins\Interfaces\OpenReassignCallback $jsFile */
-    foreach($fromPlugin as $jsFile) {
+    foreach ($fromPlugin as $jsFile) {
         $jsFile = $jsFile->getCallBackFile();
-        if(is_file($jsFile)) {
+        if (is_file($jsFile)) {
             $jsFile = file_get_contents($jsFile);
-            if(!empty($jsFile)) {
+            if (!empty($jsFile)) {
                 $jsFunction[] = $jsFile;
             }
         }
     }
 }
-$oHeadPublisher->assign( 'openReassignCallback', $jsFunction );
-G::RenderPage( 'publish', 'extJs' );
+$oHeadPublisher->assign('openReassignCallback', $jsFunction);
+G::RenderPage('publish', 'extJs');
 
-function getCategoryArray ()
+function getCategoryArray()
 {
     global $oAppCache;
     require_once 'classes/model/ProcessCategory.php';
-    $category[] = array ("",G::LoadTranslation( "ID_ALL_CATEGORIES" )
+    $category[] = array("",G::LoadTranslation("ID_ALL_CATEGORIES")
     );
 
-    $criteria = new Criteria( 'workflow' );
-    $criteria->addSelectColumn( ProcessCategoryPeer::CATEGORY_UID );
-    $criteria->addSelectColumn( ProcessCategoryPeer::CATEGORY_NAME );
+    $criteria = new Criteria('workflow');
+    $criteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_UID);
+    $criteria->addSelectColumn(ProcessCategoryPeer::CATEGORY_NAME);
     $criteria->addAscendingOrderByColumn(ProcessCategoryPeer::CATEGORY_NAME);
 
-    $dataset = ProcessCategoryPeer::doSelectRS( $criteria );
-    $dataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    $dataset = ProcessCategoryPeer::doSelectRS($criteria);
+    $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
     $dataset->next();
 
     while ($row = $dataset->getRow()) {
-        $category[] = array ($row['CATEGORY_UID'],$row['CATEGORY_NAME']);
+        $category[] = array($row['CATEGORY_UID'],$row['CATEGORY_NAME']);
         $dataset->next();
     }
     return $category;
@@ -247,9 +247,9 @@ function getStatusArray($action, $userUid)
     $status[] = array('', G::LoadTranslation('ID_ALL_STATUS'));
     foreach ($aStatus as $key => $value) {
         if ($action == 'search') {
-            $status[] =  array ($value, G::LoadTranslation( 'ID_CASES_STATUS_' . $key ));
+            $status[] =  array($value, G::LoadTranslation('ID_CASES_STATUS_' . $key));
         } else {
-            $status[] =  array ($key, G::LoadTranslation( 'ID_CASES_STATUS_' . $key ));
+            $status[] =  array($key, G::LoadTranslation('ID_CASES_STATUS_' . $key));
         }
     }
     return $status;
@@ -259,66 +259,66 @@ function getStatusArray($action, $userUid)
  * get the list configuration headers of the cases checked for reassign, for the
  * reassign cases list.
  */
-function getReassignList ()
+function getReassignList()
 {
-    $caseColumns = array ();
-    $caseColumns[] = array ('header' => '#','dataIndex' => 'APP_NUMBER','width' => 40);
-    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_SUMMARY' ),'dataIndex' => 'CASE_SUMMARY','width' => 45,'hidden' => true
+    $caseColumns = array();
+    $caseColumns[] = array('header' => '#','dataIndex' => 'APP_NUMBER','width' => 40);
+    $caseColumns[] = array('header' => G::LoadTranslation('ID_SUMMARY'),'dataIndex' => 'CASE_SUMMARY','width' => 45,'hidden' => true
     );
-    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASES_NOTES' ),'dataIndex' => 'CASE_NOTES_COUNT','width' => 45,'hidden' => true
+    $caseColumns[] = array('header' => G::LoadTranslation('ID_CASES_NOTES'),'dataIndex' => 'CASE_NOTES_COUNT','width' => 45,'hidden' => true
     );
-    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_CASE' ),'dataIndex' => 'APP_TITLE','width' => 100,'hidden' => true
+    $caseColumns[] = array('header' => G::LoadTranslation('ID_CASE'),'dataIndex' => 'APP_TITLE','width' => 100,'hidden' => true
     );
-    $caseColumns[] = array ('header' => 'CaseId','dataIndex' => 'APP_UID','width' => 200,'hidden' => true,'hideable' => false
+    $caseColumns[] = array('header' => 'CaseId','dataIndex' => 'APP_UID','width' => 200,'hidden' => true,'hideable' => false
     );
-    $caseColumns[] = array ('header' => 'User','dataIndex' => 'USR_UID','width' => 200,'hidden' => true,'hideable' => false
+    $caseColumns[] = array('header' => 'User','dataIndex' => 'USR_UID','width' => 200,'hidden' => true,'hideable' => false
     );
-    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_TASK' ),'dataIndex' => 'APP_TAS_TITLE','width' => 120
+    $caseColumns[] = array('header' => G::LoadTranslation('ID_TASK'),'dataIndex' => 'APP_TAS_TITLE','width' => 120
     );
-    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_PROCESS' ),'dataIndex' => 'APP_PRO_TITLE','width' => 120
+    $caseColumns[] = array('header' => G::LoadTranslation('ID_PROCESS'),'dataIndex' => 'APP_PRO_TITLE','width' => 120
     );
-    $caseColumns[] = array ('header' => 'Reassigned Uid','dataIndex' => 'APP_REASSIGN_USER_UID','width' => 120,'hidden' => true,'hideable' => false
+    $caseColumns[] = array('header' => 'Reassigned Uid','dataIndex' => 'APP_REASSIGN_USER_UID','width' => 120,'hidden' => true,'hideable' => false
     );
-    $caseColumns[] = array ('header' => 'Reassigned Uid','dataIndex' => 'TAS_UID','width' => 120,'hidden' => true,'hideable' => false
+    $caseColumns[] = array('header' => 'Reassigned Uid','dataIndex' => 'TAS_UID','width' => 120,'hidden' => true,'hideable' => false
     );
-    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_ASSIGNED_TO' ),'dataIndex' => 'APP_CURRENT_USER','width' => 170
+    $caseColumns[] = array('header' => G::LoadTranslation('ID_ASSIGNED_TO'),'dataIndex' => 'APP_CURRENT_USER','width' => 170
     );
-    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_REASSIGNED_TO' ),'dataIndex' => 'APP_REASSIGN_USER','width' => 170
+    $caseColumns[] = array('header' => G::LoadTranslation('ID_REASSIGNED_TO'),'dataIndex' => 'APP_REASSIGN_USER','width' => 170
     );
-    $caseColumns[] = array ('header' => G::LoadTranslation( 'ID_REASON' ),'dataIndex' => 'NOTE_REASON','width' => 170
+    $caseColumns[] = array('header' => G::LoadTranslation('ID_REASON'),'dataIndex' => 'NOTE_REASON','width' => 170
     );
     $caseColumns[] = array('header' => G::LoadTranslation('ID_NOTIFY'), 'dataIndex' => 'NOTIFY_REASSIGN', 'width' => 100
     );
 
-    $caseReaderFields = array ();
-    $caseReaderFields[] = array ('name' => 'APP_NUMBER');
-    $caseReaderFields[] = array ('name' => 'APP_TITLE');
-    $caseReaderFields[] = array ('name' => 'APP_UID');
-    $caseReaderFields[] = array ('name' => 'USR_UID');
-    $caseReaderFields[] = array ('name' => 'APP_TAS_TITLE');
-    $caseReaderFields[] = array ('name' => 'APP_PRO_TITLE');
-    $caseReaderFields[] = array ('name' => 'APP_REASSIGN_USER_UID');
-    $caseReaderFields[] = array ('name' => 'TAS_UID');
-    $caseReaderFields[] = array ('name' => 'APP_REASSIGN_USER');
-    $caseReaderFields[] = array ('name' => 'CASE_SUMMARY');
-    $caseReaderFields[] = array ('name' => 'CASE_NOTES_COUNT');
-    $caseReaderFields[] = array ('name' => 'APP_CURRENT_USER');
+    $caseReaderFields = array();
+    $caseReaderFields[] = array('name' => 'APP_NUMBER');
+    $caseReaderFields[] = array('name' => 'APP_TITLE');
+    $caseReaderFields[] = array('name' => 'APP_UID');
+    $caseReaderFields[] = array('name' => 'USR_UID');
+    $caseReaderFields[] = array('name' => 'APP_TAS_TITLE');
+    $caseReaderFields[] = array('name' => 'APP_PRO_TITLE');
+    $caseReaderFields[] = array('name' => 'APP_REASSIGN_USER_UID');
+    $caseReaderFields[] = array('name' => 'TAS_UID');
+    $caseReaderFields[] = array('name' => 'APP_REASSIGN_USER');
+    $caseReaderFields[] = array('name' => 'CASE_SUMMARY');
+    $caseReaderFields[] = array('name' => 'CASE_NOTES_COUNT');
+    $caseReaderFields[] = array('name' => 'APP_CURRENT_USER');
 
-    return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
+    return array('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
     );
 }
 
-function getReassignUsersList ()
+function getReassignUsersList()
 {
-    $caseColumns = array ();
+    $caseColumns = array();
 
-    $caseReaderFields = array ();
-    $caseReaderFields[] = array ('name' => 'userUid'
+    $caseReaderFields = array();
+    $caseReaderFields[] = array('name' => 'userUid'
     );
-    $caseReaderFields[] = array ('name' => 'userFullname'
+    $caseReaderFields[] = array('name' => 'userFullname'
     );
 
-    return array ('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
+    return array('caseColumns' => $caseColumns,'caseReaderFields' => $caseReaderFields,'rowsperpage' => 20,'dateformat' => 'M d, Y'
     );
 }
 
@@ -390,7 +390,7 @@ function getAdditionalFields($action, $confCasesList = array())
  * This function define the possibles columns for apply the specific search
  * @return array $filters values of the dropdown
  */
-function getColumnsSearchArray ()
+function getColumnsSearchArray()
 {
     $filters = [];
     $filters[] = ['APP_TITLE', G::LoadTranslation('ID_CASE_TITLE')];
@@ -435,4 +435,4 @@ function getAuthorizationCode($client)
 
     return $code;
 }
-/*----------------------------------********---------------------------------*/
\ No newline at end of file
+/*----------------------------------********---------------------------------*/
diff --git a/workflow/engine/methods/cases/casesListExtJsRedirector.php b/workflow/engine/methods/cases/casesListExtJsRedirector.php
index 51d5b30a1..ea59d2b38 100644
--- a/workflow/engine/methods/cases/casesListExtJsRedirector.php
+++ b/workflow/engine/methods/cases/casesListExtJsRedirector.php
@@ -4,14 +4,13 @@ if (typeof window.parent != 'undefined') {
 /*----------------------------------********---------------------------------*/
 $pathDerivateGmail = 'derivatedGmail';
 $statusPMGmail = false;
-$licensedFeatures = &PMLicensedFeatures::getSingleton();
+$licensedFeatures = PMLicensedFeatures::getSingleton();
 if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-
     $pmGoogle = new PmGoogleApi();
     $statusPMGmail = $pmGoogle->getServiceGmailStatus();
 }
 /*----------------------------------********---------------------------------*/
-if (isset( $_GET['ux'] )) {
+if (isset($_GET['ux'])) {
     switch ($_GET['ux']) {
         case 'SIMPLIFIED':
         case 'SWITCHABLE':
@@ -21,25 +20,25 @@ if (isset( $_GET['ux'] )) {
         default:
             $url = 'casesListExtJs';
     }
-/*----------------------------------********---------------------------------*/
-} else if( $statusPMGmail ){
+    /*----------------------------------********---------------------------------*/
+} elseif ($statusPMGmail) {
     $url = $pathDerivateGmail;
-/*----------------------------------********---------------------------------*/
+    /*----------------------------------********---------------------------------*/
 } else {
     $url = 'casesListExtJs';
 }
-if (isset( $_GET['ux'] )) {
+if (isset($_GET['ux'])) {
     echo 'if (typeof window.parent.ux_env != \'undefined\') {';
 }
 echo "  window.parent.location.href = '$url';";
-if (isset( $_GET['ux'] )) {
+if (isset($_GET['ux'])) {
     /*----------------------------------********---------------------------------*/
-    if(PMLicensedFeatures::getSingleton()->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09') && $statusPMGmail){
+    if (PMLicensedFeatures::getSingleton()->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09') && $statusPMGmail) {
         echo '} else { window.parent.location.href = \''.$pathDerivateGmail.'\'; }';
     } else {
-    /*----------------------------------********---------------------------------*/
+        /*----------------------------------********---------------------------------*/
         echo '} else { window.parent.location.href = \'casesListExtJs\'; }';
-    /*----------------------------------********---------------------------------*/
+        /*----------------------------------********---------------------------------*/
     }
     /*----------------------------------********---------------------------------*/
 }
diff --git a/workflow/engine/methods/cases/casesListSetup.php b/workflow/engine/methods/cases/casesListSetup.php
index 11ccba0f2..cb89ab15a 100644
--- a/workflow/engine/methods/cases/casesListSetup.php
+++ b/workflow/engine/methods/cases/casesListSetup.php
@@ -8,12 +8,11 @@ if ($RBAC->userCanAccess("PM_SETUP") != 1 || $RBAC->userCanAccess("PM_SETUP_ADVA
 
 $availableFields = array();
 
-$oHeadPublisher = &headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 
-$oHeadPublisher->addExtJsScript( 'cases/casesListSetup', false ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'cases/casesListSetup' ); //adding a html file  .html.
+$oHeadPublisher->addExtJsScript('cases/casesListSetup', false); //adding a javascript file .js
+$oHeadPublisher->addContent('cases/casesListSetup'); //adding a html file  .html.
 $oHeadPublisher->assignNumber("pageSize", 20); //sending the page size
 $oHeadPublisher->assignNumber("availableFields", G::json_encode($availableFields));
 
 G::RenderPage("publish", "extJs");
-
diff --git a/workflow/engine/methods/cases/casesMenuLoader.php b/workflow/engine/methods/cases/casesMenuLoader.php
index 0ed5c9901..c956e957a 100644
--- a/workflow/engine/methods/cases/casesMenuLoader.php
+++ b/workflow/engine/methods/cases/casesMenuLoader.php
@@ -1,8 +1,8 @@
 <?php
 
-$action = isset( $_GET['action'] ) ? G::sanitizeInput($_GET['action'])  : 'default';
+$action = isset($_GET['action']) ? G::sanitizeInput($_GET['action'])  : 'default';
 
-$userId = isset( $_SESSION['USER_LOGGED'] ) ? $_SESSION['USER_LOGGED'] : '00000000000000000000000000000000';
+$userId = isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : '00000000000000000000000000000000';
 switch ($action) {
     case 'getAllCounters':
         getAllCounters();
@@ -17,22 +17,22 @@ switch ($action) {
         break;
 }
 
-function getLoadTreeMenuData ()
+function getLoadTreeMenuData()
 {
-    header( "content-type: text/xml" );
+    header("content-type: text/xml");
 
     global $G_TMP_MENU;
     $oMenu = new Menu();
-    $oMenu->load( 'cases' );
+    $oMenu->load('cases');
 
     $oCases = new Cases();
-    $aTypes = Array ('to_do','draft','cancelled','sent','paused','completed','selfservice');
+    $aTypes = array('to_do','draft','cancelled','sent','paused','completed','selfservice');
     //'to_revise',
     //'to_reassign'
-    $aTypesID = Array ('CASES_INBOX' => 'to_do','CASES_DRAFT' => 'draft','CASES_CANCELLED' => 'cancelled','CASES_SENT' => 'sent','CASES_PAUSED' => 'paused','CASES_COMPLETED' => 'completed','CASES_SELFSERVICE' => 'selfservice');
+    $aTypesID = array('CASES_INBOX' => 'to_do','CASES_DRAFT' => 'draft','CASES_CANCELLED' => 'cancelled','CASES_SENT' => 'sent','CASES_PAUSED' => 'paused','CASES_COMPLETED' => 'completed','CASES_SELFSERVICE' => 'selfservice');
 
     /*----------------------------------********---------------------------------*/
-    $licensedFeatures = & PMLicensedFeatures::getSingleton();
+    $licensedFeatures = PMLicensedFeatures::getSingleton();
     if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) {
         $aTypesID['CONSOLIDATED_CASES'] = 'batch_routing';
         $aTypes[] = 'batch_routing';
@@ -41,10 +41,10 @@ function getLoadTreeMenuData ()
 
     //'CASES_TO_REVISE'=>'to_revise',
     //'CASES_TO_REASSIGN'=>'to_reassign'
-        $list = array ();
+    $list = array();
     $list['count'] = ' ';
 
-    $empty = array ();
+    $empty = array();
     foreach ($aTypes as $key => $val) {
         $empty[$val] = $list;
     }
@@ -53,7 +53,7 @@ function getLoadTreeMenuData ()
     $processNameMaxSize = 20;
 
     //now drawing the treeview using the menu options from menu/cases.php
-    $menuCases = array ();
+    $menuCases = array();
     for ($i = 0; $i < count($oMenu->Options); $i++) {
         if ($oMenu->Types[$i] == 'blockHeader') {
             $CurrentBlockID = $oMenu->Id[$i];
@@ -72,7 +72,7 @@ function getLoadTreeMenuData ()
             $menuCases[$CurrentBlockID]['blockType'] = $oMenu->Types[$i];
             $menuCases[$CurrentBlockID]['link'] = $oMenu->Options[$i];
         } elseif ($oMenu->Types[$i] == 'rootNode') {
-            $menuCases[$CurrentBlockID]['blockItems'][$oMenu->Id[$i]] = array (
+            $menuCases[$CurrentBlockID]['blockItems'][$oMenu->Id[$i]] = array(
                 'label' => $oMenu->Labels[$i],
                 'link' => $oMenu->Options[$i],
                 'icon' => (isset($oMenu->Icons[$i]) && $oMenu->Icons[$i] != '') ? $oMenu->Icons[$i] : 'kcmdf.png'
@@ -85,13 +85,13 @@ function getLoadTreeMenuData ()
 
             $i = $index;
         } else {
-            $menuCases[$CurrentBlockID]['blockItems'][$oMenu->Id[$i]] = array (
+            $menuCases[$CurrentBlockID]['blockItems'][$oMenu->Id[$i]] = array(
                 'label' => $oMenu->Labels[$i],
                 'link' => $oMenu->Options[$i],
                 'icon' => (isset($oMenu->Icons[$i]) && $oMenu->Icons[$i] != '') ? $oMenu->Icons[$i] : 'kcmdf.png'
             );
 
-            if (isset( $aTypesID[$oMenu->Id[$i]] )) {
+            if (isset($aTypesID[$oMenu->Id[$i]])) {
                 $menuCases[$CurrentBlockID]['blockItems'][$oMenu->Id[$i]]['cases_count'] = $aCount[$aTypesID[$oMenu->Id[$i]]]['count'];
             }
         }
@@ -114,7 +114,7 @@ function getLoadTreeMenuData ()
             }
         }
 
-        //This function generates an xml, so it prevents the output of a badly formed xml 
+        //This function generates an xml, so it prevents the output of a badly formed xml
         //by cleaning any content prior to this function with ob_clean
         ob_clean();
         echo $xml->asXML();
@@ -135,8 +135,7 @@ function getLoadTreeMenuData ()
             }
 
             // adding "menu_block" childs nodes
-            foreach ($menuBlock['blockItems'] as $id => $menu)
-            {
+            foreach ($menuBlock['blockItems'] as $id => $menu) {
                 if (! empty($menu['childs'])) {
                     $rootNode = $menuBlockNode->addChild('menu_block');
                     $rootNode->addAttribute('id', $id);
@@ -178,7 +177,7 @@ function getLoadTreeMenuData ()
         }
     }
 
-    //This function generates an xml, so it prevents the output of a badly formed xml 
+    //This function generates an xml, so it prevents the output of a badly formed xml
     //by cleaning any content prior to this function with ob_clean
     ob_clean();
     echo $xml->asXML();
@@ -199,11 +198,11 @@ function getAllCountersEnterprise()
 }
 /*----------------------------------********---------------------------------*/
 
-function getAllCounters ()
+function getAllCounters()
 {
-    $userUid = (isset( $_SESSION['USER_LOGGED'] ) && $_SESSION['USER_LOGGED'] != '') ? $_SESSION['USER_LOGGED'] : null;
+    $userUid = (isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '') ? $_SESSION['USER_LOGGED'] : null;
 
-    $aTypes = Array ();
+    $aTypes = array();
     $aTypes['to_do'] = 'CASES_INBOX';
     $aTypes['draft'] = 'CASES_DRAFT';
     $aTypes['cancelled'] = 'CASES_CANCELLED';
@@ -217,7 +216,7 @@ function getAllCounters ()
     $case = new \ProcessMaker\BusinessModel\Cases();
     $aCount = $case->getListCounters($userUid, array_keys($aTypes));
 
-    $response = Array ();
+    $response = array();
     $i = 0;
     foreach ($aCount as $type => $count) {
         $response[$i] = new stdclass();
@@ -225,7 +224,7 @@ function getAllCounters ()
         $response[$i]->count = $count;
         $i ++;
     }
-    echo G::json_encode( $response );
+    echo G::json_encode($response);
 }
 
 function getChilds($menu, $index)
@@ -234,7 +233,6 @@ function getChilds($menu, $index)
 
     for ($i = $index; $i < count($menu->Options); $i++) {
         if ($menu->Types[$i] == 'childNode') {
-
             $childs[$menu->Id[$i]] = array(
                 'label' => $menu->Labels[$i],
                 'link' => $menu->Options[$i],
@@ -248,4 +246,3 @@ function getChilds($menu, $index)
 
     return array($childs, --$i);
 }
-
diff --git a/workflow/engine/methods/cases/casesStartPage.php b/workflow/engine/methods/cases/casesStartPage.php
index 91ba58df7..ce56ef1b5 100644
--- a/workflow/engine/methods/cases/casesStartPage.php
+++ b/workflow/engine/methods/cases/casesStartPage.php
@@ -1,44 +1,43 @@
 <?php
-unset( $_SESSION['__currentTabDashboard'] );
-if (isset( $_GET['action'] )) {
+unset($_SESSION['__currentTabDashboard']);
+if (isset($_GET['action'])) {
     $_SESSION['__currentTabDashboard'] = $_GET['action'];
 }
 $page = "";
-if (isset( $_GET['action'] )) {
+if (isset($_GET['action'])) {
     $page = $_GET['action'];
 }
 
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 global $RBAC;
 switch ($page) {
     case "startCase":
-        $oHeadPublisher->addExtJsScript( 'cases/casesStartCase', true ); //adding a javascript file .js
-        $oHeadPublisher->addContent( 'cases/casesStartCase' ); //adding a html file  .html.
+        $oHeadPublisher->addExtJsScript('cases/casesStartCase', true); //adding a javascript file .js
+        $oHeadPublisher->addContent('cases/casesStartCase'); //adding a html file  .html.
         $c = new Configurations();
-        $oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
+        $oHeadPublisher->assign('FORMATS', $c->getFormats());
         $oHeadPublisher->assign('isIE', Bootstrap::isIE());
         break;
     case "documents":
 
         $c = new Configurations();
-        $configPage = $c->getConfiguration( 'documentsModule', 'pageSize', '', $_SESSION['USER_LOGGED'] );
-        $configEnv = $c->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
-        $Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
-        $oHeadPublisher->assign( 'CONFIG', $Config );
-        $oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
+        $configPage = $c->getConfiguration('documentsModule', 'pageSize', '', $_SESSION['USER_LOGGED']);
+        $configEnv = $c->getConfiguration('ENVIRONMENT_SETTINGS', '');
+        $Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
+        $oHeadPublisher->assign('CONFIG', $Config);
+        $oHeadPublisher->assign('FORMATS', $c->getFormats());
 
-        $oHeadPublisher->assign( 'permitodelete', $RBAC->userCanAccess( 'PM_FOLDER_DELETE' ) );
-        $oHeadPublisher->assign( 'permitoaddfile', $RBAC->userCanAccess( 'PM_FOLDERS_ADD_FILE' ) );
-        $oHeadPublisher->assign( 'permitoaddfolder', $RBAC->userCanAccess( 'PM_FOLDERS_ADD_FOLDER' ) );
+        $oHeadPublisher->assign('permitodelete', $RBAC->userCanAccess('PM_FOLDER_DELETE'));
+        $oHeadPublisher->assign('permitoaddfile', $RBAC->userCanAccess('PM_FOLDERS_ADD_FILE'));
+        $oHeadPublisher->assign('permitoaddfolder', $RBAC->userCanAccess('PM_FOLDERS_ADD_FOLDER'));
 
-        $oHeadPublisher->addExtJsScript( 'cases/casesDocuments', false ); //adding a javascript file .js
-        $oHeadPublisher->addContent( 'cases/casesDocuments' ); //adding a html file  .html.
+        $oHeadPublisher->addExtJsScript('cases/casesDocuments', false); //adding a javascript file .js
+        $oHeadPublisher->addContent('cases/casesDocuments'); //adding a html file  .html.
         break;
     default:
-        $oHeadPublisher->addExtJsScript( 'cases/casesStartPage', false ); //adding a javascript file .js
-        $oHeadPublisher->addContent( 'cases/casesStartPage' ); //adding a html file  .html.
+        $oHeadPublisher->addExtJsScript('cases/casesStartPage', false); //adding a javascript file .js
+        $oHeadPublisher->addContent('cases/casesStartPage'); //adding a html file  .html.
         break;
 
 }
-G::RenderPage( 'publish', 'extJs' );
-
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/cases/casesToRevisePanelExtJs.php b/workflow/engine/methods/cases/casesToRevisePanelExtJs.php
index 94479797f..ae32eac73 100644
--- a/workflow/engine/methods/cases/casesToRevisePanelExtJs.php
+++ b/workflow/engine/methods/cases/casesToRevisePanelExtJs.php
@@ -1,15 +1,11 @@
 <?php
-//  $oHeadPublisher =& headPublisher::getSingleton();
-//  $TRANSLATIONS = array_merge($TRANSLATIONS, $TRANSLATIONS2);
 
 $delIndex = $_GET['DEL_INDEX'];
 $appUid = $_GET['APP_UID'];
-//  $oHeadPublisher->assign( 'TRANSLATIONS',   $TRANSLATIONS); //translations
 $casesPanelUrl = 'casesToReviseTreeContent?APP_UID=' . $appUid . '&DEL_INDEX=' . $delIndex;
-$oHeadPublisher->assign( 'casesPanelUrl', $casesPanelUrl ); //translations
-$oHeadPublisher->assign( 'treeTitle', G::loadtranslation( 'ID_STEP_LIST' ) ); //translations
-$oHeadPublisher->addExtJsScript( 'cases/casesToRevisePanel', false ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'cases/casesToRevisePanel' ); //adding a html file  .html.
-
-G::RenderPage( 'publish', 'extJs' );
+$oHeadPublisher->assign('casesPanelUrl', $casesPanelUrl); //translations
+$oHeadPublisher->assign('treeTitle', G::loadtranslation('ID_STEP_LIST')); //translations
+$oHeadPublisher->addExtJsScript('cases/casesToRevisePanel', false); //adding a javascript file .js
+$oHeadPublisher->addContent('cases/casesToRevisePanel'); //adding a html file  .html.
 
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php
index 140772f30..823fa5734 100644
--- a/workflow/engine/methods/cases/cases_Ajax.php
+++ b/workflow/engine/methods/cases/cases_Ajax.php
@@ -11,7 +11,7 @@ if (!isset($_SESSION['USER_LOGGED'])) {
     $response = new stdclass();
     $response->message = G::LoadTranslation('ID_LOGIN_AGAIN');
     $response->lostSession = true;
-    print G::json_encode( $response );
+    print G::json_encode($response);
     die();
 }
 /**
@@ -47,11 +47,11 @@ $oCase = new Cases();
 //}
 
 
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_CASES" )) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess("PM_CASES")) != 1) {
     return $RBAC_Response;
 }
 
-if (isset( $_POST['showWindow'] )) {
+if (isset($_POST['showWindow'])) {
     if ($_POST['showWindow'] == 'steps') {
         $fn = 'showSteps();';
     } elseif ($_POST['showWindow'] == 'information') {
@@ -68,7 +68,7 @@ if (isset( $_POST['showWindow'] )) {
     $_SESSION['showCasesWindow'] = $fn;
 }
 
-if (! isset( $_POST['action'] )) {
+if (!isset($_POST['action'])) {
     $_POST['action'] = '';
 }
 
@@ -76,30 +76,30 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
     case 'steps':
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'view', 'cases/cases_StepsTree' );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('view', 'cases/cases_StepsTree');
+        G::RenderPage('publish', 'raw');
         break;
     case 'information':
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'view', 'cases/cases_InformationTree' );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('view', 'cases/cases_InformationTree');
+        G::RenderPage('publish', 'raw');
         break;
     case 'actions':
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'view', 'cases/cases_ActionsTree' );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('view', 'cases/cases_ActionsTree');
+        G::RenderPage('publish', 'raw');
         break;
     case 'showProcessMap':
 
-        $oTemplatePower = new TemplatePower( PATH_TPL . 'processes/processes_Map.html' );
+        $oTemplatePower = new TemplatePower(PATH_TPL . 'processes/processes_Map.html');
         $oTemplatePower->prepare();
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
-        $oHeadPublisher = & headPublisher::getSingleton();
-        $oHeadPublisher->addScriptCode( '
-            var maximunX = ' . ProcessMap::getMaximunTaskX( $_SESSION['PROCESS'] ) . ';
+        $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
+        $oHeadPublisher = headPublisher::getSingleton();
+        $oHeadPublisher->addScriptCode('
+            var maximunX = ' . ProcessMap::getMaximunTaskX($_SESSION['PROCESS']) . ';
             var pb=leimnud.dom.capture("tag.body 0");
             Pm=new processmap();
 
@@ -148,105 +148,105 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
                 rw        : false,
                 hideMenu  : false
             }
-            Pm.make();' );
-        G::RenderPage( 'publish', 'raw' );
+            Pm.make();');
+        G::RenderPage('publish', 'raw');
         break;
     case 'showLeyends':
-        $aFields = array ();
-        $aFields['sLabel1'] = G::LoadTranslation( 'ID_TASK_IN_PROGRESS' );
-        $aFields['sLabel2'] = G::LoadTranslation( 'ID_COMPLETED_TASK' );
-        $aFields['sLabel3'] = G::LoadTranslation( 'ID_PENDING_TASK' );
-        $aFields['sLabel4'] = G::LoadTranslation( 'ID_PARALLEL_TASK' );
+        $aFields = array();
+        $aFields['sLabel1'] = G::LoadTranslation('ID_TASK_IN_PROGRESS');
+        $aFields['sLabel2'] = G::LoadTranslation('ID_COMPLETED_TASK');
+        $aFields['sLabel3'] = G::LoadTranslation('ID_PENDING_TASK');
+        $aFields['sLabel4'] = G::LoadTranslation('ID_PARALLEL_TASK');
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'smarty', 'cases/cases_Leyends', '', '', $aFields );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('smarty', 'cases/cases_Leyends', '', '', $aFields);
+        G::RenderPage('publish', 'raw');
         break;
     case 'showProcessInformation':
         //require_once 'classes/model/Process.php';
         $oProcess = new Process();
-        $aFields = $oProcess->load( $_SESSION['PROCESS'] );
+        $aFields = $oProcess->load($_SESSION['PROCESS']);
         require_once 'classes/model/Users.php';
         $oUser = new Users();
         try {
-            $aUser = $oUser->load( $aFields['PRO_CREATE_USER'] );
+            $aUser = $oUser->load($aFields['PRO_CREATE_USER']);
             $aFields['PRO_AUTHOR'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
         } catch (Exception $oError) {
             $aFields['PRO_AUTHOR'] = '(USER DELETED)';
         }
-        $aFields['PRO_CREATE_DATE'] = date( 'F j, Y', strtotime( $aFields['PRO_CREATE_DATE'] ) );
+        $aFields['PRO_CREATE_DATE'] = date('F j, Y', strtotime($aFields['PRO_CREATE_DATE']));
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ProcessInformation', '', $aFields );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ProcessInformation', '', $aFields);
+        G::RenderPage('publish', 'raw');
         break;
     case 'showTransferHistory':
-        $c = Cases::getTransferHistoryCriteria( $_SESSION['APPLICATION'] );
+        $c = Cases::getTransferHistoryCriteria($_SESSION['APPLICATION']);
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/cases_TransferHistory', $c, array () );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_TransferHistory', $c, array());
+        G::RenderPage('publish', 'raw');
         break;
     case 'showDynaformListHistory':
         //require_once 'classes/model/AppHistory.php';
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'view', 'cases/cases_DynaformHistory' );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('view', 'cases/cases_DynaformHistory');
+        G::RenderPage('publish', 'raw');
         break;
     case 'showTaskInformation':
         //require_once 'classes/model/AppDelegation.php';
         //require_once 'classes/model/Task.php';
         $oTask = new Task();
-        $aFields = $oTask->load( $_SESSION['TASK'] );
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->add( AppDelegationPeer::APP_UID, $_SESSION['APPLICATION'] );
-        $oCriteria->add( AppDelegationPeer::DEL_INDEX, $_SESSION['INDEX'] );
-        $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $aFields = $oTask->load($_SESSION['TASK']);
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->add(AppDelegationPeer::APP_UID, $_SESSION['APPLICATION']);
+        $oCriteria->add(AppDelegationPeer::DEL_INDEX, $_SESSION['INDEX']);
+        $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         $aDelegation = $oDataset->getRow();
-        $iDiff = strtotime( $aDelegation['DEL_FINISH_DATE'] ) - strtotime( $aDelegation['DEL_INIT_DATE'] );
-        $aFields['INIT_DATE'] = ($aDelegation['DEL_INIT_DATE'] != null ? $aDelegation['DEL_INIT_DATE'] : G::LoadTranslation( 'ID_CASE_NOT_YET_STARTED' ));
-        $aFields['DUE_DATE'] = ($aDelegation['DEL_TASK_DUE_DATE'] != null ? $aDelegation['DEL_TASK_DUE_DATE'] : G::LoadTranslation( 'ID_NOT_FINISHED' ));
-        $aFields['FINISH'] = ($aDelegation['DEL_FINISH_DATE'] != null ? $aDelegation['DEL_FINISH_DATE'] : G::LoadTranslation( 'ID_NOT_FINISHED' ));
-        $aFields['DURATION'] = ($aDelegation['DEL_FINISH_DATE'] != null ? (int) ($iDiff / 3600) . ' ' . ((int) ($iDiff / 3600) == 1 ? G::LoadTranslation( 'ID_HOUR' ) : G::LoadTranslation( 'ID_HOURS' )) . ' ' . (int) (($iDiff % 3600) / 60) . ' ' . ((int) (($iDiff % 3600) / 60) == 1 ? G::LoadTranslation( 'ID_MINUTE' ) : G::LoadTranslation( 'ID_MINUTES' )) . ' ' . (int) (($iDiff % 3600) % 60) . ' ' . ((int) (($iDiff % 3600) % 60) == 1 ? G::LoadTranslation( 'ID_SECOND' ) : G::LoadTranslation( 'ID_SECONDS' )) : G::LoadTranslation( 'ID_NOT_FINISHED' ));
+        $iDiff = strtotime($aDelegation['DEL_FINISH_DATE']) - strtotime($aDelegation['DEL_INIT_DATE']);
+        $aFields['INIT_DATE'] = ($aDelegation['DEL_INIT_DATE'] != null ? $aDelegation['DEL_INIT_DATE'] : G::LoadTranslation('ID_CASE_NOT_YET_STARTED'));
+        $aFields['DUE_DATE'] = ($aDelegation['DEL_TASK_DUE_DATE'] != null ? $aDelegation['DEL_TASK_DUE_DATE'] : G::LoadTranslation('ID_NOT_FINISHED'));
+        $aFields['FINISH'] = ($aDelegation['DEL_FINISH_DATE'] != null ? $aDelegation['DEL_FINISH_DATE'] : G::LoadTranslation('ID_NOT_FINISHED'));
+        $aFields['DURATION'] = ($aDelegation['DEL_FINISH_DATE'] != null ? (int)($iDiff / 3600) . ' ' . ((int)($iDiff / 3600) == 1 ? G::LoadTranslation('ID_HOUR') : G::LoadTranslation('ID_HOURS')) . ' ' . (int)(($iDiff % 3600) / 60) . ' ' . ((int)(($iDiff % 3600) / 60) == 1 ? G::LoadTranslation('ID_MINUTE') : G::LoadTranslation('ID_MINUTES')) . ' ' . (int)(($iDiff % 3600) % 60) . ' ' . ((int)(($iDiff % 3600) % 60) == 1 ? G::LoadTranslation('ID_SECOND') : G::LoadTranslation('ID_SECONDS')) : G::LoadTranslation('ID_NOT_FINISHED'));
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_TaskInformation', '', $aFields );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_TaskInformation', '', $aFields);
+        G::RenderPage('publish', 'raw');
         break;
     case 'showTaskDetails':
         //require_once 'classes/model/AppDelegation.php';
         //require_once 'classes/model/Task.php';
         //require_once 'classes/model/Users.php';
         $oTask = new Task();
-        $aRow = $oTask->load( $_POST['sTaskUID'] );
+        $aRow = $oTask->load($_POST['sTaskUID']);
         $sTitle = $aRow['TAS_TITLE'];
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->addSelectColumn( UsersPeer::USR_UID );
-        $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
-        $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
-        $oCriteria->addSelectColumn( AppDelegationPeer::DEL_INIT_DATE );
-        $oCriteria->addSelectColumn( AppDelegationPeer::DEL_TASK_DUE_DATE );
-        $oCriteria->addSelectColumn( AppDelegationPeer::DEL_FINISH_DATE );
-        $oCriteria->addJoin( AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN );
-        $oCriteria->add( AppDelegationPeer::APP_UID, $_SESSION['APPLICATION'] );
-        $oCriteria->add( AppDelegationPeer::TAS_UID, $_POST['sTaskUID'] );
-        $oCriteria->addDescendingOrderByColumn( AppDelegationPeer::DEL_INDEX );
-        $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn(UsersPeer::USR_UID);
+        $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
+        $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
+        $oCriteria->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE);
+        $oCriteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE);
+        $oCriteria->addSelectColumn(AppDelegationPeer::DEL_FINISH_DATE);
+        $oCriteria->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
+        $oCriteria->add(AppDelegationPeer::APP_UID, $_SESSION['APPLICATION']);
+        $oCriteria->add(AppDelegationPeer::TAS_UID, $_POST['sTaskUID']);
+        $oCriteria->addDescendingOrderByColumn(AppDelegationPeer::DEL_INDEX);
+        $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         $aRow = $oDataset->getRow();
-        $iDiff = strtotime( $aRow['DEL_FINISH_DATE'] ) - strtotime( $aRow['DEL_INIT_DATE'] );
-        $aFields = array ();
+        $iDiff = strtotime($aRow['DEL_FINISH_DATE']) - strtotime($aRow['DEL_INIT_DATE']);
+        $aFields = array();
         $aFields['TASK'] = $sTitle;
-        $aFields['USER'] = ($aRow['USR_UID'] != null ? $aRow['USR_FIRSTNAME'] . ' ' . $aRow['USR_LASTNAME'] : G::LoadTranslation( 'ID_NONE' ));
-        $aFields['INIT_DATE'] = ($aRow['DEL_INIT_DATE'] != null ? $aRow['DEL_INIT_DATE'] : G::LoadTranslation( 'ID_CASE_NOT_YET_STARTED' ));
-        $aFields['DUE_DATE'] = ($aRow['DEL_TASK_DUE_DATE'] != null ? $aRow['DEL_TASK_DUE_DATE'] : G::LoadTranslation( 'ID_CASE_NOT_YET_STARTED' ));
-        $aFields['FINISH'] = ($aRow['DEL_FINISH_DATE'] != null ? $aRow['DEL_FINISH_DATE'] : G::LoadTranslation( 'ID_NOT_FINISHED' ));
-        $aFields['DURATION'] = ($aRow['DEL_FINISH_DATE'] != null ? (int) ($iDiff / 3600) . ' ' . ((int) ($iDiff / 3600) == 1 ? G::LoadTranslation( 'ID_HOUR' ) : G::LoadTranslation( 'ID_HOURS' )) . ' ' . (int) (($iDiff % 3600) / 60) . ' ' . ((int) (($iDiff % 3600) / 60) == 1 ? G::LoadTranslation( 'ID_MINUTE' ) : G::LoadTranslation( 'ID_MINUTES' )) . ' ' . (int) (($iDiff % 3600) % 60) . ' ' . ((int) (($iDiff % 3600) % 60) == 1 ? G::LoadTranslation( 'ID_SECOND' ) : G::LoadTranslation( 'ID_SECONDS' )) : G::LoadTranslation( 'ID_NOT_FINISHED' ));
+        $aFields['USER'] = ($aRow['USR_UID'] != null ? $aRow['USR_FIRSTNAME'] . ' ' . $aRow['USR_LASTNAME'] : G::LoadTranslation('ID_NONE'));
+        $aFields['INIT_DATE'] = ($aRow['DEL_INIT_DATE'] != null ? $aRow['DEL_INIT_DATE'] : G::LoadTranslation('ID_CASE_NOT_YET_STARTED'));
+        $aFields['DUE_DATE'] = ($aRow['DEL_TASK_DUE_DATE'] != null ? $aRow['DEL_TASK_DUE_DATE'] : G::LoadTranslation('ID_CASE_NOT_YET_STARTED'));
+        $aFields['FINISH'] = ($aRow['DEL_FINISH_DATE'] != null ? $aRow['DEL_FINISH_DATE'] : G::LoadTranslation('ID_NOT_FINISHED'));
+        $aFields['DURATION'] = ($aRow['DEL_FINISH_DATE'] != null ? (int)($iDiff / 3600) . ' ' . ((int)($iDiff / 3600) == 1 ? G::LoadTranslation('ID_HOUR') : G::LoadTranslation('ID_HOURS')) . ' ' . (int)(($iDiff % 3600) / 60) . ' ' . ((int)(($iDiff % 3600) / 60) == 1 ? G::LoadTranslation('ID_MINUTE') : G::LoadTranslation('ID_MINUTES')) . ' ' . (int)(($iDiff % 3600) % 60) . ' ' . ((int)(($iDiff % 3600) % 60) == 1 ? G::LoadTranslation('ID_SECOND') : G::LoadTranslation('ID_SECONDS')) : G::LoadTranslation('ID_NOT_FINISHED'));
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_TaskDetails', '', $aFields );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_TaskDetails', '', $aFields);
+        G::RenderPage('publish', 'raw');
         break;
     case 'showUsers':
         $_POST['TAS_ASSIGN_TYPE'] = $filter->xssFilterHard($_POST['TAS_ASSIGN_TYPE']);
@@ -254,15 +254,15 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
             // switch verify $_POST['TAS_ASSIGN_TYPE']
             case 'BALANCED':
                 $USR_UID = $filter->xssFilterHard($_POST['USR_UID']);
-                $oUser = new User( new DBConnection() );
-                $oUser->load( $USR_UID );
+                $oUser = new User(new DBConnection());
+                $oUser->load($USR_UID);
                 $oUser->Fields['USR_FIRSTNAME'] = $filter->xssFilterHard($oUser->Fields['USR_FIRSTNAME']);
                 $oUser->Fields['USR_LASTNAME'] = $filter->xssFilterHard($oUser->Fields['USR_LASTNAME']);
-                echo $oUser->Fields['USR_FIRSTNAME'] . ' ' . $oUser->Fields['USR_LASTNAME'] . '<input type="hidden" name="form[TASKS][1][USR_UID]" id="form[TASKS][1][USR_UID]" value="'.$USR_UID.'">';
+                echo $oUser->Fields['USR_FIRSTNAME'] . ' ' . $oUser->Fields['USR_LASTNAME'] . '<input type="hidden" name="form[TASKS][1][USR_UID]" id="form[TASKS][1][USR_UID]" value="' . $USR_UID . '">';
                 break;
             case 'MANUAL':
                 $sAux = '<select name="form[TASKS][1][USR_UID]" id="form[TASKS][1][USR_UID]">';
-                $oSession = new DBSession( new DBConnection() );
+                $oSession = new DBSession(new DBConnection());
                 /*
                 $oDataset = $oSession->Execute("SELECT
                                                 TU.USR_UID AS USR_UID,
@@ -280,11 +280,10 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
                                                 TU.TU_RELATION = 1 AND
                                                 U.USR_STATUS   = 1");
                 */
-                $sDataBase = 'database_' . strtolower( DB_ADAPTER );
-                if (G::LoadSystemExist( $sDataBase )) {
-
+                $sDataBase = 'database_' . strtolower(DB_ADAPTER);
+                if (G::LoadSystemExist($sDataBase)) {
                     $oDataBase = new database();
-                    $sConcat = $oDataBase->concatString( "U.USR_LASTNAME", "' '", "U.USR_FIRSTNAME" );
+                    $sConcat = $oDataBase->concatString("U.USR_LASTNAME", "' '", "U.USR_FIRSTNAME");
                 }
                 $sSQL = "   SELECT
                                     TU.USR_UID AS USR_UID, " . $sConcat . " AS USR_FULLNAME
@@ -300,7 +299,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
                                     TU.TU_TYPE     = 1 AND
                                     TU.TU_RELATION = 1 AND
                                     U.USR_STATUS   = 1";
-                $oDataset = $oSession->Execute( $sSQL );
+                $oDataset = $oSession->Execute($sSQL);
 
                 while ($aRow = $oDataset->Read()) {
                     $sAux .= '<option value="' . $aRow['USR_UID'] . '">' . $aRow['USR_FULLNAME'] . '</option>';
@@ -310,21 +309,21 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
                 break;
             case 'EVALUATE':
                 $TAS_ASSIGN_VARIABLE = $filter->xssFilterHard($_POST['TAS_ASSIGN_VARIABLE']);
-                $APPLICATION = $filter->xssFilterHard($_SESSION['APPLICATION']);
-                $oApplication = new Application( new DBConnection() );
-                $oApplication->load( $APPLICATION );
+                $sessionAppUid = $filter->xssFilterHard($_SESSION['APPLICATION']);
+                $oApplication = new Application(new DBConnection());
+                $oApplication->load($sessionAppUid);
                 $sUser = '';
                 if ($TAS_ASSIGN_VARIABLE != '') {
-                    if (isset( $oApplication->Fields['APP_DATA'][str_replace( '@@', '', $TAS_ASSIGN_VARIABLE )] )) {
-                        $sUser = $oApplication->Fields['APP_DATA'][str_replace( '@@', '', $TAS_ASSIGN_VARIABLE )];
+                    if (isset($oApplication->Fields['APP_DATA'][str_replace('@@', '', $TAS_ASSIGN_VARIABLE)])) {
+                        $sUser = $oApplication->Fields['APP_DATA'][str_replace('@@', '', $TAS_ASSIGN_VARIABLE)];
                     }
                 }
                 if ($sUser != '') {
-                    $oUser = new User( new DBConnection() );
-                    $oUser->load( $sUser );
+                    $oUser = new User(new DBConnection());
+                    $oUser->load($sUser);
                     echo $oUser->Fields['USR_FIRSTNAME'] . ' ' . $oUser->Fields['USR_LASTNAME'] . '<input type="hidden" name="form[TASKS][1][USR_UID]" id="form[TASKS][1][USR_UID]" value="' . $sUser . '">';
                 } else {
-                    $ID_EMPTY = $filter->xssFilterHard(G::LoadTranslation( 'ID_EMPTY' ));
+                    $ID_EMPTY = $filter->xssFilterHard(G::LoadTranslation('ID_EMPTY'));
                     echo '<strong>Error: </strong>' . $TAS_ASSIGN_VARIABLE . ' ' . $ID_EMPTY;
                     echo '<input type="hidden" name="_ERROR_" id="_ERROR_" value="">';
                 }
@@ -338,16 +337,16 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         $oCase = new Cases();
         $multiple = false;
 
-        if (isset( $_POST['APP_UID'] ) && isset( $_POST['DEL_INDEX'] )) {
+        if (isset($_POST['APP_UID']) && isset($_POST['DEL_INDEX'])) {
             $APP_UID = $_POST['APP_UID'];
             $DEL_INDEX = $_POST['DEL_INDEX'];
 
-            $appUids = explode( ',', $APP_UID );
-            $delIndexes = explode( ',', $DEL_INDEX );
-            if (count( $appUids ) > 1 && count( $delIndexes ) > 1) {
+            $appUids = explode(',', $APP_UID);
+            $delIndexes = explode(',', $DEL_INDEX);
+            if (count($appUids) > 1 && count($delIndexes) > 1) {
                 $multiple = true;
             }
-        } elseif (isset( $_POST['sApplicationUID'] ) && isset( $_POST['iIndex'] )) {
+        } elseif (isset($_POST['sApplicationUID']) && isset($_POST['iIndex'])) {
             $APP_UID = $_POST['sApplicationUID'];
             $DEL_INDEX = $_POST['iIndex'];
         } else {
@@ -357,44 +356,44 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
 
         if ($multiple) {
             foreach ($appUids as $i => $appUid) {
-                $oCase->cancelCase( $appUid, $delIndexes[$i], $_SESSION['USER_LOGGED'] );
+                $oCase->cancelCase($appUid, $delIndexes[$i], $_SESSION['USER_LOGGED']);
             }
         } else {
-            $oCase->cancelCase( $APP_UID, $DEL_INDEX, $_SESSION['USER_LOGGED'] );
+            $oCase->cancelCase($APP_UID, $DEL_INDEX, $_SESSION['USER_LOGGED']);
         }
         break;
     case 'reactivateCase':
-        $sApplicationUID = isset( $_POST['sApplicationUID'] ) ? $_POST['sApplicationUID'] : $_SESSION['APPLICATION'];
-        $iIndex = (isset( $_POST['sApplicationUID'] )) ? $_POST['iIndex'] : $_SESSION['INDEX'];
+        $sApplicationUID = isset($_POST['sApplicationUID']) ? $_POST['sApplicationUID'] : $_SESSION['APPLICATION'];
+        $iIndex = (isset($_POST['sApplicationUID'])) ? $_POST['iIndex'] : $_SESSION['INDEX'];
         $oCase = new Cases();
-        $oCase->reactivateCase( $sApplicationUID, $iIndex, $_SESSION['USER_LOGGED'] );
+        $oCase->reactivateCase($sApplicationUID, $iIndex, $_SESSION['USER_LOGGED']);
         break;
     case 'showPauseCaseInput':
         //echo '<input type=button onclick="close_pauseCase()" value="Cancel">';
-        $aFields = Array ();
+        $aFields = array();
         $G_PUBLISH = new Publisher();
-        $aFields['TIME_STAMP'] = G::getformatedDate( date( 'Y-m-d' ), 'M d, yyyy', SYS_LANG );
+        $aFields['TIME_STAMP'] = G::getformatedDate(date('Y-m-d'), 'M d, yyyy', SYS_LANG);
 
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_UnpauseDateInput', '', $aFields );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_UnpauseDateInput', '', $aFields);
+        G::RenderPage('publish', 'raw');
         break;
     case 'pauseCase':
         // Save the note pause reason
         if ($_POST['NOTE_REASON'] != '') {
-            require_once ("classes/model/AppNotes.php");
+            require_once("classes/model/AppNotes.php");
             $appNotes = new AppNotes();
-            $noteContent = addslashes( $_POST['NOTE_REASON'] );
-            $result = $appNotes->postNewNote( $_POST['APP_UID'], $_SESSION['USER_LOGGED'], $noteContent, $_POST['NOTIFY_PAUSE'] );
+            $noteContent = addslashes($_POST['NOTE_REASON']);
+            $result = $appNotes->postNewNote($_POST['APP_UID'], $_SESSION['USER_LOGGED'], $noteContent, $_POST['NOTIFY_PAUSE']);
         }
         // End save
 
 
-        $unpauseDate = $_POST['unpausedate'] . ' '. $_REQUEST['unpauseTime'];
+        $unpauseDate = $_POST['unpausedate'] . ' ' . $_REQUEST['unpauseTime'];
         $oCase = new Cases();
-        if (isset( $_POST['APP_UID'] ) && isset( $_POST['DEL_INDEX'] )) {
+        if (isset($_POST['APP_UID']) && isset($_POST['DEL_INDEX'])) {
             $APP_UID = $_POST['APP_UID'];
             $DEL_INDEX = $_POST['DEL_INDEX'];
-        } elseif (isset( $_POST['sApplicationUID'] ) && isset( $_POST['iIndex'] )) {
+        } elseif (isset($_POST['sApplicationUID']) && isset($_POST['iIndex'])) {
             $APP_UID = $_POST['sApplicationUID'];
             $DEL_INDEX = $_POST['iIndex'];
         } else {
@@ -406,25 +405,25 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         $oCase->pauseCase($APP_UID, $DEL_INDEX, $_SESSION['USER_LOGGED'], $unpauseDate, $appTitle);
         break;
     case 'unpauseCase':
-        $sApplicationUID = (isset( $_POST['sApplicationUID'] )) ? $_POST['sApplicationUID'] : $_SESSION['APPLICATION'];
-        $iIndex = (isset( $_POST['sApplicationUID'] )) ? $_POST['iIndex'] : $_SESSION['INDEX'];
+        $sApplicationUID = (isset($_POST['sApplicationUID'])) ? $_POST['sApplicationUID'] : $_SESSION['APPLICATION'];
+        $iIndex = (isset($_POST['sApplicationUID'])) ? $_POST['iIndex'] : $_SESSION['INDEX'];
         $oCase = new Cases();
-        $oCase->unpauseCase( $sApplicationUID, $iIndex, $_SESSION['USER_LOGGED'] );
+        $oCase->unpauseCase($sApplicationUID, $iIndex, $_SESSION['USER_LOGGED']);
         break;
     case 'deleteCase':
         $oCase = new Cases();
-        $sApplicationUID = (isset( $_POST['sApplicationUID'] )) ? $_POST['sApplicationUID'] : $_SESSION['APPLICATION'];
-        $oCase->removeCase( $sApplicationUID );
+        $sApplicationUID = (isset($_POST['sApplicationUID'])) ? $_POST['sApplicationUID'] : $_SESSION['APPLICATION'];
+        $oCase->removeCase($sApplicationUID);
         break;
     case 'view_reassignCase':
 
         $oTasks = new Tasks();
-        $aAux = $oTasks->getGroupsOfTask( $_SESSION['TASK'], 1 );
-        $row = array ();
+        $aAux = $oTasks->getGroupsOfTask($_SESSION['TASK'], 1);
+        $row = array();
 
         $groups = new Groups();
         foreach ($aAux as $aGroup) {
-            $aUsers = $groups->getUsersOfGroup( $aGroup['GRP_UID'] );
+            $aUsers = $groups->getUsersOfGroup($aGroup['GRP_UID']);
             foreach ($aUsers as $aUser) {
                 if ($aUser['USR_UID'] != $_SESSION['USER_LOGGED']) {
                     $row[] = $aUser['USR_UID'];
@@ -432,7 +431,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
             }
         }
 
-        $aAux = $oTasks->getUsersOfTask( $_SESSION['TASK'], 1 );
+        $aAux = $oTasks->getUsersOfTask($_SESSION['TASK'], 1);
         foreach ($aAux as $aUser) {
             if ($aUser['USR_UID'] != $_SESSION['USER_LOGGED']) {
                 $row[] = $aUser['USR_UID'];
@@ -440,20 +439,20 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         }
 
         //require_once 'classes/model/Users.php';
-        $c = new Criteria( 'workflow' );
-        $c->addSelectColumn( UsersPeer::USR_UID );
-        $c->addSelectColumn( UsersPeer::USR_FIRSTNAME );
-        $c->addSelectColumn( UsersPeer::USR_LASTNAME );
-        $c->add( UsersPeer::USR_UID, $row, Criteria::IN );
+        $c = new Criteria('workflow');
+        $c->addSelectColumn(UsersPeer::USR_UID);
+        $c->addSelectColumn(UsersPeer::USR_FIRSTNAME);
+        $c->addSelectColumn(UsersPeer::USR_LASTNAME);
+        $c->add(UsersPeer::USR_UID, $row, Criteria::IN);
 
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'processes/processes_viewreassignCase', $c );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('propeltable', 'paged-table', 'processes/processes_viewreassignCase', $c);
+        G::RenderPage('publish', 'raw');
         break;
     case 'reassignCase':
         $cases = new Cases();
-        $cases->reassignCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], $_POST['USR_UID'], $_POST['THETYPE'] );
+        $cases->reassignCase($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], $_POST['USR_UID'], $_POST['THETYPE']);
         break;
     case 'toRevisePanel':
         $APP_UID = $filter->xssFilterHard($_POST['APP_UID']);
@@ -463,18 +462,18 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         $_GET['DEL_INDEX'] = $DEL_INDEX;
         $G_PUBLISH = new Publisher();
 
-        
+
         echo "<iframe scrolling='no' style='border:none;height=300px;width:240px;'" . " src='casesToRevisePanelExtJs?APP_UID=$APP_UID&DEL_INDEX=$DEL_INDEX'></iframe>";
         //  $G_PUBLISH->AddContent( 'smarty', 'cases/cases_toRevise' );
         //  $G_PUBLISH->AddContent('smarty', 'cases/cases_toReviseIn', '', '', array());
-        G::RenderPage( 'publish', 'raw' );
+        G::RenderPage('publish', 'raw');
         break;
     case 'showUploadedDocuments':
         $oCase = new Cases();
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/cases_AllInputdocsList', $oCase->getAllUploadedDocumentsCriteria( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED'] ) );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_AllInputdocsList', $oCase->getAllUploadedDocumentsCriteria($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED']));
+        G::RenderPage('publish', 'raw');
         break;
     case 'showUploadedDocument':
         //require_once 'classes/model/AppDocument.php';
@@ -482,32 +481,32 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         //require_once 'classes/model/InputDocument.php';
         //require_once 'classes/model/Users.php';
         $oAppDocument = new AppDocument();
-        $oAppDocument->Fields = $oAppDocument->load( $_POST['APP_DOC_UID'] );
+        $oAppDocument->Fields = $oAppDocument->load($_POST['APP_DOC_UID']);
         $oInputDocument = new InputDocument();
-        if ($oAppDocument->Fields['DOC_UID'] != - 1) {
-            $Fields = $oInputDocument->load( $oAppDocument->Fields['DOC_UID'] );
+        if ($oAppDocument->Fields['DOC_UID'] != -1) {
+            $Fields = $oInputDocument->load($oAppDocument->Fields['DOC_UID']);
         } else {
-            $Fields = array ('INP_DOC_FORM_NEEDED' => '','FILENAME' => $oAppDocument->Fields['APP_DOC_FILENAME']);
+            $Fields = array('INP_DOC_FORM_NEEDED' => '', 'FILENAME' => $oAppDocument->Fields['APP_DOC_FILENAME']);
         }
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->add( AppDelegationPeer::APP_UID, $oAppDocument->Fields['APP_UID'] );
-        $oCriteria->add( AppDelegationPeer::DEL_INDEX, $oAppDocument->Fields['DEL_INDEX'] );
-        $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->add(AppDelegationPeer::APP_UID, $oAppDocument->Fields['APP_UID']);
+        $oCriteria->add(AppDelegationPeer::DEL_INDEX, $oAppDocument->Fields['DEL_INDEX']);
+        $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         $aRow = $oDataset->getRow();
         $oTask = new Task();
         try {
-            $aTask = $oTask->load( $aRow['TAS_UID'] );
+            $aTask = $oTask->load($aRow['TAS_UID']);
             $Fields['ORIGIN'] = $aTask['TAS_TITLE'];
-            $oAppDocument->Fields['VIEW'] = G::LoadTranslation( 'ID_OPEN' );
+            $oAppDocument->Fields['VIEW'] = G::LoadTranslation('ID_OPEN');
         } catch (Exception $oException) {
             $Fields['ORIGIN'] = '(TASK DELETED)';
         }
 
         try {
             $oUser = new Users();
-            $aUser = $oUser->load( $oAppDocument->Fields['USR_UID'] );
+            $aUser = $oUser->load($oAppDocument->Fields['USR_UID']);
             $Fields['CREATOR'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
         } catch (Exception $e) {
             $Fields['CREATOR'] = '***';
@@ -530,16 +529,16 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         //$oAppDocument->Fields['VIEW'] = G::LoadTranslation('ID_OPEN');
         $oAppDocument->Fields['FILE'] = 'cases_ShowDocument?a=' . $_POST['APP_DOC_UID'] . '&r=' . rand();
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', $sXmlForm, '', G::array_merges( $Fields, $oAppDocument->Fields ), '' );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', $sXmlForm, '', G::array_merges($Fields, $oAppDocument->Fields), '');
+        G::RenderPage('publish', 'raw');
         break;
     case 'showGeneratedDocuments':
         global $G_PUBLISH;
         $oCase = new Cases();
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/cases_AllOutputdocsList', $oCase->getAllGeneratedDocumentsCriteria( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED'] ) );
+        $G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_AllOutputdocsList', $oCase->getAllGeneratedDocumentsCriteria($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED']));
 
-        G::RenderPage( 'publish', 'raw' );
+        G::RenderPage('publish', 'raw');
         break;
     case 'uploadDocumentGrid_Ajax':
         global $G_PUBLISH;
@@ -551,7 +550,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         );
 
         $oCase = new Cases();
-        $aProcesses = Array();
+        $aProcesses = array();
         $G_PUBLISH = new Publisher();
         $tasUid = isset($_SESSION['CURRENT_TASK']) ? $_SESSION['CURRENT_TASK'] : $_SESSION['TASK'];
         $criteria = $oCase->getAllUploadedDocumentsCriteria(
@@ -596,7 +595,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         global $G_PUBLISH;
 
         $oCase = new Cases();
-        $aProcesses = Array ();
+        $aProcesses = array();
         $G_PUBLISH = new Publisher();
         $tasUid = isset($_SESSION['CURRENT_TASK']) ? $_SESSION['CURRENT_TASK'] : $_SESSION['TASK'];
         $c = $oCase->getAllGeneratedDocumentsCriteria(
@@ -608,40 +607,40 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         );
 
         if ($c->getDbName() == 'dbarray') {
-            $rs = ArrayBasePeer::doSelectRs( $c );
+            $rs = ArrayBasePeer::doSelectRs($c);
         } else {
-            $rs = GulliverBasePeer::doSelectRs( $c );
+            $rs = GulliverBasePeer::doSelectRs($c);
         }
 
-        $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $rs->next();
 
         $totalCount = 0;
 
-        for ($j = 0; $j < $rs->getRecordCount(); $j ++) {
+        for ($j = 0; $j < $rs->getRecordCount(); $j++) {
             $result = $rs->getRow();
             $result["FILEDOCEXIST"] = ($result["FILEDOC"]);
             $result["FILEPDFEXIST"] = ($result["FILEPDF"]);
-            $result["DELETE_FILE"] = (isset( $result['ID_DELETE'] ) && $result['ID_DELETE'] == 'Delete') ? true : false;
+            $result["DELETE_FILE"] = (isset($result['ID_DELETE']) && $result['ID_DELETE'] == 'Delete') ? true : false;
 
             $aProcesses[] = $result;
 
             $rs->next();
-            $totalCount ++;
+            $totalCount++;
         }
 
         //!dateFormat
         $conf = new Configurations();
 
         try {
-            $globaleneralConfCasesList = $conf->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
+            $globaleneralConfCasesList = $conf->getConfiguration('ENVIRONMENT_SETTINGS', '');
         } catch (Exception $e) {
-            $generalConfCasesList = array ();
+            $generalConfCasesList = array();
         }
 
         $dateFormat = "";
-        $varFlag = isset( $generalConfCasesList['casesListDateFormat'] );
-        if ($varFlag && ! empty( $generalConfCasesList['casesListDateFormat'] )) {
+        $varFlag = isset($generalConfCasesList['casesListDateFormat']);
+        if ($varFlag && !empty($generalConfCasesList['casesListDateFormat'])) {
             $dateFormat = $generalConfCasesList['casesListDateFormat'];
         }
 
@@ -650,62 +649,62 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         $r->totalCount = $totalCount;
         $r->dataFormat = $dateFormat;
 
-        echo Bootstrap::json_encode( $r );
+        echo Bootstrap::json_encode($r);
         break;
     case 'showGeneratedDocument':
         //require_once 'classes/model/AppDocument.php';
         //require_once 'classes/model/AppDelegation.php';
         $oAppDocument = new AppDocument();
-        $aFields = $oAppDocument->load( $_POST['APP_DOC_UID'] );
+        $aFields = $oAppDocument->load($_POST['APP_DOC_UID']);
         require_once 'classes/model/OutputDocument.php';
         $oOutputDocument = new OutputDocument();
-        $aOD = $oOutputDocument->load( $aFields['DOC_UID'] );
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->add( AppDelegationPeer::APP_UID, $aFields['APP_UID'] );
-        $oCriteria->add( AppDelegationPeer::DEL_INDEX, $aFields['DEL_INDEX'] );
-        $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $aOD = $oOutputDocument->load($aFields['DOC_UID']);
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->add(AppDelegationPeer::APP_UID, $aFields['APP_UID']);
+        $oCriteria->add(AppDelegationPeer::DEL_INDEX, $aFields['DEL_INDEX']);
+        $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         $aRow = $oDataset->getRow();
         $oTask = new Task();
-        $aTask = $oTask->load( $aRow['TAS_UID'] );
+        $aTask = $oTask->load($aRow['TAS_UID']);
         $aFields['ORIGIN'] = $aTask['TAS_TITLE'];
         require_once 'classes/model/Users.php';
         $oUser = new Users();
-        $aUser = $oUser->load( $aFields['USR_UID'] );
+        $aUser = $oUser->load($aFields['USR_UID']);
         $aFields['CREATOR'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
-        $aFields['VIEW'] = G::LoadTranslation( 'ID_OPEN' );
+        $aFields['VIEW'] = G::LoadTranslation('ID_OPEN');
         $aFields['FILE1'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=doc&random=' . rand();
         $aFields['FILE2'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=pdf&random=' . rand();
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewAnyOutputDocument', '', G::array_merges( $aOD, $aFields ), '' );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ViewAnyOutputDocument', '', G::array_merges($aOD, $aFields), '');
+        G::RenderPage('publish', 'raw');
         break;
     case 'showDynaformList':
         $oCase = new Cases();
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/cases_AllDynaformsList', $oCase->getallDynaformsCriteria( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED'] ) );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_AllDynaformsList', $oCase->getallDynaformsCriteria($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED']));
+        G::RenderPage('publish', 'raw');
         break;
     case 'showDynaform':
         $G_PUBLISH = new Publisher();
         $oCase = new Cases();
-        $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+        $Fields = $oCase->loadCase($_SESSION['APPLICATION']);
         $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
         $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
         $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
         $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;';
-        if (isset( $_POST['DYN_UID'] )) {
+        if (isset($_POST['DYN_UID'])) {
             $_SESSION['DYN_UID_PRINT'] = $_POST['DYN_UID'];
         } else {
             $_SESSION['DYN_UID_PRINT'] = $_REQUEST['DYN_UID'];
         }
-        if (! isset( $_SESSION['CURRENT_DYN_UID'] )) {
+        if (!isset($_SESSION['CURRENT_DYN_UID'])) {
             $_SESSION['CURRENT_DYN_UID'] = $_POST['DYN_UID'] ? $_POST['DYN_UID'] : $_REQUEST['DYN_UID'];
         }
-        $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_REQUEST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view' );
-        G::RenderPage( 'publish', 'blank' );
+        $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_REQUEST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view');
+        G::RenderPage('publish', 'blank');
         break;
     case 'showDynaformHistory':
         $G_PUBLISH = new Publisher();
@@ -715,89 +714,89 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
         $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
         $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'return false;';
-        $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view' );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_POST['DYN_UID'], '', $Fields['APP_DATA'], '', '', 'view');
+        G::RenderPage('publish', 'raw');
         break;
     case 'adhocAssignmentUsers':
 
         $oTasks = new Tasks();
-        $aAux = $oTasks->getGroupsOfTask( $_SESSION['TASK'], 2 );
-        $aAdhocUsers = array ();
+        $aAux = $oTasks->getGroupsOfTask($_SESSION['TASK'], 2);
+        $aAdhocUsers = array();
         $oGroups = new Groups();
         foreach ($aAux as $aGroup) {
-            $aUsers = $oGroups->getUsersOfGroup( $aGroup['GRP_UID'] );
+            $aUsers = $oGroups->getUsersOfGroup($aGroup['GRP_UID']);
             foreach ($aUsers as $aUser) {
                 if ($aUser['USR_UID'] != $_SESSION['USER_LOGGED']) {
                     $aAdhocUsers[] = $aUser['USR_UID'];
                 }
             }
         }
-        $aAux = $oTasks->getUsersOfTask( $_SESSION['TASK'], 2 );
+        $aAux = $oTasks->getUsersOfTask($_SESSION['TASK'], 2);
         foreach ($aAux as $aUser) {
             if ($aUser['USR_UID'] != $_SESSION['USER_LOGGED']) {
                 $aAdhocUsers[] = $aUser['USR_UID'];
             }
         }
         //require_once 'classes/model/Users.php';
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->addSelectColumn( UsersPeer::USR_UID );
-        $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
-        $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
-        $oCriteria->add( UsersPeer::USR_UID, $aAdhocUsers, Criteria::IN );
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn(UsersPeer::USR_UID);
+        $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
+        $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
+        $oCriteria->add(UsersPeer::USR_UID, $aAdhocUsers, Criteria::IN);
 
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'processes/processes_viewreassignCase', $oCriteria, array ('THETYPE' => 'ADHOC'
-        ) );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('propeltable', 'paged-table', 'processes/processes_viewreassignCase', $oCriteria, array('THETYPE' => 'ADHOC'
+        ));
+        G::RenderPage('publish', 'raw');
         break;
     case 'showHistoryMessages':
         $oCase = new Cases();
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/cases_Messages', $oCase->getHistoryMessagesTracker( $_SESSION['APPLICATION'] ) );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_Messages', $oCase->getHistoryMessagesTracker($_SESSION['APPLICATION']));
+        G::RenderPage('publish', 'raw');
         break;
     case 'showHistoryMessage':
         $G_PUBLISH = new Publisher();
         $oCase = new Cases();
 
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_MessagesView', '', $oCase->getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] ) );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_MessagesView', '', $oCase->getHistoryMessagesTrackerView($_POST['APP_UID'], $_POST['APP_MSG_UID']));
+        G::RenderPage('publish', 'raw');
         break;
     case 'deleteUploadedDocument':
         //require_once 'classes/model/AppDocument.php';
         $oAppDocument = new AppDocument();
-        $oAppDocument->remove( $_POST['DOC'] );
+        $oAppDocument->remove($_POST['DOC']);
         $oCase = new Cases();
-        $oCase->getAllUploadedDocumentsCriteria( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED'] );
+        $oCase->getAllUploadedDocumentsCriteria($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED']);
         break;
     case 'deleteGeneratedDocument':
         //require_once 'classes/model/AppDocument.php';
         $oAppDocument = new AppDocument();
-        $oAppDocument->remove( $_POST['DOC'] );
+        $oAppDocument->remove($_POST['DOC']);
         $oCase = new Cases();
-        $oCase->getAllGeneratedDocumentsCriteria( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED'] );
+        $oCase->getAllGeneratedDocumentsCriteria($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['TASK'], $_SESSION['USER_LOGGED']);
         break;
     /* @Author Erik Amaru Ortiz <erik@colosa.com> */
     case 'resendMessage':
         //require_once 'classes/model/Configuration.php';
 
         $oCase = new Cases();
-        $data = $oCase->getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] );
+        $data = $oCase->getHistoryMessagesTrackerView($_POST['APP_UID'], $_POST['APP_MSG_UID']);
         //print_r($data);
 
         $aSetup = System::getEmailConfiguration();
 
         $passwd = $aSetup['MESS_PASSWORD'];
-        $passwdDec = G::decrypt( $passwd, 'EMAILENCRYPT' );
-        $auxPass = explode( 'hash:', $passwdDec );
-        if (count( $auxPass ) > 1) {
-            if (count( $auxPass ) == 2) {
+        $passwdDec = G::decrypt($passwd, 'EMAILENCRYPT');
+        $auxPass = explode('hash:', $passwdDec);
+        if (count($auxPass) > 1) {
+            if (count($auxPass) == 2) {
                 $passwd = $auxPass[1];
             } else {
-                array_shift( $auxPass );
-                $passwd = implode( '', $auxPass );
+                array_shift($auxPass);
+                $passwd = implode('', $auxPass);
             }
         }
         $aSetup['MESS_PASSWORD'] = $passwd;
@@ -809,7 +808,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
 
         $oSpool = new SpoolRun();
         $oSpool->setConfig(
-            array (
+            array(
                 'MESS_ENGINE' => $aSetup['MESS_ENGINE'],
                 'MESS_SERVER' => $aSetup['MESS_SERVER'],
                 'MESS_PORT' => $aSetup['MESS_PORT'],
@@ -819,19 +818,19 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
                 'SMTPAuth' => $aSetup['MESS_RAUTH']
             )
         );
-        $oSpool->create( array ('msg_uid' => $data['MSG_UID'],'app_uid' => $data['APP_UID'],'del_index' => $data['DEL_INDEX'],'app_msg_type' => $data['APP_MSG_TYPE'],'app_msg_subject' => $data['APP_MSG_SUBJECT'],'app_msg_from' => $data['APP_MSG_FROM'],'app_msg_to' => $data['APP_MSG_TO'],'app_msg_body' => $data['APP_MSG_BODY'],'app_msg_cc' => $data['APP_MSG_CC'],'app_msg_bcc' => $data['APP_MSG_BCC'],'app_msg_attach' => $data['APP_MSG_ATTACH'],'app_msg_template' => $data['APP_MSG_TEMPLATE'],'app_msg_status' => 'pending'
-        ) );
+        $oSpool->create(array('msg_uid' => $data['MSG_UID'], 'app_uid' => $data['APP_UID'], 'del_index' => $data['DEL_INDEX'], 'app_msg_type' => $data['APP_MSG_TYPE'], 'app_msg_subject' => $data['APP_MSG_SUBJECT'], 'app_msg_from' => $data['APP_MSG_FROM'], 'app_msg_to' => $data['APP_MSG_TO'], 'app_msg_body' => $data['APP_MSG_BODY'], 'app_msg_cc' => $data['APP_MSG_CC'], 'app_msg_bcc' => $data['APP_MSG_BCC'], 'app_msg_attach' => $data['APP_MSG_ATTACH'], 'app_msg_template' => $data['APP_MSG_TEMPLATE'], 'app_msg_status' => 'pending'
+        ));
         $oSpool->sendMail();
         break;
     /* @Author Erik Amaru Ortiz <erik@colosa.com> */
     case 'showdebug':
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'view', 'cases/showDebugFrame' );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('view', 'cases/showDebugFrame');
+        G::RenderPage('publish', 'raw');
         break;
     /* @Author Erik Amaru Ortiz <erik@colosa.com> */
     case 'reassignByUserList':
-        $APP_UIDS = explode( ',', $_POST['APP_UIDS'] );
+        $APP_UIDS = explode(',', $_POST['APP_UIDS']);
         $sReassignFromUser = $_POST['FROM_USR_ID'];
 
         $oTasks = new Tasks();
@@ -839,29 +838,29 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         $oUser = new Users();
         $oCases = new Cases();
 
-        $aCasesList = Array ();
+        $aCasesList = array();
 
         foreach ($APP_UIDS as $APP_UID) {
-            $aCase = $oCases->loadCaseInCurrentDelegation( $APP_UID, true );
+            $aCase = $oCases->loadCaseInCurrentDelegation($APP_UID, true);
 
-            $aUsersInvolved = Array ();
-            $aCaseGroups = $oTasks->getGroupsOfTask( $aCase['TAS_UID'], 1 );
+            $aUsersInvolved = array();
+            $aCaseGroups = $oTasks->getGroupsOfTask($aCase['TAS_UID'], 1);
 
             foreach ($aCaseGroups as $aCaseGroup) {
-                $aCaseUsers = $oGroups->getUsersOfGroup( $aCaseGroup['GRP_UID'] );
+                $aCaseUsers = $oGroups->getUsersOfGroup($aCaseGroup['GRP_UID']);
                 foreach ($aCaseUsers as $aCaseUser) {
                     if ($aCaseUser['USR_UID'] != $sReassignFromUser) {
-                        $aCaseUserRecord = $oUser->load( $aCaseUser['USR_UID'] );
+                        $aCaseUserRecord = $oUser->load($aCaseUser['USR_UID']);
                         $aUsersInvolved[$aCaseUser['USR_UID']] = $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME'];
                         // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')';
                     }
                 }
             }
 
-            $aCaseUsers = $oTasks->getUsersOfTask( $aCase['TAS_UID'], 1 );
+            $aCaseUsers = $oTasks->getUsersOfTask($aCase['TAS_UID'], 1);
             foreach ($aCaseUsers as $aCaseUser) {
                 if ($aCaseUser['USR_UID'] != $sReassignFromUser) {
-                    $aCaseUserRecord = $oUser->load( $aCaseUser['USR_UID'] );
+                    $aCaseUserRecord = $oUser->load($aCaseUser['USR_UID']);
                     $aUsersInvolved[$aCaseUser['USR_UID']] = $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME'];
                     // . ' (' . $aCaseUserRecord['USR_USERNAME'] . ')';
                 }
@@ -870,39 +869,39 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
             $oTmp->items = $aUsersInvolved;
             $oTmp->id = $aCase['APP_UID'];
             $aCase['USERS'] = $oTmp;
-            array_push( $aCasesList, $aCase );
+            array_push($aCasesList, $aCase);
         }
 
-        $filedNames = Array ("APP_UID","APP_NUMBER","APP_UPDATE_DATE","DEL_PRIORITY","DEL_INDEX","TAS_UID","DEL_INIT_DATE","DEL_FINISH_DATE","USR_UID","APP_STATUS","DEL_TASK_DUE_DATE","APP_CURRENT_USER","APP_TITLE","APP_PRO_TITLE","APP_TAS_TITLE","APP_DEL_PREVIOUS_USER","USERS"
+        $filedNames = array("APP_UID", "APP_NUMBER", "APP_UPDATE_DATE", "DEL_PRIORITY", "DEL_INDEX", "TAS_UID", "DEL_INIT_DATE", "DEL_FINISH_DATE", "USR_UID", "APP_STATUS", "DEL_TASK_DUE_DATE", "APP_CURRENT_USER", "APP_TITLE", "APP_PRO_TITLE", "APP_TAS_TITLE", "APP_DEL_PREVIOUS_USER", "USERS"
         );
 
-        $aCasesList = array_merge( Array ($filedNames
-        ), $aCasesList );
+        $aCasesList = array_merge(array($filedNames
+        ), $aCasesList);
 
         global $_DBArray;
         $_DBArray['reassign_byuser'] = $aCasesList;
-        $oCriteria = new Criteria( 'dbarray' );
-        $oCriteria->setDBArrayTable( 'reassign_byuser' );
+        $oCriteria = new Criteria('dbarray');
+        $oCriteria->setDBArrayTable('reassign_byuser');
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'propeltable', 'cases/paged-table-reassigByUser2', 'cases/cases_ToReassignByUserList2', $oCriteria );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-reassigByUser2', 'cases/cases_ToReassignByUserList2', $oCriteria);
+        G::RenderPage('publish', 'raw');
         break;
     /* @Author Erik Amaru Ortiz <erik@colosa.com> */
     case 'reassignByUser':
 
         $oCases = new Cases();
-        $aCases = Array ();
+        $aCases = array();
 
-        if (isset( $_POST['items'] ) && trim( $_POST['items'] ) != '') {
+        if (isset($_POST['items']) && trim($_POST['items']) != '') {
             $sItems = $_POST['items'];
-            $aItems = explode( ',', $sItems );
+            $aItems = explode(',', $sItems);
             $FROM_USR_UID = $_POST['USR_UID'];
 
             foreach ($aItems as $item) {
-                list ($APP_UID, $USR_UID) = explode( '|', $item );
-                $aCase = $oCases->loadCaseInCurrentDelegation( $APP_UID, true );
-                $oCase->reassignCase( $aCase['APP_UID'], $aCase['DEL_INDEX'], $FROM_USR_UID, $USR_UID );
-                array_push( $aCases, $aCase );
+                list($APP_UID, $USR_UID) = explode('|', $item);
+                $aCase = $oCases->loadCaseInCurrentDelegation($APP_UID, true);
+                $oCase->reassignCase($aCase['APP_UID'], $aCase['DEL_INDEX'], $FROM_USR_UID, $USR_UID);
+                array_push($aCases, $aCase);
             }
             //G::pr($aCases);
 
@@ -911,16 +910,16 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
             $oUser = new Users();
             $sText = '';
             foreach ($aCases as $aCase) {
-                $aCaseUpdated = $oCases->loadCaseInCurrentDelegation( $aCase['APP_UID'], true );
-                $aUser = $oUser->load( $aCaseUpdated['USR_UID'] );
+                $aCaseUpdated = $oCases->loadCaseInCurrentDelegation($aCase['APP_UID'], true);
+                $aUser = $oUser->load($aCaseUpdated['USR_UID']);
                 $sText .= $aCaseUpdated['APP_PRO_TITLE'] . ' - ' . ' Case: ' . $aCaseUpdated['APP_NUMBER'] . '# (' . $aCaseUpdated['APP_TAS_TITLE'] . ') <b> => Reassigned to => </b> <font color="blue">' . $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . ' [' . $aUser['USR_USERNAME'] . ']' . '</font><br />';
             }
 
             $G_PUBLISH = new Publisher();
             $aMessage['MESSAGE'] = $sText;
             $aMessage['URL'] = 'cases_ReassignByUser?REASSIGN_USER=' . $_POST['USR_UID'];
-            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ReassignShowInfo', '', $aMessage );
-            G::RenderPage( 'publish', 'raw' );
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ReassignShowInfo', '', $aMessage);
+            G::RenderPage('publish', 'raw');
         }
         break;
     case "uploadInputDocument":
@@ -931,19 +930,19 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         $Fields['actionType'] = $_POST['actionType'];
         $Fields['docVersion'] = $_POST['docVersion'];
         $oInputDocument = new InputDocument();
-        $InpDocData = $oInputDocument->load( $Fields['DOC_UID'] );
+        $InpDocData = $oInputDocument->load($Fields['DOC_UID']);
 
         $inpDocMaxFilesize = $InpDocData["INP_DOC_MAX_FILESIZE"];
         $inpDocMaxFilesizeUnit = $InpDocData["INP_DOC_MAX_FILESIZE_UNIT"];
-        $inpDocMaxFilesize = $inpDocMaxFilesize * (($inpDocMaxFilesizeUnit == "MB")? 1024 *1024 : 1024); //Bytes
+        $inpDocMaxFilesize = $inpDocMaxFilesize * (($inpDocMaxFilesizeUnit == "MB") ? 1024 * 1024 : 1024); //Bytes
 
-        $Fields["INP_DOC_SUPPORTED_EXTENSIONS_FILENAME_LABEL"] = "[" . $InpDocData["INP_DOC_TYPE_FILE"]. "]";
+        $Fields["INP_DOC_SUPPORTED_EXTENSIONS_FILENAME_LABEL"] = "[" . $InpDocData["INP_DOC_TYPE_FILE"] . "]";
         $Fields["INP_DOC_MAX_FILESIZE"] = $inpDocMaxFilesize;
-        $Fields["INP_DOC_MAX_FILESIZE_LABEL"] = ($inpDocMaxFilesize > 0)? "[" . $InpDocData["INP_DOC_MAX_FILESIZE"] . " " . $InpDocData["INP_DOC_MAX_FILESIZE_UNIT"] . "]" : "";
+        $Fields["INP_DOC_MAX_FILESIZE_LABEL"] = ($inpDocMaxFilesize > 0) ? "[" . $InpDocData["INP_DOC_MAX_FILESIZE"] . " " . $InpDocData["INP_DOC_MAX_FILESIZE_UNIT"] . "]" : "";
         $Fields['fileTypes'] = $InpDocData['INP_DOC_TYPE_FILE'];
 
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_AttachInputDocumentGeneral', '', $Fields, 'cases_SaveDocument?UID=' . $_POST['docID'] );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_AttachInputDocumentGeneral', '', $Fields, 'cases_SaveDocument?UID=' . $_POST['docID']);
+        G::RenderPage('publish', 'raw');
         break;
     case "uploadToReviseInputDocument":
         //krumo($_POST);
@@ -954,61 +953,61 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         $Fields["docVersion"] = (int)($_POST["docVersion"]);
 
         $oInputDocument = new InputDocument();
-        $InpDocData = $oInputDocument->load( $Fields['DOC_UID'] );
+        $InpDocData = $oInputDocument->load($Fields['DOC_UID']);
 
         $inpDocMaxFilesize = $InpDocData["INP_DOC_MAX_FILESIZE"];
         $inpDocMaxFilesizeUnit = $InpDocData["INP_DOC_MAX_FILESIZE_UNIT"];
-        $inpDocMaxFilesize = $inpDocMaxFilesize * (($inpDocMaxFilesizeUnit == "MB")? 1024 *1024 : 1024); //Bytes
+        $inpDocMaxFilesize = $inpDocMaxFilesize * (($inpDocMaxFilesizeUnit == "MB") ? 1024 * 1024 : 1024); //Bytes
 
-        $Fields["INP_DOC_SUPPORTED_EXTENSIONS_FILENAME_LABEL"] = "[" . $InpDocData["INP_DOC_TYPE_FILE"]. "]";
+        $Fields["INP_DOC_SUPPORTED_EXTENSIONS_FILENAME_LABEL"] = "[" . $InpDocData["INP_DOC_TYPE_FILE"] . "]";
         $Fields["INP_DOC_MAX_FILESIZE"] = $inpDocMaxFilesize;
-        $Fields["INP_DOC_MAX_FILESIZE_LABEL"] = ($inpDocMaxFilesize > 0)? "[" . $InpDocData["INP_DOC_MAX_FILESIZE"] . " " . $InpDocData["INP_DOC_MAX_FILESIZE_UNIT"] . "]" : "";
+        $Fields["INP_DOC_MAX_FILESIZE_LABEL"] = ($inpDocMaxFilesize > 0) ? "[" . $InpDocData["INP_DOC_MAX_FILESIZE"] . " " . $InpDocData["INP_DOC_MAX_FILESIZE_UNIT"] . "]" : "";
         $Fields['fileTypes'] = $InpDocData['INP_DOC_TYPE_FILE'];
 
-        if($_POST['actionType'] == 'NV'){
+        if ($_POST['actionType'] == 'NV') {
             $appDocument = new AppDocument();
             $arrayAppDocumentData = $appDocument->load($_POST["appDocId"]);
-            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_AttachInputDocumentGeneral', '', $Fields, 'cases_SupervisorSaveDocument?APP_DOC_UID=' . $_POST['appDocId'] . "&DOC_VERSION=" . ($Fields['docVersion'] + 1) . '&APP_UID=' . $arrayAppDocumentData["APP_UID"] . '&UID=' . $_POST['docID']);
-        }else{
-            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_AttachInputDocumentGeneral', '', $Fields, 'cases_SupervisorSaveDocument?UID=' . $_POST['docID'] . '&APP_UID=' . $_POST['appDocId'] );
-        }        
-        G::RenderPage( 'publish', 'raw' );
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_AttachInputDocumentGeneral', '', $Fields, 'cases_SupervisorSaveDocument?APP_DOC_UID=' . $_POST['appDocId'] . "&DOC_VERSION=" . ($Fields['docVersion'] + 1) . '&APP_UID=' . $arrayAppDocumentData["APP_UID"] . '&UID=' . $_POST['docID']);
+        } else {
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_AttachInputDocumentGeneral', '', $Fields, 'cases_SupervisorSaveDocument?UID=' . $_POST['docID'] . '&APP_UID=' . $_POST['appDocId']);
+        }
+        G::RenderPage('publish', 'raw');
         break;
     case "inputDocumentVersionHistory":
         //krumo($_POST);
         $G_PUBLISH = new Publisher();
         $Fields['DOC_UID'] = $_POST['docID'];
         $Fields['APP_DOC_UID'] = $_POST['appDocId'];
-        $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/cases_InputdocsListHistory', $oCase->getInputDocumentsCriteria( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_POST['docID'], $_POST['appDocId'] ), array () ); //$aFields
+        $G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_InputdocsListHistory', $oCase->getInputDocumentsCriteria($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_POST['docID'], $_POST['appDocId']), array()); //$aFields
         //$G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_AttachInputDocumentGeneral',
         // '', $Fields, 'cases_SaveDocument?UID=' . $_POST['docID']);
-        G::RenderPage( 'publish', 'raw' );
+        G::RenderPage('publish', 'raw');
         break;
     case "getCountCasesFolder":
         //$json = new Services_JSON();
-        $aTypes = Array ('to_do','draft','cancelled','sent','paused','completed','selfservice','to_revise','to_reassign');
-        $aTypesID = Array ('to_do' => 'CASES_INBOX','draft' => 'CASES_DRAFT','cancelled' => 'CASES_CANCELLED','sent' => 'CASES_SENT','paused' => 'CASES_PAUSED','completed' => 'CASES_COMPLETED','selfservice' => 'CASES_SELFSERVICE','to_revise' => 'CASES_TO_REVISE','to_reassign' => 'CASES_TO_REASSIGN');
+        $aTypes = array('to_do', 'draft', 'cancelled', 'sent', 'paused', 'completed', 'selfservice', 'to_revise', 'to_reassign');
+        $aTypesID = array('to_do' => 'CASES_INBOX', 'draft' => 'CASES_DRAFT', 'cancelled' => 'CASES_CANCELLED', 'sent' => 'CASES_SENT', 'paused' => 'CASES_PAUSED', 'completed' => 'CASES_COMPLETED', 'selfservice' => 'CASES_SELFSERVICE', 'to_revise' => 'CASES_TO_REVISE', 'to_reassign' => 'CASES_TO_REASSIGN');
 
-        if (! isset( $_POST['A'] )) {
+        if (!isset($_POST['A'])) {
             $oCases = new Cases();
-            $aCount = $oCases->getAllConditionCasesCount( $aTypes, true );
-            echo Bootstrap::json_encode( $aCount );
+            $aCount = $oCases->getAllConditionCasesCount($aTypes, true);
+            echo Bootstrap::json_encode($aCount);
         } else {
-            echo Bootstrap::json_encode( $aTypesID );
+            echo Bootstrap::json_encode($aTypesID);
         }
         break;
     case "previusJump":
 
-        $oCriteria = new Criteria( 'workflow' );
-        $response = array ("success" => true );
+        $oCriteria = new Criteria('workflow');
+        $response = array("success" => true);
 
-        $oCriteria->add( ApplicationPeer::APP_NUMBER, $_POST['appNumber'] );
-        $oDataset = ApplicationPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oCriteria->add(ApplicationPeer::APP_NUMBER, $_POST['appNumber']);
+        $oDataset = ApplicationPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         $aApplication = $oDataset->getRow();
 
-        if (is_array( $aApplication )) {
+        if (is_array($aApplication)) {
             $response['exists'] = true;
             $objCase = new \ProcessMaker\BusinessModel\Cases();
             $aUserCanAccess = $objCase->userAuthorization(
@@ -1016,11 +1015,11 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
                 $aApplication['PRO_UID'],
                 $aApplication['APP_UID'],
                 array('PM_ALLCASES'),
-                array('SUMMARY_FORM'=>'VIEW')
+                array('SUMMARY_FORM' => 'VIEW')
             );
 
             //Check if the user is a supervisor to this Process
-            if (isset($_POST['actionFromList']) && $_POST['actionFromList']==='to_revise') {
+            if (isset($_POST['actionFromList']) && $_POST['actionFromList'] === 'to_revise') {
                 if (!$aUserCanAccess['supervisor']) {
                     $response['exists'] = false;
                     $response['message'] = G::LoadTranslation('ID_NO_PERMISSION_NO_PARTICIPATED');
@@ -1036,14 +1035,14 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
             $response['message'] = G::LoadTranslation('ID_CASE_DOES_NOT_EXIST_JS', array($_POST['appNumber']));
         }
 
-        echo Bootstrap::json_encode( $response );
+        echo Bootstrap::json_encode($response);
         break;
     default:
         echo 'default';
 }
 
-function getCasesTypeIds ()
+function getCasesTypeIds()
 {
-    $aTypes = Array ('to_do','draft','cancelled','sent','paused','completed','selfservice','to_revise','to_reassign');
+    $aTypes = array('to_do', 'draft', 'cancelled', 'sent', 'paused', 'completed', 'selfservice', 'to_revise', 'to_reassign');
     return $aTypesID;
 }
diff --git a/workflow/engine/methods/cases/cases_CatchExecute.php b/workflow/engine/methods/cases/cases_CatchExecute.php
index 0afd03356..4e1fce6eb 100644
--- a/workflow/engine/methods/cases/cases_CatchExecute.php
+++ b/workflow/engine/methods/cases/cases_CatchExecute.php
@@ -26,25 +26,25 @@ if (!isset($_SESSION['USER_LOGGED'])) {
     $responseObject->error = G::LoadTranslation('ID_LOGIN_AGAIN');
     $responseObject->success = true;
     $responseObject->lostSession = true;
-    print G::json_encode( $responseObject );
+    print G::json_encode($responseObject);
     die();
 }
 /* Permissions */
-switch ($RBAC->userCanAccess( 'PM_CASES' )) {
+switch ($RBAC->userCanAccess('PM_CASES')) {
     case - 2:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
     case - 1:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
 }
 
-if (isset( $_POST['form']['BTN_CANCEL'] )) {
-    header( "Location: ../cases/main" );
+if (isset($_POST['form']['BTN_CANCEL'])) {
+    header("Location: ../cases/main");
     die();
 }
 
@@ -55,16 +55,16 @@ $sAppUid = $_SESSION['APPLICATION'];
 $iDelIndex = $_SESSION['INDEX'];
 
 $oAppDelegation = new AppDelegation();
-$aDelegation = $oAppDelegation->load( $sAppUid, $iDelIndex );
+$aDelegation = $oAppDelegation->load($sAppUid, $iDelIndex);
 
 //if there are no user in the delegation row, this case is still in selfservice
 if ($aDelegation['USR_UID'] == "") {
-    $oCase->setCatchUser( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'] );
+    $oCase->setCatchUser($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED']);
     /*----------------------------------********---------------------------------*/
-    $licensedFeatures = &PMLicensedFeatures::getSingleton();
+    $licensedFeatures = PMLicensedFeatures::getSingleton();
     if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
         $pmGoogle = new PmGoogleApi();
-        if($pmGoogle->getServiceGmailStatus()) {
+        if ($pmGoogle->getServiceGmailStatus()) {
             $labGmail = new labelsGmail();
             $labGmail->addRelabelingToQueue($sAppUid, $iDelIndex, -1, true);
         }
@@ -81,20 +81,20 @@ if ($aDelegation['USR_UID'] == "") {
     }
     /*----------------------------------********---------------------------------*/
     //changing email labels if the claim comes from gmail
-    if(array_key_exists('gmail',$_SESSION) && $_SESSION['gmail'] == 1){
-        die( '<script type="text/javascript">
+    if (array_key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1) {
+        die('<script type="text/javascript">
         parent.document.getElementById("iframePM").setAttribute("src", "'.$_SESSION["server"].'cases/cases_Open?APP_UID=' . $_SESSION["APPLICATION"] . '&DEL_INDEX=' . $_SESSION["INDEX"] . '&action=unassigned");
-        </script>' );
+        </script>');
     }
 } else {
-    G::SendMessageText( G::LoadTranslation( 'ID_CASE_ALREADY_DERIVATED' ), 'error' );
+    G::SendMessageText(G::LoadTranslation('ID_CASE_ALREADY_DERIVATED'), 'error');
 }
 
 $validation = (SYS_SKIN != 'uxs') ? 'true' : 'false';
 
 unset($_SESSION['TASK']);
 
-die( '<script type="text/javascript">
+die('<script type="text/javascript">
   if (' . $validation . ') {
       if (window.parent.frames.length != 0) {
           parent.location = "open?APP_UID=' . $_SESSION['APPLICATION'] . '&DEL_INDEX=' . $_SESSION['INDEX'] . '&action=unassigned";
@@ -104,5 +104,4 @@ die( '<script type="text/javascript">
   } else {
       window.location = "../cases/cases_Open?APP_UID=' . $_SESSION['APPLICATION'] . '&DEL_INDEX=' . $_SESSION['INDEX'] . '&action=unassigned";
   }
-  </script>' );
-
+  </script>');
diff --git a/workflow/engine/methods/cases/cases_CatchSelfService.php b/workflow/engine/methods/cases/cases_CatchSelfService.php
index a7f4b1f13..4c7f1f55f 100644
--- a/workflow/engine/methods/cases/cases_CatchSelfService.php
+++ b/workflow/engine/methods/cases/cases_CatchSelfService.php
@@ -22,51 +22,51 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 /* Permissions */
-switch ($RBAC->userCanAccess( 'PM_CASES' )) {
+switch ($RBAC->userCanAccess('PM_CASES')) {
     case - 2:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
     case - 1:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
 }
 
 $oCase = new Cases();
-$Fields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'] );
+$Fields = $oCase->loadCase($_SESSION['APPLICATION'], $_SESSION['INDEX']);
 
 /* Render page */
 require_once 'classes/model/Process.php';
 require_once 'classes/model/Task.php';
 
 $objProc = new Process();
-$aProc = $objProc->load( $Fields['PRO_UID'] );
+$aProc = $objProc->load($Fields['PRO_UID']);
 $Fields['PRO_TITLE'] = $aProc['PRO_TITLE'];
 
 $objTask = new Task();
-$aTask = $objTask->load( $Fields['TAS_UID'] );
+$aTask = $objTask->load($Fields['TAS_UID']);
 $Fields['TAS_TITLE'] = $aTask['TAS_TITLE'];
 
-$Fields['STATUS'] .= ' ( ' . G::LoadTranslation( 'ID_UNASSIGNED' ) . ' )';
+$Fields['STATUS'] .= ' ( ' . G::LoadTranslation('ID_UNASSIGNED') . ' )';
 
 //now getting information about the PREVIOUS task. If is the first task then no preious, use 1
 $oAppDel = new AppDelegation();
-$oAppDel->Load( $Fields['APP_UID'], ($Fields['DEL_PREVIOUS'] == 0 ? $Fields['DEL_PREVIOUS'] = 1 : $Fields['DEL_PREVIOUS']) );
+$oAppDel->Load($Fields['APP_UID'], ($Fields['DEL_PREVIOUS'] == 0 ? $Fields['DEL_PREVIOUS'] = 1 : $Fields['DEL_PREVIOUS']));
 
-$aAppDel = $oAppDel->toArray( BasePeer::TYPE_FIELDNAME );
+$aAppDel = $oAppDel->toArray(BasePeer::TYPE_FIELDNAME);
 try {
     $oCurUser = new Users();
-    $oCurUser->load( $aAppDel['USR_UID'] );
+    $oCurUser->load($aAppDel['USR_UID']);
     $Fields['PREVIOUS_USER'] = $oCurUser->getUsrFirstname() . ' ' . $oCurUser->getUsrLastname();
 } catch (Exception $oError) {
-    $Fields['PREVIOUS_USER'] = G::LoadTranslation( 'ID_NO_PREVIOUS_USR_UID' );
+    $Fields['PREVIOUS_USER'] = G::LoadTranslation('ID_NO_PREVIOUS_USR_UID');
 }
 
 $objTask = new Task();
-$aTask = $objTask->load( $aAppDel['TAS_UID'] );
+$aTask = $objTask->load($aAppDel['TAS_UID']);
 $Fields['PREVIOUS_TASK'] = $aTask['TAS_TITLE'];
 
 //To enable information (dynaforms, steps) before claim a case
@@ -75,14 +75,14 @@ $G_MAIN_MENU = 'processmaker';
 $G_SUB_MENU = 'caseOptions';
 $G_ID_MENU_SELECTED = 'CASES';
 $G_ID_SUB_MENU_SELECTED = '_';
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addScriptCode( "
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addScriptCode("
 if (typeof parent != 'undefined') {
   if (parent.showCaseNavigatorPanel) {
     parent.showCaseNavigatorPanel('{$Fields['APP_STATUS']}');
   }
-}" );
-$oHeadPublisher->addScriptCode( '
+}");
+$oHeadPublisher->addScriptCode('
       var Cse = {};
       Cse.panels = {};
       var leimnud = new maborak();
@@ -92,13 +92,12 @@ $oHeadPublisher->addScriptCode( '
       leimnud.Package.Load("cases_Step",{Type:"file",Absolute:true,Path:"/jscore/cases/core/cases_Step.js"});
       leimnud.Package.Load("processmap",{Type:"file",Absolute:true,Path:"/jscore/processmap/core/processmap.js"});
       leimnud.exec(leimnud.fix.memoryLeak);
-    ' );
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addScriptFile( '/jscore/cases/core/cases_Step.js' );
+    ');
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addScriptFile('/jscore/cases/core/cases_Step.js');
 
 $Fields['isIE'] = Bootstrap::isIE();
 
 $G_PUBLISH = new Publisher();
-$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_CatchSelfService.xml', '', $Fields, 'cases_CatchExecute' );
-G::RenderPage( 'publish', 'blank' );
-
+$G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_CatchSelfService.xml', '', $Fields, 'cases_CatchExecute');
+G::RenderPage('publish', 'blank');
diff --git a/workflow/engine/methods/cases/cases_Derivate.php b/workflow/engine/methods/cases/cases_Derivate.php
index 85202a9f5..8fdfe11f2 100644
--- a/workflow/engine/methods/cases/cases_Derivate.php
+++ b/workflow/engine/methods/cases/cases_Derivate.php
@@ -174,21 +174,20 @@ try {
 
     $flagGmail = false;
     /*----------------------------------********---------------------------------*/
-    $licensedFeatures = &PMLicensedFeatures::getSingleton();
+    $licensedFeatures = PMLicensedFeatures::getSingleton();
     if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-        $pmGoogle = new PmGoogleApi ();
+        $pmGoogle = new PmGoogleApi();
         if ($pmGoogle->getServiceGmailStatus()) {
             $flagGmail = true;
 
-            $appDel = new AppDelegation ();
+            $appDel = new AppDelegation();
             $actualThread = $appDel->Load($_SESSION ['APPLICATION'], $_SESSION ['INDEX']);
 
             $appDelPrev = $appDel->LoadParallel($_SESSION ['APPLICATION']);
-            $Pmgmail = new \ProcessMaker\BusinessModel\Pmgmail ();
+            $Pmgmail = new \ProcessMaker\BusinessModel\Pmgmail();
             foreach ($appDelPrev as $app) {
                 if (($app ['DEL_INDEX'] != $_SESSION ['INDEX']) && ($app ['DEL_PREVIOUS'] != $actualThread ['DEL_PREVIOUS'])) {
-                    $Pmgmail->gmailsIfSelfServiceValueBased($_SESSION ['APPLICATION'], $app ['DEL_INDEX'],
-                        $_POST ['form'] ['TASKS'], $appFields ['APP_DATA']);
+                    $Pmgmail->gmailsIfSelfServiceValueBased($_SESSION ['APPLICATION'], $app ['DEL_INDEX'], $_POST ['form'] ['TASKS'], $appFields ['APP_DATA']);
                 }
             }
         }
@@ -239,9 +238,8 @@ try {
 
     /*----------------------------------********---------------------------------*/
     // Set users drive - start
-    $licensedFeatures = &PMLicensedFeatures::getSingleton();
+    $licensedFeatures = PMLicensedFeatures::getSingleton();
     if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
-
         $drive = new AppDocumentDrive();
         if ($drive->getStatusDrive()) {
             //add users email next task
diff --git a/workflow/engine/methods/cases/cases_ReassignByUser.php b/workflow/engine/methods/cases/cases_ReassignByUser.php
index fd8fc338d..90c5c09af 100644
--- a/workflow/engine/methods/cases/cases_ReassignByUser.php
+++ b/workflow/engine/methods/cases/cases_ReassignByUser.php
@@ -29,20 +29,20 @@
 
 try {
     global $RBAC;
-    switch ($RBAC->userCanAccess( 'PM_REASSIGNCASE' )) {
+    switch ($RBAC->userCanAccess('PM_REASSIGNCASE')) {
         case - 2:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         case - 1:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
     }
 
-    if (! isset( $_GET['REASSIGN_USER'] )) {
+    if (! isset($_GET['REASSIGN_USER'])) {
         $_GET['REASSIGN_USER'] = '';
     }
     $_GET['REASSIGN_BY'] = 2;
@@ -54,27 +54,27 @@ try {
     ///SELECT USR_UID, CONCAT(USR_FIRSTNAME, ' ', USR_LASTNAME, ' (', USR_USERNAME, ')') AS USER_FULLNAME FROM USERS WHERE USR_STATUS <> 'CLOSED'//////
     require_once 'classes/model/Users.php';
     $oCriteria = new Criteria();
-    $oCriteria->addSelectColumn( UsersPeer::USR_UID );
-    $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
-    $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
-    $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
-    $oCriteria->addSelectColumn( UsersPeer::USR_EMAIL );
-    $oCriteria->add( UsersPeer::USR_STATUS, '', Criteria::NOT_EQUAL );
-    $oDataset = UsersPeer::doSelectRS( $oCriteria );
-    $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+    $oCriteria->addSelectColumn(UsersPeer::USR_UID);
+    $oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
+    $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
+    $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
+    $oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
+    $oCriteria->add(UsersPeer::USR_STATUS, '', Criteria::NOT_EQUAL);
+    $oDataset = UsersPeer::doSelectRS($oCriteria);
+    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
     ///////////////////////
 
     $oConf = new Configurations();
-    $oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
+    $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
 
-    $defaultOption = isset( $oConf->aConfig['format'] ) ? $oConf->aConfig['format'] : '';
-    $aUserInfo = array ();
-    $aUserInfo[] = array ('USR_UID' => 'char','USER_FULLNAME' => 'char'
+    $defaultOption = isset($oConf->aConfig['format']) ? $oConf->aConfig['format'] : '';
+    $aUserInfo = array();
+    $aUserInfo[] = array('USR_UID' => 'char','USER_FULLNAME' => 'char'
     );
     while ($oDataset->next()) {
         $aRow1 = $oDataset->getRow();
-        $infoUser = G::getFormatUserList( $defaultOption, $aRow1 );
-        $aUserInfo[] = array ('USR_UID' => $aRow1['USR_UID'],'USER_FULLNAME' => $infoUser
+        $infoUser = G::getFormatUserList($defaultOption, $aRow1);
+        $aUserInfo[] = array('USR_UID' => $aRow1['USR_UID'],'USER_FULLNAME' => $infoUser
         );
     }
     global $_DBArray;
@@ -82,12 +82,11 @@ try {
     $_SESSION['_DBArray'] = $_DBArray;
     //////////////////
     $G_PUBLISH = new Publisher();
-    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ReassignBy', '', $_GET );
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ReassignBy', '', $_GET);
 
-    $sUserToReassign = trim( $_GET['REASSIGN_USER'] );
+    $sUserToReassign = trim($_GET['REASSIGN_USER']);
 
     if ($_GET['REASSIGN_USER'] != '') {
-
         $oTasks = new Tasks();
         $oGroups = new Groups();
         $oUser = new Users();
@@ -97,57 +96,55 @@ try {
         $oCriteriaToDo = $oAppCache->getToDoListCriteria($sUserToReassign);
         $oCriteriaDraft = $oAppCache->getDraftListCriteria($sUserToReassign);
 
-        $aCasesList = Array ();
+        $aCasesList = array();
 
-        $oDataset = ApplicationPeer::doSelectRS( $oCriteriaToDo );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataset = ApplicationPeer::doSelectRS($oCriteriaToDo);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
         while ($oDataset->next()) {
-            array_push( $aCasesList, $oDataset->getRow() );
+            array_push($aCasesList, $oDataset->getRow());
         }
 
-        $oDataset = ApplicationPeer::doSelectRS( $oCriteriaDraft );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataset = ApplicationPeer::doSelectRS($oCriteriaDraft);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
         while ($oDataset->next()) {
-            array_push( $aCasesList, $oDataset->getRow() );
+            array_push($aCasesList, $oDataset->getRow());
         }
 
-        $filedNames = Array ("APP_UID","APP_NUMBER","APP_UPDATE_DATE","DEL_PRIORITY","DEL_INDEX","TAS_UID","DEL_INIT_DATE","DEL_FINISH_DATE","USR_UID","APP_STATUS","DEL_TASK_DUE_DATE","APP_CURRENT_USER","APP_TITLE","APP_PRO_TITLE","APP_TAS_TITLE","APP_DEL_PREVIOUS_USER"
+        $filedNames = array("APP_UID","APP_NUMBER","APP_UPDATE_DATE","DEL_PRIORITY","DEL_INDEX","TAS_UID","DEL_INIT_DATE","DEL_FINISH_DATE","USR_UID","APP_STATUS","DEL_TASK_DUE_DATE","APP_CURRENT_USER","APP_TITLE","APP_PRO_TITLE","APP_TAS_TITLE","APP_DEL_PREVIOUS_USER"
         );
 
-        $aCasesList = array_merge( Array ($filedNames
-        ), $aCasesList );
+        $aCasesList = array_merge(array($filedNames
+        ), $aCasesList);
 
         // G::pr($aCasesList); die;
 
 
-        require_once ('classes/class.xmlfield_InputPM.php');
+        require_once('classes/class.xmlfield_InputPM.php');
 
         global $_DBArray;
         $_DBArray['reassign_byuser'] = $aCasesList;
         $_SESSION['_DBArray'] = $_DBArray;
 
-        $oCriteria = new Criteria( 'dbarray' );
-        $oCriteria->setDBArrayTable( 'reassign_byuser' );
+        $oCriteria = new Criteria('dbarray');
+        $oCriteria->setDBArrayTable('reassign_byuser');
 
-        $oHeadPublisher = & headPublisher::getSingleton();
-        $oHeadPublisher->addScriptFile( '/jscore/cases/reassignByUser.js' );
+        $oHeadPublisher = headPublisher::getSingleton();
+        $oHeadPublisher->addScriptFile('/jscore/cases/reassignByUser.js');
         $G_PUBLISH->ROWS_PER_PAGE = 12;
-        $G_PUBLISH->AddContent( 'propeltable', 'cases/paged-table-reassigByUser', 'cases/cases_ToReassignByUserList', $oCriteria, Array ('FROM_USR_UID' => $sUserToReassign
-        ) );
-
+        $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-reassigByUser', 'cases/cases_ToReassignByUserList', $oCriteria, array('FROM_USR_UID' => $sUserToReassign
+        ));
     }
 
-    G::RenderPage( 'publish', 'blank' );
+    G::RenderPage('publish', 'blank');
 } catch (Exception $oException) {
     $token = strtotime("now");
     PMException::registerErrorLog($oException, $token);
-    G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
+    G::outRes(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)));
     die;
 }
 ?>
 <div id="publisherContent[10]" style="display: none"></div>
 
 <?php
-
diff --git a/workflow/engine/methods/cases/cases_Resume.php b/workflow/engine/methods/cases/cases_Resume.php
index f985b671e..c8318cf63 100644
--- a/workflow/engine/methods/cases/cases_Resume.php
+++ b/workflow/engine/methods/cases/cases_Resume.php
@@ -22,15 +22,15 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 /* Permissions */
-switch ($RBAC->userCanAccess( 'PM_CASES' )) {
+switch ($RBAC->userCanAccess('PM_CASES')) {
     case - 2:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
     case - 1:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
 }
@@ -57,7 +57,7 @@ $aUserCanAccess = $objCase->userAuthorization(
 );
 
 if (isset($_SESSION['ACTION']) && ($_SESSION['ACTION'] == 'jump')) {
-    $Fields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['ACTION']);
+    $Fields = $oCase->loadCase($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['ACTION']);
     $process = new Process();
     $processData = $process->load($Fields['PRO_UID']);
     if (isset($processData['PRO_DYNAFORMS']['PROCESS']) && $processData['PRO_DYNAFORMS']['PROCESS'] != '' &&
@@ -70,23 +70,23 @@ if (isset($_SESSION['ACTION']) && ($_SESSION['ACTION'] == 'jump')) {
         exit();
     }
 } else {
-    $Fields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX']);
+    $Fields = $oCase->loadCase($_SESSION['APPLICATION'], $_SESSION['INDEX']);
 }
 
 if (!$aUserCanAccess['participated'] && !$aUserCanAccess['supervisor'] && !$aUserCanAccess['rolesPermissions']['PM_ALLCASES'] && !$aUserCanAccess['objectPermissions']['SUMMARY_FORM']) {
-    $aMessage['MESSAGE'] = G::LoadTranslation( 'ID_NO_PERMISSION_NO_PARTICIPATED' );
+    $aMessage['MESSAGE'] = G::LoadTranslation('ID_NO_PERMISSION_NO_PARTICIPATED');
     $G_PUBLISH = new Publisher();
-    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-    G::RenderPage( 'publishBlank', 'blank' );
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage);
+    G::RenderPage('publishBlank', 'blank');
     die();
 }
-if (isset( $aRow['APP_TYPE'] )) {
+if (isset($aRow['APP_TYPE'])) {
     switch ($aRow['APP_TYPE']) {
         case 'PAUSE':
-            $Fields['STATUS'] = ucfirst( strtolower( G::LoadTranslation( 'ID_PAUSED' ) ) );
+            $Fields['STATUS'] = ucfirst(strtolower(G::LoadTranslation('ID_PAUSED')));
             break;
         case 'CANCEL':
-            $Fields['STATUS'] = ucfirst( strtolower( G::LoadTranslation( 'ID_CANCELLED' ) ) );
+            $Fields['STATUS'] = ucfirst(strtolower(G::LoadTranslation('ID_CANCELLED')));
             break;
     }
 }
@@ -97,16 +97,16 @@ if (isset($_GET['action']) && $_GET['action'] == 'paused') {
 }
 
     /* Render page */
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 
-$oHeadPublisher->addScriptCode( "
+$oHeadPublisher->addScriptCode("
   if (typeof parent != 'undefined') {
     if (parent.showCaseNavigatorPanel) {
       parent.showCaseNavigatorPanel('{$Fields['APP_STATUS']}');
     }
-  }" );
+  }");
 
-$oHeadPublisher->addScriptCode( '
+$oHeadPublisher->addScriptCode('
   var Cse = {};
   Cse.panels = {};
   var leimnud = new maborak();
@@ -116,21 +116,21 @@ $oHeadPublisher->addScriptCode( '
   leimnud.Package.Load("cases_Step",{Type:"file",Absolute:true,Path:"/jscore/cases/core/cases_Step.js"});
   leimnud.Package.Load("processmap",{Type:"file",Absolute:true,Path:"/jscore/processmap/core/processmap.js"});
   leimnud.exec(leimnud.fix.memoryLeak);
-  ' );
+  ');
 
 require_once 'classes/model/Process.php';
 
 $objProc = new Process();
-$aProc = $objProc->load( $Fields['PRO_UID'] );
+$aProc = $objProc->load($Fields['PRO_UID']);
 $Fields['PRO_TITLE'] = $aProc['PRO_TITLE'];
 
 $objTask = new Task();
-if(!isset($Fields['TAS_UID']) || $Fields['TAS_UID'] == '') {
+if (!isset($Fields['TAS_UID']) || $Fields['TAS_UID'] == '') {
     $Fields['TAS_UID'] = $Fields['APP_DATA']['TASK'];
 }
 
 $tasksInParallel = explode('|', $Fields['TAS_UID']);
-$tasksInParallel = array_filter($tasksInParallel, function($value) {
+$tasksInParallel = array_filter($tasksInParallel, function ($value) {
     return !empty($value);
 });
 $nTasksInParallel = count($tasksInParallel);
@@ -144,22 +144,22 @@ if ($nTasksInParallel > 1) {
 $Fields['TAS_TITLE'] = $aTask['TAS_TITLE'];
 
 $objUser = new Users();
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addScriptFile( '/jscore/cases/core/cases_Step.js' );
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addScriptFile('/jscore/cases/core/cases_Step.js');
 $G_PUBLISH = new Publisher();
-$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume.xml', '', $Fields, '' );
+$G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_Resume.xml', '', $Fields, '');
 if ($Fields['APP_STATUS'] != 'COMPLETED') {
-    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume_Current_Task_Title.xml', '', $Fields, '' );
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_Resume_Current_Task_Title.xml', '', $Fields, '');
     $objDel = new AppDelegation();
     $parallel = $objDel->LoadParallel($Fields['APP_UID']);
     $FieldsPar = $Fields;
     foreach ($parallel as $row) {
         $FieldsPar['TAS_UID'] = $row['TAS_UID'];
-        $aTask = $objTask->load( $row['TAS_UID'] );
+        $aTask = $objTask->load($row['TAS_UID']);
         $FieldsPar['TAS_TITLE'] = $aTask['TAS_TITLE'];
         $FieldsPar['USR_UID'] = $row['USR_UID'];
         if (isset($row['USR_UID']) && !empty($row['USR_UID'])) {
-            $aUser = $objUser->loadDetails ($row['USR_UID']);
+            $aUser = $objUser->loadDetails($row['USR_UID']);
             $FieldsPar['CURRENT_USER'] = $aUser['USR_FULLNAME'];
         } else {
             $FieldsPar['CURRENT_USER'] = '';
@@ -168,7 +168,7 @@ if ($Fields['APP_STATUS'] != 'COMPLETED') {
         $FieldsPar['DEL_INIT_DATE']     = $row['DEL_INIT_DATE'];
         $FieldsPar['DEL_TASK_DUE_DATE'] = $row['DEL_TASK_DUE_DATE'];
         $FieldsPar['DEL_FINISH_DATE']   = $row['DEL_FINISH_DATE'];
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume_Current_Task.xml', '', $FieldsPar);
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_Resume_Current_Task.xml', '', $FieldsPar);
     }
 }
 
diff --git a/workflow/engine/methods/cases/cases_Scheduler_Log.php b/workflow/engine/methods/cases/cases_Scheduler_Log.php
index 0a2df29e1..b5edb325b 100644
--- a/workflow/engine/methods/cases/cases_Scheduler_Log.php
+++ b/workflow/engine/methods/cases/cases_Scheduler_Log.php
@@ -23,23 +23,22 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 global $RBAC;
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_LOGIN" )) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess("PM_LOGIN")) != 1) {
     return $RBAC_Response;
 }
-$RBAC->requirePermissions( 'PM_SETUP' );
+$RBAC->requirePermissions('PM_SETUP');
 
 $G_PUBLISH = new Publisher();
 $c = new Configurations();
-$configPage = $c->getConfiguration( 'casesSchedulerLogList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
-$Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
+$configPage = $c->getConfiguration('casesSchedulerLogList', 'pageSize', '', $_SESSION['USER_LOGGED']);
+$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
 
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 
-$oHeadPublisher->addExtJsScript( 'cases/casesSchedulerLog', false ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'cases/casesSchedulerLog' ); //adding a html file  .html.
+$oHeadPublisher->addExtJsScript('cases/casesSchedulerLog', false); //adding a javascript file .js
+$oHeadPublisher->addContent('cases/casesSchedulerLog'); //adding a html file  .html.
 
 
-$oHeadPublisher->assign( 'CONFIG', $Config );
-
-G::RenderPage( 'publish', 'extJs' );
+$oHeadPublisher->assign('CONFIG', $Config);
 
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/cases/cases_ShowDocument.php b/workflow/engine/methods/cases/cases_ShowDocument.php
index 178d52697..fd9c1aa71 100644
--- a/workflow/engine/methods/cases/cases_ShowDocument.php
+++ b/workflow/engine/methods/cases/cases_ShowDocument.php
@@ -26,26 +26,26 @@
  *
  * @author David Callizaya <davidsantos@colosa.com>
  */
-if (isset($_REQUEST['actionAjax']) && $_REQUEST['actionAjax'] == "verifySession" ) {
+if (isset($_REQUEST['actionAjax']) && $_REQUEST['actionAjax'] == "verifySession") {
     if (!isset($_SESSION['USER_LOGGED'])) {
-        if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) {
+        if ((isset($_POST['request'])) && ($_POST['request'] == true)) {
             $response = new stdclass();
             $response->message = G::LoadTranslation('ID_LOGIN_AGAIN');
             $response->lostSession = true;
-            print G::json_encode( $response );
+            print G::json_encode($response);
             die();
         } else {
-            G::SendMessageText( G::LoadTranslation('ID_LOGIN_TO_SEE_OUTPUTDOCS'), "WARNING" );
+            G::SendMessageText(G::LoadTranslation('ID_LOGIN_TO_SEE_OUTPUTDOCS'), "WARNING");
             G::header("location: " . "/");
             die();
         }
     } else {
         $response = new stdclass();
-        print G::json_encode( $response );
+        print G::json_encode($response);
         die();
     }
 }
-require_once ("classes/model/AppDocumentPeer.php");
+require_once("classes/model/AppDocumentPeer.php");
 $oAppDocument = new AppDocument();
 
 if (empty($_GET['a'])) {
@@ -64,21 +64,20 @@ if (empty($_GET['v'])) {
 //Send the parameter v = Version
 //Send the parameter a = Case UID
 if (defined('DISABLE_DOWNLOAD_DOCUMENTS_SESSION_VALIDATION') && DISABLE_DOWNLOAD_DOCUMENTS_SESSION_VALIDATION == 0) {
-
     if (!$oAppDocument->canDownloadInput($_SESSION['USER_LOGGED'], $_GET['a'], $docVersion)) {
         G::header('Location: /errors/error403.php');
         die();
     }
 }
 
-$oAppDocument->Fields = $oAppDocument->load( $_GET['a'], $docVersion );
+$oAppDocument->Fields = $oAppDocument->load($_GET['a'], $docVersion);
 
 $sAppDocUid = $oAppDocument->getAppDocUid();
 $iDocVersion = $oAppDocument->getDocVersion();
-$info = pathinfo( $oAppDocument->getAppDocFilename() );
-$ext = (isset($info['extension'])?$info['extension']:'');//BUG fix: must handle files without any extension
+$info = pathinfo($oAppDocument->getAppDocFilename());
+$ext = (isset($info['extension']) ? $info['extension'] : '');//BUG fix: must handle files without any extension
 
-if (isset( $_GET['b'] )) {
+if (isset($_GET['b'])) {
     if ($_GET['b'] == '0') {
         $bDownload = false;
     } else {
@@ -91,41 +90,39 @@ if (isset( $_GET['b'] )) {
 $app_uid = G::getPathFromUID($oAppDocument->Fields['APP_UID']);
 $file = G::getPathFromFileUID($oAppDocument->Fields['APP_UID'], $sAppDocUid);
 
-$realPath = PATH_DOCUMENT .  $app_uid . '/' . $file[0] . $file[1] . '_' . $iDocVersion . '.' . $ext;
+$realPath = PATH_DOCUMENT . $app_uid . '/' . $file[0] . $file[1] . '_' . $iDocVersion . '.' . $ext;
 $realPath1 = PATH_DOCUMENT . $app_uid . '/' . $file[0] . $file[1] . '.' . $ext;
 $sw_file_exists = false;
-if (file_exists( $realPath )) {
+if (file_exists($realPath)) {
     $sw_file_exists = true;
-} elseif (file_exists( $realPath1 )) {
+} elseif (file_exists($realPath1)) {
     $sw_file_exists = true;
     $realPath = $realPath1;
 }
 
-if (! $sw_file_exists) {
-    $error_message = G::LoadTranslation( 'ID_ERROR_STREAMING_FILE' );
-    if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) {
+if (!$sw_file_exists) {
+    $error_message = G::LoadTranslation('ID_ERROR_STREAMING_FILE');
+    if ((isset($_POST['request'])) && ($_POST['request'] == true)) {
         $res['success'] = 'failure';
         $res['message'] = $error_message;
-        print G::json_encode( $res );
+        print G::json_encode($res);
     } else {
-        G::SendMessageText( $error_message, "ERROR" );
-        $backUrlObj = explode( "sys" . config("system.workspace"), $_SERVER['HTTP_REFERER'] );
-        G::header( "location: " . "/sys" . config("system.workspace") . $backUrlObj[1] );
+        G::SendMessageText($error_message, "ERROR");
+        $backUrlObj = explode("sys" . config("system.workspace"), $_SERVER['HTTP_REFERER']);
+        G::header("location: " . "/sys" . config("system.workspace") . $backUrlObj[1]);
         die();
     }
-
 } else {
-    if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) {
+    if ((isset($_POST['request'])) && ($_POST['request'] == true)) {
         $res['success'] = 'success';
         $res['message'] = $oAppDocument->Fields['APP_DOC_FILENAME'];
-        print G::json_encode( $res );
+        print G::json_encode($res);
     } else {
         $nameFile = $oAppDocument->Fields['APP_DOC_FILENAME'];
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
+        $licensedFeatures = PMLicensedFeatures::getSingleton();
         $downloadStatus = false;
         /*----------------------------------********---------------------------------*/
         if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
-
             $drive = new AppDocumentDrive();
             if ($drive->getStatusDrive()) {
                 $fieldDrive = $oAppDocument->getAppDocDriveDownload();
@@ -135,7 +132,7 @@ if (! $sw_file_exists) {
                 if ($fileContent !== null) {
                     $downloadStatus = true;
                     header('Content-Description: File Transfer');
-                    header('Content-Disposition: attachment; filename='.$nameFile);
+                    header('Content-Disposition: attachment; filename=' . $nameFile);
                     header('Content-Transfer-Encoding: binary');
                     header('Set-Cookie: fileLoading=true');
                     echo $fileContent;
@@ -145,11 +142,7 @@ if (! $sw_file_exists) {
         }
         /*----------------------------------********---------------------------------*/
         if (!$downloadStatus) {
-            G::streamFile( $realPath, $bDownload, $nameFile ); //download
+            G::streamFile($realPath, $bDownload, $nameFile); //download
         }
-
-
-
     }
-}
-
+}
\ No newline at end of file
diff --git a/workflow/engine/methods/cases/cases_ShowOutputDocument.php b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
index b786e3814..e25106058 100644
--- a/workflow/engine/methods/cases/cases_ShowOutputDocument.php
+++ b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
@@ -1,166 +1,164 @@
-<?php
-/**
- * cases_ShowOutputDocument.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- *
- * Created on 13-02-2008
- *
- *
- * @author David Callizaya <davidsantos@colosa.com>
- */
-
-use ProcessMaker\Plugins\PluginRegistry;
-
-if (isset($_REQUEST['actionAjax']) && $_REQUEST['actionAjax'] == "verifySession" ) {
-    if (!isset($_SESSION['USER_LOGGED'])) {
-        if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) {
-            $response = new stdclass();
-            $response->message = G::LoadTranslation('ID_LOGIN_AGAIN');
-            $response->lostSession = true;
-            print G::json_encode( $response );
-            die();
-        } else {
-            G::SendMessageText( G::LoadTranslation('ID_LOGIN_TO_SEE_OUTPUTDOCS'), "WARNING" );
-            G::header("location: " . "/");
-            die();
-        }
-    } else {
-        $response = new stdclass();
-        print G::json_encode( $response );
-        die();
-    }
-}
-
-require_once ("classes/model/AppDocumentPeer.php");
-require_once ("classes/model/OutputDocumentPeer.php");
-
-$oAppDocument = new AppDocument();
-$oAppDocument->Fields = $oAppDocument->load( $_GET['a'], (isset( $_GET['v'] )) ? $_GET['v'] : null );
-
-$sAppDocUid = $oAppDocument->getAppDocUid();
-$sDocUid = $oAppDocument->Fields['DOC_UID'];
-
-$oOutputDocument = new OutputDocument();
-$oOutputDocument->Fields = $oOutputDocument->getByUid($sDocUid);
-$download = $oOutputDocument->Fields['OUT_DOC_OPEN_TYPE'];
-
-//Check if the user can be download the Output Document
-if (defined('DISABLE_DOWNLOAD_DOCUMENTS_SESSION_VALIDATION') && DISABLE_DOWNLOAD_DOCUMENTS_SESSION_VALIDATION == 0) {
-    if (!$oAppDocument->canDownloadOutput(
-        $oAppDocument->Fields['USR_UID'],
-        $_SESSION['USER_LOGGED'],
-        $oOutputDocument->Fields['PRO_UID'],
-        $oAppDocument->Fields['APP_UID'],
-        $sAppDocUid)
-    ) {
-       G::header('Location: /errors/error403.php');
-       die();
-    }
-}
-
-
-$info = pathinfo( $oAppDocument->getAppDocFilename() );
-if (! isset( $_GET['ext'] )) {
-    $ext = $info['extension'];
-} else {
-    if ($_GET['ext'] != '') {
-        $ext = $_GET['ext'];
-    } else {
-        $ext = $info['extension'];
-    }
-}
-$ver = (isset( $_GET['v'] ) && $_GET['v'] != '') ? '_' . $_GET['v'] : '';
-
-if (! $ver) //This code is in the case the outputdocument won't be versioned
-    $ver = '_1';
-
-$realPath = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $sAppDocUid . $ver . '.' . $ext;
-$realPath1 = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $info['basename'] . $ver . '.' . $ext;
-$realPath2 = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $info['basename'] . '.' . $ext;
-
-$sw_file_exists = false;
-if (file_exists( $realPath )) {
-    $sw_file_exists = true;
-} elseif (file_exists( $realPath1 )) {
-    $sw_file_exists = true;
-    $realPath = $realPath1;
-} elseif (file_exists( $realPath2 )) {
-    $sw_file_exists = true;
-    $realPath = $realPath2;
-}
-
-if (!$sw_file_exists) {
-
-    $oPluginRegistry = PluginRegistry::loadSingleton();
-    if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT )) {
-        $error_message = G::LoadTranslation( 'ID_ERROR_FILE_NOT_EXIST', SYS_LANG, array('filename' => $info['basename'] . $ver . '.' . $ext) ) . ' ' . G::LoadTranslation('ID_CONTACT_ADMIN');
-    } else {
-        $error_message = "'" . $info['basename'] . $ver . '.' . $ext . "' " . G::LoadTranslation( 'ID_ERROR_STREAMING_FILE' );
-    }
-
-    if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) {
-            $res['success'] = 'failure';
-            $res['message'] = $error_message;
-            print G::json_encode( $res );
-    } else {
-        G::SendMessageText( $error_message, "ERROR" );
-        $backUrlObj = explode( "sys" . config("system.workspace"), $_SERVER['HTTP_REFERER'] );
-        G::header( "location: " . "/sys" . config("system.workspace") . $backUrlObj[1] );
-        die();
-    }
-
-} else {
-    if ((isset( $_POST['request'] )) && ($_POST['request'] == true)) {
-        $res['success'] = 'success';
-        $res['message'] = $info['basename'] . $ver . '.' . $ext;
-        print G::json_encode( $res );
-    } else {
-        $nameFile = $info['basename'] . $ver . '.' . $ext;
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
-        $downloadStatus = false;
-        /*----------------------------------********---------------------------------*/
-        if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
-
-            $drive = new AppDocumentDrive();
-            if ($drive->getStatusDrive()) {
-                $fieldDrive = $oAppDocument->getAppDocDriveDownload();
-                $drive->loadUser($_SESSION['USER_LOGGED']);
-                $type = $ext == 'doc' ? 'OUTPUT_DOC' : 'OUTPUT_PDF';
-                $uidDrive = $drive->changeUrlDrive($oAppDocument->Fields, $type);
-                $fileContent = $drive->download($uidDrive);
-                if ($fileContent !== null) {
-                    $downloadStatus = true;
-                    header('Content-Description: File Transfer');
-                    header('Content-Disposition: attachment; filename='.$nameFile);
-                    header('Content-Transfer-Encoding: binary');
-                    header('Set-Cookie: fileLoading=true');
-                    echo $fileContent;
-                    exit();
-                }
-            }
-        }
-        /*----------------------------------********---------------------------------*/
-        if (!$downloadStatus) {
-            G::streamFile( $realPath, $download, G::inflect($nameFile)); //download
-        }
-    }
-}
-
+<?php
+/**
+ * cases_ShowOutputDocument.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * Created on 13-02-2008
+ *
+ *
+ * @author David Callizaya <davidsantos@colosa.com>
+ */
+
+use ProcessMaker\Plugins\PluginRegistry;
+
+if (isset($_REQUEST['actionAjax']) && $_REQUEST['actionAjax'] == "verifySession") {
+    if (!isset($_SESSION['USER_LOGGED'])) {
+        if ((isset($_POST['request'])) && ($_POST['request'] == true)) {
+            $response = new stdclass();
+            $response->message = G::LoadTranslation('ID_LOGIN_AGAIN');
+            $response->lostSession = true;
+            print G::json_encode($response);
+            die();
+        } else {
+            G::SendMessageText(G::LoadTranslation('ID_LOGIN_TO_SEE_OUTPUTDOCS'), "WARNING");
+            G::header("location: " . "/");
+            die();
+        }
+    } else {
+        $response = new stdclass();
+        print G::json_encode($response);
+        die();
+    }
+}
+
+require_once("classes/model/AppDocumentPeer.php");
+require_once("classes/model/OutputDocumentPeer.php");
+
+$oAppDocument = new AppDocument();
+$oAppDocument->Fields = $oAppDocument->load($_GET['a'], (isset($_GET['v'])) ? $_GET['v'] : null);
+
+$sAppDocUid = $oAppDocument->getAppDocUid();
+$sDocUid = $oAppDocument->Fields['DOC_UID'];
+
+$oOutputDocument = new OutputDocument();
+$oOutputDocument->Fields = $oOutputDocument->getByUid($sDocUid);
+$download = $oOutputDocument->Fields['OUT_DOC_OPEN_TYPE'];
+
+//Check if the user can be download the Output Document
+if (defined('DISABLE_DOWNLOAD_DOCUMENTS_SESSION_VALIDATION') && DISABLE_DOWNLOAD_DOCUMENTS_SESSION_VALIDATION == 0) {
+    if (!$oAppDocument->canDownloadOutput(
+        $oAppDocument->Fields['USR_UID'],
+        $_SESSION['USER_LOGGED'],
+        $oOutputDocument->Fields['PRO_UID'],
+        $oAppDocument->Fields['APP_UID'],
+        $sAppDocUid
+    )
+    ) {
+        G::header('Location: /errors/error403.php');
+        die();
+    }
+}
+
+
+$info = pathinfo($oAppDocument->getAppDocFilename());
+if (!isset($_GET['ext'])) {
+    $ext = $info['extension'];
+} else {
+    if ($_GET['ext'] != '') {
+        $ext = $_GET['ext'];
+    } else {
+        $ext = $info['extension'];
+    }
+}
+$ver = (isset($_GET['v']) && $_GET['v'] != '') ? '_' . $_GET['v'] : '';
+
+if (!$ver) { //This code is in the case the outputdocument won't be versioned
+    $ver = '_1';
+}
+
+$realPath = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $sAppDocUid . $ver . '.' . $ext;
+$realPath1 = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $info['basename'] . $ver . '.' . $ext;
+$realPath2 = PATH_DOCUMENT . G::getPathFromUID($oAppDocument->Fields['APP_UID']) . '/outdocs/' . $info['basename'] . '.' . $ext;
+
+$sw_file_exists = false;
+if (file_exists($realPath)) {
+    $sw_file_exists = true;
+} elseif (file_exists($realPath1)) {
+    $sw_file_exists = true;
+    $realPath = $realPath1;
+} elseif (file_exists($realPath2)) {
+    $sw_file_exists = true;
+    $realPath = $realPath2;
+}
+
+if (!$sw_file_exists) {
+    $oPluginRegistry = PluginRegistry::loadSingleton();
+    if ($oPluginRegistry->existsTrigger(PM_UPLOAD_DOCUMENT)) {
+        $error_message = G::LoadTranslation('ID_ERROR_FILE_NOT_EXIST', SYS_LANG, array('filename' => $info['basename'] . $ver . '.' . $ext)) . ' ' . G::LoadTranslation('ID_CONTACT_ADMIN');
+    } else {
+        $error_message = "'" . $info['basename'] . $ver . '.' . $ext . "' " . G::LoadTranslation('ID_ERROR_STREAMING_FILE');
+    }
+
+    if ((isset($_POST['request'])) && ($_POST['request'] == true)) {
+        $res['success'] = 'failure';
+        $res['message'] = $error_message;
+        print G::json_encode($res);
+    } else {
+        G::SendMessageText($error_message, "ERROR");
+        $backUrlObj = explode("sys" . config("system.workspace"), $_SERVER['HTTP_REFERER']);
+        G::header("location: " . "/sys" . config("system.workspace") . $backUrlObj[1]);
+        die();
+    }
+} else {
+    if ((isset($_POST['request'])) && ($_POST['request'] == true)) {
+        $res['success'] = 'success';
+        $res['message'] = $info['basename'] . $ver . '.' . $ext;
+        print G::json_encode($res);
+    } else {
+        $nameFile = $info['basename'] . $ver . '.' . $ext;
+        $licensedFeatures = PMLicensedFeatures::getSingleton();
+        $downloadStatus = false;
+        /*----------------------------------********---------------------------------*/
+        if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
+            $drive = new AppDocumentDrive();
+            if ($drive->getStatusDrive()) {
+                $fieldDrive = $oAppDocument->getAppDocDriveDownload();
+                $drive->loadUser($_SESSION['USER_LOGGED']);
+                $type = $ext == 'doc' ? 'OUTPUT_DOC' : 'OUTPUT_PDF';
+                $uidDrive = $drive->changeUrlDrive($oAppDocument->Fields, $type);
+                $fileContent = $drive->download($uidDrive);
+                if ($fileContent !== null) {
+                    $downloadStatus = true;
+                    header('Content-Description: File Transfer');
+                    header('Content-Disposition: attachment; filename=' . $nameFile);
+                    header('Content-Transfer-Encoding: binary');
+                    header('Set-Cookie: fileLoading=true');
+                    echo $fileContent;
+                    exit();
+                }
+            }
+        }
+        /*----------------------------------********---------------------------------*/
+        if (!$downloadStatus) {
+            G::streamFile($realPath, $download, G::inflect($nameFile)); //download
+        }
+    }
+}
diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index 6488c1631..fd11b5bf3 100644
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -9,16 +9,16 @@ $filter = new InputFilter();
 $_GET = $filter->xssRegexFilter($_GET, '/[\-\w]/');
 
 if (!isset($_SESSION['USER_LOGGED'])) {
-    if(!strpos($_SERVER['REQUEST_URI'], 'gmail')) {
+    if (!strpos($_SERVER['REQUEST_URI'], 'gmail')) {
         $responseObject = new stdclass();
         $responseObject->error = G::LoadTranslation('ID_LOGIN_AGAIN');
         $responseObject->success = true;
         $responseObject->lostSession = true;
-        print G::json_encode( $responseObject );
+        print G::json_encode($responseObject);
         die();
     } else {
-        G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' );
-        die( '<script type="text/javascript">
+        G::SendTemporalMessage('ID_LOGIN_AGAIN', 'warning', 'labels');
+        die('<script type="text/javascript">
 				try
 				{
 				var olink = document.location.href;
@@ -69,8 +69,8 @@ if ($delegation->alreadyRouted($_SESSION['APPLICATION'], $_SESSION['INDEX'])) {
         die();
     } else {
         die('<script type="text/javascript">'
-                . 'window.parent.location="casesListExtJs?action=todo";'
-                . '</script>');
+            . 'window.parent.location="casesListExtJs?action=todo";'
+            . '</script>');
     }
 }
 /**
@@ -97,41 +97,41 @@ if ($delegation->alreadyRouted($_SESSION['APPLICATION'], $_SESSION['INDEX'])) {
  */
 
 /* Permissions */
-switch ($RBAC->userCanAccess( 'PM_CASES' )) {
-    case - 2:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+switch ($RBAC->userCanAccess('PM_CASES')) {
+    case -2:
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
-    case - 1:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+    case -1:
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
 }
 
-if(array_key_exists('gmail',$_GET) && $_GET['gmail'] == 1){
-	$_SESSION['gmail'] = 1;
+if (array_key_exists('gmail', $_GET) && $_GET['gmail'] == 1) {
+    $_SESSION['gmail'] = 1;
 }
 
-if ((int) $_SESSION['INDEX'] < 1) {
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-    G::header( 'location: ' . $_SERVER['HTTP_REFERER'] );
+if ((int)$_SESSION['INDEX'] < 1) {
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+    G::header('location: ' . $_SERVER['HTTP_REFERER']);
     die();
 }
 global $_DBArray;
-if (! isset( $_DBArray )) {
-    $_DBArray = array ();
+if (!isset($_DBArray)) {
+    $_DBArray = [];
 }
 
 /* GET , POST & $_SESSION Vars */
-if (isset( $_GET['POSITION'] )) {
-    $_SESSION['STEP_POSITION'] = (int) $_GET['POSITION'];
+if (isset($_GET['POSITION'])) {
+    $_SESSION['STEP_POSITION'] = (int)$_GET['POSITION'];
 }
 
-if (isset( $_SESSION['CASES_REFRESH'] )) {
-    unset( $_SESSION['CASES_REFRESH'] );
-    G::evalJScript( "if(typeof parent != 'undefined' && parent.refreshCountFolders) parent.refreshCountFolders();" );
+if (isset($_SESSION['CASES_REFRESH'])) {
+    unset($_SESSION['CASES_REFRESH']);
+    G::evalJScript("if(typeof parent != 'undefined' && parent.refreshCountFolders) parent.refreshCountFolders();");
 }
 
 /* Menues */
@@ -141,11 +141,11 @@ $G_SUB_MENU = 'caseOptions';
 $G_ID_SUB_MENU_SELECTED = '_';
 
 /* Prepare page before to show */
-$oTemplatePower = new TemplatePower( PATH_TPL . 'cases/cases_Step.html' );
+$oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step.html');
 $oTemplatePower->prepare();
 $G_PUBLISH = new Publisher();
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addScriptCode( '
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addScriptCode('
   var Cse = {};
   Cse.panels = {};
   var leimnud = new maborak();
@@ -153,29 +153,29 @@ $oHeadPublisher->addScriptCode( '
   leimnud.Package.Load("rpc,drag,drop,panel,app,validator,fx,dom,abbr",{Instance:leimnud,Type:"module"});
   leimnud.exec(leimnud.fix.memoryLeak);
   leimnud.event.add(window,"load",function(){
-    ' . (isset( $_SESSION['showCasesWindow'] ) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '
+    ' . (isset($_SESSION['showCasesWindow']) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '
   });
-  ' );
-$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
+  ');
+$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
 
 $oCase = new Cases();
 $oStep = new Step();
 $bmWebEntry = new \ProcessMaker\BusinessModel\WebEntry;
 
-$Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
-$Fields['APP_DATA'] = array_merge( $Fields['APP_DATA'], G::getSystemConstants() );
+$Fields = $oCase->loadCase($_SESSION['APPLICATION']);
+$Fields['APP_DATA'] = array_merge($Fields['APP_DATA'], G::getSystemConstants());
 $sStatus = $Fields['APP_STATUS'];
 
 $APP_NUMBER = $Fields['APP_NUMBER'];
 $APP_TITLE = $Fields['TITLE'];
 
 $oProcess = new Process();
-$oProcessFieds = $oProcess->Load( $_SESSION['PROCESS'] );
+$oProcessFieds = $oProcess->Load($_SESSION['PROCESS']);
 
 #trigger debug routines...
 
 
-if (isset( $oProcessFieds['PRO_DEBUG'] ) && $oProcessFieds['PRO_DEBUG']) {
+if (isset($oProcessFieds['PRO_DEBUG']) && $oProcessFieds['PRO_DEBUG']) {
     #here we must verify if is a debugg session
     $_SESSION['TRIGGER_DEBUG']['ISSET'] = 1;
     $_SESSION['PMDEBUGGER'] = true;
@@ -192,43 +192,42 @@ if (isset($_GET["TYPE"]) && $_GET["TYPE"] == "OUTPUT_DOCUMENT" && isset($_GET["A
 }
 
 if ($flagExecuteBeforeTriggers) {
-    if (isset( $_SESSION['TRIGGER_DEBUG']['info'] )) {
-        unset( $_SESSION['TRIGGER_DEBUG']['info'] );
+    if (isset($_SESSION['TRIGGER_DEBUG']['info'])) {
+        unset($_SESSION['TRIGGER_DEBUG']['info']);
     }
 
-    if (! isset( $_SESSION['_NO_EXECUTE_TRIGGERS_'] )) {
-        $_SESSION['TRIGGER_DEBUG']['ERRORS'] = Array ();
+    if (!isset($_SESSION['_NO_EXECUTE_TRIGGERS_'])) {
+        $_SESSION['TRIGGER_DEBUG']['ERRORS'] = [];
     }
-    $_SESSION['TRIGGER_DEBUG']['DATA'] = Array ();
-    $_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = Array ();
-    $_SESSION['TRIGGER_DEBUG']['TRIGGERS_VALUES'] = Array ();
+    $_SESSION['TRIGGER_DEBUG']['DATA'] = [];
+    $_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = [];
+    $_SESSION['TRIGGER_DEBUG']['TRIGGERS_VALUES'] = [];
     $_SESSION['TRIGGER_DEBUG']['TRIGGERS_EXECUTION_TIME'] = [];
 
-    $triggers = $oCase->loadTriggers( $_SESSION['TASK'], $_GET['TYPE'], $_GET['UID'], 'BEFORE' );
+    $triggers = $oCase->loadTriggers($_SESSION['TASK'], $_GET['TYPE'], $_GET['UID'], 'BEFORE');
 
-    $_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] = count( $triggers );
+    $_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] = count($triggers);
     $_SESSION['TRIGGER_DEBUG']['TIME'] = G::toUpper(G::loadTranslation('ID_BEFORE'));
     if ($_SESSION['TRIGGER_DEBUG']['NUM_TRIGGERS'] != 0) {
         $_SESSION['TRIGGER_DEBUG']['TRIGGERS_NAMES'] = array_column($triggers, 'TRI_TITLE');
         $_SESSION['TRIGGER_DEBUG']['TRIGGERS_VALUES'] = $triggers;
     }
 
-    if (! isset( $_SESSION['_NO_EXECUTE_TRIGGERS_'] )) {
+    if (!isset($_SESSION['_NO_EXECUTE_TRIGGERS_'])) {
         //Execute before triggers - Start
-        $Fields['APP_DATA'] = $oCase->ExecuteTriggers( $_SESSION['TASK'], $_GET['TYPE'], $_GET['UID'], 'BEFORE', $Fields['APP_DATA'] );
+        $Fields['APP_DATA'] = $oCase->ExecuteTriggers($_SESSION['TASK'], $_GET['TYPE'], $_GET['UID'], 'BEFORE', $Fields['APP_DATA']);
         //Execute before triggers - End
 
         $_SESSION['TRIGGER_DEBUG']['TRIGGERS_EXECUTION_TIME'] = $oCase->arrayTriggerExecutionTime;
-
     } else {
-        unset( $_SESSION['_NO_EXECUTE_TRIGGERS_'] );
+        unset($_SESSION['_NO_EXECUTE_TRIGGERS_']);
     }
 }
 
 $Fields["DEL_INDEX"] = $_SESSION["INDEX"];
 $Fields["TAS_UID"] = $_SESSION["TASK"];
 
-if (isset( $_GET['breakpoint'] )) {
+if (isset($_GET['breakpoint'])) {
     $_POST['NextStep'] = $_SESSION['TRIGGER_DEBUG']['BREAKPAGE'];
 }
 
@@ -238,61 +237,56 @@ if (isset( $_GET['breakpoint'] )) {
 $isIE = Bootstrap::isIE();
 
 if (isset($_GET['breakpoint'])) {
-
-    $G_PUBLISH->AddContent( 'view', 'cases/showDebugFrameLoader' );
-    $G_PUBLISH->AddContent( 'view', 'cases/showDebugFrameBreaker' );
-    G::RenderPage( 'publish', 'blank' );
+    $G_PUBLISH->AddContent('view', 'cases/showDebugFrameLoader');
+    $G_PUBLISH->AddContent('view', 'cases/showDebugFrameBreaker');
+    G::RenderPage('publish', 'blank');
     exit();
 }
 #end trigger debug session.......
 
-
-//$oCase->thisIsTheCurrentUser($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], 'REDIRECT', 'casesListExtJs');
-
-
 //Save data - Start
 unset($Fields['APP_STATUS']);
 unset($Fields['APP_PROC_STATUS']);
 unset($Fields['APP_PROC_CODE']);
 unset($Fields['APP_PIN']);
 
-$Fields["USER_UID"]         = $_SESSION["USER_LOGGED"];
+$Fields["USER_UID"] = $_SESSION["USER_LOGGED"];
 $Fields["CURRENT_DYNAFORM"] = $_GET["UID"];
-$Fields["OBJECT_TYPE"]      = ($_GET["UID"] == "-1")? "ASSIGN_TASK" : $_GET["TYPE"];
+$Fields["OBJECT_TYPE"] = ($_GET["UID"] == "-1") ? "ASSIGN_TASK" : $_GET["TYPE"];
 
-$oCase->updateCase( $_SESSION['APPLICATION'], $Fields );
+$oCase->updateCase($_SESSION['APPLICATION'], $Fields);
 //Save data - End
 
 //Obtain previous and next step - Start
 try {
     $oCase = new Cases();
-    $aNextStep = $oCase->getNextStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
-    $aPreviousStep = $oCase->getPreviousStep( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION'] );
+    $aNextStep = $oCase->getNextStep($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION']);
+    $aPreviousStep = $oCase->getPreviousStep($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['STEP_POSITION']);
 } catch (Exception $e) {
     throw $e;
 }
 //Obtain previous and next step - End
 
 $aRequiredFields = array(
-    'APPLICATION'   => $Fields['APP_DATA']['APPLICATION'],
-    'PROCESS'       => $Fields['APP_DATA']['PROCESS'],
-    'TASK'          => $Fields['APP_DATA']['TASK'],
-    'INDEX'         => $Fields['APP_DATA']['INDEX'],
-    'TRIGGER_DEBUG' => isset($Fields['APP_DATA']['TRIGGER_DEBUG']) ? $Fields['APP_DATA']['TRIGGER_DEBUG']:array()
+    'APPLICATION' => $Fields['APP_DATA']['APPLICATION'],
+    'PROCESS' => $Fields['APP_DATA']['PROCESS'],
+    'TASK' => $Fields['APP_DATA']['TASK'],
+    'INDEX' => $Fields['APP_DATA']['INDEX'],
+    'TRIGGER_DEBUG' => isset($Fields['APP_DATA']['TRIGGER_DEBUG']) ? $Fields['APP_DATA']['TRIGGER_DEBUG'] : array()
 );
 
 $oHeadPublisher->addScriptCode('var __dynaformSVal__ = \'' . base64_encode(serialize($aRequiredFields)) . '\'; ');
 try {
     //Add content content step - Start
-    $oApp = ApplicationPeer::retrieveByPK( $_SESSION['APPLICATION'] );
+    $oApp = ApplicationPeer::retrieveByPK($_SESSION['APPLICATION']);
     $array['APP_NUMBER'] = $APP_NUMBER;
     $sTitleCase = $oApp->getAppTitle();
     $array['APP_TITLE'] = $sTitleCase;
-    $array['CASE'] = G::LoadTranslation( 'ID_CASE' );
-    $array['TITLE'] = G::LoadTranslation( 'ID_TITLE' );
+    $array['CASE'] = G::LoadTranslation('ID_CASE');
+    $array['TITLE'] = G::LoadTranslation('ID_TITLE');
     $Fields['TITLE'] = $sTitleCase;
     $noShowTitle = 0;
-    if (isset( $oProcessFieds['PRO_SHOW_MESSAGE'] )) {
+    if (isset($oProcessFieds['PRO_SHOW_MESSAGE'])) {
         $noShowTitle = $oProcessFieds['PRO_SHOW_MESSAGE'];
     }
     if ($bmWebEntry->isTaskAWebEntry($_SESSION['TASK'])) {
@@ -302,37 +296,36 @@ try {
     switch ($_GET['TYPE']) {
         case 'DYNAFORM':
             if ($noShowTitle == 0) {
-                $G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $array );
+                $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array);
             }
-            if (! $aPreviousStep) {
+            if (!$aPreviousStep) {
                 $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
             } else {
                 $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
-                $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation( "ID_PREVIOUS_STEP" );
+                $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
             }
             $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = $aNextStep['PAGE'];
-            $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation( 'ID_NEXT_STEP' );
+            $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation('ID_NEXT_STEP');
             $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PHPSESSID'] = @session_id();
             $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['DYNUIDPRINT'] = $_GET['UID'];
 
-            $oHeadPublisher = & headPublisher::getSingleton();
+            $oHeadPublisher = headPublisher::getSingleton();
 
             if (!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) {
-                $oHeadPublisher->addScriptCode( "
+                $oHeadPublisher->addScriptCode("
                                                     if (typeof parent != 'undefined') {
                                                         if (parent.setNode) {
                                                             parent.setNode('" . $_GET['UID'] . "');
                                                         }
-                                                    }" );
+                                                    }");
             }
 
-            $oStep = $oStep->loadByProcessTaskPosition( $_SESSION['PROCESS'], $_SESSION['TASK'], $_GET['POSITION'] );
+            $oStep = $oStep->loadByProcessTaskPosition($_SESSION['PROCESS'], $_SESSION['TASK'], $_GET['POSITION']);
 
             /**
-             * Added By erik 16-05-08
              * Description: this was added for the additional database connections
              */
-            $oDbConnections = new DbConnections( $_SESSION['PROCESS'] );
+            $oDbConnections = new DbConnections($_SESSION['PROCESS']);
             $oDbConnections->loadAdditionalConnections();
             $_SESSION['CURRENT_DYN_UID'] = $_GET['UID'];
 
@@ -345,75 +338,73 @@ try {
             if ($a->isResponsive()) {
                 $a->printEdit();
             } else {
-            	if(array_key_exists('gmail',$_GET) && $_GET['gmail'] == 1){
-            		$G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', DateTime::convertUtcToTimeZone($Fields['APP_DATA']), 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'] . '&gmail=1', '', (strtolower($oStep->getStepMode()) != 'edit' ? strtolower($oStep->getStepMode()) : ''));
-            	}else{
-            		$G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', DateTime::convertUtcToTimeZone($Fields['APP_DATA']), 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'], '', (strtolower($oStep->getStepMode()) != 'edit' ? strtolower($oStep->getStepMode()) : ''));
-            	}
+                if(array_key_exists('gmail',$_GET) && $_GET['gmail'] == 1){
+                    $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', DateTime::convertUtcToTimeZone($Fields['APP_DATA']), 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'] . '&gmail=1', '', (strtolower($oStep->getStepMode()) != 'edit' ? strtolower($oStep->getStepMode()) : ''));
+                } else {
+                    $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', DateTime::convertUtcToTimeZone($Fields['APP_DATA']), 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'], '', (strtolower($oStep->getStepMode()) != 'edit' ? strtolower($oStep->getStepMode()) : ''));
+                }
             }
             break;
         case 'INPUT_DOCUMENT':
             if ($noShowTitle == 0) {
-                $G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $array );
+                $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array);
             }
             $oInputDocument = new InputDocument();
-            $Fields = $oInputDocument->load( $_GET['UID'] );
-            if (! $aPreviousStep) {
+            $Fields = $oInputDocument->load($_GET['UID']);
+            if (!$aPreviousStep) {
                 $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
                 $Fields['PREVIOUS_STEP_LABEL'] = '';
             } else {
                 $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
-                $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation( "ID_PREVIOUS_STEP" );
+                $Fields['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
 
                 $Fields['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
-                $Fields['PREVIOUS_STEP_LABEL'] = G::loadTranslation( "ID_PREVIOUS_STEP" );
+                $Fields['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
             }
             $Fields['NEXT_STEP'] = $aNextStep['PAGE'];
-            $Fields['NEXT_STEP_LABEL'] = G::loadTranslation( "ID_NEXT_STEP" );
+            $Fields['NEXT_STEP_LABEL'] = G::loadTranslation("ID_NEXT_STEP");
             switch ($_GET['ACTION']) {
                 case 'ATTACH':
                     switch ($Fields['INP_DOC_FORM_NEEDED']) {
                         case 'REAL':
-                            $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_NEW' );
+                            $Fields['TYPE_LABEL'] = G::LoadTranslation('ID_NEW');
                             $sXmlForm = 'cases/cases_AttachInputDocument2';
                             break;
                         case 'VIRTUAL':
-                            $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_ATTACH' );
+                            $Fields['TYPE_LABEL'] = G::LoadTranslation('ID_ATTACH');
                             $sXmlForm = 'cases/cases_AttachInputDocument1';
                             break;
                         case 'VREAL':
-                            $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_ATTACH' );
+                            $Fields['TYPE_LABEL'] = G::LoadTranslation('ID_ATTACH');
                             $sXmlForm = 'cases/cases_AttachInputDocument3';
                             break;
                     }
-                    $Fields['MESSAGE1'] = G::LoadTranslation( 'ID_PLEASE_ENTER_COMMENTS' );
-                    $Fields['MESSAGE2'] = G::LoadTranslation( 'ID_PLEASE_SELECT_FILE' );
+                    $Fields['MESSAGE1'] = G::LoadTranslation('ID_PLEASE_ENTER_COMMENTS');
+                    $Fields['MESSAGE2'] = G::LoadTranslation('ID_PLEASE_SELECT_FILE');
                     //START: If there is a Break Step registered from Plugin Similar as a Trigger debug
                     $oPluginRegistry = PluginRegistry::loadSingleton();
-                    if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT_BEFORE )) {
+                    if ($oPluginRegistry->existsTrigger(PM_UPLOAD_DOCUMENT_BEFORE)) {
                         //If a Plugin has registered a Break Page Evaluator
-                        $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT_BEFORE, array ('USR_UID' => $_SESSION['USER_LOGGED']) );
+                        $oPluginRegistry->executeTriggers(PM_UPLOAD_DOCUMENT_BEFORE, array('USR_UID' => $_SESSION['USER_LOGGED']));
                     }
                     //END: If there is a Break Step registered from Plugin
-                    $G_PUBLISH->AddContent( 'propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_InputdocsList', $oCase->getInputDocumentsCriteria( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['UID'] ), array_merge( array ('DOC_UID' => $_GET['UID']
-                    ), $Fields ) ); //$aFields
+                    $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_InputdocsList', $oCase->getInputDocumentsCriteria($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['UID']), array_merge(array('DOC_UID' => $_GET['UID']
+                    ), $Fields)); //$aFields
 
-                    $oHeadPublisher = & headPublisher::getSingleton();
+                    $oHeadPublisher = headPublisher::getSingleton();
                     $titleDocument = "<h3>" . htmlspecialchars($Fields['INP_DOC_TITLE'], ENT_QUOTES) . "<br><small>" . G::LoadTranslation('ID_INPUT_DOCUMENT') . "</small></h3>";
                     if ($Fields['INP_DOC_DESCRIPTION']) {
-                        $titleDocument .= " " . str_replace( "\n", "", str_replace( "'", "\'", nl2br( html_entity_decode($Fields['INP_DOC_DESCRIPTION'], ENT_COMPAT, "UTF-8") ) ) ) . "";
+                        $titleDocument .= " " . str_replace("\n", "", str_replace("'", "\'", nl2br(html_entity_decode($Fields['INP_DOC_DESCRIPTION'], ENT_COMPAT, "UTF-8")))) . "";
                     }
 
-                    $oHeadPublisher->addScriptCode( "documentName='{$titleDocument}';" );
+                    $oHeadPublisher->addScriptCode("documentName='{$titleDocument}';");
                     break;
                 case 'VIEW':
-                    //require_once 'classes/model/AppDocument.php';
-                    //require_once 'classes/model/Users.php';
                     $oAppDocument = new AppDocument();
-                    $oAppDocument->Fields = $oAppDocument->load( $_GET['DOC'], $_GET['VERSION'] );
+                    $oAppDocument->Fields = $oAppDocument->load($_GET['DOC'], $_GET['VERSION']);
                     $Fields['POSITION'] = $_SESSION['STEP_POSITION'];
                     $oUser = new Users();
-                    $aUser = $oUser->load( $oAppDocument->Fields['USR_UID'] );
+                    $aUser = $oUser->load($oAppDocument->Fields['USR_UID']);
                     $Fields['CREATOR'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
                     switch ($Fields['INP_DOC_FORM_NEEDED']) {
                         case 'REAL':
@@ -426,134 +417,119 @@ try {
                             $sXmlForm = 'cases/cases_ViewInputDocument3';
                             break;
                     }
-                    $oAppDocument->Fields['VIEW'] = G::LoadTranslation( 'ID_OPEN' );
+                    $oAppDocument->Fields['VIEW'] = G::LoadTranslation('ID_OPEN');
                     $oAppDocument->Fields['FILE'] = 'cases_ShowDocument?a=' . $_GET['DOC'] . '&r=' . rand();
-                    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', $sXmlForm, '', G::array_merges( $Fields, $oAppDocument->Fields ), '' );
+                    $G_PUBLISH->AddContent('xmlform', 'xmlform', $sXmlForm, '', G::array_merges($Fields, $oAppDocument->Fields), '');
                     break;
             }
             break;
         case 'OUTPUT_DOCUMENT':
-            //$G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array);
-
-            //require_once 'classes/model/OutputDocument.php';
             $oOutputDocument = new OutputDocument();
-            $aOD = $oOutputDocument->load( $_GET['UID'] );
-            if (! $aPreviousStep) {
+            $aOD = $oOutputDocument->load($_GET['UID']);
+            if (!$aPreviousStep) {
                 $aOD['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
             } else {
                 $aOD['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
-                $aOD['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation( "ID_PREVIOUS_STEP" );
+                $aOD['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
             }
             $aOD['__DYNAFORM_OPTIONS']['NEXT_STEP'] = $aNextStep['PAGE'];
-            $aOD['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation( "ID_NEXT_STEP" );
+            $aOD['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation("ID_NEXT_STEP");
             switch ($_GET['ACTION']) {
                 case 'GENERATE':
                     //START: If there is a Break Step registered from Plugin Similar as a Trigger debug
                     $oPluginRegistry = PluginRegistry::loadSingleton();
-                    if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT_BEFORE )) {
+                    if ($oPluginRegistry->existsTrigger(PM_UPLOAD_DOCUMENT_BEFORE)) {
                         //If a Plugin has registered a Break Page Evaluator
-                        $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT_BEFORE, array ('USR_UID' => $_SESSION['USER_LOGGED']) );
+                        $oPluginRegistry->executeTriggers(PM_UPLOAD_DOCUMENT_BEFORE, array('USR_UID' => $_SESSION['USER_LOGGED']));
                     }
                     //END: If there is a Break Step registered from Plugin
 
-                    $sFilenameOriginal = $sFilename = preg_replace( '[^A-Za-z0-9_]', '_', G::replaceDataField( $aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA'] ) );
-                    //require_once 'classes/model/AppFolder.php';
-                    //require_once 'classes/model/AppDocument.php';
+                    $sFilenameOriginal = $sFilename = preg_replace('[^A-Za-z0-9_]', '_', G::replaceDataField($aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA']));
 
                     //Get the Custom Folder ID (create if necessary)
                     $oFolder = new AppFolder();
-                    $folderId = $oFolder->createFromPath( $aOD['OUT_DOC_DESTINATION_PATH'] );
+                    $folderId = $oFolder->createFromPath($aOD['OUT_DOC_DESTINATION_PATH']);
 
                     //Tags
-                    $fileTags = $oFolder->parseTags( $aOD['OUT_DOC_TAGS'] );
+                    $fileTags = $oFolder->parseTags($aOD['OUT_DOC_TAGS']);
 
                     //Get last Document Version and apply versioning if is enabled
 
 
                     $oAppDocument = new AppDocument();
-                    $lastDocVersion = $oAppDocument->getLastDocVersion( $_GET['UID'], $_SESSION['APPLICATION'] );
+                    $lastDocVersion = $oAppDocument->getLastDocVersion($_GET['UID'], $_SESSION['APPLICATION']);
 
-                    //if(($aOD['OUT_DOC_VERSIONING'])||($lastDocVersion==0)){
-                    //  $lastDocVersion++;
-                    //}
-
-                    $oCriteria = new Criteria( 'workflow' );
-                    $oCriteria->add( AppDocumentPeer::APP_UID, $_SESSION['APPLICATION'] );
-                    //$oCriteria->add(AppDocumentPeer::DEL_INDEX,    $_SESSION['INDEX']);
-                    $oCriteria->add( AppDocumentPeer::DOC_UID, $_GET['UID'] );
-                    $oCriteria->add( AppDocumentPeer::DOC_VERSION, $lastDocVersion );
-                    $oCriteria->add( AppDocumentPeer::APP_DOC_TYPE, 'OUTPUT' );
-                    $oDataset = AppDocumentPeer::doSelectRS( $oCriteria );
-                    $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+                    $oCriteria = new Criteria('workflow');
+                    $oCriteria->add(AppDocumentPeer::APP_UID, $_SESSION['APPLICATION']);
+                    $oCriteria->add(AppDocumentPeer::DOC_UID, $_GET['UID']);
+                    $oCriteria->add(AppDocumentPeer::DOC_VERSION, $lastDocVersion);
+                    $oCriteria->add(AppDocumentPeer::APP_DOC_TYPE, 'OUTPUT');
+                    $oDataset = AppDocumentPeer::doSelectRS($oCriteria);
+                    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
                     $oDataset->next();
                     if (($aOD['OUT_DOC_VERSIONING']) && ($lastDocVersion != 0)) {
                         //Create new Version of current output
-                        $lastDocVersion ++;
+                        $lastDocVersion++;
                         if ($aRow = $oDataset->getRow()) {
-                            $aFields = array ('APP_DOC_UID' => $aRow['APP_DOC_UID'],'APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'DOC_UID' => $_GET['UID'],'DOC_VERSION' => $lastDocVersion + 1,'USR_UID' => $_SESSION['USER_LOGGED'],'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags
+                            $aFields = array('APP_DOC_UID' => $aRow['APP_DOC_UID'], 'APP_UID' => $_SESSION['APPLICATION'], 'DEL_INDEX' => $_SESSION['INDEX'], 'DOC_UID' => $_GET['UID'], 'DOC_VERSION' => $lastDocVersion + 1, 'USR_UID' => $_SESSION['USER_LOGGED'], 'APP_DOC_TYPE' => 'OUTPUT', 'APP_DOC_CREATE_DATE' => date('Y-m-d H:i:s'), 'APP_DOC_FILENAME' => $sFilename, 'FOLDER_UID' => $folderId, 'APP_DOC_TAGS' => $fileTags
                             );
                             $oAppDocument = new AppDocument();
-                            $oAppDocument->create( $aFields );
+                            $oAppDocument->create($aFields);
                             $sDocUID = $aRow['APP_DOC_UID'];
                         }
                     } else {
                         //No versioning so Update a current Output or Create new if no exist
                         if ($aRow = $oDataset->getRow()) {
                             //Update
-                            $aFields = array ('APP_DOC_UID' => $aRow['APP_DOC_UID'],'APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'DOC_UID' => $_GET['UID'],'DOC_VERSION' => $lastDocVersion,'USR_UID' => $_SESSION['USER_LOGGED'],'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags );
+                            $aFields = array('APP_DOC_UID' => $aRow['APP_DOC_UID'], 'APP_UID' => $_SESSION['APPLICATION'], 'DEL_INDEX' => $_SESSION['INDEX'], 'DOC_UID' => $_GET['UID'], 'DOC_VERSION' => $lastDocVersion, 'USR_UID' => $_SESSION['USER_LOGGED'], 'APP_DOC_TYPE' => 'OUTPUT', 'APP_DOC_CREATE_DATE' => date('Y-m-d H:i:s'), 'APP_DOC_FILENAME' => $sFilename, 'FOLDER_UID' => $folderId, 'APP_DOC_TAGS' => $fileTags);
                             $oAppDocument = new AppDocument();
-                            $oAppDocument->update( $aFields );
+                            $oAppDocument->update($aFields);
                             $sDocUID = $aRow['APP_DOC_UID'];
                         } else {
                             //create
                             if ($lastDocVersion == 0) {
-                                $lastDocVersion ++;
+                                $lastDocVersion++;
                             }
-                            $aFields = array ('APP_UID' => $_SESSION['APPLICATION'],'DEL_INDEX' => $_SESSION['INDEX'],'DOC_UID' => $_GET['UID'],'DOC_VERSION' => $lastDocVersion,'USR_UID' => $_SESSION['USER_LOGGED'],'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags);
+                            $aFields = array('APP_UID' => $_SESSION['APPLICATION'], 'DEL_INDEX' => $_SESSION['INDEX'], 'DOC_UID' => $_GET['UID'], 'DOC_VERSION' => $lastDocVersion, 'USR_UID' => $_SESSION['USER_LOGGED'], 'APP_DOC_TYPE' => 'OUTPUT', 'APP_DOC_CREATE_DATE' => date('Y-m-d H:i:s'), 'APP_DOC_FILENAME' => $sFilename, 'FOLDER_UID' => $folderId, 'APP_DOC_TAGS' => $fileTags);
                             $oAppDocument = new AppDocument();
-                            $aFields['APP_DOC_UID'] = $sDocUID = $oAppDocument->create( $aFields );
-
+                            $aFields['APP_DOC_UID'] = $sDocUID = $oAppDocument->create($aFields);
                         }
                     }
 
-                    //$sFilename = ereg_replace('[^A-Za-z0-9_]', '_', G::replaceDataField($aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA']));
-                    //if ( $sFilename == '' ) $sFilename='_';
-
                     $sFilename = $aFields['APP_DOC_UID'] . "_" . $lastDocVersion;
 
                     $pathOutput = PATH_DOCUMENT . G::getPathFromUID($_SESSION['APPLICATION']) . PATH_SEP . 'outdocs' . PATH_SEP;
-                    G::mk_dir( $pathOutput );
+                    G::mk_dir($pathOutput);
                     switch ($aOD['OUT_DOC_TYPE']) {
                         case 'HTML':
 
-                            $aProperties = array (); //maui
+                            $aProperties = [];
 
-                            if (! isset( $aOD['OUT_DOC_MEDIA'] )) {
+                            if (!isset($aOD['OUT_DOC_MEDIA'])) {
                                 $aOD['OUT_DOC_MEDIA'] = 'Letter';
                             }
-                            if (! isset( $aOD['OUT_DOC_LEFT_MARGIN'] )) {
+                            if (!isset($aOD['OUT_DOC_LEFT_MARGIN'])) {
                                 $aOD['OUT_DOC_LEFT_MARGIN'] = '15';
                             }
-                            if (! isset( $aOD['OUT_DOC_RIGHT_MARGIN'] )) {
+                            if (!isset($aOD['OUT_DOC_RIGHT_MARGIN'])) {
                                 $aOD['OUT_DOC_RIGHT_MARGIN'] = '15';
                             }
-                            if (! isset( $aOD['OUT_DOC_TOP_MARGIN'] )) {
+                            if (!isset($aOD['OUT_DOC_TOP_MARGIN'])) {
                                 $aOD['OUT_DOC_TOP_MARGIN'] = '15';
                             }
-                            if (! isset( $aOD['OUT_DOC_BOTTOM_MARGIN'] )) {
+                            if (!isset($aOD['OUT_DOC_BOTTOM_MARGIN'])) {
                                 $aOD['OUT_DOC_BOTTOM_MARGIN'] = '15';
                             }
 
                             $aProperties['media'] = $aOD['OUT_DOC_MEDIA'];
-                            $aProperties['margins'] = array ('left' => $aOD['OUT_DOC_LEFT_MARGIN'],'right' => $aOD['OUT_DOC_RIGHT_MARGIN'],'top' => $aOD['OUT_DOC_TOP_MARGIN'],'bottom' => $aOD['OUT_DOC_BOTTOM_MARGIN']);
+                            $aProperties['margins'] = array('left' => $aOD['OUT_DOC_LEFT_MARGIN'], 'right' => $aOD['OUT_DOC_RIGHT_MARGIN'], 'top' => $aOD['OUT_DOC_TOP_MARGIN'], 'bottom' => $aOD['OUT_DOC_BOTTOM_MARGIN']);
                             if ($aOD['OUT_DOC_PDF_SECURITY_ENABLED'] == '1') {
-                                $aProperties['pdfSecurity'] = array ('openPassword' => $aOD['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'],'ownerPassword' => $aOD['OUT_DOC_PDF_SECURITY_OWNER_PASSWORD'],'permissions' => $aOD['OUT_DOC_PDF_SECURITY_PERMISSIONS']);
+                                $aProperties['pdfSecurity'] = array('openPassword' => $aOD['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'], 'ownerPassword' => $aOD['OUT_DOC_PDF_SECURITY_OWNER_PASSWORD'], 'permissions' => $aOD['OUT_DOC_PDF_SECURITY_PERMISSIONS']);
                             }
                             if (isset($aOD['OUT_DOC_REPORT_GENERATOR'])) {
                                 $aProperties['report_generator'] = $aOD['OUT_DOC_REPORT_GENERATOR'];
                             }
-                            $oOutputDocument->generate( $_GET['UID'], $Fields['APP_DATA'], $pathOutput, $sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean) $aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'], $aProperties );
-                            //$sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean)$aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'] );
+                            $oOutputDocument->generate($_GET['UID'], $Fields['APP_DATA'], $pathOutput, $sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean)$aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'], $aProperties);
                             break;
                         case 'JRXML':
                             //creating the xml with the application data;
@@ -562,32 +538,27 @@ try {
                                 $xmlData .= "  <$key>$val</$key>\n";
                             }
                             $xmlData .= "</dynaform>\n";
-                            $iSize = file_put_contents( $javaOutput . 'addressBook.xml', $xmlData );
+                            $iSize = file_put_contents($javaOutput . 'addressBook.xml', $xmlData);
 
                             $JBPM = new JavaBridgePM();
                             $JBPM->checkJavaExtension();
 
-                            $util = new Java( "com.processmaker.util.pmutils" );
-                            $util->setInputPath( $javaInput );
-                            $util->setOutputPath( $javaOutput );
+                            $util = new Java("com.processmaker.util.pmutils");
+                            $util->setInputPath($javaInput);
+                            $util->setOutputPath($javaOutput);
 
 
                             $filter = new InputFilter();
 
-                            //$content = file_get_contents ( PATH_DYNAFORM . $aOD['PRO_UID'] . PATH_SEP . $aOD['OUT_DOC_UID'] . '.jrxml' );
-                            //$iSize = file_put_contents ( $javaInput .  $aOD['OUT_DOC_UID'] . '.jrxml', $content );
                             $locationFrom = PATH_DYNAFORM . $aOD['PRO_UID'] . PATH_SEP . $aOD['OUT_DOC_UID'] . '.jrxml';
                             $locationFrom = $filter->validateInput($locationFrom, "path");
-                            copy( $locationFrom, $javaInput . $aOD['OUT_DOC_UID'] . '.jrxml' );
+                            copy($locationFrom, $javaInput . $aOD['OUT_DOC_UID'] . '.jrxml');
 
                             $outputFile = $javaOutput . $sFilename . '.pdf';
-                            print $util->jrxml2pdf( $aOD['OUT_DOC_UID'] . '.jrxml', basename( $outputFile ) );
+                            print $util->jrxml2pdf($aOD['OUT_DOC_UID'] . '.jrxml', basename($outputFile));
 
-                            //$content = file_get_contents ( $outputFile );
-                            //$iSize = file_put_contents ( $pathOutput .  $sFilename . '.pdf' , $content );
                             $outputFile = $filter->validateInput($outputFile, "path");
-                            copy( $outputFile, $pathOutput . $sFilename . '.pdf' );
-                            //die;
+                            copy($outputFile, $pathOutput . $sFilename . '.pdf');
                             break;
                         case 'ACROFORM':
                             //creating the xml with the application data;
@@ -596,36 +567,34 @@ try {
                                 $xmlData .= "  <$key>$val</$key>\n";
                             }
                             $xmlData .= "</dynaform>\n";
-                            //$iSize = file_put_contents ( $javaOutput .  'addressBook.xml' , $xmlData );
 
                             $JBPM = new JavaBridgePM();
                             $JBPM->checkJavaExtension();
 
-                            $util = new Java( "com.processmaker.util.pmutils" );
-                            $util->setInputPath( $javaInput );
-                            $util->setOutputPath( $javaOutput );
-
+                            $util = new Java("com.processmaker.util.pmutils");
+                            $util->setInputPath($javaInput);
+                            $util->setOutputPath($javaOutput);
 
                             $filter = new InputFilter();
 
                             $locationFrom = PATH_DYNAFORM . $aOD['PRO_UID'] . PATH_SEP . $aOD['OUT_DOC_UID'] . '.pdf';
                             $locationFrom = $filter->validateInput($locationFrom, "path");
-                            copy( $locationFrom, $javaInput . $aOD['OUT_DOC_UID'] . '.pdf' );
+                            copy($locationFrom, $javaInput . $aOD['OUT_DOC_UID'] . '.pdf');
 
                             $outputFile = $javaOutput . $sFilename . '.pdf';
-                            print $util->writeVarsToAcroFields( $aOD['OUT_DOC_UID'] . '.pdf', $xmlData );
+                            print $util->writeVarsToAcroFields($aOD['OUT_DOC_UID'] . '.pdf', $xmlData);
 
                             $locationFrom = $javaOutput . $aOD['OUT_DOC_UID'] . '.pdf';
                             $locationFrom = $filter->validateInput($locationFrom, "path");
-                            copy( $locationFrom, $pathOutput . $sFilename . '.pdf' );
+                            copy($locationFrom, $pathOutput . $sFilename . '.pdf');
 
                             break;
                         default:
-                            throw (new Exception( 'invalid output document' ));
+                            throw (new Exception('invalid output document'));
                     }
 
                     //Execute after triggers - Start
-                    $Fields['APP_DATA'] = $oCase->ExecuteTriggers( $_SESSION['TASK'], 'OUTPUT_DOCUMENT', $_GET['UID'], 'AFTER', $Fields['APP_DATA'] );
+                    $Fields['APP_DATA'] = $oCase->ExecuteTriggers($_SESSION['TASK'], 'OUTPUT_DOCUMENT', $_GET['UID'], 'AFTER', $Fields['APP_DATA']);
                     $Fields['DEL_INDEX'] = $_SESSION['INDEX'];
                     $Fields['TAS_UID'] = $_SESSION['TASK'];
                     //Execute after triggers - End
@@ -637,13 +606,13 @@ try {
                     unset($Fields['APP_PROC_STATUS']);
                     unset($Fields['APP_PROC_CODE']);
                     unset($Fields['APP_PIN']);
-                    $oCase->updateCase( $_SESSION['APPLICATION'], $Fields );
+                    $oCase->updateCase($_SESSION['APPLICATION'], $Fields);
                     //Save data - End
 
                     //Plugin Hook PM_UPLOAD_DOCUMENT for upload document
                     $oPluginRegistry = PluginRegistry::loadSingleton();
-                    if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT ) && class_exists( 'uploadDocumentData' )) {
-                        $triggerDetail = $oPluginRegistry->getTriggerInfo( PM_UPLOAD_DOCUMENT );
+                    if ($oPluginRegistry->existsTrigger(PM_UPLOAD_DOCUMENT) && class_exists('uploadDocumentData')) {
+                        $triggerDetail = $oPluginRegistry->getTriggerInfo(PM_UPLOAD_DOCUMENT);
 
                         $sPathName = PATH_DOCUMENT . G::getPathFromUID($_SESSION['APPLICATION']) . PATH_SEP;
 
@@ -651,105 +620,100 @@ try {
                         $oData['ATTACHMENT_FOLDER'] = true;
                         switch ($aOD['OUT_DOC_GENERATE']) {
                             case "BOTH":
-                                $documentData = new uploadDocumentData( $_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.pdf', $sFilenameOriginal . '.pdf', $sDocUID, $oAppDocument->getDocVersion() );
+                                $documentData = new uploadDocumentData($_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.pdf', $sFilenameOriginal . '.pdf', $sDocUID, $oAppDocument->getDocVersion());
 
                                 $documentData->sFileType = "PDF";
                                 $documentData->bUseOutputFolder = true;
-                                $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
+                                $uploadReturn = $oPluginRegistry->executeTriggers(PM_UPLOAD_DOCUMENT, $documentData);
                                 if ($uploadReturn) {
                                     //Only delete if the file was saved correctly
                                     $aFields['APP_DOC_PLUGIN'] = $triggerDetail->getNamespace();
-                                    //$oAppDocument = new AppDocument();
-                                    //$oAppDocument->update($aFields);
-                                    unlink( $pathOutput . $sFilename . '.pdf' );
+                                    unlink($pathOutput . $sFilename . '.pdf');
                                 }
 
-                                $documentData = new uploadDocumentData( $_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.doc', $sFilenameOriginal . '.doc', $sDocUID, $oAppDocument->getDocVersion() );
+                                $documentData = new uploadDocumentData($_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.doc', $sFilenameOriginal . '.doc', $sDocUID, $oAppDocument->getDocVersion());
 
                                 $documentData->sFileType = "DOC";
                                 $documentData->bUseOutputFolder = true;
-                                $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
+                                $uploadReturn = $oPluginRegistry->executeTriggers(PM_UPLOAD_DOCUMENT, $documentData);
                                 if ($uploadReturn) {
                                     //Only delete if the file was saved correctly
-                                    unlink( $pathOutput . $sFilename . '.doc' );
+                                    unlink($pathOutput . $sFilename . '.doc');
                                 }
                                 break;
                             case "PDF":
-                                $documentData = new uploadDocumentData( $_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.pdf', $sFilenameOriginal . '.pdf', $sDocUID, $oAppDocument->getDocVersion() );
+                                $documentData = new uploadDocumentData($_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.pdf', $sFilenameOriginal . '.pdf', $sDocUID, $oAppDocument->getDocVersion());
 
                                 $documentData->sFileType = "PDF";
                                 $documentData->bUseOutputFolder = true;
-                                $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
+                                $uploadReturn = $oPluginRegistry->executeTriggers(PM_UPLOAD_DOCUMENT, $documentData);
                                 if ($uploadReturn) {
                                     //Only delete if the file was saved correctly
-                                    unlink( $pathOutput . $sFilename . '.pdf' );
+                                    unlink($pathOutput . $sFilename . '.pdf');
                                 }
                                 break;
                             case "DOC":
-                                $documentData = new uploadDocumentData( $_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.doc', $sFilenameOriginal . '.doc', $sDocUID, $oAppDocument->getDocVersion() );
+                                $documentData = new uploadDocumentData($_SESSION['APPLICATION'], $_SESSION['USER_LOGGED'], $pathOutput . $sFilename . '.doc', $sFilenameOriginal . '.doc', $sDocUID, $oAppDocument->getDocVersion());
 
                                 $documentData->sFileType = "DOC";
                                 $documentData->bUseOutputFolder = true;
-                                $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
+                                $uploadReturn = $oPluginRegistry->executeTriggers(PM_UPLOAD_DOCUMENT, $documentData);
                                 if ($uploadReturn) {
                                     //Only delete if the file was saved correctly
-                                    unlink( $pathOutput . $sFilename . '.doc' );
+                                    unlink($pathOutput . $sFilename . '.doc');
                                 }
                                 break;
                         }
-
                     }
 
                     $outputNextStep = 'cases_Step?TYPE=OUTPUT_DOCUMENT&UID=' . $_GET['UID'] . '&POSITION=' . $_SESSION['STEP_POSITION'] . '&ACTION=VIEW&DOC=' . $sDocUID;
-                    G::header( 'location: ' . $outputNextStep );
+                    G::header('location: ' . $outputNextStep);
                     die();
                     break;
                 case 'VIEW':
                     if ($noShowTitle == 0) {
-                        $G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $array );
+                        $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array);
                     }
-                    //require_once 'classes/model/AppDocument.php';
                     $oAppDocument = new AppDocument();
                     $lastVersion = $oAppDocument->getLastAppDocVersion( $_GET['DOC'], $_SESSION['APPLICATION'] );
                     $aFields = $oAppDocument->load( $_GET['DOC'], $lastVersion );
                     $aFields['APP_DOC_CREATE_DATE'] = DateTime::convertUtcToTimeZone($aFields['APP_DOC_CREATE_DATE']);
                     $listing = false;
                     $oPluginRegistry = PluginRegistry::loadSingleton();
-                    if ($oPluginRegistry->existsTrigger( PM_CASE_DOCUMENT_LIST )) {
-                        $folderData = new folderData( null, null, $_SESSION['APPLICATION'], null, $_SESSION['USER_LOGGED'] );
+                    if ($oPluginRegistry->existsTrigger(PM_CASE_DOCUMENT_LIST)) {
+                        $folderData = new folderData(null, null, $_SESSION['APPLICATION'], null, $_SESSION['USER_LOGGED']);
                         $folderData->PMType = "OUTPUT";
                         $folderData->returnList = true;
-                        $listing = $oPluginRegistry->executeTriggers( PM_CASE_DOCUMENT_LIST, $folderData );
+                        $listing = $oPluginRegistry->executeTriggers(PM_CASE_DOCUMENT_LIST, $folderData);
                     }
 
-                    //require_once 'classes/model/OutputDocument.php';
                     $oOutputDocument = new OutputDocument();
-                    $aGields = $oOutputDocument->load( $aFields['DOC_UID'] );
+                    $aGields = $oOutputDocument->load($aFields['DOC_UID']);
 
-                    if (isset( $aGields['OUT_DOC_VERSIONING'] ) && $aGields['OUT_DOC_VERSIONING'] != 0) {
+                    if (isset($aGields['OUT_DOC_VERSIONING']) && $aGields['OUT_DOC_VERSIONING'] != 0) {
                         $oAppDocument = new AppDocument();
-                        $lastDocVersion = $oAppDocument->getLastDocVersion( $_GET['UID'], $_SESSION['APPLICATION'] );
+                        $lastDocVersion = $oAppDocument->getLastDocVersion($_GET['UID'], $_SESSION['APPLICATION']);
                     } else {
                         $lastDocVersion = '';
                     }
-                    $aFields['VIEW1'] = G::LoadTranslation( 'ID_OPEN' );
+                    $aFields['VIEW1'] = G::LoadTranslation('ID_OPEN');
 
-                    $aFields['VIEW2'] = G::LoadTranslation( 'ID_OPEN' );
+                    $aFields['VIEW2'] = G::LoadTranslation('ID_OPEN');
 
                     $aFields['FILE1'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&v=' . $lastDocVersion . '&ext=doc&random=' . rand() . '&PHPSESSID=' . @session_id();
 
                     $aFields['FILE2'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&v=' . $lastDocVersion . '&ext=pdf&random=' . rand() . '&PHPSESSID=' . @session_id();
 
-                    if (is_array( $listing )) {
+                    if (is_array($listing)) {
                         //If exist in Plugin Document List
                         foreach ($listing as $folderitem) {
                             if (($folderitem->filename == $aFields['APP_DOC_UID']) && ($folderitem->type == 'DOC')) {
-                                $aFields['VIEW1'] = G::LoadTranslation( 'ID_GET_EXTERNAL_FILE' );
+                                $aFields['VIEW1'] = G::LoadTranslation('ID_GET_EXTERNAL_FILE');
                                 $aFields['FILE1'] = $folderitem->downloadScript;
                                 continue;
                             }
                             if (($folderitem->filename == $aFields['APP_DOC_UID']) && ($folderitem->type == 'PDF')) {
-                                $aFields['VIEW2'] = G::LoadTranslation( 'ID_GET_EXTERNAL_FILE' );
+                                $aFields['VIEW2'] = G::LoadTranslation('ID_GET_EXTERNAL_FILE');
                                 $aFields['FILE2'] = $folderitem->downloadScript;
                                 continue;
                             }
@@ -757,15 +721,15 @@ try {
                     }
 
                     if (($aGields['OUT_DOC_GENERATE'] == 'BOTH') || ($aGields['OUT_DOC_GENERATE'] == '')) {
-                        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocument1', '', G::array_merges( $aOD, $aFields ), '' );
+                        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ViewOutputDocument1', '', G::array_merges($aOD, $aFields), '');
                     }
 
                     if ($aGields['OUT_DOC_GENERATE'] == 'DOC') {
-                        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocument2', '', G::array_merges( $aOD, $aFields ), '' );
+                        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ViewOutputDocument2', '', G::array_merges($aOD, $aFields), '');
                     }
 
                     if ($aGields['OUT_DOC_GENERATE'] == 'PDF') {
-                        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocument3', '', G::array_merges( $aOD, $aFields ), '' );
+                        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ViewOutputDocument3', '', G::array_merges($aOD, $aFields), '');
                     }
                     break;
             }
@@ -773,26 +737,26 @@ try {
         case 'ASSIGN_TASK':
             $oDerivation = new Derivation();
             $oProcess = new Process();
-            $aData = $oCase->loadCase( $_SESSION['APPLICATION'] );
+            $aData = $oCase->loadCase($_SESSION['APPLICATION']);
 
-            $aFields['PROCESS'] = $oProcess->load( $_SESSION['PROCESS'] );
+            $aFields['PROCESS'] = $oProcess->load($_SESSION['PROCESS']);
             $aFields['PREVIOUS_PAGE'] = $aPreviousStep['PAGE'];
-            $aFields['PREVIOUS_PAGE_LABEL'] = G::LoadTranslation( 'ID_PREVIOUS_STEP' );
-            $aFields['ASSIGN_TASK'] = G::LoadTranslation( 'ID_ASSIGN_TASK' );
-            $aFields['END_OF_PROCESS'] = G::LoadTranslation( 'ID_END_OF_PROCESS' );
-            $aFields['NEXT_TASK_LABEL'] = G::LoadTranslation( 'ID_NEXT_TASK' );
-            $aFields['EMPLOYEE'] = G::LoadTranslation( 'ID_EMPLOYEE' );
-            $aFields['LAST_EMPLOYEE'] = G::LoadTranslation( 'ID_LAST_EMPLOYEE' );
-            $aFields['OPTION_LABEL'] = G::LoadTranslation( 'ID_OPTION' );
-            $aFields['CONTINUE'] = G::LoadTranslation( 'ID_CONTINUE' );
-            $aFields['FINISH'] = G::LoadTranslation( 'ID_FINISH' );
-            $aFields['CONTINUE_WITH_OPTION'] = G::LoadTranslation( 'ID_CONTINUE_WITH_OPTION' );
-            $aFields['FINISH_WITH_OPTION'] = G::LoadTranslation( 'ID_FINISH_WITH_OPTION' );
-            $aFields['TAS_TIMING_TITLE'] = G::LoadTranslation( 'ID_TIMING_CONTROL' );
-            $aFields['TAS_DURATION'] = G::LoadTranslation( 'ID_TASK_DURATION' );
-            $aFields['TAS_TIMEUNIT'] = G::LoadTranslation( 'ID_TIME_UNIT' );
-            $aFields['TAS_TYPE_DAY'] = G::LoadTranslation( 'ID_COUNT_DAYS' );
-            $aFields['TAS_CALENDAR'] = G::LoadTranslation( 'ID_CALENDAR' );
+            $aFields['PREVIOUS_PAGE_LABEL'] = G::LoadTranslation('ID_PREVIOUS_STEP');
+            $aFields['ASSIGN_TASK'] = G::LoadTranslation('ID_ASSIGN_TASK');
+            $aFields['END_OF_PROCESS'] = G::LoadTranslation('ID_END_OF_PROCESS');
+            $aFields['NEXT_TASK_LABEL'] = G::LoadTranslation('ID_NEXT_TASK');
+            $aFields['EMPLOYEE'] = G::LoadTranslation('ID_EMPLOYEE');
+            $aFields['LAST_EMPLOYEE'] = G::LoadTranslation('ID_LAST_EMPLOYEE');
+            $aFields['OPTION_LABEL'] = G::LoadTranslation('ID_OPTION');
+            $aFields['CONTINUE'] = G::LoadTranslation('ID_CONTINUE');
+            $aFields['FINISH'] = G::LoadTranslation('ID_FINISH');
+            $aFields['CONTINUE_WITH_OPTION'] = G::LoadTranslation('ID_CONTINUE_WITH_OPTION');
+            $aFields['FINISH_WITH_OPTION'] = G::LoadTranslation('ID_FINISH_WITH_OPTION');
+            $aFields['TAS_TIMING_TITLE'] = G::LoadTranslation('ID_TIMING_CONTROL');
+            $aFields['TAS_DURATION'] = G::LoadTranslation('ID_TASK_DURATION');
+            $aFields['TAS_TIMEUNIT'] = G::LoadTranslation('ID_TIME_UNIT');
+            $aFields['TAS_TYPE_DAY'] = G::LoadTranslation('ID_COUNT_DAYS');
+            $aFields['TAS_CALENDAR'] = G::LoadTranslation('ID_CALENDAR');
 
             $oRoute = new \ProcessMaker\Core\RoutingScreen();
             $arrayData = array(
@@ -802,8 +766,8 @@ try {
             );
             $aFields['TASK'] = $oRoute->prepareRoutingScreen($arrayData);
 
-            if (empty( $aFields['TASK'] )) {
-                throw (new Exception( G::LoadTranslation( 'ID_NO_DERIVATION_RULE' ) ));
+            if (empty($aFields['TASK'])) {
+                throw (new Exception(G::LoadTranslation('ID_NO_DERIVATION_RULE')));
             }
 
             //Take the first derivation rule as the task derivation rule type.
@@ -814,18 +778,16 @@ try {
                 $sPriority = ''; //set priority value
                 if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'] != '') {
                     //TO DO: review this type of assignment
-                    if (isset( $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'] )] )) {
-                        $sPriority = $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'] )];
+                    if (isset($aData['APP_DATA'][str_replace('@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'])])) {
+                        $sPriority = $aData['APP_DATA'][str_replace('@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'])];
                     }
                 } //set priority value
 
-                //$sTask = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_UID'];
                 //TAS_UID has a hidden field to store the TAS_UID
                 $hiddenName = "form[TASKS][" . $sKey . "][TAS_UID]";
                 $hiddenField = '<input type="hidden" name="' . $hiddenName . '" id="' . $hiddenName . '" value="' . $aValues['NEXT_TASK']['TAS_UID'] . '">';
                 $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_HIDDEN_FIELD'] = $hiddenField;
 
-                //print "<hr>".$aValues['NEXT_TASK']['TAS_ASSIGN_TYPE']."<hr>";
                 switch ($aValues['NEXT_TASK']['TAS_ASSIGN_TYPE']) {
                     case 'EVALUATE':
                     case 'REPORT_TO':
@@ -834,7 +796,6 @@ try {
                         $hiddenName = "form[TASKS][" . $sKey . "][USR_UID]";
                         $aFields['TASK'][$sKey]['NEXT_TASK']['USR_UID'] = $aFields['TASK'][$sKey]['NEXT_TASK']['USER_ASSIGNED']['USR_FULLNAME'];
                         $aFields['TASK'][$sKey]['NEXT_TASK']['USR_HIDDEN_FIELD'] = '<input type="hidden" name="' . $hiddenName . '" id="' . $hiddenName . '" value="' . $aValues['NEXT_TASK']['USER_ASSIGNED']['USR_UID'] . '">';
-                        //var_dump($aFields);
                         //there is a error with reportsTo, when the USR_UID is empty means there are no manager for this user, so we are disabling buttons
                         //but this validation is not for SELF_SERVICE
                         if ($aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'] != 'SELF_SERVICE') {
@@ -844,13 +805,13 @@ try {
                         }
                         break;
                     case 'MANUAL':
-                        $Aux = array ();
+                        $Aux = [];
                         foreach ($aValues['NEXT_TASK']['USER_ASSIGNED'] as $aUser) {
                             $Aux[$aUser['USR_UID']] = $aUser['USR_FULLNAME'];
                         }
-                        asort( $Aux );
+                        asort($Aux);
                         $sAux = '<select name="form[TASKS][' . $sKey . '][USR_UID]" id="form[TASKS][' . $sKey . '][USR_UID]">';
-                        $sAux .= '<option value="" enabled>' . G::LoadTranslation( 'ID_SELECT' ) . '</option>';
+                        $sAux .= '<option value="" enabled>' . G::LoadTranslation('ID_SELECT') . '</option>';
                         foreach ($Aux as $key => $value) {
                             $sAux .= '<option value="' . $key . '">' . $value . '</option>';
                         }
@@ -861,28 +822,28 @@ try {
                     case 'CANCEL_MI':
                     case 'STATIC_MI':
                         //count the Users in the group
-                        $cntInstanceUsers = count( $aValues['NEXT_TASK']['USER_ASSIGNED'] );
+                        $cntInstanceUsers = count($aValues['NEXT_TASK']['USER_ASSIGNED']);
 
                         //set TAS_MI_INSTANCE_VARIABLE value
                         $sMIinstanceVar = '';
                         if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] != '') {
-                            if (isset( $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] )] )) {
-                                $sMIinstanceVar = $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] )];
+                            if (isset($aData['APP_DATA'][str_replace('@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'])])) {
+                                $sMIinstanceVar = $aData['APP_DATA'][str_replace('@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'])];
                                 if ($sMIinstanceVar > $cntInstanceUsers) {
-                                    throw (new Exception( "Total Multiple Instance Task cannot be greater than number of users in the group." ));
+                                    throw (new Exception("Total Multiple Instance Task cannot be greater than number of users in the group."));
                                 } elseif ($sMIinstanceVar == 0) {
-                                    throw (new Exception( "Total Multiple Instance Task cannot be zero." ));
+                                    throw (new Exception("Total Multiple Instance Task cannot be zero."));
                                 }
-                            } elseif (is_int( (int) $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'] )) {
+                            } elseif (is_int((int)$aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'])) {
                                 $sMIinstanceVar = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_INSTANCE_VARIABLE'];
                                 if ($sMIinstanceVar > $cntInstanceUsers) {
-                                    throw (new Exception( "Total Multiple Instance Task cannot be greater than number of users in the group." ));
+                                    throw (new Exception("Total Multiple Instance Task cannot be greater than number of users in the group."));
                                 }
                             } else {
-                                throw (new Exception( "Total Multiple Instance Task variable doesn't have valid value." ));
+                                throw (new Exception("Total Multiple Instance Task variable doesn't have valid value."));
                             }
                         } else {
-                            throw (new Exception( "Total Multiple Instance Task variable doesn't have valid value." ));
+                            throw (new Exception("Total Multiple Instance Task variable doesn't have valid value."));
                             ////set TAS_MI_INSTANCE_VARIABLE value
                         }
 
@@ -890,25 +851,23 @@ try {
                         //set TAS_MI_COMPLETE_VARIABLE value
                         $sMIcompleteVar = '';
                         if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] != '') {
-                            if (isset( $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] )] )) {
-                                $sMIcompleteVar = $aData['APP_DATA'][str_replace( '@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] )];
-                                //
+                            if (isset($aData['APP_DATA'][str_replace('@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'])])) {
+                                $sMIcompleteVar = $aData['APP_DATA'][str_replace('@@', '', $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'])];
                                 if ($sMIcompleteVar > $sMIinstanceVar) {
-                                    throw (new Exception( "Total Multiple Instance Task to complete cannot be greater than Total number of Instances." ));
+                                    throw (new Exception("Total Multiple Instance Task to complete cannot be greater than Total number of Instances."));
                                 }
-                            } elseif (is_int( (int) $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'] )) {
+                            } elseif (is_int((int)$aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'])) {
                                 $sMIcompleteVar = $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_MI_COMPLETE_VARIABLE'];
                                 if ($sMIcompleteVar > $sMIinstanceVar) {
-                                    throw (new Exception( "Total Multiple Instance Task to complete cannot be greater than Total number of Instances." ));
+                                    throw (new Exception("Total Multiple Instance Task to complete cannot be greater than Total number of Instances."));
                                 }
                             } else {
-                                throw (new Exception( "Total Multiple Instance Task to complete variable doesn't have valid value." ));
+                                throw (new Exception("Total Multiple Instance Task to complete variable doesn't have valid value."));
                             }
-
                         } else {
-                            throw (new Exception( "Total Multiple Instance Task to complete variable doesn't have valid value." ));
+                            throw (new Exception("Total Multiple Instance Task to complete variable doesn't have valid value."));
                         }
-                            //set TAS_MI_COMPLETE_VARIABLE value
+                        //set TAS_MI_COMPLETE_VARIABLE value
                         $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_NEXT'] = $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'];
 
                         //If the Users in the group is equal to the MI Instance variable then Show all the users without Dropdown
@@ -920,17 +879,17 @@ try {
                             }
                         }                         //If the Users in the group is not equal to the MI Instance variable then Show Only count users in dropdown
                         else {
-                            $Aux = array ();
+                            $Aux = [];
                             foreach ($aValues['NEXT_TASK']['USER_ASSIGNED'] as $aUser) {
                                 $Aux[$aUser['USR_UID']] = $aUser['USR_FULLNAME'];
                             }
-                            asort( $Aux );
-                            $aAux = '<option value="" enabled>' . G::LoadTranslation( 'ID_SELECT' ) . '</option>';
+                            asort($Aux);
+                            $aAux = '<option value="" enabled>' . G::LoadTranslation('ID_SELECT') . '</option>';
                             foreach ($Aux as $akey => $value) {
                                 $aAux .= '<option value="' . $akey . '">' . $value . '</option>';
                             }
 
-                            for ($key = 0; $key < $sMIinstanceVar; $key ++) {
+                            for ($key = 0; $key < $sMIinstanceVar; $key++) {
                                 $hiddenName = "form[TASKS][" . $sKey . "][NEXT_TASK][USER_ASSIGNED][" . $key . "][USR_UID]";
                                 $sAux = "<select name=$hiddenName id=$hiddenName";
                                 $sAux .= $aAux;
@@ -942,14 +901,14 @@ try {
                         break;
                     case '': //when this task is the Finish process
                     case 'nobody':
-                        $userFields = $oDerivation->getUsersFullNameFromArray( $aFields['TASK'][$sKey]['USER_UID'] );
+                        $userFields = $oDerivation->getUsersFullNameFromArray($aFields['TASK'][$sKey]['USER_UID']);
                         $aFields['TASK'][$sKey]['NEXT_TASK']['USR_UID'] = $userFields['USR_FULLNAME'];
                         $aFields['TASK'][$sKey]['NEXT_TASK']['ROU_FINISH_FLAG'] = true;
                         $aFields['PROCESS']['ROU_FINISH_FLAG'] = true;
                         break;
                     case "MULTIPLE_INSTANCE":
                     case "MULTIPLE_INSTANCE_VALUE_BASED":
-                        $arrayAux = array();
+                        $arrayAux = [];
 
                         foreach ($aValues["NEXT_TASK"]["USER_ASSIGNED"] as $value) {
                             $arrayAux[$value["USR_UID"]] = $value["USR_FULLNAME"];
@@ -961,7 +920,7 @@ try {
                         break;
                 }
 
-                $optionTaskType = (isset($aFields["TASK"][$sKey]["NEXT_TASK"]["TAS_TYPE"]))? $aFields["TASK"][$sKey]["NEXT_TASK"]["TAS_TYPE"] : "";
+                $optionTaskType = (isset($aFields["TASK"][$sKey]["NEXT_TASK"]["TAS_TYPE"])) ? $aFields["TASK"][$sKey]["NEXT_TASK"]["TAS_TYPE"] : "";
 
                 switch ($optionTaskType) {
                     case "SERVICE-TASK":
@@ -985,7 +944,7 @@ try {
                 */
                 if ($aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'] != '') {
                     //Check for End of Process
-                    $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TRANSFER_FLY'] = strtolower( $aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] );
+                    $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TRANSFER_FLY'] = strtolower($aValues['NEXT_TASK']['TAS_TRANSFER_FLY']);
                     $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] = "<input type=hidden name='" . $hiddenName . "[NEXT_TASK][TAS_TRANSFER_HIDDEN_FLY]' id='" . $hiddenName . "[NEXT_TASK][TAS_TRANSFER_HIDDEN_FLY]' value=" . $aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] . ">";
                     if ($aValues['NEXT_TASK']['TAS_TRANSFER_FLY'] == 'true') {
                         $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_DURATION'] = '<input type="text" size="5" name="' . $hiddenName . '[NEXT_TASK][TAS_DURATION]" id="' . $hiddenName . '[NEXT_TASK][TAS_DURATION]" value="' . $aValues['NEXT_TASK']['TAS_DURATION'] . '">';
@@ -994,7 +953,7 @@ try {
                             $hoursSelected = "selected = 'selected'";
                         } else {
                             if ($aFields['TASK'][$sKey]['NEXT_TASK']['TAS_TIMEUNIT'] == 'MINUTES') {
-                               $minSelected = "selected = 'selected'";
+                                $minSelected = "selected = 'selected'";
                             }
                             $daysSelected = "selected = 'selected'";
                         }
@@ -1022,44 +981,43 @@ try {
                         //Check for
 
                         $calendar = new Calendar();
-                        $calendarObj = $calendar->getCalendarList( true, true );
+                        $calendarObj = $calendar->getCalendarList(true, true);
                         $availableCalendar = $calendarObj['array'];
                         $aCalendar['CALENDAR_UID'] = '00000000000000000000000000000001';
                         $aCalendar['CALENDAR_NAME'] = 'DEFAULT';
                         $sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_CALENDAR] id= ' . $hiddenName . '[NEXT_TASK][TAS_CALENDAR] ';
                         $sAux .= "<option value='none'>-None-</option> ";
                         foreach ($availableCalendar as $aCalendar) {
-                            if (is_array( $aCalendar )) {
+                            if (is_array($aCalendar)) {
                                 $sAux .= "<option value='" . $aCalendar['CALENDAR_UID'] . "'>" . $aCalendar['CALENDAR_NAME'] . "</option> ";
                             }
                         }
                         $sAux .= '</select>';
                         $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_CALENDAR'] = $sAux;
-
                     }
 
                     $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_ASSIGN_TYPE'] = '<input type="hidden" name="' . $hiddenName . '[TAS_ASSIGN_TYPE]"   id="' . $hiddenName . '[TAS_ASSIGN_TYPE]"   value="' . $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'] . '">';
-                    if (isset( $aValues['NEXT_TASK']['TAS_DEF_PROC_CODE'] )) {
+                    if (isset($aValues['NEXT_TASK']['TAS_DEF_PROC_CODE'])) {
                         $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_DEF_PROC_CODE'] = '<input type="hidden" name="' . $hiddenName . '[TAS_DEF_PROC_CODE]" id="' . $hiddenName . '[TAS_DEF_PROC_CODE]" value="' . $aValues['NEXT_TASK']['TAS_DEF_PROC_CODE'] . '">';
                     } else {
                         $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_DEF_PROC_CODE'] = '<input type="hidden" name="' . $hiddenName . '[TAS_DEF_PROC_CODE]" id="' . $hiddenName . '[TAS_DEF_PROC_CODE]" value="">';
                     }
                     $aFields['TASK'][$sKey]['NEXT_TASK']['DEL_PRIORITY'] = '<input type="hidden" name="' . $hiddenName . '[DEL_PRIORITY]"      id="' . $hiddenName . '[DEL_PRIORITY]"      value="' . $sPriority . '">';
                     $aFields['TASK'][$sKey]['NEXT_TASK']['TAS_PARENT'] = '<input type="hidden" name="' . $hiddenName . '[TAS_PARENT]"        id="' . $hiddenName . '[TAS_PARENT]"        value="' . $aValues['NEXT_TASK']['TAS_PARENT'] . '">';
-                    if(isset($aValues['NEXT_TASK']['ROU_PREVIOUS_TASK']) && isset($aValues['NEXT_TASK']['ROU_PREVIOUS_TYPE'])){
+                    if (isset($aValues['NEXT_TASK']['ROU_PREVIOUS_TASK']) && isset($aValues['NEXT_TASK']['ROU_PREVIOUS_TYPE'])) {
                         $aFields['TASK'][$sKey]['NEXT_TASK']['ROU_PREVIOUS_TASK'] = '<input type="hidden" name="' . $hiddenName . '[ROU_PREVIOUS_TASK]"        id="' . $hiddenName . '[ROU_PREVIOUS_TASK]"        value="' . $aValues['NEXT_TASK']['ROU_PREVIOUS_TASK'] . '">';
                         $aFields['TASK'][$sKey]['NEXT_TASK']['ROU_PREVIOUS_TYPE'] = '<input type="hidden" name="' . $hiddenName . '[ROU_PREVIOUS_TYPE]"        id="' . $hiddenName . '[ROU_PREVIOUS_TYPE]"        value="' . $aValues['NEXT_TASK']['ROU_PREVIOUS_TYPE'] . '">';
                     }
-                    if(isset($aValues['ROU_CONDITION'])){
+                    if (isset($aValues['ROU_CONDITION'])) {
                         $aFields['TASK'][$sKey]['NEXT_TASK']['ROU_CONDITION'] = '<input type="hidden" name="' . $hiddenName . '[ROU_CONDITION]"        id="' . $hiddenName . '[ROU_CONDITION]"        value="' . $aValues['ROU_CONDITION'] . '">';
                     }
-                    if(isset($aValues['SOURCE_UID'])){
+                    if (isset($aValues['SOURCE_UID'])) {
                         $aFields['TASK'][$sKey]['NEXT_TASK']['SOURCE_UID'] = '<input type="hidden" name="' . $hiddenName . '[SOURCE_UID]"        id="' . $hiddenName . '[SOURCE_UID]"        value="' . $aValues['SOURCE_UID'] . '">';
                     }
                 }
             }
 
-            $aFields['PROCESSING_MESSAGE'] = G::loadTranslation( 'ID_PROCESSING' );
+            $aFields['PROCESSING_MESSAGE'] = G::loadTranslation('ID_PROCESSING');
 
             /**
              * New Feature: Derivation Screen can be personalized
@@ -1067,17 +1025,17 @@ try {
              * @author Erik Amaru Ortiz <erik@colosa.com>
              */
             $tplFile = 'cases/cases_ScreenDerivation';
-            $task = TaskPeer::retrieveByPk( $_SESSION['TASK'] );
+            $task = TaskPeer::retrieveByPk($_SESSION['TASK']);
 
             $tasDerivationScreenTpl = $task->getTasDerivationScreenTpl();
 
-            if (! empty( $tasDerivationScreenTpl )) {
-                //erik: first, verify if the task has a personalized template (for derivation screen)
+            if (!empty($tasDerivationScreenTpl)) {
+                //first, verify if the task has a personalized template (for derivation screen)
                 $tplFile = $tasDerivationScreenTpl;
                 $tplFile = PATH_DATA_MAILTEMPLATES . $aFields['PROCESS']['PRO_UID'] . PATH_SEP . $tplFile;
             } else {
-                //erik: verify if the process has a personalized template (for derivation screen)
-                if (! empty( $aFields['PROCESS']['PRO_DERIVATION_SCREEN_TPL'] )) {
+                //verify if the process has a personalized template (for derivation screen)
+                if (!empty($aFields['PROCESS']['PRO_DERIVATION_SCREEN_TPL'])) {
                     $tplFile = $aFields['PROCESS']['PRO_DERIVATION_SCREEN_TPL'];
                     $tplFile = PATH_DATA_MAILTEMPLATES . $aFields['PROCESS']['PRO_UID'] . PATH_SEP . $tplFile;
                 }
@@ -1115,11 +1073,11 @@ try {
                 }
             }
 
-            $G_PUBLISH->AddContent( 'smarty', $tplFile, '', '', $aFields );
+            $G_PUBLISH->AddContent('smarty', $tplFile, '', '', $aFields);
             break;
         case 'EXTERNAL':
             if ($noShowTitle == 0) {
-                $G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $array );
+                $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $array);
             }
             $oPluginRegistry = PluginRegistry::loadSingleton();
             $externalSteps = $oPluginRegistry->getSteps();
@@ -1133,59 +1091,59 @@ try {
 
                 }
             }
-            if (class_exists( $sNamespace . "plugin" )) {
-                if (! $aPreviousStep) {
+            if (class_exists($sNamespace . "plugin")) {
+                if (!$aPreviousStep) {
                     $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
                 } else {
                     $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP'] = $aPreviousStep['PAGE'];
-                    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation( "ID_PREVIOUS_STEP" );
+                    $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = G::loadTranslation("ID_PREVIOUS_STEP");
                 }
                 $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = $aNextStep['PAGE'];
-                $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation( "ID_NEXT_STEP" );
+                $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = G::loadTranslation("ID_NEXT_STEP");
 
                 /**
                  * Added By erik date: 16-05-08
                  * Description: this was added for the additional database connections
                  */
 
-                $oDbConnections = new DbConnections( $_SESSION['PROCESS'] );
+                $oDbConnections = new DbConnections($_SESSION['PROCESS']);
                 $oDbConnections->loadAdditionalConnections();
                 $stepFilename = "$sNamespace/$sStepName";
-                G::evalJScript( "
+                G::evalJScript("
         if (parent.setCurrent) {
           parent.setCurrent('" . $_GET['UID'] . "');
-        }" );
+        }");
 
-                $G_PUBLISH->AddContent( 'content', $stepFilename );
+                $G_PUBLISH->AddContent('content', $stepFilename);
             } else {
-                $aMessage['MESSAGE'] = G::loadTranslation( 'ID_EXTERNAL_STEP_MISSING', SYS_LANG, array ("plugin" => $sNamespace
-                ) );
-                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
+                $aMessage['MESSAGE'] = G::loadTranslation('ID_EXTERNAL_STEP_MISSING', SYS_LANG, array("plugin" => $sNamespace
+                ));
+                $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage);
             }
             break;
     }
     //Add content content step - End
 } catch (Exception $e) {
     //Check if the process is BPMN
-    if(isset($oProcessFieds['PRO_BPMN']) && $oProcessFieds['PRO_BPMN'] == 1){
-      G::SendTemporalMessage( G::LoadTranslation( 'ID_BPMN_PROCESS_DEF_PROBLEM' ), 'error', 'string', 3, 100 );
-    }else{
-      G::SendTemporalMessage( G::LoadTranslation( 'ID_PROCESS_DEF_PROBLEM' ), 'error', 'string', 3, 100 );
+    if (isset($oProcessFieds['PRO_BPMN']) && $oProcessFieds['PRO_BPMN'] == 1) {
+        G::SendTemporalMessage(G::LoadTranslation('ID_BPMN_PROCESS_DEF_PROBLEM'), 'error', 'string', 3, 100);
+    } else {
+        G::SendTemporalMessage(G::LoadTranslation('ID_PROCESS_DEF_PROBLEM'), 'error', 'string', 3, 100);
     }
 
-    $aMessage = array ();
+    $aMessage = [];
     $aMessage['MESSAGE'] = $e->getMessage();
     $G_PUBLISH = new Publisher();
-    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-    G::RenderPage( 'publish', 'blank' );
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage);
+    G::RenderPage('publish', 'blank');
     die();
 }
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addScriptFile( "/jscore/cases/core/cases_Step.js" );
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addScriptFile("/jscore/cases/core/cases_Step.js");
 
 if (!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) {
-    $oHeadPublisher->addScriptCode( "
+    $oHeadPublisher->addScriptCode("
                                         if (typeof parent != 'undefined') {
                                             if (parent.showCaseNavigatorPanel) {
                                                 parent.showCaseNavigatorPanel('$sStatus');
@@ -1194,15 +1152,14 @@ if (!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) {
                                             if (parent.setCurrent) {
                                                 parent.setCurrent('" . $_GET['UID'] . "');
                                             }
-                                        }" );
-
+                                        }");
 }
 
-G::RenderPage( 'publish', 'blank' );
+G::RenderPage('publish', 'blank');
 
 if ($_SESSION['TRIGGER_DEBUG']['ISSET'] && !$isIE) {
-    G::evalJScript( '
+    G::evalJScript('
     if (typeof showdebug != \'undefined\') {
       showdebug();
-    }' );
+    }');
 }
diff --git a/workflow/engine/methods/cases/cases_StepToRevise.php b/workflow/engine/methods/cases/cases_StepToRevise.php
index df72f5b7c..30d9ad870 100644
--- a/workflow/engine/methods/cases/cases_StepToRevise.php
+++ b/workflow/engine/methods/cases/cases_StepToRevise.php
@@ -25,16 +25,16 @@
 /* Permissions */
 
 $filter = new InputFilter();
-$_GET = $filter->xssFilterHard($_GET,"url");
-switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
+$_GET = $filter->xssFilterHard($_GET, "url");
+switch ($RBAC->userCanAccess('PM_SUPERVISOR')) {
     case - 2:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
     case - 1:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
 }
@@ -42,17 +42,17 @@ switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
 //If the user does not have the permission and the user can be access from url
 $processUser = new ProcessUser();
 $userAccess = $processUser->validateUserAccess($_GET['PRO_UID'], $_SESSION['USER_LOGGED']);
-if(!$userAccess) {
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-    G::header( 'location: ../login/login' );
+if (!$userAccess) {
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+    G::header('location: ../login/login');
     die();
 }
 
-$_SESSION = $filter->xssFilterHard($_SESSION,"url");
+$_SESSION = $filter->xssFilterHard($_SESSION, "url");
 if ((int) $_SESSION['INDEX'] < 1) {
     $_SERVER['HTTP_REFERER'] = $filter->xssFilterHard($_SERVER['HTTP_REFERER']);
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-    G::header( 'location: ' . $_SERVER['HTTP_REFERER'] );
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+    G::header('location: ' . $_SERVER['HTTP_REFERER']);
     die();
 }
 
@@ -63,21 +63,21 @@ $G_ID_MENU_SELECTED = 'CASES';
 $G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
 
 /* Prepare page before to show */
-$oTemplatePower = new TemplatePower( PATH_TPL . 'cases/cases_Step.html' );
+$oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step.html');
 $oTemplatePower->prepare();
 $G_PUBLISH = new Publisher();
 $oCase = new Cases();
-$Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+$Fields = $oCase->loadCase($_SESSION['APPLICATION']);
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addScriptCode( "
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addScriptCode("
 if (typeof parent != 'undefined') {
   if (parent.showCaseNavigatorPanel) {
     parent.showCaseNavigatorPanel('{$Fields['APP_STATUS']}');
   }
-}" );
+}");
 // DEPRECATED this script call is marked for removal since almost all the interface is extJS based
-$oHeadPublisher->addScriptCode( '
+$oHeadPublisher->addScriptCode('
     var Cse = {};
     Cse.panels = {};
     var leimnud = new maborak();
@@ -88,19 +88,19 @@ $oHeadPublisher->addScriptCode( '
     leimnud.Package.Load("processmap",{Type:"file",Absolute:true,Path:"/jscore/processmap/core/processmap.js"});
     leimnud.exec(leimnud.fix.memoryLeak);
     leimnud.event.add(window,"load",function(){
-        ' . (isset( $_SESSION['showCasesWindow'] ) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '
+        ' . (isset($_SESSION['showCasesWindow']) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '
     });
-' );
+');
 // DEPRECATED this script call is marked for removal
-$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
+$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
 
-if (! isset( $_GET['type'] )) {
+if (! isset($_GET['type'])) {
     $_GET['type'] = 'DYNAFORM';
 }
-if (! isset( $_GET['position'] )) {
+if (! isset($_GET['position'])) {
     $_GET['position'] = $_SESSION['STEP_POSITION'];
-}else{
-    if($_GET['type'] == 'DYNAFORM'){
+} else {
+    if ($_GET['type'] == 'DYNAFORM') {
         $criteria = new Criteria();
 
         $criteria->addSelectColumn(StepSupervisorPeer::STEP_POSITION);
@@ -113,7 +113,7 @@ if (! isset( $_GET['position'] )) {
         $aRow = $rsCriteria->getRow();
 
         $_GET['position'] = $aRow['STEP_POSITION'];
-    }else{
+    } else {
         $_GET['position'] = 1;
     }
 }
@@ -121,7 +121,7 @@ if (! isset( $_GET['position'] )) {
 $_SESSION['STEP_POSITION'] = (int) $_GET['position'];
 
 //Obtain previous and next step - Start
-if (isset( $_GET['type'] )) {
+if (isset($_GET['type'])) {
     $sType = $_GET['type'];
 } else {
     $sType = '';
@@ -135,11 +135,11 @@ $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
  * date: 16-05-08
  * Description: this was added for the additional database connections
  */
-if (! isset( $_GET['ex'] )) {
+if (! isset($_GET['ex'])) {
     $_GET['ex'] = $_GET['position'];
 }
 
-$oDbConnections = new DbConnections( $_SESSION['PROCESS'] );
+$oDbConnections = new DbConnections($_SESSION['PROCESS']);
 $oDbConnections->loadAdditionalConnections();
 
 $G_PUBLISH = new Publisher();
@@ -152,12 +152,12 @@ if ($_GET['DYN_UID'] != '') {
     $a = new PmDynaform($FieldsPmDynaform);
     if ($a->isResponsive()) {
         $a->printEditSupervisor();
-    }else{
-        $G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['DYN_UID'], '', $Fields['APP_DATA'], 'cases_SaveDataSupervisor?UID=' . $_GET['DYN_UID'] . '&ex=' .  $_GET['ex']);
+    } else {
+        $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['DYN_UID'], '', $Fields['APP_DATA'], 'cases_SaveDataSupervisor?UID=' . $_GET['DYN_UID'] . '&ex=' .  $_GET['ex']);
     }
 }
 
-G::RenderPage( 'publish', 'blank' );
+G::RenderPage('publish', 'blank');
 ?>
 
 <script>
@@ -181,4 +181,3 @@ function setSelect()
 </script>
 
 <?php
-
diff --git a/workflow/engine/methods/cases/cases_StepToReviseInputs.php b/workflow/engine/methods/cases/cases_StepToReviseInputs.php
index 27f4045c5..077240d2b 100644
--- a/workflow/engine/methods/cases/cases_StepToReviseInputs.php
+++ b/workflow/engine/methods/cases/cases_StepToReviseInputs.php
@@ -25,24 +25,24 @@
 /* Permissions */
 
 $filter = new InputFilter();
-$_GET = $filter->xssFilterHard($_GET,"url");
-switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
+$_GET = $filter->xssFilterHard($_GET, "url");
+switch ($RBAC->userCanAccess('PM_SUPERVISOR')) {
     case - 2:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
     case - 1:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
 }
-$_SESSION = $filter->xssFilterHard($_SESSION,"url");
+$_SESSION = $filter->xssFilterHard($_SESSION, "url");
 if ((int) $_SESSION['INDEX'] < 1) {
     $_SERVER['HTTP_REFERER'] = $filter->xssFilterHard($_SERVER['HTTP_REFERER']);
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-    G::header( 'location: ' . $_SERVER['HTTP_REFERER'] );
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+    G::header('location: ' . $_SERVER['HTTP_REFERER']);
     die();
 }
 
@@ -57,12 +57,12 @@ $G_ID_MENU_SELECTED = 'CASES';
 $G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
 
 /* Prepare page before to show */
-$oTemplatePower = new TemplatePower( PATH_TPL . 'cases/cases_Step.html' );
+$oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step.html');
 $oTemplatePower->prepare();
 $G_PUBLISH = new Publisher();
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 //  Check if these code needs to be removed since the interface ar now moving to ExtJS
-$oHeadPublisher->addScriptCode( '
+$oHeadPublisher->addScriptCode('
     var Cse = {};
     Cse.panels = {};
     var leimnud = new maborak();
@@ -73,62 +73,62 @@ $oHeadPublisher->addScriptCode( '
     leimnud.Package.Load("processmap",{Type:"file",Absolute:true,Path:"/jscore/processmap/core/processmap.js"});
     leimnud.exec(leimnud.fix.memoryLeak);
     leimnud.event.add(window,"load",function(){
-        ' . (isset( $_SESSION['showCasesWindow'] ) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '
+        ' . (isset($_SESSION['showCasesWindow']) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '
 });
-  ' );
+  ');
 //  Check if these code needs to be removed since the interface ar now moving to ExtJS
-$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
+$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
 
-if (! isset( $_GET['position'] )) {
+if (! isset($_GET['position'])) {
     $_GET['position'] = 1;
 }
 
 $_SESSION['STEP_POSITION'] = (int) $_GET['position'];
 $oCase = new Cases();
-$Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+$Fields = $oCase->loadCase($_SESSION['APPLICATION']);
 
 $G_PUBLISH = new Publisher();
 $ex = 0;
-if (! isset( $_GET['ex'] ) || empty($_GET['ex'])) {
+if (! isset($_GET['ex']) || empty($_GET['ex'])) {
     $_GET['ex'] = 0;
 } else {
     $ex = $filter->xssFilterHard($_GET['ex']);
 }
 
-if (! isset( $_GET['INP_DOC_UID'] )) {
+if (! isset($_GET['INP_DOC_UID'])) {
     $oCase = new Cases();
-    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/cases_InputdocsListToRevise', $oCase->getInputDocumentsCriteriaToRevise( $_SESSION['APPLICATION'] ), '' );
+    $G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_InputdocsListToRevise', $oCase->getInputDocumentsCriteriaToRevise($_SESSION['APPLICATION']), '');
 } else {
     $oInputDocument = new InputDocument();
-    $Fields = $oInputDocument->load( $_GET['INP_DOC_UID'] );
+    $Fields = $oInputDocument->load($_GET['INP_DOC_UID']);
     switch ($Fields['INP_DOC_FORM_NEEDED']) {
         case 'REAL':
-            $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_NEW' );
+            $Fields['TYPE_LABEL'] = G::LoadTranslation('ID_NEW');
             $sXmlForm = 'cases/cases_AttachInputDocument2';
             break;
         case 'VIRTUAL':
-            $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_ATTACH' );
+            $Fields['TYPE_LABEL'] = G::LoadTranslation('ID_ATTACH');
             $sXmlForm = 'cases/cases_AttachInputDocument1';
             break;
         case 'VREAL':
-            $Fields['TYPE_LABEL'] = G::LoadTranslation( 'ID_ATTACH' );
+            $Fields['TYPE_LABEL'] = G::LoadTranslation('ID_ATTACH');
             $sXmlForm = 'cases/cases_AttachInputDocument3';
             break;
     }
-    $Fields['MESSAGE1'] = G::LoadTranslation( 'ID_PLEASE_ENTER_COMMENTS' );
-    $Fields['MESSAGE2'] = G::LoadTranslation( 'ID_PLEASE_SELECT_FILE' );
+    $Fields['MESSAGE1'] = G::LoadTranslation('ID_PLEASE_ENTER_COMMENTS');
+    $Fields['MESSAGE2'] = G::LoadTranslation('ID_PLEASE_SELECT_FILE');
     $docName = $Fields['INP_DOC_TITLE'];
-    $oHeadPublisher->addScriptCode( 'var documentName=\'Reviewing Input Document<br>' . $docName . '\';' );
+    $oHeadPublisher->addScriptCode('var documentName=\'Reviewing Input Document<br>' . $docName . '\';');
     //  $G_PUBLISH->AddContent('xmlform', 'xmlform', $sXmlForm, '', $Fields, 'cases_SupervisorSaveDocument?UID=' .
     //$_GET['INP_DOC_UID'] . '&APP_UID=' . $_GET['APP_UID'] . '&position=' . $_GET['position']);
-    $G_PUBLISH->AddContent( 'propeltable', 'cases/paged-table-inputDocumentsToRevise', 'cases/cases_ToReviseInputdocsList', $oCase->getInputDocumentsCriteria( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['INP_DOC_UID'] ), array_merge( array ('DOC_UID' => $_GET['INP_DOC_UID']
-    ), $Fields ) );
+    $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocumentsToRevise', 'cases/cases_ToReviseInputdocsList', $oCase->getInputDocumentsCriteria($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['INP_DOC_UID']), array_merge(array('DOC_UID' => $_GET['INP_DOC_UID']
+    ), $Fields));
     //$aFields
     //  $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_InputdocsList',
     //$oCase->getInputDocumentsCriteria($_SESSION['APPLICATION']));//$aFields
 }
 
-G::RenderPage( 'publish', 'blank' );
+G::RenderPage('publish', 'blank');
 
 ?>
 
@@ -153,4 +153,3 @@ function setSelect()
 </script>
 
 <?php
-
diff --git a/workflow/engine/methods/cases/cases_StepToReviseOutputs.php b/workflow/engine/methods/cases/cases_StepToReviseOutputs.php
index 63ccf001a..f804092e8 100644
--- a/workflow/engine/methods/cases/cases_StepToReviseOutputs.php
+++ b/workflow/engine/methods/cases/cases_StepToReviseOutputs.php
@@ -25,20 +25,20 @@
 /* Permissions */
 
 $filter = new InputFilter();
-$_GET = $filter->xssFilterHard($_GET,"url");
-switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
+$_GET = $filter->xssFilterHard($_GET, "url");
+switch ($RBAC->userCanAccess('PM_SUPERVISOR')) {
     case - 2:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
     case - 1:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
 }
-$_SESSION = $filter->xssFilterHard($_SESSION,"url");
+$_SESSION = $filter->xssFilterHard($_SESSION, "url");
 
 /* Menues */
 $G_MAIN_MENU = 'processmaker';
@@ -47,12 +47,12 @@ $G_ID_MENU_SELECTED = 'CASES';
 $G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
 
 /* Prepare page before to show */
-$oTemplatePower = new TemplatePower( PATH_TPL . 'cases/cases_Step.html' );
+$oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step.html');
 $oTemplatePower->prepare();
 $G_PUBLISH = new Publisher();
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 // check if the code for the addScriptCode is necessary since the interface is now based in ExtJs
-$oHeadPublisher->addScriptCode( '
+$oHeadPublisher->addScriptCode('
 var Cse = {};
 Cse.panels = {};
 var leimnud = new maborak();
@@ -63,14 +63,14 @@ leimnud.Package.Load("cases_Step",{Type:"file",Absolute:true,Path:"/jscore/cases
 leimnud.Package.Load("processmap",{Type:"file",Absolute:true,Path:"/jscore/processmap/core/processmap.js"});
 leimnud.exec(leimnud.fix.memoryLeak);
 leimnud.event.add(window,"load",function(){
-  ' . (isset( $_SESSION['showCasesWindow'] ) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '});
-' );
-$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
+  ' . (isset($_SESSION['showCasesWindow']) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '});
+');
+$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
 $oCase = new Cases();
-$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/cases_OutputdocsListToRevise', $oCase->getOutputDocumentsCriteriaToRevise( $_SESSION['APPLICATION'] ), '' );
-G::RenderPage( 'publish', 'blank' );
+$G_PUBLISH->AddContent('propeltable', 'paged-table', 'cases/cases_OutputdocsListToRevise', $oCase->getOutputDocumentsCriteriaToRevise($_SESSION['APPLICATION']), '');
+G::RenderPage('publish', 'blank');
 
-if (! isset( $_GET['ex'] )) {
+if (! isset($_GET['ex'])) {
     $_GET['ex'] = 0;
 }
 ?>
@@ -97,4 +97,3 @@ function setSelect()
 </script>
 
 <?php
-
diff --git a/workflow/engine/methods/cases/cases_ToReviseOutputDocView.php b/workflow/engine/methods/cases/cases_ToReviseOutputDocView.php
index 5c93e7164..c41fdfca7 100644
--- a/workflow/engine/methods/cases/cases_ToReviseOutputDocView.php
+++ b/workflow/engine/methods/cases/cases_ToReviseOutputDocView.php
@@ -25,20 +25,20 @@
 /* Permissions */
 
 $filter = new InputFilter();
-$_GET = $filter->xssFilterHard($_GET,"url");
-switch ($RBAC->userCanAccess( 'PM_SUPERVISOR' )) {
+$_GET = $filter->xssFilterHard($_GET, "url");
+switch ($RBAC->userCanAccess('PM_SUPERVISOR')) {
     case - 2:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
     case - 1:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
 }
-$_SESSION = $filter->xssFilterHard($_SESSION,"url");
+$_SESSION = $filter->xssFilterHard($_SESSION, "url");
 
 /* Menues */
 $G_MAIN_MENU = 'processmaker';
@@ -47,12 +47,12 @@ $G_ID_MENU_SELECTED = 'CASES';
 $G_ID_SUB_MENU_SELECTED = 'CASES_TO_REVISE';
 
 /* Prepare page before to show */
-$oTemplatePower = new TemplatePower( PATH_TPL . 'cases/cases_Step.html' );
+$oTemplatePower = new TemplatePower(PATH_TPL . 'cases/cases_Step.html');
 $oTemplatePower->prepare();
 $G_PUBLISH = new Publisher();
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addScriptCode( '
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addScriptCode('
 var Cse = {};
 Cse.panels = {};
 var leimnud = new maborak();
@@ -63,17 +63,17 @@ leimnud.Package.Load("cases_Step",{Type:"file",Absolute:true,Path:"/jscore/cases
 leimnud.Package.Load("processmap",{Type:"file",Absolute:true,Path:"/jscore/processmap/core/processmap.js"});
 leimnud.exec(leimnud.fix.memoryLeak);
 leimnud.event.add(window,"load",function(){
-  ' . (isset( $_SESSION['showCasesWindow'] ) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '});
-' );
-$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
+  ' . (isset($_SESSION['showCasesWindow']) ? 'try{' . $_SESSION['showCasesWindow'] . '}catch(e){}' : '') . '});
+');
+$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
 //
 require_once 'classes/model/OutputDocument.php';
 $oOutputDocument = new OutputDocument();
-$aOD = $oOutputDocument->load( $_GET['UID'] );
+$aOD = $oOutputDocument->load($_GET['UID']);
 require_once 'classes/model/AppDocument.php';
 $oAppDocument = new AppDocument();
-$aFields = $oAppDocument->load( $_GET['DOC'] );
-$aFields['VIEW'] = G::LoadTranslation( 'ID_OPEN' );
+$aFields = $oAppDocument->load($_GET['DOC']);
+$aFields['VIEW'] = G::LoadTranslation('ID_OPEN');
 switch ($aOD['OUT_DOC_GENERATE']) {
     case 'DOC':
         $aFields['FILE1'] = 'cases_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=doc&random=' . rand();
@@ -88,11 +88,11 @@ switch ($aOD['OUT_DOC_GENERATE']) {
 }
 
 $G_PUBLISH = new Publisher();
-$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocumentToRevise', '', G::array_merges( $aOD, $aFields ), '' );
+$G_PUBLISH->AddContent('xmlform', 'xmlform', 'cases/cases_ViewOutputDocumentToRevise', '', G::array_merges($aOD, $aFields), '');
 //
-G::RenderPage( 'publish', 'blank' );
+G::RenderPage('publish', 'blank');
 
-if (! isset( $_GET['ex'] )) {
+if (! isset($_GET['ex'])) {
     $_GET['ex'] = 0;
 }
 
@@ -118,4 +118,3 @@ function setSelect()
 }
 </script>
 <?php
-
diff --git a/workflow/engine/methods/cases/derivatedGmail.php b/workflow/engine/methods/cases/derivatedGmail.php
index 1ab94f628..3ffd8a230 100644
--- a/workflow/engine/methods/cases/derivatedGmail.php
+++ b/workflow/engine/methods/cases/derivatedGmail.php
@@ -1,8 +1,8 @@
 <?php 
-$licensedFeatures = & PMLicensedFeatures::getSingleton();
+$licensedFeatures = PMLicensedFeatures::getSingleton();
 if (!$licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-    G::header( 'location: ../login/login' );
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+    G::header('location: ../login/login');
     die;
 }
 $caseId = $_SESSION['APPLICATION'];
@@ -12,6 +12,7 @@ $actualIndex = $_SESSION['INDEX'];
 $cont = 0;
 
 use \ProcessMaker\Services\Api;
+
 $appDel = new AppDelegation();
 
 $actualThread = $appDel->Load($caseId, $actualIndex);
@@ -21,16 +22,15 @@ $oLabels = new labelsGmail();
 $oLabels->addRelabelingToQueue($caseId, $actualIndex, $actualLastIndex, false);
 
 $pmGoogle = new PmGoogleApi();
-if(array_key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && $pmGoogle->getServiceGmailStatus() ){
-	$_SESSION['gmail'] = 0;
-	unset($_SESSION['gmail']); //cleaning session
-	$mUrl = '/sys'. $_SESSION['WORKSPACE'] .'/en/'.$_SESSION['currentSkin'].'/cases/cases_Open?APP_UID='.$caseId.'&DEL_INDEX='.$actualIndex.'&action=sent';
-} else{
-	$mUrl = 'casesListExtJs';
-        if (isset($_SESSION["currentSkin"]) && $_SESSION["currentSkin"] === 'uxs') {
-            $mUrl = '../home';
-        }
+if (array_key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && $pmGoogle->getServiceGmailStatus()) {
+    $_SESSION['gmail'] = 0;
+    unset($_SESSION['gmail']); //cleaning session
+    $mUrl = '/sys'. $_SESSION['WORKSPACE'] .'/en/'.$_SESSION['currentSkin'].'/cases/cases_Open?APP_UID='.$caseId.'&DEL_INDEX='.$actualIndex.'&action=sent';
+} else {
+    $mUrl = 'casesListExtJs';
+    if (isset($_SESSION["currentSkin"]) && $_SESSION["currentSkin"] === 'uxs') {
+        $mUrl = '../home';
+    }
 }
 
-header( 'location:' . $mUrl );
-
+header('location:' . $mUrl);
diff --git a/workflow/engine/methods/cases/main.php b/workflow/engine/methods/cases/main.php
index 1df695d55..2c461e3da 100644
--- a/workflow/engine/methods/cases/main.php
+++ b/workflow/engine/methods/cases/main.php
@@ -4,13 +4,11 @@ $RBAC->requirePermissions('PM_CASES/strict');
 $G_MAIN_MENU = 'processmaker';
 $G_ID_MENU_SELECTED = 'CASES';
 
-$_POST['qs'] = isset($_SERVER['QUERY_STRING'])
-    && $_SERVER['QUERY_STRING'] != '' ? '?' . $_SERVER['QUERY_STRING'] : '';
+$_POST['qs'] = isset($_SERVER['QUERY_STRING']) && $_SERVER['QUERY_STRING'] !== '' ? '?' . $_SERVER['QUERY_STRING'] : '';
 
 $G_PUBLISH = new Publisher();
 $G_PUBLISH->AddContent('view', 'cases/cases_Load');
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addScriptFile('/jscore/src/PM.js');
 $oHeadPublisher->addScriptFile('/jscore/src/Sessions.js');
 G::RenderPage('publish');
-
diff --git a/workflow/engine/methods/cases/main_init.php b/workflow/engine/methods/cases/main_init.php
index 8d233002e..882191496 100644
--- a/workflow/engine/methods/cases/main_init.php
+++ b/workflow/engine/methods/cases/main_init.php
@@ -24,29 +24,29 @@
 
 $conf = new Configurations();
 
-$oHeadPublisher = &headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( "cases/main", false ); //Adding a javascript file .js
-$oHeadPublisher->addContent( "cases/main" ); //Adding a html file  .html.
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript("cases/main", false); //Adding a javascript file .js
+$oHeadPublisher->addContent("cases/main"); //Adding a html file  .html.
 
 $keyMem = "USER_PREFERENCES" . $_SESSION["USER_LOGGED"];
-$memcache = &PMmemcached::getSingleton( config("system.workspace") );
+$memcache = PMmemcached::getSingleton(config("system.workspace"));
 
-if (($arrayConfig = $memcache->get( $keyMem )) === false) {
-    $conf->loadConfig( $x, "USER_PREFERENCES", "", "", $_SESSION["USER_LOGGED"], "" );
+if (($arrayConfig = $memcache->get($keyMem)) === false) {
+    $conf->loadConfig($x, "USER_PREFERENCES", "", "", $_SESSION["USER_LOGGED"], "");
     $arrayConfig = $conf->aConfig;
-    $memcache->set( $keyMem, $arrayConfig, PMmemcached::ONE_HOUR );
+    $memcache->set($keyMem, $arrayConfig, PMmemcached::ONE_HOUR);
 }
 
 $confDefaultOption = "";
 
-if (isset( $arrayConfig["DEFAULT_CASES_MENU"] )) {
+if (isset($arrayConfig["DEFAULT_CASES_MENU"])) {
     //this user has a configuration record
     $confDefaultOption = $arrayConfig["DEFAULT_CASES_MENU"];
 
     global $G_TMP_MENU;
 
     $oMenu = new Menu();
-    $oMenu->load( "cases" );
+    $oMenu->load("cases");
     $defaultOption = "";
 
     foreach ($oMenu->Id as $i => $id) {
@@ -74,13 +74,13 @@ if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) {
 
     if (!empty($arrayResult)) {
         $arrayDefaultOption = [
-            'TO_DO'        => ['CASES_INBOX', 'todo'],
-            'DRAFT'        => ['CASES_DRAFT', 'draft'],
-            'CANCELLED'    => ['CASES_SENT',  'sent'],
-            'COMPLETED'    => ['CASES_SENT',  'sent'],
-            'PARTICIPATED' => ['CASES_SENT',  'sent'],
-            'UNASSIGNED'   => ['CASES_SELFSERVICE', 'unassigned'],
-            'PAUSED'       => ['CASES_PAUSED',      'paused']
+            'TO_DO' => ['CASES_INBOX', 'todo'],
+            'DRAFT' => ['CASES_DRAFT', 'draft'],
+            'CANCELLED' => ['CASES_SENT', 'sent'],
+            'COMPLETED' => ['CASES_SENT', 'sent'],
+            'PARTICIPATED' => ['CASES_SENT', 'sent'],
+            'UNASSIGNED' => ['CASES_SELFSERVICE', 'unassigned'],
+            'PAUSED' => ['CASES_PAUSED', 'paused']
         ];
 
         $confDefaultOption = $arrayDefaultOption[$arrayResult['APP_STATUS']][0];
@@ -122,8 +122,8 @@ if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) {
     }
 }
 
-$oServerConf = & ServerConf::getSingleton();
-if ($oServerConf->isRtl( SYS_LANG )) {
+$oServerConf = ServerConf::getSingleton();
+if ($oServerConf->isRtl(SYS_LANG)) {
     $regionTreePanel = 'east';
     $regionDebug = 'west';
 } else {
@@ -158,7 +158,7 @@ function getDsn()
 {
     list($host, $port) = strpos(DB_HOST, ':') !== false ? explode(':', DB_HOST) : array(DB_HOST, '');
     $port = empty($port) ? '' : ";port=$port";
-    $dsn = DB_ADAPTER.':host='.$host.';dbname='.DB_NAME.$port;
+    $dsn = DB_ADAPTER . ':host=' . $host . ';dbname=' . DB_NAME . $port;
 
     return array('dsn' => $dsn, 'username' => DB_USER, 'password' => DB_PASS);
 }
@@ -179,7 +179,7 @@ function getAuthorizationCode($client)
     ));
 
     $response = $oauthServer->postAuthorize($authorize, $userId, true);
-    $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
+    $code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=') + 5, 40);
 
     return $code;
 }
diff --git a/workflow/engine/methods/cases/open.php b/workflow/engine/methods/cases/open.php
index 178854640..26ee94eec 100644
--- a/workflow/engine/methods/cases/open.php
+++ b/workflow/engine/methods/cases/open.php
@@ -65,12 +65,12 @@ $tasUid = (isset($_GET['TAS_UID'])) ? $tasUid = htmlspecialchars($_GET['TAS_UID'
 $oCase = new Cases();
 $conf = new Configurations();
 
-$oHeadPublisher = &headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 
 $urlToRedirectAfterPause = 'casesListExtJs';
 
 /*----------------------------------********---------------------------------*/
-$licensedFeatures = &PMLicensedFeatures::getSingleton();
+$licensedFeatures = PMLicensedFeatures::getSingleton();
 if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
     $pmGoogle = new PmGoogleApi();
     if (array_key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && $pmGoogle->getServiceGmailStatus()) {
@@ -153,4 +153,3 @@ if (!isset($_SESSION['APPLICATION']) || !isset($_SESSION['TASK']) || !isset($_SE
 }
 $_SESSION['actionCaseOptions'] = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';
 G::RenderPage('publish', 'extJs');
-
diff --git a/workflow/engine/methods/cases/opencase.php b/workflow/engine/methods/cases/opencase.php
index 82381f525..0e7527e32 100644
--- a/workflow/engine/methods/cases/opencase.php
+++ b/workflow/engine/methods/cases/opencase.php
@@ -47,7 +47,7 @@ if ($isBrowserMobile) {
         $_SESSION['__CD__'] = '../';
         $_SESSION['__OPEN_APPLICATION_UID__'] = $applicationUid;
         $G_PUBLISH->AddContent('view', 'cases/cases_Load');
-        $headPublisher = &headPublisher::getSingleton();
+        $headPublisher = headPublisher::getSingleton();
         $headPublisher->addScriptFile('/jscore/src/PM.js');
         $headPublisher->addScriptFile('/jscore/src/Sessions.js');
     } else {
diff --git a/workflow/engine/methods/cases/proxyCasesList.php b/workflow/engine/methods/cases/proxyCasesList.php
index 40bf8e518..eb7d01913 100644
--- a/workflow/engine/methods/cases/proxyCasesList.php
+++ b/workflow/engine/methods/cases/proxyCasesList.php
@@ -48,7 +48,7 @@ if ($sort == 'APP_STATUS_LABEL') {
 
 try {
     $userUid = (isset($_SESSION["USER_LOGGED"]) && $_SESSION["USER_LOGGED"] != "") ? $_SESSION["USER_LOGGED"] : null;
-    $result = "";
+    $result = [];
 
     switch ($action) {
         case "search":
@@ -111,4 +111,3 @@ try {
     $msg = array("error" => $e->getMessage());
     echo G::json_encode($msg);
 }
-
diff --git a/workflow/engine/methods/controls/varsAjax.php b/workflow/engine/methods/controls/varsAjax.php
index 906363903..bb4cd44ac 100644
--- a/workflow/engine/methods/controls/varsAjax.php
+++ b/workflow/engine/methods/controls/varsAjax.php
@@ -57,16 +57,16 @@ $html .= '<label for="prefix_label">'.$filter->xssFilterHard(G::LoadTranslation(
 $html .= '</td>';
 
 $html .= '<td width="25%">';
-$html .= '<label for="variables_label">'.$filter->xssFilterHard(G::LoadTranslation( 'ID_SEARCH')).'</label>';
+$html .= '<label for="variables_label">'.$filter->xssFilterHard(G::LoadTranslation('ID_SEARCH')).'</label>';
 $html .= '</td>';
 $html .= '</tr>';
 
 $html .= '<tr>';
 $html .= '<td width="25%">';
 $html .= '<select name="type_variables" id="type_variables">';
-$html .= '<option value="all">'.$filter->xssFilterHard(G::LoadTranslation( 'ID_TINY_ALL_VARIABLES' )).'</option>';
-$html .= '<option value="system">'.$filter->xssFilterHard(G::LoadTranslation( 'ID_TINY_SYSTEM_VARIABLES' )).'</option>';
-$html .= '<option value="process">'.$filter->xssFilterHard(G::LoadTranslation( 'ID_TINY_PROCESS_VARIABLES' )).'</option>';
+$html .= '<option value="all">'.$filter->xssFilterHard(G::LoadTranslation('ID_TINY_ALL_VARIABLES')).'</option>';
+$html .= '<option value="system">'.$filter->xssFilterHard(G::LoadTranslation('ID_TINY_SYSTEM_VARIABLES')).'</option>';
+$html .= '<option value="process">'.$filter->xssFilterHard(G::LoadTranslation('ID_TINY_PROCESS_VARIABLES')).'</option>';
 
 $oCriteria = new Criteria('workflow');
 $oCriteria->addSelectColumn(BpmnProjectPeer::PRJ_UID);
@@ -78,7 +78,7 @@ $row = $oDataset->getRow();
 $isBpmn = false;
 if (isset($row["PRJ_UID"])) {
     $isBpmn = true;
-    $html .= '<option value="grid">'.$filter->xssFilterHard(G::LoadTranslation( 'ID_TINY_GRID_VARIABLES' )).'</option>';
+    $html .= '<option value="grid">'.$filter->xssFilterHard(G::LoadTranslation('ID_TINY_GRID_VARIABLES')).'</option>';
 }
 
 $html .= '</select> &nbsp;&nbsp;&nbsp;&nbsp;';
@@ -103,35 +103,35 @@ $html .= '<input type="text" id="search" size="15">';
 $html .= '</td>';
 $html .= '</tr>';
 $html .= '<tr>';
-$html .= '<tr><td><label for="prefix_label">'.$filter->xssFilterHard(G::LoadTranslation( 'ID_VARIABLES' )).'</label></td></tr>';
+$html .= '<tr><td><label for="prefix_label">'.$filter->xssFilterHard(G::LoadTranslation('ID_VARIABLES')).'</label></td></tr>';
 $html .= '<tr>';
 
 $html .= '<td colspan="3">';
 
-$aFields = getDynaformsVars( $_REQUEST['sProcess'], true, isset( $_POST['bIncMulSelFields'] ) ? $_POST['bIncMulSelFields'] : 0 );
+$aFields = getDynaformsVars($_REQUEST['sProcess'], true, isset($_POST['bIncMulSelFields']) ? $_POST['bIncMulSelFields'] : 0);
 
 $displayOption = '';
-if (isset($_REQUEST['displayOption'])){
+if (isset($_REQUEST['displayOption'])) {
     $displayOption = 'displayOption="'.$_REQUEST['displayOption'].'"';
 } else {
     $displayOption = 'displayOption="normal"' ;
 }
-$html .= '<select name="_Var_Form_" id="_Var_Form_" size="8"  style="width:100%;' . (! isset( $_POST['sNoShowLeyend'] ) ? 'height:170;' : '') . '" '.$displayOption.'>';
+$html .= '<select name="_Var_Form_" id="_Var_Form_" size="8"  style="width:100%;' . (! isset($_POST['sNoShowLeyend']) ? 'height:170;' : '') . '" '.$displayOption.'>';
 
 foreach ($aFields as $aField) {
     $value = $_REQUEST['sSymbol'] . $aField['sName'];
     if ($isBpmn) {
-        if(strtolower($aField['sType']) == 'grid') {
+        if (strtolower($aField['sType']) == 'grid') {
             $gridValue = 'gridt<table border=1 cellspacing=0> <tr> <th>Header_1</th> </tr> <!--@>'.$aField['sName'].'--> <tr> <td>column_name1</td> </tr><!--@<'.$aField['sName'].'--> </table>';
             $value = htmlentities($gridValue);
-        } 
+        }
     }
     $html .= '<option value="' . $value . '">' . $_REQUEST['sSymbol'] . $aField['sName'] . ' (' . $aField['sType'] . ')</option>';
 }
 
-$aRows[0] = Array ('fieldname' => 'char','variable' => 'char','type' => 'type','label' => 'char');
+$aRows[0] = array('fieldname' => 'char','variable' => 'char','type' => 'type','label' => 'char');
 foreach ($aFields as $aField) {
-    $aRows[] = Array ('fieldname' => $_REQUEST['sFieldName'], 'variable' => $_REQUEST['sSymbol'] . $aField['sName'],'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\'' . $_REQUEST['sFieldName'] . '\',\'' . $_REQUEST['sSymbol'] . $aField['sName'] . '\');">' . $_REQUEST['sSymbol'] . $aField['sName'] . '</a></div>','type' => $aField['sType'],'label' => $aField['sLabel']
+    $aRows[] = array('fieldname' => $_REQUEST['sFieldName'], 'variable' => $_REQUEST['sSymbol'] . $aField['sName'],'variable_label' => '<div class="pm__dynavars"> <a id="dynalink" href=# onclick="insertFormVar(\'' . $_REQUEST['sFieldName'] . '\',\'' . $_REQUEST['sSymbol'] . $aField['sName'] . '\');">' . $_REQUEST['sSymbol'] . $aField['sName'] . '</a></div>','type' => $aField['sType'],'label' => $aField['sLabel']
     );
 }
 $html .= '</select>';
@@ -163,7 +163,7 @@ $html .= '</div>';
 $html .= '<br>';
 $html .= '<table width="90%" align="center">';
 $html .= '<tr><td>';
-$html .= '<label for="desc_prefix">*<span id="desc_prefix">'.$filter->xssFilterHard(G::LoadTranslation( 'ID_TO_STRING' )).'</span></label>';
+$html .= '<label for="desc_prefix">*<span id="desc_prefix">'.$filter->xssFilterHard(G::LoadTranslation('ID_TO_STRING')).'</span></label>';
 $html .= '</td></tr>';
 $html .= '</div>';
 
@@ -172,10 +172,10 @@ $html .= '</form>';
 $display = 'raw';
 
 $G_PUBLISH = new Publisher();
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addScriptFile('/jscore/controls/variablePicker.js');
 if (isset($_REQUEST['displayOption'])) {
-    if($_REQUEST['displayOption']=='tinyMCE'){
+    if ($_REQUEST['displayOption']=='tinyMCE') {
         $display = 'blank';
         $oHeadPublisher->addScriptFile('/js/tinymce/jscripts/tiny_mce/tiny_mce_popup.js');
         $oHeadPublisher->addScriptFile('/js/tinymce/jscripts/tiny_mce/plugins/pmVariablePicker/editor_plugin_src.js');
@@ -184,4 +184,4 @@ if (isset($_REQUEST['displayOption'])) {
 
 echo $html;
 
-G::RenderPage( 'publish', $display );
\ No newline at end of file
+G::RenderPage('publish', $display);
diff --git a/workflow/engine/methods/dashboard/main.php b/workflow/engine/methods/dashboard/main.php
index 4f15ac770..23bcd9bac 100644
--- a/workflow/engine/methods/dashboard/main.php
+++ b/workflow/engine/methods/dashboard/main.php
@@ -22,15 +22,14 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 
-$RBAC->requirePermissions( 'PM_DASHBOARD' );
+$RBAC->requirePermissions('PM_DASHBOARD');
 
 $G_MAIN_MENU = 'processmaker';
 $G_ID_MENU_SELECTED = 'DASHBOARD';
 
 $G_PUBLISH = new Publisher();
-$G_PUBLISH->AddContent( 'view', 'dashboard/load' );
-$oHeadPublisher = & headPublisher::getSingleton();
+$G_PUBLISH->AddContent('view', 'dashboard/load');
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addScriptFile('/jscore/src/PM.js');
 $oHeadPublisher->addScriptFile('/jscore/src/Sessions.js');
-G::RenderPage( 'publish' );
-
+G::RenderPage('publish');
diff --git a/workflow/engine/methods/dbConnections/genericDbConnections.php b/workflow/engine/methods/dbConnections/genericDbConnections.php
deleted file mode 100644
index eb85b848d..000000000
--- a/workflow/engine/methods/dbConnections/genericDbConnections.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Description: This is a additional configuration for load all connections; if exist in a particular proccess
- * @Date: 15-05-2008
- *
- * @author : Erik Amaru Ortiz <erik@colosa.com>
- */
-if (isset( $_SESSION['PROCESS'] )) {
-    $pro = include (PATH_CORE . "config/databases.php");
-
-    $oDbConnections = new DbConnections( $_SESSION['PROCESS'] );
-    foreach ($oDbConnections->connections as $db) {
-        $db['DBS_PASSWORD'] = $oDbConnections->getPassWithoutEncrypt( $db );
-
-        $flagTns = ($db["DBS_TYPE"] == "oracle" && $db["DBS_CONNECTION_TYPE"] == "TNS")? 1 : 0;
-
-        if ($flagTns == 0) {
-            $dbsPort = ($db['DBS_PORT'] == '') ? ('') : (':' . $db['DBS_PORT']);
-            $ENCODE = (trim( $db['DBS_ENCODE'] ) == '') ? '' : '?encoding=' . $db['DBS_ENCODE'];
-            if (strpos( $db['DBS_SERVER'], "\\" ) && $db['DBS_TYPE'] == 'mssql') {
-                $pro['datasources'][$db['DBS_UID']]['connection'] = $db['DBS_TYPE'] . '://' . $db['DBS_USERNAME'] . ':' . $db['DBS_PASSWORD'] . '@' . $db['DBS_SERVER'] . '/' . $db['DBS_DATABASE_NAME'] . $ENCODE;
-            } else {
-                $pro['datasources'][$db['DBS_UID']]['connection'] = $db['DBS_TYPE'] . '://' . $db['DBS_USERNAME'] . ':' . $db['DBS_PASSWORD'] . '@' . $db['DBS_SERVER'] . $dbsPort . '/' . $db['DBS_DATABASE_NAME'] . $ENCODE;
-            }
-        } else {
-            $pro["datasources"][$db["DBS_UID"]]["connection"] = $db["DBS_TYPE"] . "://" . $db["DBS_USERNAME"] . ":" . $db["DBS_PASSWORD"] . "@" . $db["DBS_TNS"];
-        }
-
-        $pro['datasources'][$db['DBS_UID']]['adapter'] = $db['DBS_TYPE'];
-    }
-    return $pro;
-}
-
diff --git a/workflow/engine/methods/departments/departmentUsers.php b/workflow/engine/methods/departments/departmentUsers.php
index 7946d774b..27ff30b9f 100644
--- a/workflow/engine/methods/departments/departmentUsers.php
+++ b/workflow/engine/methods/departments/departmentUsers.php
@@ -24,27 +24,27 @@
 
 require_once 'classes/model/Department.php';
 
-$access = $RBAC->userCanAccess( 'PM_USERS' );
+$access = $RBAC->userCanAccess('PM_USERS');
 if ($access != 1) {
     switch ($access) {
         case - 1:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         case - 2:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         default:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
     }
 }
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_USERS" )) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess("PM_USERS")) != 1) {
     return $RBAC_Response;
 }
 
@@ -55,9 +55,9 @@ $G_ID_SUB_MENU_SELECTED = 'DEPARTMENTS';
 
 $G_PUBLISH = new Publisher();
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( 'departments/departmentUsers', false ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'departments/departmentUsers' ); //adding a html file  .html.
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('departments/departmentUsers', false); //adding a javascript file .js
+$oHeadPublisher->addContent('departments/departmentUsers'); //adding a html file  .html.
 
 $c = new Configurations();
 
@@ -67,16 +67,15 @@ $arrayConfig = [];
 $arrayConfig['pageSize'] = (isset($arrayConfigPage['pageSize']))? $arrayConfigPage['pageSize'] : 20;
 
 $dep = new Department();
-$dep->Load( $_GET['dUID'] );
+$dep->Load($_GET['dUID']);
 
-$depart = Array ();
+$depart = array();
 $depart['DEP_UID'] = $dep->getDepUid();
 $depart['DEP_TITLE'] = $dep->getDepTitle();
 $depart['DEP_MANAGER'] = $dep->getDepManager();
 
-$oHeadPublisher->assign( 'DEPARTMENT', $depart );
-$oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
+$oHeadPublisher->assign('DEPARTMENT', $depart);
+$oHeadPublisher->assign('FORMATS', $c->getFormats());
 $oHeadPublisher->assign('CONFIG', $arrayConfig);
 
-G::RenderPage( 'publish', 'extJs' );
-
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/departments/departments.php b/workflow/engine/methods/departments/departments.php
index 060608a33..e7746bc1c 100644
--- a/workflow/engine/methods/departments/departments.php
+++ b/workflow/engine/methods/departments/departments.php
@@ -24,27 +24,27 @@
  */
 $c = new Configurations();
 
-$access = $RBAC->requirePermissions( 'PM_USERS' );
+$access = $RBAC->requirePermissions('PM_USERS');
 if ($access != 1) {
     switch ($access) {
         case - 1:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         case - 2:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         default:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
     }
 }
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_USERS" )) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess("PM_USERS")) != 1) {
     return $RBAC_Response;
 }
 
@@ -55,16 +55,15 @@ $G_ID_SUB_MENU_SELECTED = 'DEPARTMENTS';
 
 $G_PUBLISH = new Publisher();
 
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 
-$oHeadPublisher->addExtJsScript( 'departments/departmentList', false ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'departments/departmentList' ); //adding a html file  .html.
+$oHeadPublisher->addExtJsScript('departments/departmentList', false); //adding a javascript file .js
+$oHeadPublisher->addContent('departments/departmentList'); //adding a html file  .html.
 
 
 //$labels = G::getTranslations(Array('ID_DEPARTMENTS','ID_DELETE','ID_EDIT','ID_USERS','ID_ACTIVE','ID_INACTIVE','ID_SELECT_STATUS',
 //    'ID_CLOSE','ID_SAVE','ID_DEPARTMENT_NAME','ID_STATUS'));
 //
 //$oHeadPublisher->assign('TRANSLATIONS', $labels);
-$oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
-G::RenderPage( 'publish', 'extJs' );
-
+$oHeadPublisher->assign('FORMATS', $c->getFormats());
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/departments/departments_Ajax.php b/workflow/engine/methods/departments/departments_Ajax.php
index b0a267467..23578caa1 100644
--- a/workflow/engine/methods/departments/departments_Ajax.php
+++ b/workflow/engine/methods/departments/departments_Ajax.php
@@ -22,28 +22,28 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
-function LookForChildren ($parent, $level, $aDepUsers)
+function LookForChildren($parent, $level, $aDepUsers)
 {
     $conf = new Configurations();
     $oDept = new Department();
-    $allDepartments = $oDept->getDepartments( $parent );
+    $allDepartments = $oDept->getDepartments($parent);
     $level ++;
-    $rows = Array ();
+    $rows = array();
     foreach ($allDepartments as $department) {
-        unset( $depto );
-        $depto['DEP_TITLE'] = str_replace( array ("<",">" ), array ("&lt;","&gt;" ), $department['DEP_TITLE'] );
+        unset($depto);
+        $depto['DEP_TITLE'] = str_replace(array("<",">" ), array("&lt;","&gt;" ), $department['DEP_TITLE']);
         $depto['DEP_STATUS'] = $department['DEP_STATUS'];
         if ($department['DEP_MANAGER_USERNAME'] != '') {
-            $depto['DEP_MANAGER_NAME'] = $conf->usersNameFormat( $department['DEP_MANAGER_USERNAME'], $department['DEP_MANAGER_FIRSTNAME'], $department['DEP_MANAGER_LASTNAME'] );
+            $depto['DEP_MANAGER_NAME'] = $conf->usersNameFormat($department['DEP_MANAGER_USERNAME'], $department['DEP_MANAGER_FIRSTNAME'], $department['DEP_MANAGER_LASTNAME']);
         } else {
             $depto['DEP_MANAGER_NAME'] = '';
         }
-        $depto['DEP_TOTAL_USERS'] = isset( $aDepUsers[$department['DEP_UID']] ) ? $aDepUsers[$department['DEP_UID']] : 0;
+        $depto['DEP_TOTAL_USERS'] = isset($aDepUsers[$department['DEP_UID']]) ? $aDepUsers[$department['DEP_UID']] : 0;
         $depto['DEP_UID'] = $department['DEP_UID'];
         $depto['DEP_MANAGER'] = $department['DEP_MANAGER'];
         $depto['DEP_PARENT'] = $department['DEP_PARENT'];
         if ($department['HAS_CHILDREN'] > 0) {
-            $depto['children'] = LookForChildren( $department['DEP_UID'], $level, $aDepUsers );
+            $depto['children'] = LookForChildren($department['DEP_UID'], $level, $aDepUsers);
             $depto['iconCls'] = 'ss_sprite ss_chart_organisation';
             $depto['expanded'] = true;
         } else {
@@ -59,10 +59,10 @@ function LookForChildren ($parent, $level, $aDepUsers)
     return $rows;
 }
 
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_USERS" )) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess("PM_USERS")) != 1) {
     return $RBAC_Response;
 }
-$_POST['action'] = get_ajax_value( 'action' );
+$_POST['action'] = get_ajax_value('action');
 
 require_once 'classes/model/Department.php';
 
@@ -70,51 +70,51 @@ switch ($_POST['action']) {
     case 'showUsers':
         global $G_PUBLISH;
         $oDept = new Department();
-        $aFields = $oDept->Load( $_POST['sDptoUID'] );
+        $aFields = $oDept->Load($_POST['sDptoUID']);
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'departments/departments_Edit', '', $aFields, '' );
+        $G_PUBLISH->AddContent('xmlform', 'xmlform', 'departments/departments_Edit', '', $aFields, '');
 
-        $criteria = $oDept->getUsersFromDepartment( $_POST['sDptoUID'], $aFields['DEP_MANAGER'] );
+        $criteria = $oDept->getUsersFromDepartment($_POST['sDptoUID'], $aFields['DEP_MANAGER']);
 
-        $G_PUBLISH->AddContent( 'propeltable', 'departments/paged-table2', 'departments/departments_UsersList', $criteria, $aFields );
+        $G_PUBLISH->AddContent('propeltable', 'departments/paged-table2', 'departments/departments_UsersList', $criteria, $aFields);
         //$G_PUBLISH->AddContent('propeltable', 'paged-table', 'departments/departments_UsersList', $criteria, $aFields);
 
-        $oHeadPublisher = & headPublisher::getSingleton();
-        $oHeadPublisher->addScriptCode( "groupname='{$aFields["DEP_TITLE"]}';" );
-        $oHeadPublisher->addScriptCode( "depUid='{$aFields["DEP_UID"]}';" );
+        $oHeadPublisher = headPublisher::getSingleton();
+        $oHeadPublisher->addScriptCode("groupname='{$aFields["DEP_TITLE"]}';");
+        $oHeadPublisher->addScriptCode("depUid='{$aFields["DEP_UID"]}';");
 
-        G::RenderPage( 'publish', 'raw' );
+        G::RenderPage('publish', 'raw');
         break;
     case 'assignAllUsers':
-        $aUsers = explode( ',', $_POST['aUsers'] );
+        $aUsers = explode(',', $_POST['aUsers']);
         $oDept = new Department();
         $depUid = $_POST['DEP_UID'];
-        $cant = $oDept->cantUsersInDepartment( $depUid );
+        $cant = $oDept->cantUsersInDepartment($depUid);
 
         if ($cant == 0) {
             $manager = true;
         }
 
-        for ($i = 0; $i < count( $aUsers ); $i ++) {
-            $oDept->addUserToDepartment( $depUid, $aUsers[$i], $manager, false );
+        for ($i = 0; $i < count($aUsers); $i ++) {
+            $oDept->addUserToDepartment($depUid, $aUsers[$i], $manager, false);
             $manager = false;
         }
-        $oDept->updateDepartmentManager( $depUid );
+        $oDept->updateDepartmentManager($depUid);
         break;
     case 'removeUserFromDepartment':
         $oDept = new Department();
-        $oDept->removeUserFromDepartment( $_POST['DEP_UID'], $_POST['USR_UID'] );
+        $oDept->removeUserFromDepartment($_POST['DEP_UID'], $_POST['USR_UID']);
         break;
     case 'verifyDptoname':
-        $_POST['sOriginalGroupname'] = get_ajax_value( 'sOriginalGroupname' );
-        $_POST['sGroupname'] = get_ajax_value( 'sGroupname' );
+        $_POST['sOriginalGroupname'] = get_ajax_value('sOriginalGroupname');
+        $_POST['sGroupname'] = get_ajax_value('sGroupname');
         if ($_POST['sOriginalGroupname'] == $_POST['sGroupname']) {
             echo '0';
         } else {
             $oDpto = new Department();
-            $oCriteria = $oDpto->loadByGroupname( $_POST['sGroupname'] );
-            $oDataset = DepartmentPeer::doSelectRS( $oCriteria );
-            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oCriteria = $oDpto->loadByGroupname($_POST['sGroupname']);
+            $oDataset = DepartmentPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
             $aRow = $oDataset->getRow();
             if (! $aRow) {
@@ -125,39 +125,39 @@ switch ($_POST['action']) {
         }
         break;
     case 'showUnAssignedUsers':
-        $_POST['UID'] = get_ajax_value( 'UID' );
-        require_once ('classes/class.xmlfield_InputPM.php');
+        $_POST['UID'] = get_ajax_value('UID');
+        require_once('classes/class.xmlfield_InputPM.php');
 
-        if (($RBAC_Response = $RBAC->userCanAccess( "PM_USERS" )) != 1) {
+        if (($RBAC_Response = $RBAC->userCanAccess("PM_USERS")) != 1) {
             return $RBAC_Response;
         }
 
         $oDept = new Department();
 
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'propeltable', 'departments/paged-table3', 'departments/departments_AddUnAssignedUsers', $oDept->getAvailableUsersCriteria( '' ) );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('propeltable', 'departments/paged-table3', 'departments/departments_AddUnAssignedUsers', $oDept->getAvailableUsersCriteria(''));
+        G::RenderPage('publish', 'raw');
         break;
     case 'departmentList':
         global $RBAC;
         $aDEPTS = $RBAC->getAllUsersByDepartment();
-        $tree_depart = LookForChildren( '', 0, $aDEPTS );
-        echo G::json_encode( $tree_depart );
+        $tree_depart = LookForChildren('', 0, $aDEPTS);
+        echo G::json_encode($tree_depart);
         break;
     case 'checkDepartmentName':
         $parent = $_REQUEST['parent'];
         $dep_name = $_REQUEST['name'];
 
-        $oCriteria = new Criteria( 'workflow' );
+        $oCriteria = new Criteria('workflow');
 
         $oCriteria->clearSelectColumns();
-        $oCriteria->addSelectColumn( DepartmentPeer::DEP_PARENT );
-        $oCriteria->addSelectColumn( DepartmentPeer::DEP_TITLE );
-        $oCriteria->add( DepartmentPeer::DEP_TITLE, $dep_name );
-        $oCriteria->add( DepartmentPeer::DEP_PARENT, $parent );
+        $oCriteria->addSelectColumn(DepartmentPeer::DEP_PARENT);
+        $oCriteria->addSelectColumn(DepartmentPeer::DEP_TITLE);
+        $oCriteria->add(DepartmentPeer::DEP_TITLE, $dep_name);
+        $oCriteria->add(DepartmentPeer::DEP_PARENT, $parent);
 
-        $oDataset = DepartmentPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataset = DepartmentPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         $aRow = $oDataset->getRow();
         echo (! $aRow) ? 'true' : 'false';
@@ -167,7 +167,7 @@ switch ($_POST['action']) {
         $dep_name = $_REQUEST['name'];
         $dep_uid = $_REQUEST['uid'];
         $oDepartment = new Department();
-        $checkVal = $oDepartment->checkDepartmentName( $dep_name, $parent, $dep_uid );
+        $checkVal = $oDepartment->checkDepartmentName($dep_name, $parent, $dep_uid);
         echo (! $checkVal) ? 'true' : 'false';
         break;
     case 'saveDepartment':
@@ -176,28 +176,28 @@ switch ($_POST['action']) {
         $newDepartment['DEP_PARENT'] = $parent;
         $newDepartment['DEP_TITLE'] = $dep_name;
         $oDept = new Department();
-        $oDept->create( $newDepartment );
+        $oDept->create($newDepartment);
         echo '{success: true}';
         break;
     case 'usersByDepartment':
 
         $sDepUid = $_REQUEST['DEP_UID'];
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->addSelectColumn( UsersPeer::USR_UID );
-        $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
-        $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
-        $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
-        $oCriteria->addSelectColumn( UsersPeer::USR_REPORTS_TO );
-        $oCriteria->add( UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL );
-        $oCriteria->add( UsersPeer::DEP_UID, $sDepUid );
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn(UsersPeer::USR_UID);
+        $oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
+        $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
+        $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
+        $oCriteria->addSelectColumn(UsersPeer::USR_REPORTS_TO);
+        $oCriteria->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
+        $oCriteria->add(UsersPeer::DEP_UID, $sDepUid);
 
-        $oDataset = DepartmentPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataset = DepartmentPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
-        $rows = Array ();
-        unset( $first );
+        $rows = array();
+        unset($first);
         $first['USR_UID'] = '';
-        $first['USR_VALUE'] = G::LoadTranslation( 'ID_NO_MANAGER_SELECTED' );
+        $first['USR_VALUE'] = G::LoadTranslation('ID_NO_MANAGER_SELECTED');
         $rows[] = $first;
 
         $conf = new Configurations();
@@ -205,11 +205,11 @@ switch ($_POST['action']) {
         while ($oDataset->next()) {
             $aRow = $oDataset->getRow();
             $user['USR_UID'] = $aRow['USR_UID'];
-            $user['USR_VALUE'] = $conf->usersNameFormat( $aRow['USR_USERNAME'], $aRow['USR_FIRSTNAME'], $aRow['USR_LASTNAME'] );
+            $user['USR_VALUE'] = $conf->usersNameFormat($aRow['USR_USERNAME'], $aRow['USR_FIRSTNAME'], $aRow['USR_LASTNAME']);
             $rows[] = $user;
         }
 
-        echo '{users: ' . G::json_encode( $rows ) . '}';
+        echo '{users: ' . G::json_encode($rows) . '}';
         break;
     case 'updateDepartment':
         try {
@@ -224,18 +224,18 @@ switch ($_POST['action']) {
             $editDepartment['DEP_STATUS'] = $dep_status;
             $editDepartment['DEP_MANAGER'] = $dep_manager;
             $oDept = new Department();
-            $oDept->update( $editDepartment );
-            $oDept->updateDepartmentManager( $dep_uid );
+            $oDept->update($editDepartment);
+            $oDept->updateDepartmentManager($dep_uid);
 
             $managerName = ' - No Manager Selected';
 
             if ($_REQUEST['manager'] != '') {
-                $oCriteria = new Criteria( 'workflow' );
-                $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
-                $oCriteria->add( UsersPeer::USR_UID, $dep_manager);
+                $oCriteria = new Criteria('workflow');
+                $oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
+                $oCriteria->add(UsersPeer::USR_UID, $dep_manager);
 
-                $oDataset = UsersPeer::doSelectRS( $oCriteria );
-                $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+                $oDataset = UsersPeer::doSelectRS($oCriteria);
+                $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
                 while ($oDataset->next()) {
                     $aRow = $oDataset->getRow();
@@ -257,7 +257,7 @@ switch ($_POST['action']) {
     case 'canDeleteDepartment':
         global $RBAC;
         $aDEPTS = $RBAC->getAllUsersByDepartment();
-        if (isset( $aDEPTS[$_POST['dep_uid']] )) {
+        if (isset($aDEPTS[$_POST['dep_uid']])) {
             echo '{success: false, users: ' . $aDEPTS[$_POST['dep_uid']] . '}';
         } else {
             echo '{success: true}';
@@ -266,7 +266,7 @@ switch ($_POST['action']) {
     case 'deleteDepartment':
         $DEP_UID = $_POST['DEP_UID'];
         $oDept = new Department();
-        $oDept->remove( $DEP_UID );
+        $oDept->remove($DEP_UID);
         echo '{success: true}';
         break;
     case 'assignedUsers':
@@ -311,31 +311,31 @@ switch ($_POST['action']) {
     case 'assignDepartmentToUserMultiple':
         $DEP_UID = $_REQUEST['DEP_UID'];
         $uSERS = $_REQUEST['USR_UID'];
-        $aUsers = explode( ',', $uSERS );
+        $aUsers = explode(',', $uSERS);
         $dep = new Department();
-        $dep->Load( $DEP_UID );
+        $dep->Load($DEP_UID);
         $dep_manager = $dep->getDepManager();
         $manager = ($dep_manager == '') ? true : false;
         foreach ($aUsers as $USR_UID) {
-            $dep->addUserToDepartment( $DEP_UID, $USR_UID, $manager, false );
+            $dep->addUserToDepartment($DEP_UID, $USR_UID, $manager, false);
             $manager = false;
         }
-        $dep->updateDepartmentManager( $DEP_UID );
+        $dep->updateDepartmentManager($DEP_UID);
         break;
     case 'deleteDepartmentToUserMultiple':
         $DEP_UID = $_REQUEST['DEP_UID'];
         $uSERS = $_REQUEST['USR_UID'];
-        $aUsers = explode( ',', $uSERS );
+        $aUsers = explode(',', $uSERS);
         $dep = new Department();
-        $dep->Load( $DEP_UID );
+        $dep->Load($DEP_UID);
         $manager = $dep->getDepManager();
         foreach ($aUsers as $USR_UID) {
-            $dep->removeUserFromDepartment( $DEP_UID, $USR_UID );
+            $dep->removeUserFromDepartment($DEP_UID, $USR_UID);
             if ($USR_UID == $manager) {
                 $editDepto['DEP_UID'] = $DEP_UID;
                 $editDepto['DEP_MANAGER'] = '';
-                $dep->update( $editDepto );
-                $dep->updateDepartmentManager( $DEP_UID );
+                $dep->update($editDepto);
+                $dep->updateDepartmentManager($DEP_UID);
             }
         }
         break;
@@ -345,9 +345,8 @@ switch ($_POST['action']) {
         $editDepartment['DEP_UID'] = $dep_uid;
         $editDepartment['DEP_MANAGER'] = (!isset($_POST['NO_DEP_MANAGER'])? $dep_manager : '');
         $oDept = new Department();
-        $oDept->update( $editDepartment );
-        $oDept->updateDepartmentManager( $dep_uid );
+        $oDept->update($editDepartment);
+        $oDept->updateDepartmentManager($dep_uid);
         echo '{success: true}';
         break;
 }
-
diff --git a/workflow/engine/methods/dynaforms/conditionalShowHide.php b/workflow/engine/methods/dynaforms/conditionalShowHide.php
index 40772df0b..fc3107e04 100644
--- a/workflow/engine/methods/dynaforms/conditionalShowHide.php
+++ b/workflow/engine/methods/dynaforms/conditionalShowHide.php
@@ -26,49 +26,48 @@
   */
 
 $G_PUBLISH = new Publisher();
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 $DISPLAY_MAX_SIZE = 25;
 global $_DBArray;
 
 $oFieldCondition = new FieldCondition();
 if (isset($_SESSION['Current_Dynafom']['Parameters']['DYN_UID'])) {
     $DYN_UID = $_SESSION['Current_Dynafom']['Parameters']['DYN_UID'];
-    $aRows = $oFieldCondition->getAllByDynUid( $DYN_UID );
+    $aRows = $oFieldCondition->getAllByDynUid($DYN_UID);
 }
 
-$aFieldNames = Array ('FCD_NRO','FCD_UID','FCD_FUNCTION','FCD_FIELDS','FCD_CONDITION','FCD_EVENTS','FCD_EVENT_OWNERS','FCD_STATUS','FCD_DYN_UID' );
+$aFieldNames = array('FCD_NRO','FCD_UID','FCD_FUNCTION','FCD_FIELDS','FCD_CONDITION','FCD_EVENTS','FCD_EVENT_OWNERS','FCD_STATUS','FCD_DYN_UID' );
 
 //Routines to limit the show in list max size for some fields that can have large size
 $inndex = 0;
-$aRowsTmp = Array ();
+$aRowsTmp = array();
 foreach ($aRows as $aRow) {
     $aRow['FCD_NRO'] = ++ $inndex;
-    if (strlen( $aRow['FCD_FIELDS'] ) > $DISPLAY_MAX_SIZE) {
-        $aRow['FCD_FIELDS'] = substr( $aRow['FCD_FIELDS'], 0, $DISPLAY_MAX_SIZE ) . '...';
+    if (strlen($aRow['FCD_FIELDS']) > $DISPLAY_MAX_SIZE) {
+        $aRow['FCD_FIELDS'] = substr($aRow['FCD_FIELDS'], 0, $DISPLAY_MAX_SIZE) . '...';
     }
 
     if ($aRow['FCD_FUNCTION'] == 'showAll' || $aRow['FCD_FUNCTION'] == 'hideAll') {
         $aRow['FCD_FIELDS'] = 'ALL';
     }
 
-    if (strlen( $aRow['FCD_CONDITION'] ) > $DISPLAY_MAX_SIZE) {
-        $aRow['FCD_CONDITION'] = substr( $aRow['FCD_CONDITION'], 0, $DISPLAY_MAX_SIZE ) . '...';
+    if (strlen($aRow['FCD_CONDITION']) > $DISPLAY_MAX_SIZE) {
+        $aRow['FCD_CONDITION'] = substr($aRow['FCD_CONDITION'], 0, $DISPLAY_MAX_SIZE) . '...';
     }
-    if (strlen( $aRow['FCD_EVENT_OWNERS'] ) > $DISPLAY_MAX_SIZE) {
-        $aRow['FCD_EVENT_OWNERS'] = substr( $aRow['FCD_EVENT_OWNERS'], 0, $DISPLAY_MAX_SIZE ) . '...';
+    if (strlen($aRow['FCD_EVENT_OWNERS']) > $DISPLAY_MAX_SIZE) {
+        $aRow['FCD_EVENT_OWNERS'] = substr($aRow['FCD_EVENT_OWNERS'], 0, $DISPLAY_MAX_SIZE) . '...';
     }
-    array_push( $aRowsTmp, $aRow );
+    array_push($aRowsTmp, $aRow);
 }
 
-$aRows = array_merge( Array ($aFieldNames), $aRowsTmp );
+$aRows = array_merge(array($aFieldNames), $aRowsTmp);
 
 $_DBArray['virtual_pmtable'] = $aRows;
 $_SESSION['_DBArray'] = $_DBArray;
 
-$oCriteria = new Criteria( 'dbarray' );
-$oCriteria->setDBArrayTable( 'virtual_pmtable' );
-
-$oHeadPublisher->addScriptFile( '/jscore/dynaforms/dynaforms_conditionalShowHide.js' );
-$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'dynaforms/dynaforms_ConditionalShowHideList', $oCriteria, Array ('DYN_UID' => $DYN_UID), '' );
-G::RenderPage( 'publish', 'raw' );
+$oCriteria = new Criteria('dbarray');
+$oCriteria->setDBArrayTable('virtual_pmtable');
 
+$oHeadPublisher->addScriptFile('/jscore/dynaforms/dynaforms_conditionalShowHide.js');
+$G_PUBLISH->AddContent('propeltable', 'paged-table', 'dynaforms/dynaforms_ConditionalShowHideList', $oCriteria, array('DYN_UID' => $DYN_UID), '');
+G::RenderPage('publish', 'raw');
diff --git a/workflow/engine/methods/dynaforms/dynaforms_FlatEditor.php b/workflow/engine/methods/dynaforms/dynaforms_FlatEditor.php
index 04149031f..074cf473f 100644
--- a/workflow/engine/methods/dynaforms/dynaforms_FlatEditor.php
+++ b/workflow/engine/methods/dynaforms/dynaforms_FlatEditor.php
@@ -21,7 +21,7 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_FACTORY" )) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess("PM_FACTORY")) != 1) {
     return $RBAC_Response;
 }
 
@@ -36,19 +36,19 @@ $G_ID_MENU_SELECTED = 'PROCESSES';
 $G_ID_SUB_MENU_SELECTED = 'FIELDS';
 
 $dbc = new DBConnection();
-$ses = new DBSession( $dbc );
+$ses = new DBSession($dbc);
 
 //Hardcode: UID of the library by default
-$PRO_UID = isset( $_POST['PRO_UID'] ) ? $_POST['PRO_UID'] : '746B734DC23311';
+$PRO_UID = isset($_POST['PRO_UID']) ? $_POST['PRO_UID'] : '746B734DC23311';
 
-$process = new Process( $dbc );
-$process->Load( $PRO_UID );
+$process = new Process($dbc);
+$process->Load($PRO_UID);
 
-$dynaform = new Dynaform( $dbc );
-$dynaform->Fields['DYN_UID'] = (isset( $_POST['DYN_UID'] )) ? urldecode( $_POST['DYN_UID'] ) : '0';
-$dynaform->Load( $dynaform->Fields['DYN_UID'] );
+$dynaform = new Dynaform($dbc);
+$dynaform->Fields['DYN_UID'] = (isset($_POST['DYN_UID'])) ? urldecode($_POST['DYN_UID']) : '0';
+$dynaform->Load($dynaform->Fields['DYN_UID']);
 
-if (isset( $_POST['DYN_UID'] ) && ($_POST['DYN_UID'] !== '')) {
+if (isset($_POST['DYN_UID']) && ($_POST['DYN_UID'] !== '')) {
     $file = $dynaform->Fields['DYN_FILENAME'];
 } else {
     //Hardcode: Sample of xmlform.
@@ -56,57 +56,57 @@ if (isset( $_POST['DYN_UID'] ) && ($_POST['DYN_UID'] !== '')) {
 }
 
     /* Start Comment: If file doesn't exist, it is created */
-if (! file_exists( PATH_DYNAFORM . $file . '.xml' )) {
+if (! file_exists(PATH_DYNAFORM . $file . '.xml')) {
     $newDoc = new Xml_Document();
-    $newDoc->addChildNode( new Xml_Node( 'dynaForm', 'open', '', array ('type' => 'xmlform','name' => $file
-    ) ) );
-    $newDoc->children[0]->addChildNode( new Xml_Node( '', 'cdata', "\n" ) );
-    G::verifyPath( dirname( PATH_DYNAFORM . $file . '.xml' ), true );
-    $newDoc->save( PATH_DYNAFORM . $file . '.xml' );
-    unset( $newDoc );
+    $newDoc->addChildNode(new Xml_Node('dynaForm', 'open', '', array('type' => 'xmlform','name' => $file
+    )));
+    $newDoc->children[0]->addChildNode(new Xml_Node('', 'cdata', "\n"));
+    G::verifyPath(dirname(PATH_DYNAFORM . $file . '.xml'), true);
+    $newDoc->save(PATH_DYNAFORM . $file . '.xml');
+    unset($newDoc);
 }
 /* End Comment */
 
   /* Start Comment: Create and temporal copy. */
 $pathFile = $filter->xssFilterHard(PATH_DYNAFORM . $file . '.xml', 'path');
-$copy = implode( '', file( $pathFile ) );
+$copy = implode('', file($pathFile));
 $file .= '_tmp0';
-$fcopy = fopen( $pathFile , "w" );
-fwrite( $fcopy, $copy );
-fclose( $fcopy );
+$fcopy = fopen($pathFile, "w");
+fwrite($fcopy, $copy);
+fclose($fcopy);
 /* End Comment */
 //Removes any other CURRENT_DYNAFORM that could be pending because of a page refresh or a failure
-unset( $_SESSION['CURRENT_DYNAFORM'] );
+unset($_SESSION['CURRENT_DYNAFORM']);
 
-define( 'DB_XMLDB_HOST', PATH_DYNAFORM . $file . '.xml' );
-define( 'DB_XMLDB_USER', '' );
-define( 'DB_XMLDB_PASS', '' );
-define( 'DB_XMLDB_NAME', '' );
-define( 'DB_XMLDB_TYPE', 'myxml' );
+define('DB_XMLDB_HOST', PATH_DYNAFORM . $file . '.xml');
+define('DB_XMLDB_USER', '');
+define('DB_XMLDB_PASS', '');
+define('DB_XMLDB_NAME', '');
+define('DB_XMLDB_TYPE', 'myxml');
 
 $title = $process->Fields['PRO_TITLE'] . ' : ' . $dynaform->Fields['DYN_TITLE'];
 
-$Parameters = array ('SYS_LANG' => SYS_LANG,'URL' => G::encrypt( $file, URL_KEY ),'DYN_UID' => $dynaform->Fields['DYN_UID'],'DYNAFORM_NAME' => $title
+$Parameters = array('SYS_LANG' => SYS_LANG,'URL' => G::encrypt($file, URL_KEY),'DYN_UID' => $dynaform->Fields['DYN_UID'],'DYNAFORM_NAME' => $title
 );
 
 $openDoc = new Xml_Document();
-$openDoc->parseXmlFile( PATH_DYNAFORM . $file . '.xml' );
-$XmlEditor = array ('URL' => G::encrypt( $file, URL_KEY ),'XML' => $openDoc->getXml()
+$openDoc->parseXmlFile(PATH_DYNAFORM . $file . '.xml');
+$XmlEditor = array('URL' => G::encrypt($file, URL_KEY),'XML' => $openDoc->getXml()
 );
 
-$form = new Form( $file, PATH_DYNAFORM, SYS_LANG, true );
-$HtmlEditor = array ('URL' => G::encrypt( $file, URL_KEY ),'HTML' => $form->printTemplate( $form->template, $script )
+$form = new Form($file, PATH_DYNAFORM, SYS_LANG, true);
+$HtmlEditor = array('URL' => G::encrypt($file, URL_KEY),'HTML' => $form->printTemplate($form->template, $script)
 );
-$JSEditor = array ('URL' => G::encrypt( $file, URL_KEY ),'HTML' => $form->printTemplate( $form->template, $script )
+$JSEditor = array('URL' => G::encrypt($file, URL_KEY),'HTML' => $form->printTemplate($form->template, $script)
 );
 
 /* Block : Loads the Editor configuration */
-$defaultConfig = array ('Editor' => array ('left' => '0',//'getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))',
+$defaultConfig = array('Editor' => array('left' => '0',//'getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))',
 'top' => '0',//'getAbsoluteTop(document.getElementById("dynaformEditor[0]"))',
 'width' => 'document.body.clientWidth-4','height' => 'document.body.clientHeight-2'  //'3/4*(document.body.clientWidth-getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))*2)',
-),'Toolbar' => array ('left' => 'document.body.clientWidth-2-toolbar.clientWidth-24-3+7',//'getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))',
+),'Toolbar' => array('left' => 'document.body.clientWidth-2-toolbar.clientWidth-24-3+7',//'getAbsoluteLeft(document.getElementById("dynaformEditor[0]"))',
 'top' => '52'  //'getAbsoluteTop(document.getElementById("dynaformEditor[0]"))',
-),'FieldsList' => array ('left' => '4+toolbar.clientWidth+24','top' => 'getAbsoluteTop(document.getElementById("dynaformEditor[0]"))','width' => 268 - 24,'height' => 400
+),'FieldsList' => array('left' => '4+toolbar.clientWidth+24','top' => 'getAbsoluteTop(document.getElementById("dynaformEditor[0]"))','width' => 268 - 24,'height' => 400
 )
 );
 /*$configuration = new Configuration($dbc);
@@ -125,39 +125,39 @@ $config = $defaultConfig;
 
 $G_PUBLISH = new Publisher();
 $G_PUBLISH->publisherId = 'dynaformEditor';
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->setTitle( "Dynaform Editor" );
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->setTitle("Dynaform Editor");
 
 //$G_PUBLISH->AddContent('pagedtable', 'paged-table', 'dynaforms/fields_ShortList', '', $Parameters , '', SYS_URI.'dynaforms/dynaforms_PagedTableAjax');
-$G_PUBLISH->AddContent( 'blank' );
+$G_PUBLISH->AddContent('blank');
 
-$panelConf = array ('title' => G::LoadTranslation( 'ID_DYNAFORM_EDITOR' ) . ' - [' . $title . ']','style' => array ('title' => array ('textAlign' => 'left'
+$panelConf = array('title' => G::LoadTranslation('ID_DYNAFORM_EDITOR') . ' - [' . $title . ']','style' => array('title' => array('textAlign' => 'left'
 )
 ),'width' => 700,'height' => 600,'tabWidth' => 120,'modal' => true,'drag' => false,'resize' => false,'blinkToFront' => false
 );
-$panelConf = array_merge( $panelConf, $config['Editor'] );
+$panelConf = array_merge($panelConf, $config['Editor']);
 
-$G_PUBLISH->AddContent( 'panel-init', 'mainPanel', $panelConf );
-$G_PUBLISH->AddContent( 'xmlform', 'toolbar', 'dynaforms/fields_Toolbar', '', $Parameters, '', '' );
-$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'dynaforms/dynaforms_Editor', '', $Parameters, '', '' );
-$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'dynaforms/dynaforms_XmlEditor', '', $XmlEditor, '', '' );
+$G_PUBLISH->AddContent('panel-init', 'mainPanel', $panelConf);
+$G_PUBLISH->AddContent('xmlform', 'toolbar', 'dynaforms/fields_Toolbar', '', $Parameters, '', '');
+$G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_Editor', '', $Parameters, '', '');
+$G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_XmlEditor', '', $XmlEditor, '', '');
 //This space will be loaded dynamically by el js function: "changoToHtmlCode"
-$G_PUBLISH->AddContent( 'blank' );
-$G_PUBLISH->AddContent( 'pagedtable', 'paged-table', 'dynaforms/fields_List', '', $Parameters, '', SYS_URI . 'dynaforms/dynaforms_PagedTableAjax' );
-$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'dynaforms/dynaforms_JSEditor', '', $JSEditor, '', '' );
-$G_PUBLISH->AddContent( 'blank' );
+$G_PUBLISH->AddContent('blank');
+$G_PUBLISH->AddContent('pagedtable', 'paged-table', 'dynaforms/fields_List', '', $Parameters, '', SYS_URI . 'dynaforms/dynaforms_PagedTableAjax');
+$G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_JSEditor', '', $JSEditor, '', '');
+$G_PUBLISH->AddContent('blank');
 //  $G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_Properties', '', $JSEditor , '', '');
 
 
-$G_PUBLISH->AddContent( 'panel-tab', 'Preview', 'dynaformEditor[3]', 'changoToPreview', 'saveCurrentView' );
-$G_PUBLISH->AddContent( 'panel-tab', 'XML Code', 'dynaformEditor[4]', 'changoToXmlCode', 'saveCurrentView' );
-$G_PUBLISH->AddContent( 'panel-tab', 'HTML Template', 'dynaformEditor[5]', 'changoToHtmlCode', 'saveCurrentView' );
-$G_PUBLISH->AddContent( 'panel-tab', 'Fields List', 'dynaformEditor[6]', 'changoToFieldsList', 'saveCurrentView' );
-$G_PUBLISH->AddContent( 'panel-tab', 'JavaScripts', 'dynaformEditor[7]', 'changoToJavascripts', 'saveCurrentView' );
-$G_PUBLISH->AddContent( 'panel-tab', 'Properties', 'dynaformEditor[8]', 'changoToProperties', 'saveCurrentView' );
-$G_PUBLISH->AddContent( 'panel-close' );
+$G_PUBLISH->AddContent('panel-tab', 'Preview', 'dynaformEditor[3]', 'changoToPreview', 'saveCurrentView');
+$G_PUBLISH->AddContent('panel-tab', 'XML Code', 'dynaformEditor[4]', 'changoToXmlCode', 'saveCurrentView');
+$G_PUBLISH->AddContent('panel-tab', 'HTML Template', 'dynaformEditor[5]', 'changoToHtmlCode', 'saveCurrentView');
+$G_PUBLISH->AddContent('panel-tab', 'Fields List', 'dynaformEditor[6]', 'changoToFieldsList', 'saveCurrentView');
+$G_PUBLISH->AddContent('panel-tab', 'JavaScripts', 'dynaformEditor[7]', 'changoToJavascripts', 'saveCurrentView');
+$G_PUBLISH->AddContent('panel-tab', 'Properties', 'dynaformEditor[8]', 'changoToProperties', 'saveCurrentView');
+$G_PUBLISH->AddContent('panel-close');
 
-G::RenderPage( "publish", "raw" );
+G::RenderPage("publish", "raw");
 
 ?>
 <script>
diff --git a/workflow/engine/methods/dynaforms/dynaforms_checkDependentFields.php b/workflow/engine/methods/dynaforms/dynaforms_checkDependentFields.php
index 6c1492387..a12f9747b 100644
--- a/workflow/engine/methods/dynaforms/dynaforms_checkDependentFields.php
+++ b/workflow/engine/methods/dynaforms/dynaforms_checkDependentFields.php
@@ -32,80 +32,78 @@
 $filter = new InputFilter();
 $_POST = $filter->xssFilterHard($_POST);
 
-function subDependencies ($k, &$G_FORM, &$aux, $grid = '')
+function subDependencies($k, &$G_FORM, &$aux, $grid = '')
 {
     $myDependentFields = '';
-    if (array_search( $k, $aux ) !== false) {
-        return array ();
+    if (array_search($k, $aux) !== false) {
+        return array();
     }
     if ($grid == '') {
-        if (! array_key_exists( $k, $G_FORM->fields )) {
-            return array ();
+        if (!array_key_exists($k, $G_FORM->fields)) {
+            return array();
         }
-        if (! isset( $G_FORM->fields[$k]->dependentFields )) {
-            return array ();
+        if (!isset($G_FORM->fields[$k]->dependentFields)) {
+            return array();
         }
         $aux[] = $k;
         $mydependentFields = $G_FORM->fields[$k]->dependentFields;
-
     } else {
-        if (! array_key_exists( $k, $G_FORM->fields[$grid]->fields )) {
-            return array ();
+        if (!array_key_exists($k, $G_FORM->fields[$grid]->fields)) {
+            return array();
         }
-        if (! isset( $G_FORM->fields[$grid]->fields[$k]->dependentFields )) {
-            return array ();
+        if (!isset($G_FORM->fields[$grid]->fields[$k]->dependentFields)) {
+            return array();
         }
         $myDependentFields = $G_FORM->fields[$grid]->fields[$k]->dependentFields;
-        $myDependentFields = explode( ',', $G_FORM->fields[$grid]->fields[$k]->dependentFields );
-
+        $myDependentFields = explode(',', $G_FORM->fields[$grid]->fields[$k]->dependentFields);
     }
     return $myDependentFields;
 }
 
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_FACTORY" )) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess("PM_FACTORY")) != 1) {
     return $RBAC_Response;
 }
-    // the script responds an ajax request in order to check the dependent fields,
-    // and generate a json output of the values that the dependent field must have.
-$sDynUid = G::getUIDName( urlDecode( $_POST['DYN_UID'] ) );
+// the script responds an ajax request in order to check the dependent fields,
+// and generate a json output of the values that the dependent field must have.
+$sDynUid = G::getUIDName(urlDecode($_POST['DYN_UID']));
 //$json = new Services_JSON();
-$formValues = (Bootstrap::json_decode( $_POST['fields'] ));
+$formValues = (Bootstrap::json_decode($_POST['fields']));
 $sFieldName = $_POST['fieldName'];
 $sMasterField = '';
 $sPath = PATH_DYNAFORM;
-$G_FORM = new Form( $sDynUid, $sPath );
-$aux = array ();
-$newValues = Bootstrap::json_decode( urlDecode( stripslashes( $_POST['form'] ) ) );
+$G_FORM = new Form($sDynUid, $sPath);
+$aux = array();
+$newValues = Bootstrap::json_decode(urlDecode(stripslashes($_POST['form'])));
 
-if (isset( $_POST['grid'] )) {
-    $_POST['row'] = (int) $_POST['row'];
-    $aAux = array ();
+if (isset($_POST['grid'])) {
+    $_POST['row'] = (int)$_POST['row'];
+    $aAux = array();
     foreach ($newValues as $sKey => $newValue) {
-        $newValue = (array) $newValue;
-        $aKeys = array_keys( $newValue );
-        $aValues = array ();
-        for ($i = 1; $i <= ($_POST['row'] - 1); $i ++) {
-            $aValues[$i] = array ($aKeys[0] => ''
+        $newValue = (array)$newValue;
+        $aKeys = array_keys($newValue);
+        $aValues = array();
+        for ($i = 1; $i <= ($_POST['row'] - 1); $i++) {
+            $aValues[$i] = array($aKeys[0] => ''
             );
         }
-        $aValues[$_POST['row']] = array ($aKeys[0] => $newValue[$aKeys[0]] );
-        $newValues[$sKey]->$_POST['grid'] = $aValues;
-        unset( $newValues[$sKey]->$aKeys[0] );
+        $aValues[$_POST['row']] = array($aKeys[0] => $newValue[$aKeys[0]]);
+        $newValues[$sKey]->{$_POST['grid']} = $aValues;
+        unset($newValues[$sKey]->{$aKeys[0]});
     }
 }
 
-$dependentFields = array ();
-$aux = array ();
+$dependentFields = array();
+$aux = array();
 $found = false;
-for ($r = 0; $r < sizeof( $newValues ); $r ++) {
-    $newValues[$r] = (array) $newValues[$r];
-    $G_FORM->setValues( $newValues[$r] );
+for ($r = 0; $r < sizeof($newValues); $r++) {
+    $newValues[$r] = (array)$newValues[$r];
+    $G_FORM->setValues($newValues[$r]);
     //Search dependent fields
     foreach ($newValues[$r] as $k => $v) {
-        if (! is_array( $v )) {
-            $myDependentFields = subDependencies( $k, $G_FORM, $aux );
-            if (! $found) {
-                if (in_array( $sFieldName, $myDependentFields )) {
+        if (!is_array($v)) {
+            $myDependentFields = subDependencies($k, $G_FORM, $aux);
+            if (!$found) {
+                if (in_array($sFieldName, $myDependentFields)) {
                     $sMasterField = $k;
                     $found = true;
                 }
@@ -113,9 +111,9 @@ for ($r = 0; $r < sizeof( $newValues ); $r ++) {
             $_SESSION[$G_FORM->id][$k] = $v;
         } else {
             foreach ($v[$_POST['row']] as $k1 => $v1) {
-                $myDependentFields = subDependencies( $k1, $G_FORM, $aux, $_POST['grid'] );
-                if (! $found) {
-                    if (in_array( $sFieldName, $myDependentFields )) {
+                $myDependentFields = subDependencies($k1, $G_FORM, $aux, $_POST['grid']);
+                if (!$found) {
+                    if (in_array($sFieldName, $myDependentFields)) {
                         $sMasterField = $k1;
                         $found = true;
                     }
@@ -123,15 +121,14 @@ for ($r = 0; $r < sizeof( $newValues ); $r ++) {
                 $_SESSION[$G_FORM->id][$_POST['grid']][$_POST['row']][$k1] = $v1;
             }
         }
-        $dependentFields = array_merge( $dependentFields, $myDependentFields );
+        $dependentFields = array_merge($dependentFields, $myDependentFields);
     }
 }
 switch ($_POST['function']) {
     case 'showDependentFields':
-        echo $json->encode( array_unique( $dependentFields ) );
+        echo $json->encode(array_unique($dependentFields));
         break;
     case 'showDependentOf':
         echo $sMasterField;
         break;
 }
-
diff --git a/workflow/engine/methods/dynaforms/fieldsHandler.php b/workflow/engine/methods/dynaforms/fieldsHandler.php
index dfb56815a..a3ed6c12a 100644
--- a/workflow/engine/methods/dynaforms/fieldsHandler.php
+++ b/workflow/engine/methods/dynaforms/fieldsHandler.php
@@ -26,7 +26,6 @@
   */
 
 $G_PUBLISH = new Publisher();
-$oHeadPublisher = & headPublisher::getSingleton();
-$G_PUBLISH->AddContent( 'view', 'dynaforms/fieldsHandlerViewer' );
-G::RenderPage( "publish", "raw" );
-
+$oHeadPublisher = headPublisher::getSingleton();
+$G_PUBLISH->AddContent('view', 'dynaforms/fieldsHandlerViewer');
+G::RenderPage("publish", "raw");
diff --git a/workflow/engine/methods/dynaforms/fields_Order.php b/workflow/engine/methods/dynaforms/fields_Order.php
index 56e77d596..cb9b808ef 100644
--- a/workflow/engine/methods/dynaforms/fields_Order.php
+++ b/workflow/engine/methods/dynaforms/fields_Order.php
@@ -21,37 +21,37 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_FACTORY" )) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess("PM_FACTORY")) != 1) {
     return $RBAC_Response;
 }
 
     //G::genericForceLogin( 'WF_MYINFO' , 'login/noViewPage', $urlLogin = 'login/login' );
 
 
-if (! (isset( $_POST['A'] ) && $_POST['A'] !== '')) {
+if (! (isset($_POST['A']) && $_POST['A'] !== '')) {
     return;
 }
-if (! (isset( $_POST['XMLNODE_NAME'] ) && $_POST['XMLNODE_NAME'] !== '')) {
+if (! (isset($_POST['XMLNODE_NAME']) && $_POST['XMLNODE_NAME'] !== '')) {
     return;
 }
-if (! (isset( $_POST['NEW_POS'] ) && $_POST['NEW_POS'] !== '')) {
+if (! (isset($_POST['NEW_POS']) && $_POST['NEW_POS'] !== '')) {
     return;
 }
 
-$file = PATH_DYNAFORM . G::decrypt( $_POST['A'], URL_KEY ) . '.xml';
+$file = PATH_DYNAFORM . G::decrypt($_POST['A'], URL_KEY) . '.xml';
 $fieldName = $_POST['XMLNODE_NAME'];
-$newPos = intval( $_POST['NEW_POS'] );
+$newPos = intval($_POST['NEW_POS']);
 
-if (! file_exists( $file )) {
+if (! file_exists($file)) {
     return;
 }
 
 $xmldoc = new Xml_Document();
-$xmldoc->parseXmlFile( $file );
+$xmldoc->parseXmlFile($file);
 
-$node = & $xmldoc->findNode( '/dynaForm/' . $fieldName );
+$node = $xmldoc->findNode('/dynaForm/' . $fieldName);
 
-if (! isset( $node )) {
+if (! isset($node)) {
     return;
 }
 $numFields = 0;
@@ -63,7 +63,7 @@ $newPos = ($newPos < 1) ? 1 : $newPos;
 $newPos = ($newPos > $numFields) ? $numFields : $newPos;
 
 $rowCounter = (int) 0;
-$newOrder = array ();
+$newOrder = array();
 foreach ($xmldoc->children[0]->children as $index => $child) {
     if ($child->name !== '') {
         $rowCounter ++;
@@ -86,19 +86,18 @@ if ($rowCounter < $newPos) {
 }
 $xmldoc->children[0]->children = $newOrder;
 
-$xmldoc->save( $file );
+$xmldoc->save($file);
 
 $i = 0;
-$aFields = array ();
-$aFields[] = array ('XMLNODE_NAME' => 'char','TYPE' => 'char','UP' => 'char','DOWN' => 'char','row__' => 'integer');
-$oSession = new DBSession( new DBConnection( $file, '', '', '', 'myxml' ) );
-$oDataset = $oSession->Execute( 'SELECT * FROM dynaForm WHERE NOT( XMLNODE_NAME = "" )' );
+$aFields = array();
+$aFields[] = array('XMLNODE_NAME' => 'char','TYPE' => 'char','UP' => 'char','DOWN' => 'char','row__' => 'integer');
+$oSession = new DBSession(new DBConnection($file, '', '', '', 'myxml'));
+$oDataset = $oSession->Execute('SELECT * FROM dynaForm WHERE NOT( XMLNODE_NAME = "" )');
 $iMaximun = $oDataset->count();
 while ($aRow = $oDataset->Read()) {
-    $aFields[] = array ('XMLNODE_NAME' => $aRow['XMLNODE_NAME'],'TYPE' => $aRow['TYPE'],'UP' => ($i > 0 ? G::LoadTranslation( 'ID_UP' ) : ''),'DOWN' => ($i < $iMaximun - 1 ? G::LoadTranslation( 'ID_DOWN' ) : ''),'row__' => ($i + 1) );
+    $aFields[] = array('XMLNODE_NAME' => $aRow['XMLNODE_NAME'],'TYPE' => $aRow['TYPE'],'UP' => ($i > 0 ? G::LoadTranslation('ID_UP') : ''),'DOWN' => ($i < $iMaximun - 1 ? G::LoadTranslation('ID_DOWN') : ''),'row__' => ($i + 1) );
     $i ++;
 }
 global $_DBArray;
 $_DBArray['fields'] = $aFields;
 $_SESSION['_DBArray'] = $_DBArray;
-
diff --git a/workflow/engine/methods/emailServer/emailServer.php b/workflow/engine/methods/emailServer/emailServer.php
index f877daf43..07e648c9f 100644
--- a/workflow/engine/methods/emailServer/emailServer.php
+++ b/workflow/engine/methods/emailServer/emailServer.php
@@ -15,7 +15,7 @@ $arrayConfigPage = $configuration->getConfiguration("emailServerList", "pageSize
 $arrayConfig = array();
 $arrayConfig["pageSize"] = (isset($arrayConfigPage["pageSize"]))? $arrayConfigPage["pageSize"] : 20;
 
-$headPublisher = &headPublisher::getSingleton();
+$headPublisher = headPublisher::getSingleton();
 $headPublisher->addContent("emailServer/emailServer"); //Adding a HTML file
 $headPublisher->addExtJsScript("emailServer/emailServer", false); //Adding a JavaScript file
 $headPublisher->assign("CONFIG", $arrayConfig);
@@ -25,4 +25,3 @@ $headPublisher->assign("EMAILSERVER_LICENSED", (PMLicensedFeatures::getSingleton
 /*----------------------------------********---------------------------------*/
 
 G::RenderPage("publish", "extJs");
-
diff --git a/workflow/engine/methods/enterprise/addonsStore.php b/workflow/engine/methods/enterprise/addonsStore.php
index 62b412c9c..469b77b9a 100644
--- a/workflow/engine/methods/enterprise/addonsStore.php
+++ b/workflow/engine/methods/enterprise/addonsStore.php
@@ -4,49 +4,53 @@ use ProcessMaker\Core\System;
 
 AddonsStore::checkLicenseStore();
 
-$licenseManager = &PmLicenseManager::getSingleton();
-$oHeadPublisher = &headPublisher::getSingleton();
+$licenseManager = PmLicenseManager::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 
 if (isset($licenseManager->date) && is_array($licenseManager->date)) {
     $conf = new Configurations();
     if (!empty(config("system.workspace")) && $conf->exists("ENVIRONMENT_SETTINGS")) {
-        $licenseManager->date['START']  = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['START']));
-        $licenseManager->date['END']    = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['END']));
-        $licenseManager->date['START']  = $conf->getSystemDate($licenseManager->date['START']);
-        $licenseManager->date['END']    = $conf->getSystemDate($licenseManager->date['END']);
+        $licenseManager->date['START'] = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['START']));
+        $licenseManager->date['END'] = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['END']));
+        $licenseManager->date['START'] = $conf->getSystemDate($licenseManager->date['START']);
+        $licenseManager->date['END'] = $conf->getSystemDate($licenseManager->date['END']);
     } else {
-        $licenseManager->date['START']  = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['START']));
-        $licenseManager->date['END']    = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['END']));
-        $licenseManager->date['START']  = G::getformatedDate($licenseManager->date['START'], 'M d, yyyy', SYS_LANG);
-        $licenseManager->date['END']    = G::getformatedDate($licenseManager->date['END'], 'M d, yyyy', SYS_LANG);
+        $licenseManager->date['START'] = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['START']));
+        $licenseManager->date['END'] = date("Y-m-d H:i:s", strtotime($licenseManager->date['HUMAN']['END']));
+        $licenseManager->date['START'] = G::getformatedDate($licenseManager->date['START'], 'M d, yyyy', SYS_LANG);
+        $licenseManager->date['END'] = G::getformatedDate($licenseManager->date['END'], 'M d, yyyy', SYS_LANG);
     }
 }
 
 if (isset($licenseManager->result) && $licenseManager->result == "OK") {
-    $oHeadPublisher->assign("license_start_date",$licenseManager->date["START"]);
-    $oHeadPublisher->assign("license_end_date", $licenseManager->expireIn!="NEVER" ? $licenseManager->date["END"]:"NA" );
-    $oHeadPublisher->assign("license_user",     $licenseManager->info["FIRST_NAME"] . " " . $licenseManager->info["LAST_NAME"] . " (" . $licenseManager->info["DOMAIN_WORKSPACE"] . ")");
-    $oHeadPublisher->assign("license_span",     $licenseManager->expireIn != "NEVER" ? ceil($licenseManager->date["SPAN"]/60/60/24) : "~");
-    $oHeadPublisher->assign("license_name",     $licenseManager->type);
-    $oHeadPublisher->assign("license_server",   $licenseManager->server);
-    $oHeadPublisher->assign("license_expires",  $licenseManager->expireIn);
-    $oHeadPublisher->assign("license_message",  $licenseManager->status["message"]);
+    $oHeadPublisher->assign("license_start_date", $licenseManager->date["START"]);
+    $oHeadPublisher->assign("license_end_date",
+        $licenseManager->expireIn != "NEVER" ? $licenseManager->date["END"] : "NA");
+    $oHeadPublisher->assign("license_user",
+        $licenseManager->info["FIRST_NAME"] . " " . $licenseManager->info["LAST_NAME"] . " (" . $licenseManager->info["DOMAIN_WORKSPACE"] . ")");
+    $oHeadPublisher->assign("license_span",
+        $licenseManager->expireIn != "NEVER" ? ceil($licenseManager->date["SPAN"] / 60 / 60 / 24) : "~");
+    $oHeadPublisher->assign("license_name", $licenseManager->type);
+    $oHeadPublisher->assign("license_server", $licenseManager->server);
+    $oHeadPublisher->assign("license_expires", $licenseManager->expireIn);
+    $oHeadPublisher->assign("license_message", $licenseManager->status["message"]);
     $oHeadPublisher->assign("licensed", true);
-}
-elseif (isset($licenseManager->info)) {
+} elseif (isset($licenseManager->info)) {
     $oHeadPublisher->assign("license_start_date", $licenseManager->date["START"]);
     $oHeadPublisher->assign("license_end_date", $licenseManager->date["END"]);
-    $oHeadPublisher->assign("license_span", $licenseManager->expireIn != "NEVER" ? ceil($licenseManager->date["SPAN"]/60/60/24) : "~");
-    $oHeadPublisher->assign("license_user", $licenseManager->info["FIRST_NAME"] . " " . $licenseManager->info["LAST_NAME"] . " (" . $licenseManager->info["DOMAIN_WORKSPACE"] . ")");
+    $oHeadPublisher->assign("license_span",
+        $licenseManager->expireIn != "NEVER" ? ceil($licenseManager->date["SPAN"] / 60 / 60 / 24) : "~");
+    $oHeadPublisher->assign("license_user",
+        $licenseManager->info["FIRST_NAME"] . " " . $licenseManager->info["LAST_NAME"] . " (" . $licenseManager->info["DOMAIN_WORKSPACE"] . ")");
     $oHeadPublisher->assign("license_name", $licenseManager->type);
-    $oHeadPublisher->assign("license_server",  $licenseManager->server);
+    $oHeadPublisher->assign("license_server", $licenseManager->server);
     $oHeadPublisher->assign("license_expires", $licenseManager->expireIn);
     $oHeadPublisher->assign("license_message", $licenseManager->status["message"]);
     $oHeadPublisher->assign("licensed", false);
 } else {
     $oHeadPublisher->assign("license_user", "");
     $oHeadPublisher->assign("license_name", "<b>Unlicensed</b>");
-    $oHeadPublisher->assign("license_server",  "<b>no server</b>");
+    $oHeadPublisher->assign("license_server", "<b>no server</b>");
     $oHeadPublisher->assign("license_expires", "");
 
     $currentLicenseStatus = $licenseManager->getCurrentLicenseStatus();
@@ -57,21 +61,25 @@ elseif (isset($licenseManager->info)) {
     $oHeadPublisher->assign("license_span", "");
     $oHeadPublisher->assign("licensed", false);
 }
-$oHeadPublisher->assign("license_serial", (isset($licenseManager->licenseSerial))? $licenseManager->licenseSerial : '');
-$oHeadPublisher->assign("SUPPORT_FLAG", ((isset($licenseManager->supportStartDate) && $licenseManager->supportStartDate == '') || !isset($licenseManager->supportStartDate)) ? true : false );
-$oHeadPublisher->assign("supportStartDate", (isset($licenseManager->supportStartDate))? $licenseManager->supportStartDate : '');
-$oHeadPublisher->assign("supportEndDate", (isset($licenseManager->supportEndDate))? $licenseManager->supportEndDate : '');
+$oHeadPublisher->assign("license_serial",
+    (isset($licenseManager->licenseSerial)) ? $licenseManager->licenseSerial : '');
+$oHeadPublisher->assign("SUPPORT_FLAG",
+    ((isset($licenseManager->supportStartDate) && $licenseManager->supportStartDate == '') || !isset($licenseManager->supportStartDate)) ? true : false);
+$oHeadPublisher->assign("supportStartDate",
+    (isset($licenseManager->supportStartDate)) ? $licenseManager->supportStartDate : '');
+$oHeadPublisher->assign("supportEndDate",
+    (isset($licenseManager->supportEndDate)) ? $licenseManager->supportEndDate : '');
 
 $oHeadPublisher->assign("PROCESSMAKER_VERSION", System::getVersion());
-$oHeadPublisher->assign("PROCESSMAKER_URL", "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN );
+$oHeadPublisher->assign("PROCESSMAKER_URL", "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN);
 $oHeadPublisher->assign("SYS_SKIN", SYS_SKIN);
-$oHeadPublisher->assign("URL_PART_LOGIN", ((substr(SYS_SKIN, 0, 2) == "ux" && SYS_SKIN != "uxs")? "main/login" : "login/login"));
+$oHeadPublisher->assign("URL_PART_LOGIN",
+    ((substr(SYS_SKIN, 0, 2) == "ux" && SYS_SKIN != "uxs") ? "main/login" : "login/login"));
 $oHeadPublisher->assign("URL_PART_SETUP", EnterpriseUtils::getUrlPartSetup());
-$oHeadPublisher->assign("PATH_PLUGINS_WRITABLE", ((is_writable(PATH_PLUGINS))? 1 : 0));
+$oHeadPublisher->assign("PATH_PLUGINS_WRITABLE", ((is_writable(PATH_PLUGINS)) ? 1 : 0));
 $oHeadPublisher->assign("PATH_PLUGINS_WRITABLE_MESSAGE", "The directory " . PATH_PLUGINS . " have not writable.");
 $oHeadPublisher->assign("SKIN_IS_UX", EnterpriseUtils::skinIsUx());
 $oHeadPublisher->assign("INTERNET_CONNECTION", EnterpriseUtils::getInternetConnection());
 
 $oHeadPublisher->addExtJsScript("enterprise/addonsStore", true);
 G::RenderPage("publish", "extJs");
-
diff --git a/workflow/engine/methods/enterprise/addonsStoreAction.php b/workflow/engine/methods/enterprise/addonsStoreAction.php
index 0172149e2..905c355d7 100644
--- a/workflow/engine/methods/enterprise/addonsStoreAction.php
+++ b/workflow/engine/methods/enterprise/addonsStoreAction.php
@@ -5,7 +5,7 @@ use ProcessMaker\Plugins\PluginRegistry;
 
 function runBgProcessmaker($task, $log)
 {
-    require_once (PATH_CORE . "bin/tasks/cliAddons.php");
+    require_once(PATH_CORE . "bin/tasks/cliAddons.php");
 
     $task = str_replace("\"", null, $task);
     $data = explode(" ", $task);
@@ -23,7 +23,7 @@ try {
     }
 
     if (isset($_REQUEST['addon']) && isset($_REQUEST['store'])) {
-        require_once (PATH_CORE . 'classes/model/AddonsManagerPeer.php');
+        require_once(PATH_CORE . 'classes/model/AddonsManagerPeer.php');
 
         $addon   = AddonsManagerPeer::retrieveByPK($_REQUEST['addon'], $_REQUEST['store']);
         $addonId = $_REQUEST['addon'];
@@ -53,12 +53,12 @@ try {
                     $dir = PATH_DATA_SITE;
                     G::uploadFile($aInfoLoadFile["tmp_name"], $dir, $aInfoLoadFile["name"]);
                     //reading the file that was uploaded
-                    $oPmLicenseManager = &PmLicenseManager::getSingleton();
+                    $oPmLicenseManager = PmLicenseManager::getSingleton();
                     $response = $oPmLicenseManager->installLicense($dir . $aInfoLoadFile["name"]);
 
                     ///////
                     //This command also find the following file "AddonsStore.php"
-                    $licenseManager = &PmLicenseManager::getSingleton();
+                    $licenseManager = PmLicenseManager::getSingleton();
 
                     preg_match("/^license_(.*).dat$/", $licenseManager->file, $matches);
                     $realId = urlencode($matches[1]);
@@ -212,7 +212,7 @@ try {
                 }
 
                 ///////
-                $licenseManager = &PmLicenseManager::getSingleton();
+                $licenseManager = PmLicenseManager::getSingleton();
                 $server = $licenseManager->server;
                 $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
                 $url = "http://$server/sys".$workspace."/en/green/services/rest";
@@ -232,7 +232,7 @@ try {
                 $data = $data . "--$boundary\n";
 
                 ///////
-                //$licenseManager = &pmLicenseManager::getSingleton();
+                //$licenseManager = PmLicenseManager::getSingleton();
                 $activeLicense = $licenseManager->getActiveLicense();
 
                 $data = $data . "Content-Disposition: form-data; name=\"licenseFile\"; filename=\"" . $licenseManager->file . "\"\n";
@@ -309,8 +309,7 @@ try {
     } else {
         $result["addons"] = array();
     }
-    G::outRes( G::json_encode($result) );
-
+    G::outRes(G::json_encode($result));
 } catch (Exception $e) {
     $token = strtotime("now");
     PMException::registerErrorLog($e, $token);
diff --git a/workflow/engine/methods/enterprise/enterprise.php b/workflow/engine/methods/enterprise/enterprise.php
index 7487de8d4..bc22c4e33 100644
--- a/workflow/engine/methods/enterprise/enterprise.php
+++ b/workflow/engine/methods/enterprise/enterprise.php
@@ -130,9 +130,9 @@ class enterprisePlugin extends PMPlugin
     {
         $this->setConfiguration();
 
-        require_once (PATH_CORE . 'classes/model/AddonsStore.php');
+        require_once(PATH_CORE . 'classes/model/AddonsStore.php');
         AddonsStore::checkLicenseStore();
-        $licenseManager = &PmLicenseManager::getSingleton();
+        $licenseManager = PmLicenseManager::getSingleton();
         AddonsStore::updateAll(false);
     }
 
@@ -175,7 +175,7 @@ class enterprisePlugin extends PMPlugin
         //define("PATH_PLUGINS", PATH_CORE . "plugins" . PATH_SEP);
 
         if (file_exists(PATH_CORE . "plugins" . PATH_SEP . $pluginName . ".php")) {
-            require_once (PATH_CORE . "plugins" . PATH_SEP . $pluginName . ".php");
+            require_once(PATH_CORE . "plugins" . PATH_SEP . $pluginName . ".php");
 
             $pluginRegistry = PluginRegistry::loadSingleton();
 
@@ -278,7 +278,7 @@ class enterprisePlugin extends PMPlugin
                     $strTable = str_replace("_", " ", strtolower($table));
                     $strTable = str_replace(" ", null, ucwords($strTable));
 
-                    require_once (PATH_PLUGINS . "enterprise" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "$strTable.php");
+                    require_once(PATH_PLUGINS . "enterprise" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "$strTable.php");
 
                     while ($rsSelectTablebak->next()) {
                         $row = $rsSelectTablebak->getRow();
@@ -336,4 +336,3 @@ $oPluginRegistry->registerPlugin('enterprise', __FILE__); //<- enterprise string
 //  PATH_PM_LICENSE_MANAGER.PATH_SEPARATOR.
 //  get_include_path()
 //);
-
diff --git a/workflow/engine/methods/enterprise/processMakerAjax.php b/workflow/engine/methods/enterprise/processMakerAjax.php
index d68088a97..26c3e6900 100644
--- a/workflow/engine/methods/enterprise/processMakerAjax.php
+++ b/workflow/engine/methods/enterprise/processMakerAjax.php
@@ -6,7 +6,7 @@ ini_set("max_execution_time", 0);
 
 if (!defined("PM_VERSION")) {
     if (file_exists(PATH_METHODS . "login/version-pmos.php")) {
-        include (PATH_METHODS . "login/version-pmos.php");
+        include(PATH_METHODS . "login/version-pmos.php");
     } else {
         define("PM_VERSION", "2.0.0");
     }
@@ -19,8 +19,6 @@ if (!defined("BUFSIZE")) {
 
 function install($file)
 {
-
-
     $result = array();
     $status = 1;
 
@@ -119,7 +117,7 @@ switch ($option) {
             }
 
             ///////
-            $licenseManager = &PmLicenseManager::getSingleton();
+            $licenseManager = PmLicenseManager::getSingleton();
             $server = isset($licenseManager->server) ? $licenseManager->server : '';
             $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
 
@@ -295,7 +293,7 @@ switch ($option) {
             }
 
             ///////
-            $licenseManager = &PmLicenseManager::getSingleton();
+            $licenseManager = PmLicenseManager::getSingleton();
             $server = (isset($licenseManager->server)) ? $licenseManager->server : '';
             $workspace = (isset($licenseManager->workspace)) ? $licenseManager->workspace : 'pmLicenseSrv';
 
@@ -371,4 +369,3 @@ switch ($option) {
         echo G::json_encode($response);
         break;
 }
-
diff --git a/workflow/engine/methods/events/eventList.php b/workflow/engine/methods/events/eventList.php
index 81b9213a5..859652028 100644
--- a/workflow/engine/methods/events/eventList.php
+++ b/workflow/engine/methods/events/eventList.php
@@ -56,7 +56,7 @@ $processes = getProcessArray($userUid);
 
 $G_PUBLISH = new Publisher();
 
-$oHeadPublisher = &headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript('events/eventList', false); //adding a javascript file .js
 $oHeadPublisher->addContent('events/eventList'); //adding a html file  .html.
 //sending the columns to display in grid
@@ -92,5 +92,4 @@ function getProcessArray($userUid)
     return $processes;
 }
 
-G::RenderPage( 'publish', 'extJs' );
-
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/groups/groups.php b/workflow/engine/methods/groups/groups.php
index 936e5c25e..aed2791a7 100644
--- a/workflow/engine/methods/groups/groups.php
+++ b/workflow/engine/methods/groups/groups.php
@@ -63,10 +63,9 @@ $configPage = $c->getConfiguration('groupList', 'pageSize', '', $_SESSION['USER_
 $configEnv = $c->getConfiguration('ENVIRONMENT_SETTINGS', '');
 $Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
 
-$oHeadPublisher = &headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript('groups/groupsList', false); //adding a javascript file .js
 $oHeadPublisher->addContent('groups/groupsList'); //adding a html file  .html.
 $oHeadPublisher->assign('CONFIG', $Config);
 
 G::RenderPage('publish', 'extJs');
-
diff --git a/workflow/engine/methods/groups/groupsMembers.php b/workflow/engine/methods/groups/groupsMembers.php
index e5071103b..d2fd08b95 100644
--- a/workflow/engine/methods/groups/groupsMembers.php
+++ b/workflow/engine/methods/groups/groupsMembers.php
@@ -22,28 +22,28 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 
-$access = $RBAC->userCanAccess( 'PM_USERS' );
+$access = $RBAC->userCanAccess('PM_USERS');
 if ($access != 1) {
     switch ($access) {
         case - 1:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         case - 2:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         default:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
     }
 }
 
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_USERS" )) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess("PM_USERS")) != 1) {
     return $RBAC_Response;
 }
 
@@ -54,21 +54,20 @@ $G_ID_SUB_MENU_SELECTED = 'GROUPS';
 
 $G_PUBLISH = new Publisher();
 
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 
-$oHeadPublisher->addExtJsScript( 'groups/groupsMembers', false ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'groups/groupsMembers' ); //adding a html file  .html.
+$oHeadPublisher->addExtJsScript('groups/groupsMembers', false); //adding a javascript file .js
+$oHeadPublisher->addContent('groups/groupsMembers'); //adding a html file  .html.
 
 
-$labels = G::getTranslations( Array ('ID_GROUPS','ID_GROUP_NAME','ID_BACK','ID_ASSIGN_ALL_MEMBERS','ID_REMOVE_ALL_MEMBERS','ID_MSG_AJAX_FAILURE','ID_PROCESSING','ID_ENTER_SEARCH_TERM','ID_FIRST_NAME','ID_LAST_NAME','ID_USER_NAME','ID_AVAILABLE_MEMBERS','ID_ASSIGNED_MEMBERS') );
+$labels = G::getTranslations(array('ID_GROUPS','ID_GROUP_NAME','ID_BACK','ID_ASSIGN_ALL_MEMBERS','ID_REMOVE_ALL_MEMBERS','ID_MSG_AJAX_FAILURE','ID_PROCESSING','ID_ENTER_SEARCH_TERM','ID_FIRST_NAME','ID_LAST_NAME','ID_USER_NAME','ID_AVAILABLE_MEMBERS','ID_ASSIGNED_MEMBERS'));
 
 $oGroup = new Groupwf();
-$oGroup->load( $_REQUEST['GRP_UID'] );
+$oGroup->load($_REQUEST['GRP_UID']);
 
 $groups['GRP_UID'] = $_REQUEST['GRP_UID'];
 $groups['GRP_TITLE'] = $oGroup->getGrpTitle();
 
 //$oHeadPublisher->assign('TRANSLATIONS', $labels);
-$oHeadPublisher->assign( 'GROUPS', $groups );
-G::RenderPage( 'publish', 'extJs' );
-
+$oHeadPublisher->assign('GROUPS', $groups);
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/groups/groups_Ajax.php b/workflow/engine/methods/groups/groups_Ajax.php
index 0ed7df35b..b58ebfc0c 100644
--- a/workflow/engine/methods/groups/groups_Ajax.php
+++ b/workflow/engine/methods/groups/groups_Ajax.php
@@ -21,50 +21,50 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_USERS" )) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess("PM_USERS")) != 1) {
     return $RBAC_Response;
 }
-$_POST['action'] = get_ajax_value( 'action' );
+$_POST['action'] = get_ajax_value('action');
 
 switch ($_POST['action']) {
     case 'showUsers':
 
         $oGroups = new Groups();
         $oGroup = new Groupwf();
-        $aFields = $oGroup->load( $_POST['sGroupUID'] );
+        $aFields = $oGroup->load($_POST['sGroupUID']);
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
         //$G_PUBLISH->AddContent('xmlform', 'xmlform', 'groups/groups_UsersListTitle', '', array('GRP_NAME' => $aFields['GRP_TITLE']));
-        $G_PUBLISH->AddContent( 'propeltable', 'groups/paged-table2', 'groups/groups_UsersList', $oGroups->getUsersGroupCriteria( $_POST['sGroupUID'] ), array ('GRP_UID' => $_POST['sGroupUID'],'GRP_NAME' => $aFields['GRP_TITLE']) );
-        $oHeadPublisher = & headPublisher::getSingleton();
-        $oHeadPublisher->addScriptCode( "groupname=\"{$aFields["GRP_TITLE"]}\";" );
-        G::RenderPage( 'publish', 'raw' );
+        $G_PUBLISH->AddContent('propeltable', 'groups/paged-table2', 'groups/groups_UsersList', $oGroups->getUsersGroupCriteria($_POST['sGroupUID']), array('GRP_UID' => $_POST['sGroupUID'],'GRP_NAME' => $aFields['GRP_TITLE']));
+        $oHeadPublisher = headPublisher::getSingleton();
+        $oHeadPublisher->addScriptCode("groupname=\"{$aFields["GRP_TITLE"]}\";");
+        G::RenderPage('publish', 'raw');
         break;
     case 'assignUser':
         $oGroup = new Groups();
-        $oGroup->addUserToGroup( $_POST['GRP_UID'], $_POST['USR_UID'] );
+        $oGroup->addUserToGroup($_POST['GRP_UID'], $_POST['USR_UID']);
         break;
     case 'assignAllUsers':
         $oGroup = new Groups();
-        $aUsers = explode( ',', $_POST['aUsers'] );
-        for ($i = 0; $i < count( $aUsers ); $i ++) {
-            $oGroup->addUserToGroup( $_POST['GRP_UID'], $aUsers[$i] );
+        $aUsers = explode(',', $_POST['aUsers']);
+        for ($i = 0; $i < count($aUsers); $i ++) {
+            $oGroup->addUserToGroup($_POST['GRP_UID'], $aUsers[$i]);
         }
         break;
     case 'ofToAssignUser':
         $oGroup = new Groups();
-        $oGroup->removeUserOfGroup( $_POST['GRP_UID'], $_POST['USR_UID'] );
+        $oGroup->removeUserOfGroup($_POST['GRP_UID'], $_POST['USR_UID']);
         break;
     case 'verifyGroupname':
-        $_POST['sOriginalGroupname'] = get_ajax_value( 'sOriginalGroupname' );
-        $_POST['sGroupname'] = get_ajax_value( 'sGroupname' );
+        $_POST['sOriginalGroupname'] = get_ajax_value('sOriginalGroupname');
+        $_POST['sGroupname'] = get_ajax_value('sGroupname');
         if ($_POST['sOriginalGroupname'] == $_POST['sGroupname']) {
             echo '0';
         } else {
             $oGroup = new Groupwf();
-            $oCriteria = $oGroup->loadByGroupname( $_POST['sGroupname'] );
-            $oDataset = GroupwfPeer::doSelectRS( $oCriteria );
-            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oCriteria = $oGroup->loadByGroupname($_POST['sGroupname']);
+            $oDataset = GroupwfPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
             $aRow = $oDataset->getRow();
             if (! $aRow) {
@@ -76,12 +76,12 @@ switch ($_POST['action']) {
         break;
     case 'groupsList':
         $co = new Configurations();
-        $config = $co->getConfiguration( 'groupList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
-        $env = $co->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
-        $limit_size = isset( $config['pageSize'] ) ? $config['pageSize'] : 20;
-        $start = isset( $_REQUEST['start'] ) ? $_REQUEST['start'] : 0;
-        $limit = isset( $_REQUEST['limit'] ) ? $_REQUEST['limit'] : $limit_size;
-        $filter = isset( $_REQUEST['textFilter'] ) ? $_REQUEST['textFilter'] : '';
+        $config = $co->getConfiguration('groupList', 'pageSize', '', $_SESSION['USER_LOGGED']);
+        $env = $co->getConfiguration('ENVIRONMENT_SETTINGS', '');
+        $limit_size = isset($config['pageSize']) ? $config['pageSize'] : 20;
+        $start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
+        $limit = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $limit_size;
+        $filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : '';
 
         $sortField = isset($_REQUEST["sort"])? $_REQUEST["sort"] : "";
         $sortDir = isset($_REQUEST["dir"])? $_REQUEST["dir"] : "";
@@ -98,17 +98,17 @@ switch ($_POST['action']) {
 
         $groups = new Groupwf();
 
-        $data = $groups->getAllGroup( $start, $limit, $filter, $sortField, $sortDir, true);
+        $data = $groups->getAllGroup($start, $limit, $filter, $sortField, $sortDir, true);
         $result = $data['rows'];
 
         $totalRows = 0;
-        $arrData = array ();
+        $arrData = array();
         foreach ($result as $results) {
             $totalRows ++;
-            $results['CON_VALUE'] = str_replace( array ("<",">"
-            ), array ("&lt;","&gt;"
-            ), $results['GRP_TITLE'] );
-            $results['GRP_TASKS'] = isset( $aTask[$results['GRP_UID']] ) ? $aTask[$results['GRP_UID']] : 0;
+            $results['CON_VALUE'] = str_replace(array("<",">"
+            ), array("&lt;","&gt;"
+            ), $results['GRP_TITLE']);
+            $results['GRP_TASKS'] = isset($aTask[$results['GRP_UID']]) ? $aTask[$results['GRP_UID']] : 0;
             $arrData[] = $results;
         }
 
@@ -117,13 +117,13 @@ switch ($_POST['action']) {
         $result->groups = $arrData;
         $result->total_groups = $data['totalCount'];
         G::header('Content-Type: application/json');
-        echo G::json_encode( $result );
+        echo G::json_encode($result);
         break;
     case 'exitsGroupName':
         $oGroup = new Groupwf();
-        $oCriteria = $oGroup->loadByGroupname( $_POST['GRP_NAME'] );
-        $oDataset = GroupwfPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oCriteria = $oGroup->loadByGroupname($_POST['GRP_NAME']);
+        $oDataset = GroupwfPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         $aRow = $oDataset->getRow();
         $response = ($aRow) ? 'true' : 'false';
@@ -132,10 +132,10 @@ switch ($_POST['action']) {
     case 'saveNewGroup':
         $newGroup['GRP_UID'] = '';
         $newGroup['GRP_STATUS'] = ($_POST['status'] == '1') ? 'ACTIVE' : 'INACTIVE';
-        $newGroup['GRP_TITLE'] = trim( $_POST['name'] );
-        unset( $newGroup['GRP_UID'] );
+        $newGroup['GRP_TITLE'] = trim($_POST['name']);
+        unset($newGroup['GRP_UID']);
         $group = new Groupwf();
-        $group->create( $newGroup );
+        $group->create($newGroup);
         G::auditLog("CreateGroup", "Group Name: ".$newGroup['GRP_TITLE']." - Group Status: ".$newGroup['GRP_STATUS']);
 
         echo '{success: true}';
@@ -144,109 +144,109 @@ switch ($_POST['action']) {
     case 'saveEditGroup':
         $editGroup['GRP_UID'] = $_POST['grp_uid'];
         $editGroup['GRP_STATUS'] = ($_POST['status'] == '1') ? 'ACTIVE' : 'INACTIVE';
-        $editGroup['GRP_TITLE'] = trim( $_POST['name'] );
+        $editGroup['GRP_TITLE'] = trim($_POST['name']);
         $group = new Groupwf();
-        $group->update( $editGroup );
+        $group->update($editGroup);
         G::auditLog("UpdateGroup", "Group Name: ".$editGroup['GRP_TITLE']." - Group ID: (".$_POST['grp_uid'].") - Group Status: ".$editGroup['GRP_STATUS']);
         echo '{success: true}';
         break;
     case 'deleteGroup':
         $group = new Groupwf();
-        if (! isset( $_POST['GRP_UID'] )) {
+        if (! isset($_POST['GRP_UID'])) {
             return;
         }
-        $group->remove( urldecode( $_POST['GRP_UID'] ) );
+        $group->remove(urldecode($_POST['GRP_UID']));
         G::auditLog("DeleteGroup", "Group Name: ".$_POST['GRP_NAME']." Group ID: (".$_POST['GRP_UID'].") ");
         require_once 'classes/model/TaskUser.php';
         $oProcess = new TaskUser();
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->add( TaskUserPeer::USR_UID, $_POST['GRP_UID'] );
-        TaskUserPeer::doDelete( $oCriteria );
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->add(TaskUserPeer::USR_UID, $_POST['GRP_UID']);
+        TaskUserPeer::doDelete($oCriteria);
 
         //Delete permissions
         require_once 'classes/model/ObjectPermission.php';
-        $criteria = new Criteria( 'workflow' );
+        $criteria = new Criteria('workflow');
         $criteria->add(ObjectPermissionPeer::USR_UID, $_POST['GRP_UID']);
-        ObjectPermissionPeer::doDelete( $criteria );
+        ObjectPermissionPeer::doDelete($criteria);
 
         //Delete supervisors assignments
         require_once 'classes/model/ProcessUser.php';
-        $criteria = new Criteria( 'workflow' );
+        $criteria = new Criteria('workflow');
         $criteria->add(ProcessUserPeer::USR_UID, $_POST['GRP_UID']);
         $criteria->add(ProcessUserPeer::PU_TYPE, 'GROUP_SUPERVISOR');
-        ProcessUserPeer::doDelete( $criteria );
+        ProcessUserPeer::doDelete($criteria);
         
         //Delete group users
         require_once 'classes/model/GroupUser.php';
-        $criteria = new Criteria( 'workflow' );
+        $criteria = new Criteria('workflow');
         $criteria->add(GroupUserPeer::GRP_UID, $_POST['GRP_UID']);
-        GroupUserPeer::doDelete( $criteria );
+        GroupUserPeer::doDelete($criteria);
 
         echo '{success: true}';
         break;
     case 'assignedMembers':
 
         $co = new Configurations();
-        $config = $co->getConfiguration( 'groupList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
-        $env = $co->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
-        $limit_size = isset( $config['pageSize'] ) ? $config['pageSize'] : 20;
-        $start = isset( $_REQUEST['start'] ) ? $_REQUEST['start'] : 0;
-        $limit = isset( $_REQUEST['limit'] ) ? $_REQUEST['limit'] : $limit_size;
-        $filter = isset( $_REQUEST['textFilter'] ) ? $_REQUEST['textFilter'] : '';
+        $config = $co->getConfiguration('groupList', 'pageSize', '', $_SESSION['USER_LOGGED']);
+        $env = $co->getConfiguration('ENVIRONMENT_SETTINGS', '');
+        $limit_size = isset($config['pageSize']) ? $config['pageSize'] : 20;
+        $start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
+        $limit = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $limit_size;
+        $filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : '';
 
         $sGroupUID = $_REQUEST['gUID'];
 
-        $aUsers = Array ();
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->addSelectColumn( 'COUNT(*) AS CNT' );
-        $oCriteria->addJoin( GroupUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN );
-        $oCriteria->add( GroupUserPeer::GRP_UID, $sGroupUID );
-        $oCriteria->add( UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL );
-        $filter = (isset( $_POST['textFilter'] )) ? $_POST['textFilter'] : '';
+        $aUsers = array();
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn('COUNT(*) AS CNT');
+        $oCriteria->addJoin(GroupUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
+        $oCriteria->add(GroupUserPeer::GRP_UID, $sGroupUID);
+        $oCriteria->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
+        $filter = (isset($_POST['textFilter'])) ? $_POST['textFilter'] : '';
         if ($filter != '') {
-            $oCriteria->add( $oCriteria->getNewCriterion( UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE ) ) ) );
+            $oCriteria->add($oCriteria->getNewCriterion(UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE))));
         }
-        $oDataset = UsersPeer::DoSelectRs( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataset = UsersPeer::DoSelectRs($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         $row = $oDataset->getRow();
         $totalRows = $row['CNT'];
 
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->addSelectColumn( GroupUserPeer::GRP_UID );
-        $oCriteria->addSelectColumn( UsersPeer::USR_UID );
-        $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
-        $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
-        $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
-        $oCriteria->addSelectColumn( UsersPeer::USR_EMAIL );
-        $oCriteria->addSelectColumn( UsersPeer::USR_STATUS );
-        $oCriteria->addJoin( GroupUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN );
-        $oCriteria->add( GroupUserPeer::GRP_UID, $sGroupUID );
-        $oCriteria->add( UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL );
-        $filter = (isset( $_POST['textFilter'] )) ? $_POST['textFilter'] : '';
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn(GroupUserPeer::GRP_UID);
+        $oCriteria->addSelectColumn(UsersPeer::USR_UID);
+        $oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
+        $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
+        $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
+        $oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
+        $oCriteria->addSelectColumn(UsersPeer::USR_STATUS);
+        $oCriteria->addJoin(GroupUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
+        $oCriteria->add(GroupUserPeer::GRP_UID, $sGroupUID);
+        $oCriteria->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
+        $filter = (isset($_POST['textFilter'])) ? $_POST['textFilter'] : '';
         if ($filter != '') {
-            $oCriteria->add( $oCriteria->getNewCriterion( UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE ) ) ) );
+            $oCriteria->add($oCriteria->getNewCriterion(UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE))));
         }
-        $oCriteria->setOffset( $start );
-        $oCriteria->setLimit( $limit );
+        $oCriteria->setOffset($start);
+        $oCriteria->setLimit($limit);
 
-        $oDataset = UsersPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-        $arrData = Array ();
+        $oDataset = UsersPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $arrData = array();
         while ($oDataset->next()) {
             $arrData[] = $oDataset->getRow();
         }
         G::header('Content-Type: application/json');
-        echo '{success: true, members: ' . G::json_encode( $arrData ) . ', total_users: ' . $totalRows . '}';
+        echo '{success: true, members: ' . G::json_encode($arrData) . ', total_users: ' . $totalRows . '}';
         break;
     case 'availableMembers':
         $co = new Configurations();
-        $config = $co->getConfiguration( 'groupList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
-        $env = $co->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
-        $limit_size = isset( $config['pageSize'] ) ? $config['pageSize'] : 20;
-        $start = isset( $_REQUEST['start'] ) ? $_REQUEST['start'] : 0;
-        $limit = isset( $_REQUEST['limit'] ) ? $_REQUEST['limit'] : $limit_size;
-        $filter = isset( $_REQUEST['textFilter'] ) ? $_REQUEST['textFilter'] : '';
+        $config = $co->getConfiguration('groupList', 'pageSize', '', $_SESSION['USER_LOGGED']);
+        $env = $co->getConfiguration('ENVIRONMENT_SETTINGS', '');
+        $limit_size = isset($config['pageSize']) ? $config['pageSize'] : 20;
+        $start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
+        $limit = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $limit_size;
+        $filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : '';
 
         $inputFilter = new InputFilter();
         $subQuery = "SELECT " . GroupUserPeer::USR_UID .
@@ -255,70 +255,70 @@ switch ($_POST['action']) {
                     $inputFilter->quoteSmart($_REQUEST['gUID'], Propel::getConnection("workflow")) . "'\n" .
                     "UNION SELECT '" . RBAC::GUEST_USER_UID . "'";
 
-        $aUsers = Array ();
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->addSelectColumn( 'COUNT(*) AS CNT' );
-        $oCriteria->add( UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL );
-        $oCriteria->add( UsersPeer::USR_UID, UsersPeer::USR_UID . " NOT IN ($subQuery)", Criteria::CUSTOM );
-        $filter = (isset( $_POST['textFilter'] )) ? $_POST['textFilter'] : '';
+        $aUsers = array();
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn('COUNT(*) AS CNT');
+        $oCriteria->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
+        $oCriteria->add(UsersPeer::USR_UID, UsersPeer::USR_UID . " NOT IN ($subQuery)", Criteria::CUSTOM);
+        $filter = (isset($_POST['textFilter'])) ? $_POST['textFilter'] : '';
         if ($filter != '') {
-            $oCriteria->add( $oCriteria->getNewCriterion( UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE ) ) ) );
+            $oCriteria->add($oCriteria->getNewCriterion(UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE))));
         }
-        $oDataset = UsersPeer::DoSelectRs( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+        $oDataset = UsersPeer::DoSelectRs($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         $row = $oDataset->getRow();
         $totalRows = $row['CNT'];
 
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->addSelectColumn( UsersPeer::USR_UID );
-        $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
-        $oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
-        $oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
-        $oCriteria->addSelectColumn( UsersPeer::USR_EMAIL );
-        $oCriteria->addSelectColumn( UsersPeer::USR_STATUS );
-        $oCriteria->add( UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL );
-        $oCriteria->add( UsersPeer::USR_UID, UsersPeer::USR_UID . " NOT IN ($subQuery)", Criteria::CUSTOM );
-        $filter = (isset( $_POST['textFilter'] )) ? $_POST['textFilter'] : '';
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn(UsersPeer::USR_UID);
+        $oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
+        $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
+        $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
+        $oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
+        $oCriteria->addSelectColumn(UsersPeer::USR_STATUS);
+        $oCriteria->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
+        $oCriteria->add(UsersPeer::USR_UID, UsersPeer::USR_UID . " NOT IN ($subQuery)", Criteria::CUSTOM);
+        $filter = (isset($_POST['textFilter'])) ? $_POST['textFilter'] : '';
         if ($filter != '') {
-            $oCriteria->add( $oCriteria->getNewCriterion( UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE )->addOr( $oCriteria->getNewCriterion( UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE ) ) ) );
+            $oCriteria->add($oCriteria->getNewCriterion(UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE)->addOr($oCriteria->getNewCriterion(UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE))));
         }
-        $oCriteria->addAscendingOrderByColumn( UsersPeer::USR_USERNAME );
-        $oCriteria->setOffset( $start );
-        $oCriteria->setLimit( $limit );
-        $oDataset = UsersPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-        $arrData = Array ();
+        $oCriteria->addAscendingOrderByColumn(UsersPeer::USR_USERNAME);
+        $oCriteria->setOffset($start);
+        $oCriteria->setLimit($limit);
+        $oDataset = UsersPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        $arrData = array();
         while ($oDataset->next()) {
             $arrData[] = $oDataset->getRow();
         }
         G::header('Content-Type: application/json');
-        echo '{success: true, members: ' . G::json_encode( $arrData ) . ', total_users: ' . $totalRows . '}';
+        echo '{success: true, members: ' . G::json_encode($arrData) . ', total_users: ' . $totalRows . '}';
         break;
     case 'assignUsersToGroupsMultiple':
         $GRP_UID = $_POST['GRP_UID'];
-        $uUIDs = explode( ',', $_POST['USR_UID'] );
+        $uUIDs = explode(',', $_POST['USR_UID']);
         $oGroup = new Groups();
         foreach ($uUIDs as $USR_UID) {
-            $oGroup->addUserToGroup( $GRP_UID, $USR_UID );
+            $oGroup->addUserToGroup($GRP_UID, $USR_UID);
         }
         break;
     case 'deleteUsersToGroupsMultiple':
         $GRP_UID = $_POST['GRP_UID'];
-        $uUIDs = explode( ',', $_POST['USR_UID'] );
+        $uUIDs = explode(',', $_POST['USR_UID']);
         $oGroup = new Groups();
         foreach ($uUIDs as $USR_UID) {
-            $oGroup->removeUserOfGroup( $GRP_UID, $USR_UID );
+            $oGroup->removeUserOfGroup($GRP_UID, $USR_UID);
         }
         break;
     case 'updatePageSize':
         $c = new Configurations();
         $arr['pageSize'] = $_REQUEST['size'];
-        $arr['dateSave'] = date( 'Y-m-d H:i:s' );
-        $config = Array ();
+        $arr['dateSave'] = date('Y-m-d H:i:s');
+        $config = array();
         $config[] = $arr;
         $c->aConfig = $config;
-        $c->saveConfig( 'groupList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
+        $c->saveConfig('groupList', 'pageSize', '', $_SESSION['USER_LOGGED']);
         echo '{success: true}';
         break;
     case "verifyIfAssigned":
@@ -341,4 +341,4 @@ switch ($_POST['action']) {
         $response["result"] = $message;
         echo G::json_encode($response);
         break;
-}
\ No newline at end of file
+}
diff --git a/workflow/engine/methods/install/heartbeatStatus.php b/workflow/engine/methods/install/heartbeatStatus.php
index dd79eaf13..baa0b9c41 100644
--- a/workflow/engine/methods/install/heartbeatStatus.php
+++ b/workflow/engine/methods/install/heartbeatStatus.php
@@ -1,17 +1,17 @@
 <?php
 
 try {
-    if (isset( $_REQUEST['status'] )) {
-        $oServerConf = & ServerConf::getSingleton();
+    if (isset($_REQUEST['status'])) {
+        $oServerConf = ServerConf::getSingleton();
         /*you can use SYS_TEMP or SYS_SYS ON HEAR_BEAT_CONF to save for each workspace*/
         if ($_REQUEST['status']) {
             echo "ACTIVE (Thanks!)";
-            $oServerConf->setHeartbeatProperty( 'HB_OPTION', 1, 'HEART_BEAT_CONF' );
-            $oServerConf->unsetHeartbeatProperty( 'HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF' );
+            $oServerConf->setHeartbeatProperty('HB_OPTION', 1, 'HEART_BEAT_CONF');
+            $oServerConf->unsetHeartbeatProperty('HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF');
         } else {
             echo "INACTIVE";
-            $oServerConf->setHeartbeatProperty( 'HB_OPTION', 0, 'HEART_BEAT_CONF' );
-            $oServerConf->unsetHeartbeatProperty( 'HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF' );
+            $oServerConf->setHeartbeatProperty('HB_OPTION', 0, 'HEART_BEAT_CONF');
+            $oServerConf->unsetHeartbeatProperty('HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF');
         }
     } else {
         echo "Nothing to do";
@@ -19,6 +19,5 @@ try {
 } catch (Exception $e) {
     $token = strtotime("now");
     PMException::registerErrorLog($e, $token);
-    G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
+    G::outRes(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)));
 }
-
diff --git a/workflow/engine/methods/install/newSite.php b/workflow/engine/methods/install/newSite.php
index 9bc754583..cb2785152 100644
--- a/workflow/engine/methods/install/newSite.php
+++ b/workflow/engine/methods/install/newSite.php
@@ -6,28 +6,28 @@ global $RBAC;
 
 $RBAC->allows(basename(__FILE__), basename(__FILE__));
 
-if (isset( $_POST['form']['NW_TITLE'] )) {
-    $action = (isset( $_POST['form']['ACTION'] )) ? trim( $_POST['form']['ACTION'] ) : 'test';
-    $name = trim( $_POST['form']['NW_TITLE'] );
+if (isset($_POST['form']['NW_TITLE'])) {
+    $action = (isset($_POST['form']['ACTION'])) ? trim($_POST['form']['ACTION']) : 'test';
+    $name = trim($_POST['form']['NW_TITLE']);
     $inst = new Installer();
 
-    $isset = $inst->isset_site( $name );
+    $isset = $inst->isset_site($name);
 
     $new = ((! $isset)) ? true : false;
-    $user = (isset( $_POST['form']['NW_USERNAME'] )) ? trim( $_POST['form']['NW_USERNAME'] ) : 'admin';
-    $pass = (isset( $_POST['form']['NW_PASSWORD'] )) ? $_POST['form']['NW_PASSWORD'] : 'admin';
-    $pass1 = (isset( $_POST['form']['NW_PASSWORD2'] )) ? $_POST['form']['NW_PASSWORD2'] : 'admin';
+    $user = (isset($_POST['form']['NW_USERNAME'])) ? trim($_POST['form']['NW_USERNAME']) : 'admin';
+    $pass = (isset($_POST['form']['NW_PASSWORD'])) ? $_POST['form']['NW_PASSWORD'] : 'admin';
+    $pass1 = (isset($_POST['form']['NW_PASSWORD2'])) ? $_POST['form']['NW_PASSWORD2'] : 'admin';
 
-    $ao_db_drop = (isset( $_POST['form']['AO_DB_DROP'] )) ? true : false;
+    $ao_db_drop = (isset($_POST['form']['AO_DB_DROP'])) ? true : false;
 
-    $ao_db_wf = (isset( $_POST['form']['AO_DB_WF'] )) ? $_POST['form']['AO_DB_WF'] : false;
-    $ao_db_rb = (isset( $_POST['form']['AO_DB_WF'] )) ? $_POST['form']['AO_DB_WF'] : false;
-    $ao_db_rp = (isset( $_POST['form']['AO_DB_WF'] )) ? $_POST['form']['AO_DB_WF'] : false;
+    $ao_db_wf = (isset($_POST['form']['AO_DB_WF'])) ? $_POST['form']['AO_DB_WF'] : false;
+    $ao_db_rb = (isset($_POST['form']['AO_DB_WF'])) ? $_POST['form']['AO_DB_WF'] : false;
+    $ao_db_rp = (isset($_POST['form']['AO_DB_WF'])) ? $_POST['form']['AO_DB_WF'] : false;
 
-    $result = $inst->create_site( Array ('isset' => true,'name' => $name,'admin' => Array ('username' => $user,'password' => $pass
-    ),'advanced' => Array ('ao_db_drop' => $ao_db_drop,'ao_db_wf' => $ao_db_wf,'ao_db_rb' => $ao_db_rb,'ao_db_rp' => $ao_db_rp
+    $result = $inst->create_site(array('isset' => true,'name' => $name,'admin' => array('username' => $user,'password' => $pass
+    ),'advanced' => array('ao_db_drop' => $ao_db_drop,'ao_db_wf' => $ao_db_wf,'ao_db_rb' => $ao_db_rb,'ao_db_rp' => $ao_db_rp
     )
-    ), ($action === 'create') ? true : false );
+    ), ($action === 'create') ? true : false);
     $result['result']['admin']['password'] = ($pass === $pass1) ? true : false;
     $result['result']['action'] = $action;
     //$json = new Services_JSON();
@@ -35,37 +35,35 @@ if (isset( $_POST['form']['NW_TITLE'] )) {
     $ec->created=($new)?true:false;
     $ec->name=$name;
     $ec->message=($new)?"Workspace created":"Workspace already exists or Name invalid";*/
-    echo Bootstrap::json_encode( $result );
+    echo Bootstrap::json_encode($result);
 } else {
     global $RBAC;
-    switch ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' )) {
+    switch ($RBAC->userCanAccess('PM_SETUP_ADVANCE')) {
         case - 2:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         case - 3:
         case - 1:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
     }
     $G_PUBLISH = new Publisher();
 
     $c = new Configurations();
-    $configPage = $c->getConfiguration( 'usersList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
-    $Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
+    $configPage = $c->getConfiguration('usersList', 'pageSize', '', $_SESSION['USER_LOGGED']);
+    $Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
 
-    $oHeadPublisher = & headPublisher::getSingleton();
-    $oHeadPublisher->addExtJsScript( 'setup/newSite', false ); //adding a javascript file .js
-    $oHeadPublisher->addContent( 'setup/newSite' ); //adding a html file  .html.
+    $oHeadPublisher = headPublisher::getSingleton();
+    $oHeadPublisher->addExtJsScript('setup/newSite', false); //adding a javascript file .js
+    $oHeadPublisher->addContent('setup/newSite'); //adding a html file  .html.
     //  $oHeadPublisher->assign('CONFIG', $Config);
     //  $oHeadPublisher->assign('FORMATS',$c->getFormats());
-    $oHeadPublisher->assign( "SYS_LANG", SYS_LANG );
-    $oHeadPublisher->assign( "SYS_SKIN", SYS_SKIN );
-
-    G::RenderPage( 'publish', 'extJs' );
+    $oHeadPublisher->assign("SYS_LANG", SYS_LANG);
+    $oHeadPublisher->assign("SYS_SKIN", SYS_SKIN);
 
+    G::RenderPage('publish', 'extJs');
 }
-
diff --git a/workflow/engine/methods/login/licenseUpdate.php b/workflow/engine/methods/login/licenseUpdate.php
index c3b0cbe0c..e648d810e 100644
--- a/workflow/engine/methods/login/licenseUpdate.php
+++ b/workflow/engine/methods/login/licenseUpdate.php
@@ -15,7 +15,7 @@ if ($aux['extension'] != 'dat') {
     G::uploadFile($aInfoLoadFile["tmp_name"], $dir, $aInfoLoadFile["name"]);
     //reading the file that was uploaded
 
-    $licenseManager =& PmLicenseManager::getSingleton();
+    $licenseManager = PmLicenseManager::getSingleton();
     $response = $licenseManager->installLicense($dir . $aInfoLoadFile["name"], false, false);
 
     if ($response) {
@@ -55,4 +55,4 @@ if ($aux['extension'] != 'dat') {
 }
 
 G::header('Location: ../login/login');
-die();
\ No newline at end of file
+die();
diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index 58abe4dc6..5f6aef9db 100644
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -29,10 +29,10 @@ use ProcessMaker\Plugins\PluginRegistry;
 /*----------------------------------********---------------------------------*/
 //Browser Compatibility
 $browserSupported = G::checkBrowserCompatibility();
-if ($browserSupported==false){
-	if(!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == ""){
-		G::SendTemporalMessage ('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning');
-	}
+if ($browserSupported==false) {
+    if (!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == "") {
+        G::SendTemporalMessage('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning');
+    }
 }
 /*----------------------------------********---------------------------------*/
 $aFields = array();
@@ -83,7 +83,7 @@ $pass1 = (isset($_SESSION['NW_PASSWORD2'])) ? $_SESSION['NW_PASSWORD2'] : '';
 $aFields['LOGIN_VERIFY_MSG'] = G::loadTranslation('LOGIN_VERIFY_MSG');
 //$aFields['LOGIN_VERIFY_MSG'] = Bootstrap::loadTranslation('LOGIN_VERIFY_MSG');
 
-if (isset ($_SESSION['USER_LOGGED'])) {
+if (isset($_SESSION['USER_LOGGED'])) {
     require_once 'classes/model/LoginLog.php';
     //close the session, if the current session_id was used in PM.
     $oCriteria = new Criteria('workflow');
@@ -129,12 +129,12 @@ if (isset ($_SESSION['USER_LOGGED'])) {
     $pluginRegistry = PluginRegistry::loadSingleton();
     if (defined('PM_SINGLE_SIGN_ON')) {
         /*----------------------------------********---------------------------------*/
-        $licensedFeatures = & PMLicensedFeatures::getSingleton();
+        $licensedFeatures = PMLicensedFeatures::getSingleton();
         if ($licensedFeatures->verifyfeature('x4TTzlISnp2K2tnSTJoMC8rTDRMTjlhMCtZeXV0QnNCLzU=')) {
             //Check in SSO class
             $oSso = new PmSsoClass();
             $res = $oSso->ssocVerifyUser();
-            if($res){
+            if ($res) {
                 // Start new session
                 @session_destroy();
                 session_start();
@@ -174,10 +174,10 @@ if (isset($_SESSION['__TIME_ZONE_FAILED__']) && $_SESSION['__TIME_ZONE_FAILED__'
     $browserTimeZone = $_SESSION['BROWSER_TIME_ZONE'];
     $url             = $_SESSION['URL'];
 
-    if(isset($_SESSION['USER_LANG'])){
-       $lang = $_SESSION['USER_LANG'];
-    }else{
-       $lang = SYS_LANG;
+    if (isset($_SESSION['USER_LANG'])) {
+        $lang = $_SESSION['USER_LANG'];
+    } else {
+        $lang = SYS_LANG;
     }
 }
 /*----------------------------------********---------------------------------*/
@@ -209,14 +209,14 @@ $_SESSION['NW_PASSWORD2'] = $pass1;
 
 /*----------------------------------********---------------------------------*/
 
-$licenseManager =& PmLicenseManager::getSingleton();
+$licenseManager = PmLicenseManager::getSingleton();
 if (in_array(G::encryptOld($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) {
     $G_PUBLISH = new Publisher();
     $version = explode('.', trim(file_get_contents(PATH_GULLIVER . 'VERSION')));
     $version = isset($version[0]) ? intval($version[0]) : 0;
     if ($version >= 3) {
         $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpiredpm3', '', array(), 'licenseUpdate');
-    }else{
+    } else {
         $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpired', '', array(), 'licenseUpdate');
     }
     G::RenderPage('publish');
@@ -235,7 +235,9 @@ if ($timeZoneFailed) {
     $arrayTimeZoneId = $dateTime->getTimeZoneIdByTimeZoneOffset($browserTimeZoneOffset);
 
     array_unshift($arrayTimeZoneId, 'false');
-    array_walk($arrayTimeZoneId, function (&$value, $key, $parameter) { $value = ['TZ_UID' => $value, 'TZ_NAME' => '(UTC ' . $parameter . ') ' . $value]; }, $browserUtcOffset);
+    array_walk($arrayTimeZoneId, function (&$value, $key, $parameter) {
+        $value = ['TZ_UID' => $value, 'TZ_NAME' => '(UTC ' . $parameter . ') ' . $value];
+    }, $browserUtcOffset);
 
     $_SESSION['_DBArray'] = ['TIME_ZONE' => $arrayTimeZoneId];
 
@@ -262,12 +264,12 @@ if ($timeZoneFailed) {
 $Translations = new Translation();
 $translationsTable = $Translations->getTranslationEnvironments();
 
-$availableLangArray = array ();
-$availableLangArray [] = array ('LANG_ID' => 'char', 'LANG_NAME' => 'char' );
+$availableLangArray = array();
+$availableLangArray [] = array('LANG_ID' => 'char', 'LANG_NAME' => 'char' );
 /*----------------------------------********---------------------------------*/
-$licensedFeatures = & PMLicensedFeatures::getSingleton();
+$licensedFeatures = PMLicensedFeatures::getSingleton();
 if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkdKR3ROS0VzWGdoLzNQYz0=')) {
-    $availableLangArray []  = array ('LANG_ID' => 'default', 'LANG_NAME' => G::LoadTranslation("ID_DEFAULT_LANGUAGE") );
+    $availableLangArray []  = array('LANG_ID' => 'default', 'LANG_NAME' => G::LoadTranslation("ID_DEFAULT_LANGUAGE") );
 }
 /*----------------------------------********---------------------------------*/
 foreach ($translationsTable as $locale) {
@@ -291,7 +293,7 @@ $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
 if (isset($oConf->aConfig["login_defaultLanguage"]) && $oConf->aConfig["login_defaultLanguage"] != "") {
     $aFields["USER_LANG"] = $oConf->aConfig["login_defaultLanguage"];
     /*----------------------------------********---------------------------------*/
-    $licensedFeatures = & PMLicensedFeatures::getSingleton();
+    $licensedFeatures = PMLicensedFeatures::getSingleton();
     if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkdKR3ROS0VzWGdoLzNQYz0=')) {
         $aFields["USER_LANG"] = "default";
     }
@@ -308,12 +310,12 @@ $version = isset($version[0]) ? intval($version[0]) : 0;
 $aFields["FAILED_LOGINS"] = $sFailedLogins;
 if ($version >= 3) {
     $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/loginpm3', '', $aFields, SYS_URI . 'login/authentication.php');
-}else{
+} else {
     $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php');
 }
 
 //get the serverconf singleton, and check if we can send the heartbeat
-$oServerConf = & ServerConf::getSingleton();
+$oServerConf = ServerConf::getSingleton();
 $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
 if (!$partnerFlag) {
     $sflag = $oServerConf->getHeartbeatProperty('HB_OPTION', 'HEART_BEAT_CONF');
@@ -324,7 +326,7 @@ if (!$partnerFlag) {
 
     //if flag to send heartbeat is enabled, and it is time to send heartbeat, sent it using asynchronous beat.
     if (($sflag == "1") && ((strtotime("now") > $nextBeatDate) || is_null($nextBeatDate))) {
-        $oHeadPublisher =& headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         //To do: we need to change to ExtJs
         $oHeadPublisher->addScriptCode('var flagHeartBeat = 1;');
     } else {
@@ -337,8 +339,8 @@ if (!$partnerFlag) {
 //check if we show the panel with the getting started info
 
 require_once 'classes/model/Configuration.php';
-$oConfiguration = new Configuration ( );
-$oCriteria = new Criteria ( 'workflow' );
+$oConfiguration = new Configuration();
+$oCriteria = new Criteria('workflow');
 $oCriteria->add(ConfigurationPeer::CFG_UID, 'getStarted');
 $oCriteria->add(ConfigurationPeer::OBJ_UID, '');
 $oCriteria->add(ConfigurationPeer::CFG_VALUE, '1');
@@ -375,4 +377,3 @@ $oHeadPublisher->addScriptFile('/jscore/src/Sessions.js');
 $oHeadPublisher->addScriptFile('/jscore/src/Register.js');
 
 G::RenderPage('publish');
-
diff --git a/workflow/engine/methods/login/sysLogin.php b/workflow/engine/methods/login/sysLogin.php
index 8fd4cd5c3..f3f1cd2f2 100644
--- a/workflow/engine/methods/login/sysLogin.php
+++ b/workflow/engine/methods/login/sysLogin.php
@@ -25,13 +25,13 @@
 /*----------------------------------********---------------------------------*/
 //Browser Compatibility
 $browserSupported = G::checkBrowserCompatibility();
-if ($browserSupported==false){
-	if(!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == ""){
-		G::SendTemporalMessage ('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning');
-	}
+if ($browserSupported==false) {
+    if (!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == "") {
+        G::SendTemporalMessage('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning');
+    }
 }
 /*----------------------------------********---------------------------------*/
-if (isset ($_POST['form']['USER_ENV'])) {
+if (isset($_POST['form']['USER_ENV'])) {
     @session_destroy();
     session_start();
     $_SESSION['sysLogin'] = $_POST['form'];
@@ -62,23 +62,22 @@ session_regenerate_id();
 $_SESSION = array_merge($_SESSION, $arraySession);
 
 //Required classes for dbArray work
-Propel::init (PATH_CORE . "config/databases.php");
-Creole::registerDriver ('dbarray', 'creole.contrib.DBArrayConnection');
+Propel::init(PATH_CORE . "config/databases.php");
+Creole::registerDriver('dbarray', 'creole.contrib.DBArrayConnection');
 
 function getLangFiles()
 {
     $dir = PATH_LANGUAGECONT;
-    $filesArray = array ();
-    if (file_exists ($dir)) {
-        if ($handle = opendir ($dir)) {
-            while (false !== ($file = readdir ($handle))) {
-
-                $fileParts = explode (".", $file);
+    $filesArray = array();
+    if (file_exists($dir)) {
+        if ($handle = opendir($dir)) {
+            while (false !== ($file = readdir($handle))) {
+                $fileParts = explode(".", $file);
                 if ($fileParts [0] == "translation") {
                     $filesArray [$fileParts [1]] = $file;
                 }
             }
-            closedir ($handle);
+            closedir($handle);
         }
     }
     return $filesArray;
@@ -86,28 +85,28 @@ function getLangFiles()
 
 function getWorkspacesAvailable()
 {
-    $oServerConf = & ServerConf::getSingleton ();
+    $oServerConf = ServerConf::getSingleton();
     $dir = PATH_DB;
-    $filesArray = array ();
-    if (file_exists ($dir)) {
-        if ($handle = opendir ($dir)) {
-            while (false !== ($file = readdir ($handle))) {
+    $filesArray = array();
+    if (file_exists($dir)) {
+        if ($handle = opendir($dir)) {
+            while (false !== ($file = readdir($handle))) {
                 if (($file != ".") && ($file != "..")) {
-                    if (file_exists (PATH_DB . $file . '/db.php')) {
-                        if (! $oServerConf->isWSDisabled ($file)) {
+                    if (file_exists(PATH_DB . $file . '/db.php')) {
+                        if (! $oServerConf->isWSDisabled($file)) {
                             $filesArray [] = $file;
                         }
                     }
                 }
             }
-            closedir ($handle);
+            closedir($handle);
         }
     }
-    sort ($filesArray, SORT_STRING);
+    sort($filesArray, SORT_STRING);
     return $filesArray;
 }
 
-$availableWorkspace = getWorkspacesAvailable ();
+$availableWorkspace = getWorkspacesAvailable();
 
 //Translations
 //$Translations = G::getModel("Translation");  <-- ugly way to get a class
@@ -115,8 +114,8 @@ require_once "classes/model/Translation.php";
 $Translations = new Translation();
 $translationsTable = $Translations->getTranslationEnvironments();
 
-$availableLangArray = array ();
-$availableLangArray [] = array ('LANG_ID' => 'char', 'LANG_NAME' => 'char');
+$availableLangArray = array();
+$availableLangArray [] = array('LANG_ID' => 'char', 'LANG_NAME' => 'char');
 
 foreach ($translationsTable as $locale) {
     $aFields['LANG_ID'] = $locale['LOCALE'];
@@ -129,10 +128,10 @@ foreach ($translationsTable as $locale) {
     $availableLangArray [] = $aFields;
 }
 
-$availableWorkspaceArray = array ();
-$availableWorkspaceArray [] = array ('ENV_ID' => 'char', 'ENV_NAME' => 'char');
+$availableWorkspaceArray = array();
+$availableWorkspaceArray [] = array('ENV_ID' => 'char', 'ENV_NAME' => 'char');
 foreach ($availableWorkspace as $envKey => $envName) {
-    $aFields = array ('ENV_ID' => $envName, 'ENV_NAME' => $envName);
+    $aFields = array('ENV_ID' => $envName, 'ENV_NAME' => $envName);
     $availableWorkspaceArray [] = $aFields;
 }
 
@@ -143,10 +142,10 @@ $_DBArray ['availableWorkspace'] = $availableWorkspaceArray;
 
 $_SESSION ['_DBArray'] = $_DBArray;
 
-$aField ['LOGIN_VERIFY_MSG'] = G::loadTranslation ('LOGIN_VERIFY_MSG');
+$aField ['LOGIN_VERIFY_MSG'] = G::loadTranslation('LOGIN_VERIFY_MSG');
 $aField['USER_LANG'] = SYS_LANG;
 
-$G_PUBLISH = new Publisher ();
+$G_PUBLISH = new Publisher();
 if (!defined('WS_IN_LOGIN')) {
     define('WS_IN_LOGIN', 'serverconf');
 }
@@ -156,8 +155,8 @@ $version = isset($version[0]) ? intval($version[0]) : 0;
 switch (WS_IN_LOGIN) {
     case 'serverconf':
         //Get Server Configuration
-        $oServerConf = & ServerConf::getSingleton ();
-        if ($oServerConf->getProperty ('LOGIN_NO_WS')) {
+        $oServerConf = ServerConf::getSingleton();
+        if ($oServerConf->getProperty('LOGIN_NO_WS')) {
             $fileLogin = $version >= 3 ? 'login/sysLoginNoWSpm3' : 'login/sysLoginNoWS';
         } else {
             $fileLogin = 'login/sysLogin';
@@ -173,12 +172,12 @@ switch (WS_IN_LOGIN) {
         $fileLogin = 'login/sysLogin';
         break;
 }
-setcookie("PM-Warning", trim(G::LoadTranslation('ID_BLOCKER_MSG'),'*'), time() + (24 * 60 * 60), SYS_CURRENT_URI);
+setcookie("PM-Warning", trim(G::LoadTranslation('ID_BLOCKER_MSG'), '*'), time() + (24 * 60 * 60), SYS_CURRENT_URI);
 setcookie("PM-TabPrimary", uniqid(), time() + (24 * 60 * 60), '/');
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addScriptFile('/jscore/src/PM.js');
 $oHeadPublisher->addScriptFile('/jscore/src/Sessions.js');
 $oHeadPublisher->addScriptFile('/jscore/src/Register.js');
 
-$G_PUBLISH->AddContent ('xmlform', 'xmlform', $fileLogin, '', $aField, 'sysLogin');
-G::RenderPage ("publish");
+$G_PUBLISH->AddContent('xmlform', 'xmlform', $fileLogin, '', $aField, 'sysLogin');
+G::RenderPage("publish");
diff --git a/workflow/engine/methods/mails/emailList.php b/workflow/engine/methods/mails/emailList.php
index 621d2684c..7db6d463b 100644
--- a/workflow/engine/methods/mails/emailList.php
+++ b/workflow/engine/methods/mails/emailList.php
@@ -36,7 +36,7 @@ $flagER = $pluginRegistry->isEnable('externalRegistration') ? 1 : 0;
 
 $G_PUBLISH = new Publisher();
 
-$oHeadPublisher = &headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript('mails/emailList', false); //adding a javascript file .js
 $oHeadPublisher->addContent('mails/emailList'); //adding a html file  .html.
 //sending the columns to display in grid
@@ -45,4 +45,3 @@ $oHeadPublisher->assign('processValues', $processes);
 $oHeadPublisher->assign('flagER', $flagER);
 
 G::RenderPage( 'publish', 'extJs' );
-
diff --git a/workflow/engine/methods/oauth2/accessTokenSetup.php b/workflow/engine/methods/oauth2/accessTokenSetup.php
index 5d56c4fd4..1604653e5 100644
--- a/workflow/engine/methods/oauth2/accessTokenSetup.php
+++ b/workflow/engine/methods/oauth2/accessTokenSetup.php
@@ -7,11 +7,10 @@ $arrayScope = array(
     array("value" => "edit_processes", "label" => "Edit Processes")
 );
 
-$headPublisher = &headPublisher::getSingleton();
+$headPublisher = headPublisher::getSingleton();
 $headPublisher->addContent("oauth2" . PATH_SEP . "accessTokenSetup"); //Adding a HTML file .html
 $headPublisher->addExtJsScript("oauth2" . PATH_SEP . "accessTokenSetup", false); //Adding a JavaScript file .js
 $headPublisher->assign("CONFIG", $config);
 $headPublisher->assign("SCOPE", $arrayScope);
 
 G::RenderPage("publish", "extJs");
-
diff --git a/workflow/engine/methods/oauth2/clientSetup.php b/workflow/engine/methods/oauth2/clientSetup.php
index 2dbd56f9b..e0dfae5e1 100644
--- a/workflow/engine/methods/oauth2/clientSetup.php
+++ b/workflow/engine/methods/oauth2/clientSetup.php
@@ -2,11 +2,10 @@
 $config = array();
 $config["pageSize"] = 20;
 
-$headPublisher = &headPublisher::getSingleton();
+$headPublisher = headPublisher::getSingleton();
 //$headPublisher->addContent("oauth2" . PATH_SEP . "clientSetup"); //Adding a HTML file .html
 $headPublisher->addExtJsScript("oauth2" . PATH_SEP . "clientSetup", false); //Adding a JavaScript file .js
 $headPublisher->assign("CONFIG", $config);
 $headPublisher->assign("CREATE_CLIENT", (isset($_GET["create_app"]))? 1 : 0);
 
 G::RenderPage("publish", "extJs");
-
diff --git a/workflow/engine/methods/processCategory/processCategoryList.php b/workflow/engine/methods/processCategory/processCategoryList.php
index 496f1ca21..7cecad36b 100644
--- a/workflow/engine/methods/processCategory/processCategoryList.php
+++ b/workflow/engine/methods/processCategory/processCategoryList.php
@@ -41,9 +41,9 @@ $G_ID_SUB_MENU_SELECTED = '';
 
 $G_PUBLISH = new Publisher();
 
-$oHeadPublisher = &headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript('processCategory/processCategoryList', false); //adding a javascript file .js
 $oHeadPublisher->addContent('processCategory/processCategoryList'); //adding a html file  .html.
 $oHeadPublisher->assign('FORMATS', $c->getFormats());
 $oHeadPublisher->assign('CONFIG', $Config);
-G::RenderPage('publish', 'extJs');
\ No newline at end of file
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/processes/main.php b/workflow/engine/methods/processes/main.php
index f460062b7..f418252bc 100644
--- a/workflow/engine/methods/processes/main.php
+++ b/workflow/engine/methods/processes/main.php
@@ -25,22 +25,22 @@
 /*$access = $RBAC->userCanAccess('PM_FACTORY');
 if( $access != 1 ) {
   switch ($access) {
-  	case -2:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	break;
+    case -2:
+      G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+      G::header('location: ../login/login');
+    break;
     case -1:
-  	default:
-  	  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-  	  G::header('location: ../login/login');
-  	break;
+    default:
+      G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+      G::header('location: ../login/login');
+    break;
   }
   exit();
 }*/
 //next two variables store the current process uid and the last processmap used
 //print_r ($_SESSION['PROCESS'] );
 //print_r ($_SESSION['PROCESSMAP'] );
-$RBAC->requirePermissions( 'PM_FACTORY' );
+$RBAC->requirePermissions('PM_FACTORY');
 
 $G_MAIN_MENU = 'processmaker';
 $G_SUB_MENU = 'process';
@@ -48,13 +48,13 @@ $G_ID_MENU_SELECTED = 'PROCESSES';
 $G_ID_SUB_MENU_SELECTED = '-';
 
 $G_PUBLISH = new Publisher();
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addScriptFile('/jscore/src/PM.js');
 $oHeadPublisher->addScriptFile('/jscore/src/Sessions.js');
-$G_PUBLISH->AddContent( 'view', 'processes/mainLoad' );
-
-if (isset( $_GET['type'] ))
-    G::RenderPage( "publishBlank", "blank" );
-else
-    G::RenderPage( "publish" );
+$G_PUBLISH->AddContent('view', 'processes/mainLoad');
 
+if (isset($_GET['type'])) {
+    G::RenderPage("publishBlank", "blank");
+} else {
+    G::RenderPage("publish");
+}
diff --git a/workflow/engine/methods/processes/mainInit.php b/workflow/engine/methods/processes/mainInit.php
index 2253624e4..10fbf267c 100644
--- a/workflow/engine/methods/processes/mainInit.php
+++ b/workflow/engine/methods/processes/mainInit.php
@@ -25,34 +25,33 @@
 use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
-//$oHeadPublisher = & headPublisher::getSingleton();
 global $RBAC;
-$RBAC->requirePermissions( 'PM_FACTORY' );
+$RBAC->requirePermissions('PM_FACTORY');
 
 $conf = new Configurations();
 
-$pmVersion = (preg_match("/^([\d\.]+).*$/", System::getVersion(), $arrayMatch))? $arrayMatch[1] : ""; //Otherwise: Branch master
+$pmVersion = (preg_match("/^([\d\.]+).*$/", System::getVersion(), $arrayMatch)) ? $arrayMatch[1] : ""; //Otherwise: Branch master
 
 /*----------------------------------********---------------------------------*/
 if (true) {
     $arrayFlagImportFileExtension = array("pm", "pmx", "pmx2", "bpmn");
 } else {
-/*----------------------------------********---------------------------------*/
+    /*----------------------------------********---------------------------------*/
     $arrayFlagImportFileExtension = array("pm", "pmx", "bpmn");
-/*----------------------------------********---------------------------------*/
+    /*----------------------------------********---------------------------------*/
 }
 /*----------------------------------********---------------------------------*/
 
-$arrayFlagMenuNewOption       = array("pm" => true, "bpmn" => true);
+$arrayFlagMenuNewOption = array("pm" => true, "bpmn" => true);
 
 if ($pmVersion != "") {
-    $arrayFlagImportFileExtension = (version_compare($pmVersion . "", "3", ">="))? $arrayFlagImportFileExtension : array("pm");
-    $arrayFlagMenuNewOption       = (version_compare($pmVersion . "", "3", ">="))? array("bpmn" => true) : array("pm" => true);
+    $arrayFlagImportFileExtension = (version_compare($pmVersion . "", "3", ">=")) ? $arrayFlagImportFileExtension : array("pm");
+    $arrayFlagMenuNewOption = (version_compare($pmVersion . "", "3", ">=")) ? array("bpmn" => true) : array("pm" => true);
 }
 
 $oPluginRegistry = PluginRegistry::loadSingleton();
 
-$arrayMenuNewOptionPlugin     = array();
+$arrayMenuNewOptionPlugin = array();
 $arrayContextMenuOptionPlugin = array();
 
 foreach ($oPluginRegistry->getDesignerMenu() as $value) {
@@ -79,12 +78,12 @@ foreach ($oPluginRegistry->getDesignerMenu() as $value) {
     }
 }
 
-$oHeadPublisher->addExtJsScript( 'processes/main', true ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'processes/main' ); //adding a html file  .html.
+$oHeadPublisher->addExtJsScript('processes/main', true); //adding a javascript file .js
+$oHeadPublisher->addContent('processes/main'); //adding a html file  .html.
 
 $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
-$oHeadPublisher->assign( 'PARTNER_FLAG', $partnerFlag );
-$oHeadPublisher->assign( 'pageSize', $conf->getEnvSetting( 'casesListRowNumber' ) );
+$oHeadPublisher->assign('PARTNER_FLAG', $partnerFlag);
+$oHeadPublisher->assign('pageSize', $conf->getEnvSetting('casesListRowNumber'));
 $oHeadPublisher->assign("arrayFlagImportFileExtension", $arrayFlagImportFileExtension);
 $oHeadPublisher->assign("arrayFlagMenuNewOption", $arrayFlagMenuNewOption);
 $oHeadPublisher->assign("arrayMenuNewOptionPlugin", $arrayMenuNewOptionPlugin);
@@ -100,27 +99,26 @@ $oHeadPublisher->assign('credentials', base64_encode(G::json_encode($designer->g
 
 $deleteCasesFlag = false;
 global $RBAC;
-if($RBAC->userCanAccess('PM_DELETE_PROCESS_CASES') === 1) {
+if ($RBAC->userCanAccess('PM_DELETE_PROCESS_CASES') === 1) {
     $deleteCasesFlag = true;
 }
 $oHeadPublisher->assign('deleteCasesFlag', $deleteCasesFlag);
 
 $oPluginRegistry = PluginRegistry::loadSingleton();
 $callBackFile = $oPluginRegistry->getImportProcessCallback();
-$file = false; 
-if(sizeof($callBackFile)) {
+$file = false;
+if (count($callBackFile)) {
     $file = $callBackFile[0]->getCallBackFile() != "" ? $callBackFile[0]->getCallBackFile() : false;
 }
 $oHeadPublisher->assign("importProcessCallbackFile", $file);
 
 $isGranularFeature = false;
 /*----------------------------------********---------------------------------*/
-$licensedFeatures = & PMLicensedFeatures::getSingleton();
+$licensedFeatures = PMLicensedFeatures::getSingleton();
 if ($licensedFeatures->verifyfeature('jXsSi94bkRUcVZyRStNVExlTXhEclVadGRRcG9xbjNvTWVFQUF3cklKQVBiVT0=')) {
     $isGranularFeature = true;
 }
 /*----------------------------------********---------------------------------*/
 $oHeadPublisher->assign("isGranularFeature", $isGranularFeature);
 
-G::RenderPage( 'publish', 'extJs' );
-
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/processes/processesList.php b/workflow/engine/methods/processes/processesList.php
index 347120732..0477d0ce0 100644
--- a/workflow/engine/methods/processes/processesList.php
+++ b/workflow/engine/methods/processes/processesList.php
@@ -24,10 +24,10 @@
 
 require_once 'classes/model/Process.php';
 
-$start = isset( $_POST['start'] ) ? $_POST['start'] : 0;
-$limit = isset( $_POST['limit'] ) ? $_POST['limit'] : '';
-$dir = isset( $_POST['dir'] ) ? $_POST['dir'] : 'ASC';
-$sort = isset( $_POST['sort'] ) ? $_POST['sort'] : '';
+$start = isset($_POST['start']) ? $_POST['start'] : 0;
+$limit = isset($_POST['limit']) ? $_POST['limit'] : '';
+$dir = isset($_POST['dir']) ? $_POST['dir'] : 'ASC';
+$sort = isset($_POST['sort']) ? $_POST['sort'] : '';
 
 $oProcess = new Process();
 $oProcess->dir = $dir;
@@ -36,19 +36,20 @@ $oProcess->sort = $sort;
 $memkey = 'no memcache';
 $memcacheUsed = 'not used';
 $totalCount = 0;
-if (isset( $_POST['category'] ) && $_POST['category'] !== '<reset>') {
-    if (isset( $_POST['processName'] ))
-        $proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], $_POST['processName'], true, false, $_SESSION["USER_LOGGED"]);
-    else
-        $proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], null, true, false, $_SESSION["USER_LOGGED"]);
+if (isset($_POST['category']) && $_POST['category'] !== '<reset>') {
+    if (isset($_POST['processName'])) {
+        $proData = $oProcess->getAllProcesses($start, $limit, $_POST['category'], $_POST['processName'], true, false, $_SESSION["USER_LOGGED"]);
+    } else {
+        $proData = $oProcess->getAllProcesses($start, $limit, $_POST['category'], null, true, false, $_SESSION["USER_LOGGED"]);
+    }
 } else {
-    if (isset( $_POST['processName'] )) {
+    if (isset($_POST['processName'])) {
         $memkey = 'processList-' . $start . '-' . $limit . '-' . $_POST['processName'];
         $memcacheUsed = 'yes';
-        $proData = $memcache->get( $memkey );
+        $proData = $memcache->get($memkey);
         if ($proData === false) {
-            $proData = $oProcess->getAllProcesses( $start, $limit, null, $_POST['processName'], true, false, $_SESSION["USER_LOGGED"]);
-            $memcache->set( $memkey, $proData, PMmemcached::ONE_HOUR );
+            $proData = $oProcess->getAllProcesses($start, $limit, null, $_POST['processName'], true, false, $_SESSION["USER_LOGGED"]);
+            $memcache->set($memkey, $proData, PMmemcached::ONE_HOUR);
             $totalCount = count($proData);
             $proData = array_splice($proData, $start, $limit);
             $memcacheUsed = 'no';
@@ -61,18 +62,18 @@ if (isset( $_POST['category'] ) && $_POST['category'] !== '<reset>') {
         $memkey = 'processList-allProcesses-' . $start . '-' . $limit;
         $memkeyTotal = $memkey . '-total';
         $memcacheUsed = 'yes';
-        if (($proData = $memcache->get( $memkey )) === false || ($totalCount = $memcache->get( $memkeyTotal )) === false) {
-            $proData = $oProcess->getAllProcesses( $start, $limit, null, null, true, false, $_SESSION["USER_LOGGED"]);
+        if (($proData = $memcache->get($memkey)) === false || ($totalCount = $memcache->get($memkeyTotal)) === false) {
+            $proData = $oProcess->getAllProcesses($start, $limit, null, null, true, false, $_SESSION["USER_LOGGED"]);
             $totalCount = count($proData);
             $proData = array_splice($proData, $start, $limit);
-            $memcache->set( $memkey, $proData, PMmemcached::ONE_HOUR );
-            $memcache->set( $memkeyTotal, $totalCount, PMmemcached::ONE_HOUR );
+            $memcache->set($memkey, $proData, PMmemcached::ONE_HOUR);
+            $memcache->set($memkeyTotal, $totalCount, PMmemcached::ONE_HOUR);
             $memcacheUsed = 'no';
         } else {
-        	$proData = $oProcess->orderMemcache($proData, $start, $limit);
+            $proData = $oProcess->orderMemcache($proData, $start, $limit);
             $totalCount = $proData->totalCount;
             $proData = $proData->dataMemcache;
-       }
+        }
     }
 }
 $r = new stdclass();
@@ -81,4 +82,4 @@ $r->memcache = $memcacheUsed;
 $r->data = \ProcessMaker\Util\DateTime::convertUtcToTimeZone($proData);
 $r->totalCount = $totalCount;
 
-echo G::json_encode( $r );
+echo G::json_encode($r);
diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php
index 15d991765..6a978a941 100644
--- a/workflow/engine/methods/processes/processes_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Ajax.php
@@ -23,31 +23,13 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 try {
-    /* global $RBAC;
-      switch ($RBAC->userCanAccess('PM_FACTORY'))
-      {
-      case -2:
-      G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-      G::header('location: ../login/login');
-      die;
-      break;
-      case -1:
-      G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-      G::header('location: ../login/login');
-      die;
-      break;
-      } */
-    //$oJSON = new Services_JSON();
-
-
     $filter = new InputFilter();
     $_GET = $filter->xssFilterHard($_GET);
     $_POST = $filter->xssFilterHard($_POST);
     $_REQUEST = $filter->xssFilterHard($_REQUEST);
-    //$_SESSION = $filter->xssFilterHard($_SESSION); 
 
     if (isset($_REQUEST['data'])) {
-        if($_REQUEST['action']=="addText"||$_REQUEST['action']=="updateText") {
+        if ($_REQUEST['action'] == "addText" || $_REQUEST['action'] == "updateText") {
             $oData = Bootstrap::json_decode($_REQUEST['data']);
             $oDataAux = G::json_decode($_REQUEST['data']);
             $oDataAux = (array)$oDataAux;
@@ -56,13 +38,12 @@ try {
             $oDataAux = G::json_decode(stripslashes($_REQUEST['data']));
             $oDataAux = (array)$oDataAux;
         }
-        //$oData = $oJSON->decode( stripslashes( $_REQUEST['data'] ) );
         $sOutput = '';
         $sTask = '';
 
-        if(array_key_exists('pro_uid', $oDataAux) || array_key_exists('uid', $oDataAux) || array_key_exists('PRO_UID', $oDataAux) || array_key_exists('UID', $oDataAux)) {
-            if(array_key_exists('pro_uid', $oDataAux) || array_key_exists('PRO_UID', $oDataAux)) {
-                if(array_key_exists('pro_uid', $oDataAux)) {
+        if (array_key_exists('pro_uid', $oDataAux) || array_key_exists('uid', $oDataAux) || array_key_exists('PRO_UID', $oDataAux) || array_key_exists('UID', $oDataAux)) {
+            if (array_key_exists('pro_uid', $oDataAux) || array_key_exists('PRO_UID', $oDataAux)) {
+                if (array_key_exists('pro_uid', $oDataAux)) {
                     $proUid = $oDataAux['pro_uid'];
                 } else {
                     $proUid = $oDataAux['PRO_UID'];
@@ -74,16 +55,16 @@ try {
 
             $infoProcess = new Processes();
 
-            if(!$infoProcess->processExists($proUid)) {
+            if (!$infoProcess->processExists($proUid)) {
                 $oSL = new SwimlanesElements();
-                if($oSL->swimlanesElementsExists($proUid)) {
+                if ($oSL->swimlanesElementsExists($proUid)) {
                     $aFields = $oSL->load($proUid);
                     $proUid = $aFields['PRO_UID'];
                 } else {
                     $k = new Criteria('workflow');
                     $k->clearSelectColumns();
                     $k->addSelectColumn(TaskPeer::PRO_UID);
-                    $k->add(TaskPeer::TAS_UID, $uidAux );
+                    $k->add(TaskPeer::TAS_UID, $uidAux);
                     $rs = TaskPeer::doSelectRS($k);
                     $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
                     $rs->next();
@@ -93,7 +74,7 @@ try {
             }
             $resultProcess = $infoProcess->getProcessRow($proUid);
         } else {
-            if(array_key_exists('PU_UID', $oDataAux)) {
+            if (array_key_exists('PU_UID', $oDataAux)) {
                 $c = new Criteria('workflow');
                 $c->clearSelectColumns();
                 $c->addSelectColumn(ProcessUserPeer::PRO_UID);
@@ -111,8 +92,8 @@ try {
         }
     }
 
-    if(isset($_REQUEST['pro_uid']) && !empty($_REQUEST['pro_uid']) || isset($_REQUEST['PRO_UID']) && !empty($_REQUEST['PRO_UID'])) {
-        if(isset($_REQUEST['pro_uid']) && !empty($_REQUEST['pro_uid'])) {
+    if (isset($_REQUEST['pro_uid']) && !empty($_REQUEST['pro_uid']) || isset($_REQUEST['PRO_UID']) && !empty($_REQUEST['PRO_UID'])) {
+        if (isset($_REQUEST['pro_uid']) && !empty($_REQUEST['pro_uid'])) {
             $proUid = $_REQUEST['pro_uid'];
         } else {
             $proUid = $_REQUEST['PRO_UID'];
@@ -122,13 +103,12 @@ try {
         $resultProcess = $infoProcess->getProcessRow($proUid);
     }
 
-    if(isset($proUid) && $proUid != "") {
-
+    if (isset($proUid) && $proUid != "") {
         $infoProcess = new Processes();
 
         if (!in_array($_REQUEST["action"], array("load"))) {
             $infoProcess->updateProcessRow(array(
-                "PRO_UID"         => $proUid,
+                "PRO_UID" => $proUid,
                 "PRO_UPDATE_DATE" => date("Y-m-d H:i:s")
             ));
         }
@@ -142,12 +122,12 @@ try {
         case 'load':
             $_SESSION['PROCESS'] = $oData->uid;
             if ($oData->ct) {
-                $sOutput = $oProcessMap->load($oData->uid, true, $_SESSION['APPLICATION'], - 1, $_SESSION['TASK'], $oData->ct);
+                $sOutput = $oProcessMap->load($oData->uid, true, $_SESSION['APPLICATION'], -1, $_SESSION['TASK'], $oData->ct);
             } else {
                 if ($oData->mode) {
                     $sOutput = $oProcessMap->load($oData->uid);
                 } else {
-                    if ($_SESSION['TASK'] != - 1) {
+                    if ($_SESSION['TASK'] != -1) {
                         $taskUid = $_SESSION['TASK'];
                     } else {
                         $c = new Criteria('workflow');
@@ -159,7 +139,7 @@ try {
                         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
                         $oDataset->next();
                         $aData = $oDataset->getRow();
-                        $taskUid = isset($aData['TAS_UID']) ? $aData['TAS_UID'] : - 1;
+                        $taskUid = isset($aData['TAS_UID']) ? $aData['TAS_UID'] : -1;
                     }
                     $sOutput = $oProcessMap->load($oData->uid, true, $_SESSION['APPLICATION'], $_SESSION['INDEX'], $taskUid);
                 }
@@ -169,21 +149,21 @@ try {
             $oProcessMap->editProcess($oData->pro_uid);
             break;
         case 'process_Export':
-            include (PATH_METHODS . 'processes/processes_Export.php');
-            G::auditLog('ExportProcess','Export process "'.$resultProcess['PRO_TITLE'].'"');
+            include(PATH_METHODS . 'processes/processes_Export.php');
+            G::auditLog('ExportProcess', 'Export process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'process_User':
-            include (PATH_METHODS . 'processes/processes_User.php');
+            include(PATH_METHODS . 'processes/processes_User.php');
             break;
         case 'availableProcessesUser':
-            include (PATH_METHODS . 'processes/processes_availableProcessesUser.php');
+            include(PATH_METHODS . 'processes/processes_availableProcessesUser.php');
             break;
         case 'webEntry_generate':
-            include (PATH_METHODS . 'processes/processes_webEntryGenerate.php');
+            include(PATH_METHODS . 'processes/processes_webEntryGenerate.php');
             break;
         // add this event to validate de data to create a Web Entry
         case 'webEntry_validate':
-            include (PATH_METHODS . 'processes/processes_webEntryValidate.php');
+            include(PATH_METHODS . 'processes/processes_webEntryValidate.php');
             break;
         case 'webEntry_delete':
 
@@ -210,7 +190,7 @@ try {
 
             $oProcessMap = new ProcessMap();
             $oProcessMap->listProcessesUser($oData->PRO_UID);
-            G::auditLog('AssignRole','Assign new supervisor ('.$oData->USR_UID.') in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('AssignRole', 'Assign new supervisor (' . $oData->USR_UID . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'removeProcessUser':
             $oProcessMap->removeProcessUser($oData->PU_UID);
@@ -220,7 +200,7 @@ try {
                     break;
                 }
             }
-            G::auditLog('RemoveUser','Remove supervisor ('.$userSupervisor.') in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('RemoveUser', 'Remove supervisor (' . $userSupervisor . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'supervisorDynaforms':
             $oProcessMap->supervisorDynaforms($oData->pro_uid);
@@ -232,7 +212,7 @@ try {
             $oProcessMap->webEntry($oData->pro_uid);
             break;
         case 'webEntry_Val_Assig':
-            include (PATH_METHODS . 'processes/webEntry_Val_Assig.php');
+            include(PATH_METHODS . 'processes/webEntry_Val_Assig.php');
             break;
         case 'saveTitlePosition':
             $sOutput = $oProcessMap->saveTitlePosition($oData->pro_uid, $oData->position->x, $oData->position->y);
@@ -260,13 +240,13 @@ try {
             $sOutput = $oProcessMap->addTask($oData->uid, $oData->position->x, $oData->position->y);
             $sOutputAux = G::json_decode($sOutput);
             $sOutputAux = (array)$sOutputAux;
-            G::auditLog('AddTask','Add new task ('.$sOutputAux['uid'].') in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('AddTask', 'Add new task (' . $sOutputAux['uid'] . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'addSubProcess':
             $sOutput = $oProcessMap->addSubProcess($oData->uid, $oData->position->x, $oData->position->y);
             $sOutputAux = G::json_decode($sOutput);
             $sOutputAux = (array)$sOutputAux;
-            G::auditLog('AddSubProcess','Add new sub process ('.$sOutputAux['uid'].') in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('AddSubProcess', 'Add new sub process (' . $sOutputAux['uid'] . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'taskColor':
             $oTask->taskColor($oData->pro_uid, $oData->tas_uid);
@@ -281,50 +261,50 @@ try {
             $sOutput = $oProcessMap->saveTaskPosition($oData->uid, $oData->position->x, $oData->position->y);
             $oTask = new Task();
             $oTask->load($uidAux);
-            G::auditLog('SaveTaskPosition','Change task position ('.$oTask->getTasTitle().') in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('SaveTaskPosition', 'Change task position (' . $oTask->getTasTitle() . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'deleteTask':
             $oTaskNewPattern = new Task();
-            $taskInfo=$oTaskNewPattern->load($oData->tas_uid);
-            $titleTask=$taskInfo['TAS_TITLE'];
-            G::auditlog("DeleteTask",'Delete Task -> '.$titleTask.' : '.$oData->tas_uid);
+            $taskInfo = $oTaskNewPattern->load($oData->tas_uid);
+            $titleTask = $taskInfo['TAS_TITLE'];
+            G::auditlog("DeleteTask", 'Delete Task -> ' . $titleTask . ' : ' . $oData->tas_uid);
             $sOutput = $oProcessMap->deleteTask($oData->tas_uid);
             break;
         case 'addGuide':
             $sOutput = $oProcessMap->addGuide($oData->uid, $oData->position, $oData->direction);
             $sOutputAux = G::json_decode($sOutput);
             $sOutputAux = (array)$sOutputAux;
-            G::auditLog('Add'.ucwords($oDataAux['direction']).'Line','Add '.$oDataAux['direction'].' line ('.$sOutputAux['uid'].') in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('Add' . ucwords($oDataAux['direction']) . 'Line', 'Add ' . $oDataAux['direction'] . ' line (' . $sOutputAux['uid'] . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'saveGuidePosition':
             $sOutput = $oProcessMap->saveGuidePosition($oData->uid, $oData->position, $oData->direction);
-            G::auditLog('SaveGuidePosition','Change '.$oData->direction.' line position  ('.$oData->uid.') in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('SaveGuidePosition', 'Change ' . $oData->direction . ' line position  (' . $oData->uid . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'deleteGuide':
             $sOutput = $oProcessMap->deleteGuide($oData->uid);
-            G::auditLog('DeleteLine','Delete line ('.$oData->uid.') in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('DeleteLine', 'Delete line (' . $oData->uid . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'deleteGuides':
             $sOutput = $oProcessMap->deleteGuides($oData->pro_uid);
-            G::auditLog('DeleteLines','Delete all lines in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('DeleteLines', 'Delete all lines in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'addText':
             $sOutput = $oProcessMap->addText($oData->uid, html_entity_decode(html_entity_decode($oData->label)), $oData->position->x, $oData->position->y);
             $sOutputAux = G::json_decode($sOutput);
             $sOutputAux = (array)$sOutputAux;
-            G::auditLog('AddText','Add new text ('.$sOutputAux['uid'].') in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('AddText', 'Add new text (' . $sOutputAux['uid'] . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'updateText':
             $sOutput = $oProcessMap->updateText($oData->uid, $oData->label);
-            G::auditLog('UpdateText','Edit text ('.$oData->uid.' ) in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('UpdateText', 'Edit text (' . $oData->uid . ' ) in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'saveTextPosition':
             $sOutput = $oProcessMap->saveTextPosition($oData->uid, $oData->position->x, $oData->position->y);
-            G::auditLog('SaveTextPosition','Change text position ('.$oData->uid.' ) in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('SaveTextPosition', 'Change text position (' . $oData->uid . ' ) in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'deleteText':
             $sOutput = $oProcessMap->deleteText($oData->uid);
-            G::auditLog('DeleteText','Delete text ('.$oData->uid.' ) in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('DeleteText', 'Delete text (' . $oData->uid . ' ) in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'dynaforms':
             $oProcessMap->dynaformsList($oData->pro_uid);
@@ -389,125 +369,125 @@ try {
                 case 0:
                     $sType = 'SEQUENTIAL';
                     $oProcessNewPattern = new Process();
-                    $taskProcess=$oProcessNewPattern->load($oData->pro_uid);
-                    $titleProcess=$taskProcess['PRO_TITLE'];
+                    $taskProcess = $oProcessNewPattern->load($oData->pro_uid);
+                    $titleProcess = $taskProcess['PRO_TITLE'];
                     $oTaskNewPattern = new Task();
-                    $taskInfo=$oTaskNewPattern->load($oData->tas_uid);
-                    $titleTask=$taskInfo['TAS_TITLE'];
+                    $taskInfo = $oTaskNewPattern->load($oData->tas_uid);
+                    $titleTask = $taskInfo['TAS_TITLE'];
                     if ($oData->next_task != "-1") {
                         $oTaskNextNewPattern = new Task();
-                        $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task);
-                        $titleNextTask=$taskNextInfo['TAS_TITLE'];
+                        $taskNextInfo = $oTaskNextNewPattern->load($oData->next_task);
+                        $titleNextTask = $taskNextInfo['TAS_TITLE'];
                     } else {
-                        $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS");
+                        $titleNextTask = G::LoadTranslation("ID_END_OF_PROCESS");
                     }
-                    if ($titleNextTask=='') {
-                        G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : END OF PROCESS Task Name -> '.$titleTask.' : '.$oData->tas_uid);
-                    }else{
-                        G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task);
+                    if ($titleNextTask == '') {
+                        G::auditLog("DerivationRule", 'PROCESS NAME : ' . $titleProcess . ' : ' . $oData->pro_uid . ' Routing rule : END OF PROCESS Task Name -> ' . $titleTask . ' : ' . $oData->tas_uid);
+                    } else {
+                        G::auditLog("DerivationRule", 'PROCESS NAME : ' . $titleProcess . ' : ' . $oData->pro_uid . ' Routing rule : ' . $sType . ' from -> ' . $titleTask . ' : ' . $oData->tas_uid . ' To -> ' . $titleNextTask . ' : ' . $oData->next_task);
                     }
                     break;
                 case 1:
                     $sType = 'SELECT';
                     $oProcessNewPattern = new Process();
-                    $taskProcess=$oProcessNewPattern->load($oData->pro_uid);
-                    $titleProcess=$taskProcess['PRO_TITLE'];
+                    $taskProcess = $oProcessNewPattern->load($oData->pro_uid);
+                    $titleProcess = $taskProcess['PRO_TITLE'];
                     $oTaskNewPattern = new Task();
-                    $taskInfo=$oTaskNewPattern->load($oData->tas_uid);
-                    $titleTask=$taskInfo['TAS_TITLE'];
+                    $taskInfo = $oTaskNewPattern->load($oData->tas_uid);
+                    $titleTask = $taskInfo['TAS_TITLE'];
                     if ($oData->next_task != "-1") {
                         $oTaskNextNewPattern = new Task();
-                        $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task);
-                        $titleNextTask=$taskNextInfo['TAS_TITLE'];
+                        $taskNextInfo = $oTaskNextNewPattern->load($oData->next_task);
+                        $titleNextTask = $taskNextInfo['TAS_TITLE'];
                     } else {
-                        $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS");
+                        $titleNextTask = G::LoadTranslation("ID_END_OF_PROCESS");
                     }
-                    G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task);
+                    G::auditLog("DerivationRule", 'PROCESS NAME : ' . $titleProcess . ' : ' . $oData->pro_uid . ' Routing rule : ' . $sType . ' from -> ' . $titleTask . ' : ' . $oData->tas_uid . ' To -> ' . $titleNextTask . ' : ' . $oData->next_task);
                     break;
                 case 2:
                     $sType = 'EVALUATE';
                     $oProcessNewPattern = new Process();
-                    $taskProcess=$oProcessNewPattern->load($oData->pro_uid);
-                    $titleProcess=$taskProcess['PRO_TITLE'];
+                    $taskProcess = $oProcessNewPattern->load($oData->pro_uid);
+                    $titleProcess = $taskProcess['PRO_TITLE'];
                     $oTaskNewPattern = new Task();
-                    $taskInfo=$oTaskNewPattern->load($oData->tas_uid);
-                    $titleTask=$taskInfo['TAS_TITLE'];
+                    $taskInfo = $oTaskNewPattern->load($oData->tas_uid);
+                    $titleTask = $taskInfo['TAS_TITLE'];
                     if ($oData->next_task != "-1") {
                         $oTaskNextNewPattern = new Task();
-                        $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task);
-                        $titleNextTask=$taskNextInfo['TAS_TITLE'];
+                        $taskNextInfo = $oTaskNextNewPattern->load($oData->next_task);
+                        $titleNextTask = $taskNextInfo['TAS_TITLE'];
                     } else {
-                        $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS");
+                        $titleNextTask = G::LoadTranslation("ID_END_OF_PROCESS");
                     }
-                    G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task);
+                    G::auditLog("DerivationRule", 'PROCESS NAME : ' . $titleProcess . ' : ' . $oData->pro_uid . ' Routing rule : ' . $sType . ' from -> ' . $titleTask . ' : ' . $oData->tas_uid . ' To -> ' . $titleNextTask . ' : ' . $oData->next_task);
                     break;
                 case 3:
                     $sType = 'PARALLEL';
                     $oProcessNewPattern = new Process();
-                    $taskProcess=$oProcessNewPattern->load($oData->pro_uid);
-                    $titleProcess=$taskProcess['PRO_TITLE'];
+                    $taskProcess = $oProcessNewPattern->load($oData->pro_uid);
+                    $titleProcess = $taskProcess['PRO_TITLE'];
                     $oTaskNewPattern = new Task();
-                    $taskInfo=$oTaskNewPattern->load($oData->tas_uid);
-                    $titleTask=$taskInfo['TAS_TITLE'];
+                    $taskInfo = $oTaskNewPattern->load($oData->tas_uid);
+                    $titleTask = $taskInfo['TAS_TITLE'];
                     if ($oData->next_task != "-1") {
                         $oTaskNextNewPattern = new Task();
-                        $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task);
-                        $titleNextTask=$taskNextInfo['TAS_TITLE'];
+                        $taskNextInfo = $oTaskNextNewPattern->load($oData->next_task);
+                        $titleNextTask = $taskNextInfo['TAS_TITLE'];
                     } else {
-                        $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS");
+                        $titleNextTask = G::LoadTranslation("ID_END_OF_PROCESS");
                     }
-                    G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task);
+                    G::auditLog("DerivationRule", 'PROCESS NAME : ' . $titleProcess . ' : ' . $oData->pro_uid . ' Routing rule : ' . $sType . ' from -> ' . $titleTask . ' : ' . $oData->tas_uid . ' To -> ' . $titleNextTask . ' : ' . $oData->next_task);
                     break;
                 case 4:
                     $sType = 'PARALLEL-BY-EVALUATION';
                     $oProcessNewPattern = new Process();
-                    $taskProcess=$oProcessNewPattern->load($oData->pro_uid);
-                    $titleProcess=$taskProcess['PRO_TITLE'];
+                    $taskProcess = $oProcessNewPattern->load($oData->pro_uid);
+                    $titleProcess = $taskProcess['PRO_TITLE'];
                     $oTaskNewPattern = new Task();
-                    $taskInfo=$oTaskNewPattern->load($oData->tas_uid);
-                    $titleTask=$taskInfo['TAS_TITLE'];
+                    $taskInfo = $oTaskNewPattern->load($oData->tas_uid);
+                    $titleTask = $taskInfo['TAS_TITLE'];
                     if ($oData->next_task != "-1") {
                         $oTaskNextNewPattern = new Task();
-                        $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task);
-                        $titleNextTask=$taskNextInfo['TAS_TITLE'];
+                        $taskNextInfo = $oTaskNextNewPattern->load($oData->next_task);
+                        $titleNextTask = $taskNextInfo['TAS_TITLE'];
                     } else {
-                        $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS");
+                        $titleNextTask = G::LoadTranslation("ID_END_OF_PROCESS");
                     }
-                    G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task);
+                    G::auditLog("DerivationRule", 'PROCESS NAME : ' . $titleProcess . ' : ' . $oData->pro_uid . ' Routing rule : ' . $sType . ' from -> ' . $titleTask . ' : ' . $oData->tas_uid . ' To -> ' . $titleNextTask . ' : ' . $oData->next_task);
                     break;
                 case 5:
                     $sType = 'SEC-JOIN';
                     $oProcessNewPattern = new Process();
-                    $taskProcess=$oProcessNewPattern->load($oData->pro_uid);
-                    $titleProcess=$taskProcess['PRO_TITLE'];
+                    $taskProcess = $oProcessNewPattern->load($oData->pro_uid);
+                    $titleProcess = $taskProcess['PRO_TITLE'];
                     $oTaskNewPattern = new Task();
-                    $taskInfo=$oTaskNewPattern->load($oData->tas_uid);
-                    $titleTask=$taskInfo['TAS_TITLE'];
+                    $taskInfo = $oTaskNewPattern->load($oData->tas_uid);
+                    $titleTask = $taskInfo['TAS_TITLE'];
                     if ($oData->next_task != "-1") {
                         $oTaskNextNewPattern = new Task();
-                        $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task);
-                        $titleNextTask=$taskNextInfo['TAS_TITLE'];
+                        $taskNextInfo = $oTaskNextNewPattern->load($oData->next_task);
+                        $titleNextTask = $taskNextInfo['TAS_TITLE'];
                     } else {
-                        $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS");
+                        $titleNextTask = G::LoadTranslation("ID_END_OF_PROCESS");
                     }
-                    G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task);
+                    G::auditLog("DerivationRule", 'PROCESS NAME : ' . $titleProcess . ' : ' . $oData->pro_uid . ' Routing rule : ' . $sType . ' from -> ' . $titleTask . ' : ' . $oData->tas_uid . ' To -> ' . $titleNextTask . ' : ' . $oData->next_task);
                     break;
                 case 8:
                     $sType = 'DISCRIMINATOR';
                     $oProcessNewPattern = new Process();
-                    $taskProcess=$oProcessNewPattern->load($oData->pro_uid);
-                    $titleProcess=$taskProcess['PRO_TITLE'];
+                    $taskProcess = $oProcessNewPattern->load($oData->pro_uid);
+                    $titleProcess = $taskProcess['PRO_TITLE'];
                     $oTaskNewPattern = new Task();
-                    $taskInfo=$oTaskNewPattern->load($oData->tas_uid);
-                    $titleTask=$taskInfo['TAS_TITLE'];
+                    $taskInfo = $oTaskNewPattern->load($oData->tas_uid);
+                    $titleTask = $taskInfo['TAS_TITLE'];
                     if ($oData->next_task != "-1") {
                         $oTaskNextNewPattern = new Task();
-                        $taskNextInfo=$oTaskNextNewPattern->load($oData->next_task);
-                        $titleNextTask=$taskNextInfo['TAS_TITLE'];
+                        $taskNextInfo = $oTaskNextNewPattern->load($oData->next_task);
+                        $titleNextTask = $taskNextInfo['TAS_TITLE'];
                     } else {
-                        $titleNextTask=G::LoadTranslation("ID_END_OF_PROCESS");
+                        $titleNextTask = G::LoadTranslation("ID_END_OF_PROCESS");
                     }
-                    G::auditLog("DerivationRule",'PROCESS NAME : '.$titleProcess.' : '.$oData->pro_uid.' Routing rule : '.$sType.' from -> '.$titleTask.' : '.$oData->tas_uid.' To -> '.$titleNextTask.' : '.$oData->next_task);
+                    G::auditLog("DerivationRule", 'PROCESS NAME : ' . $titleProcess . ' : ' . $oData->pro_uid . ' Routing rule : ' . $sType . ' from -> ' . $titleTask . ' : ' . $oData->tas_uid . ' To -> ' . $titleNextTask . ' : ' . $oData->next_task);
                     break;
             }
             if (($oData->type != 0) && ($oData->type != 5) && ($oData->type != 8)) {
@@ -517,7 +497,6 @@ try {
                 unset($aRow);
             }
             if (($oData->delete) || ($oData->type == 0) || ($oData->type == 5) || ($oData->type == 8)) {
-
                 $oTasks = new Tasks();
                 $oTasks->deleteAllRoutesOfTask($oData->pro_uid, $oData->tas_uid);
                 $oTasks->deleteAllGatewayOfTask($oData->pro_uid, $oData->tas_uid);
@@ -527,9 +506,9 @@ try {
         case 'deleteAllRoutes':
 
             $oTaskNewPattern = new Task();
-            $taskInfo=$oTaskNewPattern->load($oData->tas_uid);
-            $titleTask=$taskInfo['TAS_TITLE'];
-            G::auditlog("DeleteRoutes",'Delete All Routes From Task -> '.$titleTask.' : '.$oData->tas_uid);
+            $taskInfo = $oTaskNewPattern->load($oData->tas_uid);
+            $titleTask = $taskInfo['TAS_TITLE'];
+            G::auditlog("DeleteRoutes", 'Delete All Routes From Task -> ' . $titleTask . ' : ' . $oData->tas_uid);
             $oTasks = new Tasks();
             $oTasks->deleteAllRoutesOfTask($oData->pro_uid, $oData->tas_uid);
             break;
@@ -556,11 +535,11 @@ try {
         case 'exploreDirectory':
             $_SESSION["PFMDirectory"] = $oData->main_directory;
             $oProcessMap->exploreDirectory($oData->pro_uid, $oData->main_directory, $oData->directory);
-            G::auditLog('ProcessFileManager','Upload template ('.$oData->main_directory.') in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('ProcessFileManager', 'Upload template (' . $oData->main_directory . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'deleteFile':
             $oProcessMap->deleteFile($oData->pro_uid, $oData->main_directory, $oData->directory, $oData->file);
-            G::auditLog('ProcessFileManager','Delete template ('.$oData->main_directory.': '.$oData->file.') in process "'.$resultProcess['PRO_TITLE'].'"');
+            G::auditLog('ProcessFileManager', 'Delete template (' . $oData->main_directory . ': ' . $oData->file . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
             break;
         case 'deleteDirectory':
             $oProcessMap->deleteDirectory($oData->pro_uid, $oData->main_directory, $oData->directory, $oData->dir_to_delete);
@@ -570,9 +549,9 @@ try {
             break;
         case 'deleteSubProcess':
             $oTaskNewPattern = new Task();
-            $taskInfo=$oTaskNewPattern->load($oData->tas_uid);
-            $titleTask=$taskInfo['TAS_TITLE'];
-            G::auditlog("DeleteSubProcess",'Delete Sub-Process -> '.$titleTask.' : '.$oData->tas_uid);
+            $taskInfo = $oTaskNewPattern->load($oData->tas_uid);
+            $titleTask = $taskInfo['TAS_TITLE'];
+            G::auditlog("DeleteSubProcess", 'Delete Sub-Process -> ' . $titleTask . ' : ' . $oData->tas_uid);
             $sOutput = $oProcessMap->deleteSubProcess($oData->pro_uid, $oData->tas_uid);
             break;
         case 'subProcess_Properties':
@@ -655,7 +634,7 @@ try {
                 require_once 'classes/model/Configuration.php';
                 $oConfiguration = new Configuration();
                 $oConfiguration->create(array('CFG_UID' => 'REGISTER_INFORMATION', 'OBJ_UID' => '', 'CFG_VALUE' => serialize(array('u' => $oData->u, 'p' => $oData->p
-                    )), 'PRO_UID' => '', 'USR_UID' => $_SESSION['USER_LOGGED'], 'APP_UID' => ''
+                )), 'PRO_UID' => '', 'USR_UID' => $_SESSION['USER_LOGGED'], 'APP_UID' => ''
                 ));
                 $oResponse->sLabel = G::LoadTranslation('ID_DOWNLOAD');
                 $oResponse->sLink = '../processes/downloadPML?id=' . $oData->pro_uid . '&s=' . $sessionId;
@@ -676,11 +655,11 @@ try {
             switch ($sDir) {
                 case 'mailTemplates':
                     $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename'];
-                    G::auditLog('ProcessFileManager','Edit template ('.$_REQUEST['filename'].') in process "'.$resultProcess['PRO_TITLE'].'"');
+                    G::auditLog('ProcessFileManager', 'Edit template (' . $_REQUEST['filename'] . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
                     break;
                 case 'public':
                     $sDirectory = PATH_DATA_PUBLIC . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename'];
-                    G::auditLog('ProcessFileManager','Edit public template ('.$_REQUEST['filename'].') in process "'.$resultProcess['PRO_TITLE'].'"');
+                    G::auditLog('ProcessFileManager', 'Edit public template (' . $_REQUEST['filename'] . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
                     break;
                 default:
                     $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename'];
@@ -688,66 +667,26 @@ try {
             }
             $fcontent = file_get_contents($sDirectory);
             $extion = explode(".", $_REQUEST['filename']);
-            //            $oHeadPublisher = &headPublisher::getSingleton();
-            //            $oHeadPublisher->clearScripts();
-            //            $oHeadPublisher->addScriptFile( '/js/tinymce/jscripts/tiny_mce/tiny_mce.js' );
-            //            $jscriptCode .= '
-            //
-            ////                    var tmpArrToStr = Array.prototype.toStr;
-            ////                    var tmpObjToStr = Object.prototype.toStr;
-            ////                    var tmpObjConcat = Object.prototype.concat;
-            ////                    var tmpObjGetByKey = Object.prototype.get_by_key;
-            ////                    var tmpObjExpand = Object.prototype.expand;
-            ////                    var tmpObjSetParent = Object.prototype.setParent;
-            ////                    var tmpObjIsSetKey = Object.prototype.isset_key;
-            ////
-            ////                    delete Array.prototype.toStr;
-            ////                    delete Object.prototype.toStr;
-            ////                    delete Object.prototype.concat;
-            ////                    delete Object.prototype.get_by_key;
-            ////                    delete Object.prototype.expand;
-            ////                    delete Object.prototype.setParent;
-            ////                    delete Object.prototype.isset_key;
-            ////                alert ("hi");
-            ////                document.body.onload = function(){
-            //                    alert ("hello");
-            //                    tinyMCE.baseURL = "/js/tinymce/jscripts/tiny_mce";
-            //                    tinyMCE.init({
-            //                        theme   : "advanced",
-            //                        plugins : "fullpage",
-            //                        mode    : "specific_textareas",
-            //                        editor_selector : "tmceEditor",
-            //                        width   : "640",
-            //                        height  : "300",
-            //                        theme_advanced_buttons3_add : "fullpage"
-            //                    });
-            ////                    alert ("goodbye");
-            ////                }
-            //            ';
-            //            $oHeadPublisher->addScriptCode($jscriptCode);
             $_REQUEST['fcontent'] = $fcontent;
 
-            preg_match_all('/\@(?:([\>])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/',$fcontent,$matches);
+            preg_match_all('/\@(?:([\>])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/', $fcontent, $matches);
             foreach ($matches[0] as $key => $value) {
-                preg_match('/(\!--)'.$value.'(-->)/',$fcontent, $match);
-                if (count($match)==0) {
-                    $fcontent = preg_replace ('/'.$value.'/i','<!--'.$value.'-->',$fcontent);
+                preg_match('/(\!--)' . $value . '(-->)/', $fcontent, $match);
+                if (count($match) == 0) {
+                    $fcontent = preg_replace('/' . $value . '/i', '<!--' . $value . '-->', $fcontent);
                 }
             }
-            preg_match_all('/\@(?:([\<])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/',$fcontent,$matches);
+            preg_match_all('/\@(?:([\<])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/', $fcontent, $matches);
             foreach ($matches[0] as $key => $value) {
-                    preg_match('/(\!--)'.$value.'(-->)/',$fcontent, $match);
-                    if (count($match)==0) {
-                        $fcontent = preg_replace ('/'.$value.'/i','<!--'.$value.'-->',$fcontent);
-                    }
+                preg_match('/(\!--)' . $value . '(-->)/', $fcontent, $match);
+                if (count($match) == 0) {
+                    $fcontent = preg_replace('/' . $value . '/i', '<!--' . $value . '-->', $fcontent);
+                }
             }
 
-            //if($extion[count($extion)-1]=='html' || $extion[count($extion)-1]=='txt'){
-            $aData = Array('pro_uid' => $_REQUEST['pro_uid'], 'fcontent' => $fcontent, 'filename' => $_REQUEST['filename']);
+            $aData = array('pro_uid' => $_REQUEST['pro_uid'], 'fcontent' => $fcontent, 'filename' => $_REQUEST['filename']);
             $G_PUBLISH->AddContent('xmlform', 'xmlform', 'processes/processes_FileEdit', '', $aData);
             G::RenderPage('publish', 'raw');
-            // $G_PUBLISH->AddContent( 'view', 'processes/processesFileEditEmail' );
-            // G::RenderPage( 'publish', 'blank' );
             break;
         case 'saveFile':
             $_REQUEST['pro_uid'] = $filter->xssFilterHard($_REQUEST['pro_uid']);
@@ -755,8 +694,7 @@ try {
             global $G_PUBLISH;
             $G_PUBLISH = new Publisher();
             global $RBAC;
-            if ( $RBAC->userCanAccess('PM_FACTORY') == 1) {
-
+            if ($RBAC->userCanAccess('PM_FACTORY') == 1) {
                 $app = new Processes();
                 if (!$app->processExists($_REQUEST['pro_uid'])) {
                     echo G::LoadTranslation('ID_PROCESS_UID_NOT_DEFINED');
@@ -771,11 +709,11 @@ try {
                 switch ($sDir) {
                     case 'mailTemplates':
                         $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename'];
-                        G::auditLog('ProcessFileManager','Save template ('.$_REQUEST['filename'].') in process "'.$resultProcess['PRO_TITLE'].'"');
+                        G::auditLog('ProcessFileManager', 'Save template (' . $_REQUEST['filename'] . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
                         break;
                     case 'public':
                         $sDirectory = PATH_DATA_PUBLIC . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename'];
-                        G::auditLog('ProcessFileManager','Save public template ('.$_REQUEST['filename'].') in process "'.$resultProcess['PRO_TITLE'].'"');
+                        G::auditLog('ProcessFileManager', 'Save public template (' . $_REQUEST['filename'] . ') in process "' . $resultProcess['PRO_TITLE'] . '"');
                         break;
                     default:
                         $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename'];
@@ -792,32 +730,32 @@ try {
             }
             break;
         case 'getSessid':
-            if(isset($_SESSION['USER_LOGGED'])){
+            if (isset($_SESSION['USER_LOGGED'])) {
                 echo Bootstrap::json_encode(1);
-            }else{
+            } else {
                 echo Bootstrap::json_encode(0);
             }
             break;
         case 'events':
             $oProcessMap->eventsList($oData->pro_uid, $oData->type);
             break;
-            /**
-            * returns an array with all Dynaforms Fields
-            */
+        /**
+         * returns an array with all Dynaforms Fields
+         */
         case 'getVariableList':
 
             $proUid = isset($_REQUEST['process']) ? $_REQUEST['process'] : '';
             $queryText = isset($_REQUEST['queryText']) ? $_REQUEST['queryText'] : '';
-            switch($_REQUEST['type']) {
-                case 'system';
+            switch ($_REQUEST['type']) {
+                case 'system':
                     $typeVars = $_REQUEST['type'];
-                break;
-                case 'process';
+                    break;
+                case 'process':
                     $typeVars = $_REQUEST['type'];
-                break;
-                case 'grid';
+                    break;
+                case 'grid':
                     $typeVars = $_REQUEST['type'];
-                break;     
+                    break;
             }
             if ($_REQUEST['type'] == 'all') {
                 $aFields = getDynaformsVars($proUid);
@@ -834,14 +772,14 @@ try {
                 }
             } else {
                 switch ($_REQUEST["type"]) {
-                    case "system" :
+                    case "system":
                         foreach ($aFields as $key => $value) {
                             if ($aFields[$key]["sType"] == "system") {
                                 $aVariables[] = $aFields[$key];
                             }
                         }
                         break;
-                    default :
+                    default:
                         foreach ($aFields as $key => $value) {
                             $aVariables[] = $aFields[$key];
                         }
@@ -851,19 +789,19 @@ try {
 
             echo Bootstrap::json_encode($aVariables);
             break;
-            /**
-            * returns the prefix mean
-            *
-            */
+        /**
+         * returns the prefix mean
+         *
+         */
         case 'getVariablePrefix':
             $_REQUEST['prefix'] = $filter->xssFilterHard($_REQUEST['prefix']);
             $_REQUEST['prefix'] = $_REQUEST['prefix'] != null ? $_REQUEST['prefix'] : 'ID_TO_STRING';
             $prefix = $filter->xssFilterHard(G::LoadTranslation($_REQUEST['prefix']));
             echo G::LoadTranslation($prefix);
             break;
-            /**
-            * return an array with all Variables of Grid type
-            */
+        /**
+         * return an array with all Variables of Grid type
+         */
         case 'getGridList':
 
             $proUid = isset($_REQUEST['PRO_UID']) ? $_REQUEST['PRO_UID'] : '';
@@ -876,9 +814,9 @@ try {
             }
             echo Bootstrap::json_encode($aVariables);
             break;
-            /**
-            * return an array with all Grid Variables according to Grid
-            */
+        /**
+         * return an array with all Grid Variables according to Grid
+         */
         case 'getVariableGrid':
 
             $proUid = isset($_REQUEST['PRO_UID']) ? $_REQUEST['PRO_UID'] : '';
@@ -910,22 +848,7 @@ try {
                 }
             }
             echo Bootstrap::json_encode($resultArray);
-            // var_dump($resultArray);
             break;
-        /*
-          case 'saveFile':
-          global $G_PUBLISH;
-          $G_PUBLISH = new Publisher();
-          $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename'];
-
-          $fp = fopen($sDirectory, 'w');
-          $content = stripslashes($_REQUEST['fcontent']);
-          $content = str_replace("@amp@", "&", $content);
-          fwrite($fp, $content);
-          fclose($fp);
-          echo 'saved: '. $sDirectory;
-          break;
-         */
         case 'emptyFileOptions':
             global $G_PUBLISH;
             $G_PUBLISH = new Publisher();
@@ -966,7 +889,6 @@ try {
             }
             $response = new stdclass();
             $response->casesNumRec = $casesNumRec;
-            //$json = new Services_JSON();
             $sOutput = Bootstrap::json_encode($response);
             break;
         case "verifyNameFile":
@@ -991,7 +913,6 @@ try {
 } catch (Exception $oException) {
     $token = strtotime("now");
     PMException::registerErrorLog($oException, $token);
-    G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
+    G::outRes(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)));
     die;
 }
-
diff --git a/workflow/engine/methods/processes/processes_Library.php b/workflow/engine/methods/processes/processes_Library.php
index b1362e1a3..f006370c9 100644
--- a/workflow/engine/methods/processes/processes_Library.php
+++ b/workflow/engine/methods/processes/processes_Library.php
@@ -22,22 +22,22 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 global $RBAC;
-$access = $RBAC->userCanAccess( 'PM_FACTORY' );
+$access = $RBAC->userCanAccess('PM_FACTORY');
 if ($access != 1) {
     switch ($access) {
         case - 1:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         case - 2:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         default:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
     }
@@ -47,14 +47,14 @@ if ($access != 1) {
  * ***********************
  */
 
-function parseItemArray ($array)
+function parseItemArray($array)
 {
-    if (! isset( $array->item ) && ! is_array( $array )) {
+    if (! isset($array->item) && ! is_array($array)) {
         return null;
     }
 
-    $result = array ();
-    if (isset( $array->item )) {
+    $result = array();
+    if (isset($array->item)) {
         foreach ($array->item as $key => $value) {
             $result[$value->key] = $value->value;
         }
@@ -71,29 +71,29 @@ try {
     $oProcess->ws_open_public();
 
     $result = $oProcess->ws_ProcessList();
-    $processes[] = array ('uid' => 'char','name' => 'char','age' => 'integer','balance' => 'float'
+    $processes[] = array('uid' => 'char','name' => 'char','age' => 'integer','balance' => 'float'
     );
 
-    if ($result->status_code == 0 && isset( $result->processes )) {
+    if ($result->status_code == 0 && isset($result->processes)) {
         foreach ($result->processes as $key => $val) {
-            $process = parseItemArray( $val );
+            $process = parseItemArray($val);
             $processes[] = $process;
         }
     }
     $_DBArray['processes'] = $processes;
     $_SESSION['_DBArray'] = $_DBArray;
 
-    $c = new Criteria( 'dbarray' );
-    $c->setDBArrayTable( 'processes' );
+    $c = new Criteria('dbarray');
+    $c->setDBArrayTable('processes');
 
     $G_MAIN_MENU = 'processmaker';
     $G_ID_MENU_SELECTED = 'PROCESSES';
 
     $G_PUBLISH = new Publisher();
-    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'processes/processes_ListPublic', $c );
-    $oHeadPublisher = & headPublisher::getSingleton();
+    $G_PUBLISH->AddContent('propeltable', 'paged-table', 'processes/processes_ListPublic', $c);
+    $oHeadPublisher = headPublisher::getSingleton();
     //$oHeadPublisher->addScriptCode('leimnud.Package.Load("newAccount",{Type:"file",Absolute:true,Path:"/jscore/newAccount.js"});');
-    $oHeadPublisher->addScriptCode( "
+    $oHeadPublisher->addScriptCode("
   var oPanel;
   var oPanel2;
   var showDetails = function(sUID) {
@@ -124,11 +124,11 @@ try {
     }.extend(this);
     oRPC.make();
   };
-  " );
-    G::RenderPage( 'publish', 'blank' );
+  ");
+    G::RenderPage('publish', 'blank');
 } catch (Exception $e) {
     $G_PUBLISH = new Publisher();
     $aMessage['MESSAGE'] = $e->getMessage();
-    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-    G::RenderPage( 'publish', 'blank' );
-}
\ No newline at end of file
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage);
+    G::RenderPage('publish', 'blank');
+}
diff --git a/workflow/engine/methods/processes/processes_Map.php b/workflow/engine/methods/processes/processes_Map.php
index 096747fda..b6dd98da5 100644
--- a/workflow/engine/methods/processes/processes_Map.php
+++ b/workflow/engine/methods/processes/processes_Map.php
@@ -22,22 +22,22 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 global $RBAC;
-$access = $RBAC->userCanAccess( 'PM_FACTORY' );
+$access = $RBAC->userCanAccess('PM_FACTORY');
 if ($access != 1) {
     switch ($access) {
         case - 1:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         case - 2:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         default:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
     }
@@ -50,7 +50,8 @@ $criteria->add(ProcessPeer::PRO_UID, $_GET["PRO_UID"], Criteria::EQUAL);
 
 $criteria->add(
     $criteria->getNewCriterion(ProcessPeer::PRO_CREATE_USER, $_SESSION["USER_LOGGED"], Criteria::EQUAL)->addOr(
-    $criteria->getNewCriterion(ProcessPeer::PRO_TYPE_PROCESS, "PUBLIC", Criteria::EQUAL))
+    $criteria->getNewCriterion(ProcessPeer::PRO_TYPE_PROCESS, "PUBLIC", Criteria::EQUAL)
+    )
 );
 
 $rsCriteria = ProcessPeer::doSelectRS($criteria);
@@ -66,7 +67,7 @@ $processUID = $_GET['PRO_UID'];
 $_SESSION['PROCESS'] = $processUID;
 $_SESSION['PROCESSMAP'] = 'LEIMNUD';
 
-$oTemplatePower = new TemplatePower( PATH_TPL . 'processes/processes_Map.html' );
+$oTemplatePower = new TemplatePower(PATH_TPL . 'processes/processes_Map.html');
 $oTemplatePower->prepare();
 
 $G_MAIN_MENU = 'processmaker';
@@ -75,20 +76,20 @@ $G_SUB_MENU = 'processes';
 $G_ID_SUB_MENU_SELECTED = '_';
 
 $G_PUBLISH = new Publisher();
-$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
+$G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
 
 $consolidated = 0;
 /*----------------------------------********---------------------------------*/
-$licensedFeatures = & PMLicensedFeatures::getSingleton();
+$licensedFeatures = PMLicensedFeatures::getSingleton();
 if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) {
     $consolidated = 1;
 }
 /*----------------------------------********---------------------------------*/
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addScriptFile( '/jscore/dbConnections/main.js' );
-$oHeadPublisher->addScriptCode( '
-    var maximunX = ' . ProcessMap::getMaximunTaskX( $processUID ) . ';
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addScriptFile('/jscore/dbConnections/main.js');
+$oHeadPublisher->addScriptCode('
+    var maximunX = ' . ProcessMap::getMaximunTaskX($processUID) . ';
 	var leimnud = new maborak();
 	leimnud.make();
 	leimnud.Package.Load("rpc,drag,drop,panel,app,validator,fx,dom,abbr",{Instance:leimnud,Type:"module"});
@@ -111,9 +112,10 @@ $oHeadPublisher->addScriptCode( '
 		}
 		Pm.make();
 	});
-	var changesSavedLabel = "' . addslashes( G::LoadTranslation( 'ID_SAVED_SUCCESSFULLY' ) ) . '";' );
+	var changesSavedLabel = "' . addslashes(G::LoadTranslation('ID_SAVED_SUCCESSFULLY')) . '";');
 
-if (! isset( $_GET['raw'] ))
-    G::RenderPage( 'publish', 'green-submenu' );
-else
-    G::RenderPage( 'publish', 'raw' );
+if (! isset($_GET['raw'])) {
+    G::RenderPage('publish', 'green-submenu');
+} else {
+    G::RenderPage('publish', 'raw');
+}
diff --git a/workflow/engine/methods/processes/processes_UploadFilesForm.php b/workflow/engine/methods/processes/processes_UploadFilesForm.php
index 2606fc0a2..b56e5d178 100644
--- a/workflow/engine/methods/processes/processes_UploadFilesForm.php
+++ b/workflow/engine/methods/processes/processes_UploadFilesForm.php
@@ -23,28 +23,18 @@
  */
 
 if ($_GET['NAVIGATOR'] == 'ie') {
-    $oForm = new Form( 'processes/processes_UploadFilesForm', '', SYS_LANG );
+    $oForm = new Form('processes/processes_UploadFilesForm', '', SYS_LANG);
     $oForm->action = 'processes_UploadFiles';
-    $oForm->values = array ('PRO_UID' => $_GET['PRO_UID'],'MAIN_DIRECTORY' => $_GET['MAIN_DIRECTORY'],'CURRENT_DIRECTORY' => $_GET['CURRENT_DIRECTORY']
+    $oForm->values = array('PRO_UID' => $_GET['PRO_UID'],'MAIN_DIRECTORY' => $_GET['MAIN_DIRECTORY'],'CURRENT_DIRECTORY' => $_GET['CURRENT_DIRECTORY']
     );
-    echo '<link rel="stylesheet" type="text/css" href="/skins/' . SYS_SKIN . '/style.css"/>' . $oForm->render( PATH_CORE . 'templates/xmlform.html', $scriptCode = '' );
-
+    echo '<link rel="stylesheet" type="text/css" href="/skins/' . SYS_SKIN . '/style.css"/>' . $oForm->render(PATH_CORE . 'templates/xmlform.html', $scriptCode = '');
 } else {
-    $params = Array ('PRO_UID' => $_GET['PRO_UID'],'MAIN_DIRECTORY' => $_GET['MAIN_DIRECTORY'],'CURRENT_DIRECTORY' => $_GET['CURRENT_DIRECTORY']
+    $params = array('PRO_UID' => $_GET['PRO_UID'],'MAIN_DIRECTORY' => $_GET['MAIN_DIRECTORY'],'CURRENT_DIRECTORY' => $_GET['CURRENT_DIRECTORY']
     );
 
     $_SESSION['processes_upload'] = $params;
     $G_PUBLISH = new Publisher();
-    $oHeadPublisher = & headPublisher::getSingleton();
-    $G_PUBLISH->AddContent( 'view', 'processes/processes_Upload' );
-    G::RenderPage( "publish", "raw" );
+    $oHeadPublisher = headPublisher::getSingleton();
+    $G_PUBLISH->AddContent('view', 'processes/processes_Upload');
+    G::RenderPage("publish", "raw");
 }
-
-
-
-
-
-
-
-
-
diff --git a/workflow/engine/methods/processes/processes_User.php b/workflow/engine/methods/processes/processes_User.php
index 5b2eb772c..02f8fb66d 100644
--- a/workflow/engine/methods/processes/processes_User.php
+++ b/workflow/engine/methods/processes/processes_User.php
@@ -32,27 +32,26 @@
 
 try {
     //$oJSON = new Services_JSON();
-    $stdObj = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
-    if (isset( $stdObj->pro_uid ))
+    $stdObj = Bootstrap::json_decode(stripslashes($_POST['data']));
+    if (isset($stdObj->pro_uid)) {
         $sProUid = $stdObj->pro_uid;
-    else
-        throw (new Exception( 'the process uid is not defined!.' ));
+    } else {
+        throw (new Exception('the process uid is not defined!.'));
+    }
 
     $oProcessMap = new ProcessMap();
-    $c = $oProcessMap->listProcessesUser( $sProUid );
+    $c = $oProcessMap->listProcessesUser($sProUid);
 
-    $oHeadPublisher = & headPublisher::getSingleton();
-    $oHeadPublisher->addScriptFile( '/jscore/processmap/core/processUser.js' );
+    $oHeadPublisher = headPublisher::getSingleton();
+    $oHeadPublisher->addScriptFile('/jscore/processmap/core/processUser.js');
 
     $G_PUBLISH = new Publisher();
-    $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'processes/processes_User', $c, array ('PRO_UID' => $sProUid
-    ) );
-    G::RenderPage( 'publish', 'raw' );
-
+    $G_PUBLISH->AddContent('propeltable', 'paged-table', 'processes/processes_User', $c, array('PRO_UID' => $sProUid
+    ));
+    G::RenderPage('publish', 'raw');
 } catch (Exception $e) {
     $G_PUBLISH = new Publisher();
     $aMessage['MESSAGE'] = $e->getMessage();
-    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-    G::RenderPage( 'publish', 'raw' );
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage);
+    G::RenderPage('publish', 'raw');
 }
-?>
\ No newline at end of file
diff --git a/workflow/engine/methods/reportTables/edit.php b/workflow/engine/methods/reportTables/edit.php
index a093698c3..b0f246634 100644
--- a/workflow/engine/methods/reportTables/edit.php
+++ b/workflow/engine/methods/reportTables/edit.php
@@ -1,19 +1,19 @@
 <?php
 
-$id = isset( $_GET['id'] ) ? $_GET['id'] : false;
+$id = isset($_GET['id']) ? $_GET['id'] : false;
 $table = false;
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 
-$oHeadPublisher->addExtJsScript( 'reportTables/edit', true );
-$oHeadPublisher->assign( 'ADD_TAB_UID', $id );
+$oHeadPublisher->addExtJsScript('reportTables/edit', true);
+$oHeadPublisher->assign('ADD_TAB_UID', $id);
 
 if ($id) {
     // if is a edit request
 
     $additionalTables = new AdditionalTables();
-    $table = $additionalTables->load( $id, true );
-    $tableFields = array ();
-    $fieldsList = array ();
+    $table = $additionalTables->load($id, true);
+    $tableFields = array();
+    $fieldsList = array();
 
     // list the case fields
     foreach ($table['FIELDS'] as $i => $field) {
@@ -21,52 +21,51 @@ if ($id) {
         unset($table['FIELDS'][$i]);
         continue;
         }*/
-        array_push( $tableFields, $field['FLD_DYN_NAME'] );
+        array_push($tableFields, $field['FLD_DYN_NAME']);
     }
 
     //list dynaform fields
     if ($table['ADD_TAB_TYPE'] == 'NORMAL') {
-        $fields = getDynaformsVars( $table['PRO_UID'], false );
+        $fields = getDynaformsVars($table['PRO_UID'], false);
         foreach ($fields as $field) {
             //select to not assigned fields for available grid
-            if (! in_array( $field['sName'], $tableFields )) {
-                $fieldsList[] = array ('FIELD_UID' => $field['sName'] . '-' . $field['sType'],'FIELD_NAME' => $field['sName']);
+            if (! in_array($field['sName'], $tableFields)) {
+                $fieldsList[] = array('FIELD_UID' => $field['sName'] . '-' . $field['sType'],'FIELD_NAME' => $field['sName']);
             }
         }
     } else {
-        list ($gridName, $gridId) = explode( '-', $table['ADD_TAB_GRID'] );
+        list($gridName, $gridId) = explode('-', $table['ADD_TAB_GRID']);
 
-        $G_FORM = new Form( $table['PRO_UID'] . '/' . $gridId, PATH_DYNAFORM, SYS_LANG, false );
-        $gridFields = $G_FORM->getVars( false );
+        $G_FORM = new Form($table['PRO_UID'] . '/' . $gridId, PATH_DYNAFORM, SYS_LANG, false);
+        $gridFields = $G_FORM->getVars(false);
 
         foreach ($gridFields as $gfield) {
-            if (! in_array( $gfield['sName'], $tableFields )) {
-                $fieldsList[] = array ('FIELD_UID' => $gfield['sName'] . '-' . $gfield['sType'],'FIELD_NAME' => $gfield['sName']);
+            if (! in_array($gfield['sName'], $tableFields)) {
+                $fieldsList[] = array('FIELD_UID' => $gfield['sName'] . '-' . $gfield['sType'],'FIELD_NAME' => $gfield['sName']);
             }
         }
     }
 
-    $oHeadPublisher->assign( 'avFieldsList', $fieldsList );
+    $oHeadPublisher->assign('avFieldsList', $fieldsList);
 }
 
 $repTabPluginPermissions = false;
 global $G_TMP_MENU;
 $oMenu = new Menu();
-$oMenu->load( 'setup' );
+$oMenu->load('setup');
 
 foreach ($oMenu->Options as $i => $option) {
     if ($oMenu->Types[$i] == 'private' && $oMenu->Id[$i] == 'PLUGIN_REPTAB_PERMISSIONS') {
-        $repTabPluginPermissions = array ();
+        $repTabPluginPermissions = array();
         $repTabPluginPermissions['label'] = $oMenu->Labels[$i];
         $repTabPluginPermissions['fn'] = $oMenu->Options[$i];
         break;
     }
 }
 
-$oHeadPublisher->assign( '_plugin_permissions', $repTabPluginPermissions );
+$oHeadPublisher->assign('_plugin_permissions', $repTabPluginPermissions);
 
-$oHeadPublisher->assign( 'PRO_UID', isset( $_GET['PRO_UID'] ) ? $_GET['PRO_UID'] : false );
-$oHeadPublisher->assign( 'TABLE', $table );
-
-G::RenderPage( 'publish', 'extJs' );
+$oHeadPublisher->assign('PRO_UID', isset($_GET['PRO_UID']) ? $_GET['PRO_UID'] : false);
+$oHeadPublisher->assign('TABLE', $table);
 
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/reportTables/main.php b/workflow/engine/methods/reportTables/main.php
index c279d4a18..bf0a6100b 100644
--- a/workflow/engine/methods/reportTables/main.php
+++ b/workflow/engine/methods/reportTables/main.php
@@ -23,36 +23,35 @@
  */
 
 global $RBAC;
-$RBAC->requirePermissions( 'PM_SETUP_ADVANCE' );
+$RBAC->requirePermissions('PM_SETUP_ADVANCE');
 $G_PUBLISH = new Publisher();
 
 $c = new Configurations();
-$configPage = $c->getConfiguration( 'additionalTablesList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
-$Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
+$configPage = $c->getConfiguration('additionalTablesList', 'pageSize', '', $_SESSION['USER_LOGGED']);
+$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
 
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 
 $repTabPluginPermissions = false;
 global $G_TMP_MENU;
 $oMenu = new Menu();
-$oMenu->load( 'setup' );
+$oMenu->load('setup');
 
 $simpleREportsPlugin = false;
 foreach ($oMenu->Options as $i => $option) {
     if ($oMenu->Types[$i] == 'private' && $oMenu->Id[$i] == 'PLUGIN_REPTAB_PERMISSIONS') {
-        $simpleREportsPlugin = array ();
+        $simpleREportsPlugin = array();
         $simpleREportsPlugin['label'] = $oMenu->Labels[$i];
         $simpleREportsPlugin['fn'] = $oMenu->Options[$i];
         break;
     }
 }
 
-$oHeadPublisher->assign( '_PLUGIN_SIMPLEREPORTS', $simpleREportsPlugin );
-
-$oHeadPublisher->addExtJsScript( 'reportTables/main', true ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'reportTables/main' ); //adding a html file  .html.
-$oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
-$oHeadPublisher->assign( 'CONFIG', $Config );
-$oHeadPublisher->assign( 'PRO_UID', isset( $_GET['PRO_UID'] ) ? $_GET['PRO_UID'] : false );
-G::RenderPage( 'publish', 'extJs' );
+$oHeadPublisher->assign('_PLUGIN_SIMPLEREPORTS', $simpleREportsPlugin);
 
+$oHeadPublisher->addExtJsScript('reportTables/main', true); //adding a javascript file .js
+$oHeadPublisher->addContent('reportTables/main'); //adding a html file  .html.
+$oHeadPublisher->assign('FORMATS', $c->getFormats());
+$oHeadPublisher->assign('CONFIG', $Config);
+$oHeadPublisher->assign('PRO_UID', isset($_GET['PRO_UID']) ? $_GET['PRO_UID'] : false);
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/reports/reports_View.php b/workflow/engine/methods/reports/reports_View.php
index 470ce0724..283d7bc2e 100644
--- a/workflow/engine/methods/reports/reports_View.php
+++ b/workflow/engine/methods/reports/reports_View.php
@@ -33,15 +33,15 @@ use ProcessMaker\Plugins\PluginRegistry;
  */
 
 global $RBAC;
-switch ($RBAC->userCanAccess( 'PM_REPORTS' )) {
+switch ($RBAC->userCanAccess('PM_REPORTS')) {
     case - 2:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
     case - 1:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
 }
@@ -58,7 +58,7 @@ try {
     switch ($RPT_UID) {
         case 1:
             $sw = 0;
-            if (isset( $_POST['form'] )) {
+            if (isset($_POST['form'])) {
                 if ($_POST['form']['FROM'] != '0000-00-00' || $_POST['form']['TO'] != '0000-00-00') {
                     $sw = 1;
                 }
@@ -66,32 +66,32 @@ try {
                 $fields['TO'] = $_POST['form']['TO'];
                 $fields['STARTEDBY'] = $_POST['form']['STARTEDBY'];
             } else {
-                $fields['FROM'] = date( 'Y-m-d' );
-                $fields['TO'] = date( 'Y-m-d' );
+                $fields['FROM'] = date('Y-m-d');
+                $fields['TO'] = date('Y-m-d');
             }
 
             $oReport = new Report();
             if ($sw == 0) {
                 $c = $oReport->generatedReport1();
             } else {
-                $c = $oReport->generatedReport1_filter( $_POST['form']['FROM'], $_POST['form']['TO'], $_POST['form']['STARTEDBY'] );
+                $c = $oReport->generatedReport1_filter($_POST['form']['FROM'], $_POST['form']['TO'], $_POST['form']['STARTEDBY']);
             }
-            $oHeadPublisher = & headPublisher::getSingleton();
-            $oHeadPublisher->addScriptFile( '/jscore/reports/reports.js' );
+            $oHeadPublisher = headPublisher::getSingleton();
+            $oHeadPublisher->addScriptFile('/jscore/reports/reports.js');
 
             $G_PUBLISH = new Publisher();
-            $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'reports/report1', $c );
+            $G_PUBLISH->AddContent('propeltable', 'paged-table', 'reports/report1', $c);
 
-            if (isset( $_POST['form'] )) {
-                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'reports/report1_search', '', $fields );
+            if (isset($_POST['form'])) {
+                $G_PUBLISH->AddContent('xmlform', 'xmlform', 'reports/report1_search', '', $fields);
             } else {
-                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'reports/report1_search' );
+                $G_PUBLISH->AddContent('xmlform', 'xmlform', 'reports/report1_search');
             }
-            G::RenderPage( 'publish' );
+            G::RenderPage('publish');
             break;
         case 2:
             $sw = 0;
-            if (isset( $_POST['form'] )) {
+            if (isset($_POST['form'])) {
                 if ($_POST['form']['FROM'] != '0000-00-00' || $_POST['form']['TO'] != '0000-00-00') {
                     $sw = 1;
                 }
@@ -99,8 +99,8 @@ try {
                 $fields['TO'] = $_POST['form']['TO'];
                 $fields['STARTEDBY'] = $_POST['form']['STARTEDBY'];
             } else {
-                $fields['FROM'] = date( 'Y-m-d' );
-                $fields['TO'] = date( 'Y-m-d' );
+                $fields['FROM'] = date('Y-m-d');
+                $fields['TO'] = date('Y-m-d');
             }
 
             $oReport = new Report();
@@ -108,30 +108,30 @@ try {
             if ($sw == 0) {
                 $c = $oReport->generatedReport2();
             } else {
-                $c = $oReport->generatedReport2_filter( $_POST['form']['FROM'], $_POST['form']['TO'], $_POST['form']['STARTEDBY'] );
+                $c = $oReport->generatedReport2_filter($_POST['form']['FROM'], $_POST['form']['TO'], $_POST['form']['STARTEDBY']);
             }
-            $oHeadPublisher = & headPublisher::getSingleton();
-            $oHeadPublisher->addScriptFile( '/jscore/reports/reports.js' );
+            $oHeadPublisher = headPublisher::getSingleton();
+            $oHeadPublisher->addScriptFile('/jscore/reports/reports.js');
 
             $G_PUBLISH = new Publisher();
-            $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'reports/report2', $c );
+            $G_PUBLISH->AddContent('propeltable', 'paged-table', 'reports/report2', $c);
 
-            if (isset( $_POST['form'] )) {
-                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'reports/report1_search', '', $fields );
+            if (isset($_POST['form'])) {
+                $G_PUBLISH->AddContent('xmlform', 'xmlform', 'reports/report1_search', '', $fields);
             } else {
-                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'reports/report1_search' );
+                $G_PUBLISH->AddContent('xmlform', 'xmlform', 'reports/report1_search');
             }
-            G::RenderPage( 'publish' );
+            G::RenderPage('publish');
             break;
         case 3:
             $sw = 0;
-            if (isset( $_POST['form'] )) {
+            if (isset($_POST['form'])) {
                 $sw = 1;
                 $fields['PROCESS'] = $_POST['form']['PROCESS'];
                 $fields['TASKS'] = $_POST['form']['TASKS'];
             } else {
-                $fields['FROM'] = date( 'Y-m-d' );
-                $fields['TO'] = date( 'Y-m-d' );
+                $fields['FROM'] = date('Y-m-d');
+                $fields['TO'] = date('Y-m-d');
             }
 
             $oReport = new Report();
@@ -139,24 +139,24 @@ try {
             if ($sw == 0) {
                 $c = $oReport->generatedReport3();
             } else {
-                $c = $oReport->generatedReport3_filter( $_POST['form']['PROCESS'], $_POST['form']['TASKS'] );
+                $c = $oReport->generatedReport3_filter($_POST['form']['PROCESS'], $_POST['form']['TASKS']);
             }
-            $oHeadPublisher = & headPublisher::getSingleton();
-            $oHeadPublisher->addScriptFile( '/jscore/reports/reports.js' );
+            $oHeadPublisher = headPublisher::getSingleton();
+            $oHeadPublisher->addScriptFile('/jscore/reports/reports.js');
             $G_PUBLISH = new Publisher();
 
-            if (isset( $_POST['form'] )) {
-                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'reports/report_filter', '', $fields );
+            if (isset($_POST['form'])) {
+                $G_PUBLISH->AddContent('xmlform', 'xmlform', 'reports/report_filter', '', $fields);
             } else {
-                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'reports/report_filter' );
+                $G_PUBLISH->AddContent('xmlform', 'xmlform', 'reports/report_filter');
             }
-            $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'reports/report3', $c );
+            $G_PUBLISH->AddContent('propeltable', 'paged-table', 'reports/report3', $c);
 
-            G::RenderPage( 'publish' );
+            G::RenderPage('publish');
             break;
         case 4:
             $sw = 0;
-            if (isset( $_POST['form'] )) {
+            if (isset($_POST['form'])) {
                 $sw = 1;
                 $fields['PROCESS'] = $_POST['form']['PROCESS'];
                 $fields['TASKS'] = $_POST['form']['TASKS'];
@@ -167,24 +167,24 @@ try {
             if ($sw == 0) {
                 $c = $oReport->generatedReport4();
             } else {
-                $c = $oReport->generatedReport4_filter( $_POST['form']['PROCESS'], $_POST['form']['TASKS'] );
+                $c = $oReport->generatedReport4_filter($_POST['form']['PROCESS'], $_POST['form']['TASKS']);
             }
-            $oHeadPublisher = & headPublisher::getSingleton();
-            $oHeadPublisher->addScriptFile( '/jscore/reports/reports.js' );
+            $oHeadPublisher = headPublisher::getSingleton();
+            $oHeadPublisher->addScriptFile('/jscore/reports/reports.js');
             $G_PUBLISH = new Publisher();
 
-            if (isset( $_POST['form'] )) {
-                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'reports/report_filter', '', $fields );
+            if (isset($_POST['form'])) {
+                $G_PUBLISH->AddContent('xmlform', 'xmlform', 'reports/report_filter', '', $fields);
             } else {
-                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'reports/report_filter' );
+                $G_PUBLISH->AddContent('xmlform', 'xmlform', 'reports/report_filter');
             }
-            $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'reports/report4', $c );
+            $G_PUBLISH->AddContent('propeltable', 'paged-table', 'reports/report4', $c);
 
-            G::RenderPage( 'publish' );
+            G::RenderPage('publish');
             break;
         case 5:
             $sw = 0;
-            if (isset( $_POST['form'] )) {
+            if (isset($_POST['form'])) {
                 $sw = 1;
                 $fields['PROCESS'] = $_POST['form']['PROCESS'];
                 $fields['TASKS'] = $_POST['form']['TASKS'];
@@ -195,52 +195,50 @@ try {
             if ($sw == 0) {
                 $c = $oReport->generatedReport5();
             } else {
-                $c = $oReport->generatedReport5_filter( $_POST['form']['PROCESS'], $_POST['form']['TASKS'] );
+                $c = $oReport->generatedReport5_filter($_POST['form']['PROCESS'], $_POST['form']['TASKS']);
             }
-            $oHeadPublisher = & headPublisher::getSingleton();
-            $oHeadPublisher->addScriptFile( '/jscore/reports/reports.js' );
+            $oHeadPublisher = headPublisher::getSingleton();
+            $oHeadPublisher->addScriptFile('/jscore/reports/reports.js');
             $G_PUBLISH = new Publisher();
 
-            if (isset( $_POST['form'] )) {
-                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'reports/report_filter', '', $fields );
+            if (isset($_POST['form'])) {
+                $G_PUBLISH->AddContent('xmlform', 'xmlform', 'reports/report_filter', '', $fields);
             } else {
-                $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'reports/report_filter' );
+                $G_PUBLISH->AddContent('xmlform', 'xmlform', 'reports/report_filter');
             }
-            $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'reports/report5', $c );
+            $G_PUBLISH->AddContent('propeltable', 'paged-table', 'reports/report5', $c);
 
-            G::RenderPage( 'publish' );
+            G::RenderPage('publish');
             break;
         default:
             $foundReport = false;
             $oPluginRegistry = PluginRegistry::loadSingleton();
             $aAvailableReports = $oPluginRegistry->getReports();
             foreach ($aAvailableReports as $sReportClass) {
-
                 require_once PATH_PLUGINS . $sReportClass . PATH_SEP . 'class.' . $sReportClass . '.php';
                 $sClassName = $sReportClass . 'Class';
                 $oInstance = new $sClassName();
                 $aReports = $oInstance->getAvailableReports();
                 foreach ($aReports as $oReport) {
-                    if ($RPT_UID == $oReport['uid'] && method_exists( $oInstance, $RPT_UID )) {
+                    if ($RPT_UID == $oReport['uid'] && method_exists($oInstance, $RPT_UID)) {
                         $foundReport = true;
                         $result = $oInstance->{$RPT_UID}();
-
                     }
                 }
             }
 
             //now check if there are customized reports inside the processes
-            if (file_exists( PATH_DATA_PUBLIC ) && is_dir( PATH_DATA_PUBLIC )) {
-                if ($handle = opendir( PATH_DATA_PUBLIC )) {
-                    while (false !== ($dir = readdir( $handle ))) {
-                        if ($dir[0] != '.' && file_exists( PATH_DATA_PUBLIC . $dir . PATH_SEP . 'reports.php' )) {
-                            include_once (PATH_DATA_PUBLIC . $dir . PATH_SEP . 'reports.php');
+            if (file_exists(PATH_DATA_PUBLIC) && is_dir(PATH_DATA_PUBLIC)) {
+                if ($handle = opendir(PATH_DATA_PUBLIC)) {
+                    while (false !== ($dir = readdir($handle))) {
+                        if ($dir[0] != '.' && file_exists(PATH_DATA_PUBLIC . $dir . PATH_SEP . 'reports.php')) {
+                            include_once(PATH_DATA_PUBLIC . $dir . PATH_SEP . 'reports.php');
                             $className = 'report' . $dir;
-                            if (class_exists( $className )) {
+                            if (class_exists($className)) {
                                 $oInstance = new $className();
                                 $aReports = $oInstance->getAvailableReports();
                                 foreach ($aReports as $oReport) {
-                                    if ($RPT_UID == $oReport['uid'] && method_exists( $oInstance, $RPT_UID )) {
+                                    if ($RPT_UID == $oReport['uid'] && method_exists($oInstance, $RPT_UID)) {
                                         $foundReport = true;
                                         $result = $oInstance->{$RPT_UID}();
                                     }
@@ -249,17 +247,15 @@ try {
                         }
                     }
                 }
-                closedir( $handle );
+                closedir($handle);
             }
             if (! $foundReport) {
-                throw (new Exception( "Call to an nonexistent member function " . $RPT_UID . "() " ));
+                throw (new Exception("Call to an nonexistent member function " . $RPT_UID . "() "));
             }
     }
-
 } catch (Exception $e) {
     $G_PUBLISH = new Publisher();
     $aMessage['MESSAGE'] = $e->getMessage();
-    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-    G::RenderPage( 'publish', 'blank' );
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage);
+    G::RenderPage('publish', 'blank');
 }
-
diff --git a/workflow/engine/methods/roles/rolesUsersPermission.php b/workflow/engine/methods/roles/rolesUsersPermission.php
index 5dba0985d..bcb14969b 100644
--- a/workflow/engine/methods/roles/rolesUsersPermission.php
+++ b/workflow/engine/methods/roles/rolesUsersPermission.php
@@ -23,20 +23,20 @@
  */
 
 global $RBAC;
-switch ($RBAC->userCanAccess( 'PM_USERS' )) {
+switch ($RBAC->userCanAccess('PM_USERS')) {
     case - 2:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
     case - 1:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
     case - 3:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
 }
@@ -54,19 +54,18 @@ $arrayConfigPage = $configuration->getConfiguration('roleUsersPermissionsList',
 $arrayConfig = [];
 $arrayConfig['pageSize'] = (isset($arrayConfigPage['pageSize']))? $arrayConfigPage['pageSize'] : 20;
 
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->assign("PARTNER_FLAG", (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false);
 $oHeadPublisher->assign('CONFIG', $arrayConfig);
-$oHeadPublisher->addExtJsScript( 'roles/rolesUsersPermission', false ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'roles/rolesUsersPermission' ); //adding a html file  .html.
+$oHeadPublisher->addExtJsScript('roles/rolesUsersPermission', false); //adding a javascript file .js
+$oHeadPublisher->addContent('roles/rolesUsersPermission'); //adding a html file  .html.
 
 
-$roles = Array ();
+$roles = array();
 $roles['ROL_UID'] = $_GET['rUID'];
-$roles['ROL_CODE'] = $RBAC->getRoleCode( $_GET['rUID'] );
+$roles['ROL_CODE'] = $RBAC->getRoleCode($_GET['rUID']);
 $roles['CURRENT_TAB'] = ($_GET['tab'] == 'permissions') ? 1 : 0;
 
-$oHeadPublisher->assign( 'ROLES', $roles );
-$oHeadPublisher->assign( 'permissionsAdmin', $RBAC->loadPermissionAdmin() );
-G::RenderPage( 'publish', 'extJs' );
-
+$oHeadPublisher->assign('ROLES', $roles);
+$oHeadPublisher->assign('permissionsAdmin', $RBAC->loadPermissionAdmin());
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/roles/roles_List.php b/workflow/engine/methods/roles/roles_List.php
index aeb057c43..ef2a541de 100644
--- a/workflow/engine/methods/roles/roles_List.php
+++ b/workflow/engine/methods/roles/roles_List.php
@@ -56,7 +56,7 @@ $c = new Configurations();
 $configPage = $c->getConfiguration('rolesList', 'pageSize', '', $_SESSION['USER_LOGGED']);
 $Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
 
-$oHeadPublisher = &headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 
 $oHeadPublisher->addExtJsScript('roles/rolesList', false); //adding a javascript file .js
 $oHeadPublisher->addContent('roles/rolesList'); //adding a html file  .html.
@@ -64,4 +64,3 @@ $oHeadPublisher->assign('PARTNER_FLAG', (defined('PARTNER_FLAG')) ? PARTNER_FLAG
 $oHeadPublisher->assign('FORMATS', $c->getFormats());
 $oHeadPublisher->assign('CONFIG', $Config);
 G::RenderPage('publish', 'extJs');
-
diff --git a/workflow/engine/methods/services/ldapadvanced.php b/workflow/engine/methods/services/ldapadvanced.php
index 7275e82f5..68a306053 100644
--- a/workflow/engine/methods/services/ldapadvanced.php
+++ b/workflow/engine/methods/services/ldapadvanced.php
@@ -42,7 +42,7 @@ class ldapadvancedClassCron
     */
     public function executeCron($debug)
     {
-        $rbac = &RBAC::getSingleton();
+        $rbac = RBAC::getSingleton();
 
         if (is_null($rbac->authSourcesObj)) {
             $rbac->authSourcesObj = new AuthenticationSource();
@@ -203,7 +203,7 @@ class ldapadvancedClassCron
 
                     unset($arrayAuthenticationSourceData["AUTH_SOURCE_DATA"]["DEPARTMENTS_TO_UNASSIGN"]);
 
-                    $rbac = &RBAC::getSingleton();
+                    $rbac = RBAC::getSingleton();
                     $rbac->authSourcesObj->update($arrayAuthenticationSourceData);
                 }
 
@@ -240,7 +240,7 @@ class ldapadvancedClassCron
 
                     unset($arrayAuthenticationSourceData["AUTH_SOURCE_DATA"]["GROUPS_TO_UNASSIGN"]);
 
-                    $rbac = &RBAC::getSingleton();
+                    $rbac = RBAC::getSingleton();
                     $rbac->authSourcesObj->update($arrayAuthenticationSourceData);
                 }
 
@@ -599,4 +599,3 @@ class ldapadvancedClassCron
         }
     }
 }
-
diff --git a/workflow/engine/methods/setup/appCacheViewAjax.php b/workflow/engine/methods/setup/appCacheViewAjax.php
index 77c86bb6e..0442da73f 100644
--- a/workflow/engine/methods/setup/appCacheViewAjax.php
+++ b/workflow/engine/methods/setup/appCacheViewAjax.php
@@ -7,7 +7,6 @@ $request = isset($_POST['request']) ? $_POST['request'] : (isset($_GET['request'
 
 function testConnection($type, $server, $user, $passwd, $port = 'none', $dbName = "")
 {
-
     if (($port == 'none') || ($port == '') || ($port == 0)) {
         //setting defaults ports
         switch ($type) {
@@ -43,29 +42,29 @@ function testConnection($type, $server, $user, $passwd, $port = 'none', $dbName
                         $server = $filter->validateInput($server);
                         $user = $filter->validateInput($user);
                         $passwd = $filter->validateInput($passwd);
-                        $connDatabase = @mysql_connect($server, $user, $passwd);
+                        $connDatabase = mysqli_connect($server, $user, $passwd);
                         $dbNameTest = "PROCESSMAKERTESTDC";
                         $dbNameTest = $filter->validateInput($dbNameTest, 'nosql');
                         $query = "CREATE DATABASE %s";
                         $query = $filter->preventSqlInjection($query, array($dbNameTest), $connDatabase);
-                        $db = @mysql_query($query, $connDatabase);
+                        $db = mysqli_query($connDatabase, $query);
                         $success = false;
                         if (!$db) {
-                            $message = mysql_error();;
+                            $message = mysqli_error($connDatabase);
                         } else {
                             $usrTest = "wfrbtest";
                             $chkG = "GRANT ALL PRIVILEGES ON `%s`.* TO %s@'%%' IDENTIFIED BY 'sample' WITH GRANT OPTION";
                             $chkG = $filter->preventSqlInjection($chkG, array($dbNameTest, $usrTest), $connDatabase);
-                            $ch = @mysql_query($chkG, $connDatabase);
+                            $ch = mysqli_query($connDatabase, $chkG);
                             if (!$ch) {
-                                $message = mysql_error();
+                                $message = mysqli_error($connDatabase);
                             } else {
                                 $sqlCreateUser = "CREATE USER '%s'@'%%' IDENTIFIED BY '%s'";
                                 $user = $filter->validateInput($user, 'nosql');
                                 $sqlCreateUser = $filter->preventSqlInjection($sqlCreateUser, array($user . "_usertest", "sample"), $connDatabase);
-                                $result = @mysql_query($sqlCreateUser, $connDatabase);
+                                $result = mysqli_query($connDatabase, $sqlCreateUser);
                                 if (!$result) {
-                                    $message = mysql_error();
+                                    $message = mysqli_error($connDatabase);
                                 } else {
                                     $success = true;
                                     $message = G::LoadTranslation('ID_SUCCESSFUL_CONNECTION');
@@ -73,17 +72,17 @@ function testConnection($type, $server, $user, $passwd, $port = 'none', $dbName
                                 $sqlDropUser = "DROP USER '%s'@'%%'";
                                 $user = $filter->validateInput($user, 'nosql');
                                 $sqlDropUser = $filter->preventSqlInjection($sqlDropUser, array($user . "_usertest"), $connDatabase);
-                                @mysql_query($sqlDropUser, $connDatabase);
+                                mysqli_query($connDatabase, $sqlDropUser);
 
                                 $sqlDropUser = "DROP USER %s@'%%'";
                                 $usrTest = $filter->validateInput($usrTest, 'nosql');
                                 $sqlDropUser = $filter->preventSqlInjection($sqlDropUser, array($usrTest), $connDatabase);
-                                @mysql_query($sqlDropUser, $connDatabase);
+                                mysqli_query($connDatabase, $sqlDropUser);
                             }
                             $sqlDropDb = "DROP DATABASE %s";
                             $dbNameTest = $filter->validateInput($dbNameTest, 'nosql');
                             $sqlDropDb = $filter->preventSqlInjection($sqlDropDb, array($dbNameTest), $connDatabase);
-                            @mysql_query($sqlDropDb, $connDatabase);
+                            mysqli_query($connDatabase, $sqlDropDb);
                         }
                         return array($success, ($message != "") ? $message : $Server->error);
                     } else {
@@ -107,7 +106,7 @@ switch ($request) {
     //check if the APP_CACHE VIEW table and their triggers are installed
     case 'info':
         $result = new stdClass();
-        $result->info = array();
+        $result->info = [];
 
         //check the language, if no info in config about language, the default is 'en'
         $oConf = new Configurations();
@@ -126,7 +125,7 @@ switch ($request) {
         }
 
         //get user Root from hash
-        $result->info = array();
+        $result->info = [];
         $result->error = false;
 
         //setup the appcacheview object, and the path for the sql files
@@ -201,17 +200,17 @@ switch ($request) {
     case 'getLangList':
         $Translations = G::getModel('Translation');
         $result = new stdClass();
-        $result->rows = array();
+        $result->rows = [];
 
         $langs = $Translations->getTranslationEnvironments();
         foreach ($langs as $lang) {
             $result->rows[] = array('LAN_ID' => $lang['LOCALE'], 'LAN_NAME' => $lang['LANGUAGE']);
         }
 
-        print (G::json_encode($result));
+        print(G::json_encode($result));
         break;
     case 'build':
-        $sqlToExe = array();
+        $sqlToExe = [];
         $conf = new Configurations();
 
         //DEPRECATED $lang = $_POST['lang'];
@@ -225,38 +224,30 @@ switch ($request) {
 
             //Update APP_DELEGATION.DEL_LAST_INDEX data
             $res = $appCache->updateAppDelegationDelLastIndex($lang, true);
-            //$result->info[] = array("name" => "update APP_DELEGATION.DEL_LAST_INDEX", "value" => $res);
 
             //APP_DELEGATION INSERT
             $res = $appCache->triggerAppDelegationInsert($lang, true);
-            //$result->info[] = array ('name' => 'Trigger APP_DELEGATION INSERT',           'value'=> $res);
 
 
             //APP_DELEGATION Update
             $res = $appCache->triggerAppDelegationUpdate($lang, true);
-            //$result->info[] = array ('name' => 'Trigger APP_DELEGATION UPDATE',           'value'=> $res);
 
 
             //APPLICATION UPDATE
             $res = $appCache->triggerApplicationUpdate($lang, true);
-            //$result->info[] = array ('name' => 'Trigger APPLICATION UPDATE',              'value'=> $res);
 
 
             //APPLICATION DELETE
             $res = $appCache->triggerApplicationDelete($lang, true);
-            //$result->info[] = array ('name' => 'Trigger APPLICATION DELETE',              'value'=> $res);
 
             //SUB_APPLICATION INSERT
             $res = $appCache->triggerSubApplicationInsert($lang, false);
 
             //CONTENT UPDATE
             $res = $appCache->triggerContentUpdate($lang, true);
-            //$result->info[] = array("name" => "Trigger CONTENT UPDATE", "value" => $res);
 
             //build using the method in AppCacheView Class
             $res = $appCache->fillAppCacheView($lang);
-            //$result->info[] = array ('name' => 'build APP_CACHE_VIEW',              'value'=> $res);
-
 
             //set status in config table
             $confParams = array('LANG' => $lang, 'STATUS' => 'active');
@@ -268,7 +259,6 @@ switch ($request) {
             $result->msg = G::LoadTranslation('ID_TITLE_COMPLETED');
             G::auditLog("BuildCache");
             echo G::json_encode($result);
-
         } catch (Exception $e) {
             $confParams = array('lang' => $lang, 'status' => 'failed');
             $appCacheViewEngine = $oServerConf->setProperty('APP_CACHE_VIEW_ENGINE', $confParams);
@@ -276,7 +266,7 @@ switch ($request) {
             $token = strtotime("now");
             PMException::registerErrorLog($e, $token);
             $varRes = '{success: false, msg:"' . G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) . '"}';
-            G::outRes( $varRes );
+            G::outRes($varRes);
         }
         break;
     case 'recreate-root':
@@ -299,7 +289,7 @@ switch ($request) {
             $sh = G::encryptOld(filemtime(PATH_GULLIVER . "/class.g.php"));
             $h = G::encrypt($_POST['host'] . $sh . $_POST['user'] . $sh . $_POST['password'] . $sh . (1), $sh);
             $insertStatements = "define ( 'HASH_INSTALLATION','{$h}' );  \ndefine ( 'SYSTEM_HASH', '{$sh}' ); \n";
-            $lines = array();
+            $lines = [];
             $content = '';
             $filename = PATH_HOME . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths_installed.php';
             $lines = file($filename);
diff --git a/workflow/engine/methods/setup/appCacheViewConf.php b/workflow/engine/methods/setup/appCacheViewConf.php
index 7530cc014..18eeb3c0b 100644
--- a/workflow/engine/methods/setup/appCacheViewConf.php
+++ b/workflow/engine/methods/setup/appCacheViewConf.php
@@ -1,38 +1,37 @@
 <?php
 global $RBAC;
-$RBAC->requirePermissions( 'PM_SETUP' );
+$RBAC->requirePermissions('PM_SETUP');
 //  header('Pragma: no-cache');
 //  header('Cache-Control: no-store, no-cache, must-revalidate');
 
 
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 //$oHeadPublisher->setExtSkin( 'xtheme-blue');
 
 
-$oHeadPublisher->addExtJsScript( 'setup/appCacheViewConf', false ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'setup/appCacheViewConf' ); //adding a html file  .html.
+$oHeadPublisher->addExtJsScript('setup/appCacheViewConf', false); //adding a javascript file .js
+$oHeadPublisher->addContent('setup/appCacheViewConf'); //adding a html file  .html.
 
 $oConf = new Configurations();
-$oConf->loadConfig( $x, 'APP_CACHE_VIEW_ENGINE', '', '', '', '' );
+$oConf->loadConfig($x, 'APP_CACHE_VIEW_ENGINE', '', '', '', '');
 
 //first check about APP_CACHE_VIEW is enabled or not,
-if (isset( $oConf->aConfig['LANG'] ) && isset( $oConf->aConfig['STATUS'] ) && $oConf->aConfig['STATUS'] == 'active') {
+if (isset($oConf->aConfig['LANG']) && isset($oConf->aConfig['STATUS']) && $oConf->aConfig['STATUS'] == 'active') {
     $appCacheViewEnabled = true;
 } else {
     $appCacheViewEnabled = false;
 }
-$lang = isset( $oConf->aConfig['LANG'] ) ? $oConf->aConfig['LANG'] : 'en';
+$lang = isset($oConf->aConfig['LANG']) ? $oConf->aConfig['LANG'] : 'en';
 
 //$oHeadPublisher->assign('appCacheViewEnabled', $appCacheViewEnabled);
 
 
-$labels = G::getTranslations( Array ('ID_PROCESSING','ID_CACHE_LANGUAGE','ID_CACHE_HOST','ID_CACHE_USER','ID_CACHE_PASSWORD','ID_CACHE_TITLE_INFO','ID_CACHE_SUBTITLE_REBUILD','ID_CACHE_BTN_BUILD','ID_CACHE_BUILDING','ID_CACHE_SUBTITLE_SETUP_DB','ID_CACHE_BTN_SETUP_PASSWRD','ID_CACHE_SUBTITLE_SETUP_SESSION','ID_CACHE_BTN_SETUP_SESSION'
-) );
+$labels = G::getTranslations(array('ID_PROCESSING','ID_CACHE_LANGUAGE','ID_CACHE_HOST','ID_CACHE_USER','ID_CACHE_PASSWORD','ID_CACHE_TITLE_INFO','ID_CACHE_SUBTITLE_REBUILD','ID_CACHE_BTN_BUILD','ID_CACHE_BUILDING','ID_CACHE_SUBTITLE_SETUP_DB','ID_CACHE_BTN_SETUP_PASSWRD','ID_CACHE_SUBTITLE_SETUP_SESSION','ID_CACHE_BTN_SETUP_SESSION'
+));
 // $oHeadPublisher->assign('TRANSLATIONS', $labels);
 // $TRANSLATIONS->ID_PROCESSING               = G::LoadTranslation('ID_PROCESSING');
 // $oHeadPublisher->assign( 'TRANSLATIONS',   $TRANSLATIONS); //translations
-$oHeadPublisher->assign( 'currentLang', $lang ); //current language
+$oHeadPublisher->assign('currentLang', $lang); //current language
 
 
-G::RenderPage( 'publish', 'extJs' );
-
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/setup/auditLog.php b/workflow/engine/methods/setup/auditLog.php
index 80f02f02c..ee93cf9b9 100644
--- a/workflow/engine/methods/setup/auditLog.php
+++ b/workflow/engine/methods/setup/auditLog.php
@@ -7,10 +7,10 @@ if ($RBAC->userCanAccess("PM_SETUP") != 1) {
 }
 
 $c = new Configurations();
-$configPage = $c->getConfiguration( "auditLogList", "pageSize", null, $_SESSION["USER_LOGGED"] );
+$configPage = $c->getConfiguration("auditLogList", "pageSize", null, $_SESSION["USER_LOGGED"]);
 
-$config = array ();
-$config["pageSize"] = (isset( $configPage["pageSize"] )) ? $configPage["pageSize"] : 20;
+$config = array();
+$config["pageSize"] = (isset($configPage["pageSize"])) ? $configPage["pageSize"] : 20;
 
 $arrayAction = array(
     "CreateUser"                 => G::LoadTranslation("ID_CREATE_USER"),
@@ -164,9 +164,8 @@ foreach ($arrayActionAux as $key => $value) {
     $arrayAction[] = array($key, $value);
 }
 
-$oHeadPublisher = &headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( "setup/auditLog", true );
-$oHeadPublisher->assign( "CONFIG", $config );
-$oHeadPublisher->assign( "ACTION", $arrayAction );
-G::RenderPage( "publish", "extJs" );
-
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript("setup/auditLog", true);
+$oHeadPublisher->assign("CONFIG", $config);
+$oHeadPublisher->assign("ACTION", $arrayAction);
+G::RenderPage("publish", "extJs");
diff --git a/workflow/engine/methods/setup/auditLogConfigAjax.php b/workflow/engine/methods/setup/auditLogConfigAjax.php
index 04f80123c..49f4e5df9 100644
--- a/workflow/engine/methods/setup/auditLogConfigAjax.php
+++ b/workflow/engine/methods/setup/auditLogConfigAjax.php
@@ -4,11 +4,11 @@ global $G_TMP_MENU;
 switch ($_GET['action']) {
     case 'saveOption':
         try {
-            $oServerConf = & ServerConf::getSingleton();
+            $oServerConf = ServerConf::getSingleton();
             $response = new $oServerConf;
             $conf = new Configurations();
             /*you can use SYS_TEMP or SYS_SYS ON AUDIT_LOG_CONF to save for each workspace*/
-            if (isset( $_POST['acceptAL'] )) {
+            if (isset($_POST['acceptAL'])) {
                 $conf->aConfig = 'true';
                 $conf->saveConfig('AUDIT_LOG', 'log');
                 $response->enable = true;
@@ -24,7 +24,6 @@ switch ($_GET['action']) {
             $response->success = false;
             $response->msg = $e->getMessage();
         }
-        echo G::json_encode( $response );
+        echo G::json_encode($response);
         break;
 }
-
diff --git a/workflow/engine/methods/setup/calendarList.php b/workflow/engine/methods/setup/calendarList.php
index 9a98d5345..6c1cb05ca 100644
--- a/workflow/engine/methods/setup/calendarList.php
+++ b/workflow/engine/methods/setup/calendarList.php
@@ -37,13 +37,12 @@ $G_ID_SUB_MENU_SELECTED = 'CALENDAR';
 $G_PUBLISH = new Publisher();
 
 $c = new Configurations();
-$configPage = $c->getConfiguration( 'calendarList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
-$Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
+$configPage = $c->getConfiguration('calendarList', 'pageSize', '', $_SESSION['USER_LOGGED']);
+$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( 'setup/calendarList', false ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'setup/calendarList' ); //adding a html file  .html.
-$oHeadPublisher->assign( 'CONFIG', $Config );
-
-G::RenderPage( 'publish', 'extJs' );
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('setup/calendarList', false); //adding a javascript file .js
+$oHeadPublisher->addContent('setup/calendarList'); //adding a html file  .html.
+$oHeadPublisher->assign('CONFIG', $Config);
 
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/setup/clearCompiled.php b/workflow/engine/methods/setup/clearCompiled.php
index 9c8e715b3..251a65264 100644
--- a/workflow/engine/methods/setup/clearCompiled.php
+++ b/workflow/engine/methods/setup/clearCompiled.php
@@ -29,9 +29,8 @@ if (!$resultRbac) {
     die();
 }
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( 'setup/clearCompiled', true ); //adding a javascript file .js
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('setup/clearCompiled', true); //adding a javascript file .js
 
 
-G::RenderPage( 'publish', 'extJs' );
-
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/setup/cron.php b/workflow/engine/methods/setup/cron.php
index 2f4d7d211..5e53db51d 100644
--- a/workflow/engine/methods/setup/cron.php
+++ b/workflow/engine/methods/setup/cron.php
@@ -48,43 +48,43 @@ if ($osIsLinux) {
 
 //Data
 $c = new Configurations();
-$configPage = $c->getConfiguration( "cronList", "pageSize", null, $_SESSION["USER_LOGGED"] );
+$configPage = $c->getConfiguration("cronList", "pageSize", null, $_SESSION["USER_LOGGED"]);
 
-$config = array ();
-$config["pageSize"] = (isset( $configPage["pageSize"] )) ? $configPage["pageSize"] : 20;
+$config = array();
+$config["pageSize"] = (isset($configPage["pageSize"])) ? $configPage["pageSize"] : 20;
 
-$cronInfo = array ();
+$cronInfo = array();
 $fileLog = PATH_DATA . "log" . PATH_SEP . "cron.log";
-$fileLogSize = (file_exists( $fileLog )) ? number_format( filesize( $fileLog ) * (1 / 1024) * (1 / 1024), 4, ".", "" ) : 0;
+$fileLogSize = (file_exists($fileLog)) ? number_format(filesize($fileLog) * (1 / 1024) * (1 / 1024), 4, ".", "") : 0;
 
-$cronInfo["status"] = G::LoadTranslation( (($bCronIsRunning) ? "ID_CRON_STATUS_ACTIVE" : "ID_CRON_STATUS_INACTIVE") );
-$cronInfo["lastExecution"] = (! empty( $sLastExecution )) ? $sLastExecution : "";
+$cronInfo["status"] = G::LoadTranslation((($bCronIsRunning) ? "ID_CRON_STATUS_ACTIVE" : "ID_CRON_STATUS_INACTIVE"));
+$cronInfo["lastExecution"] = (! empty($sLastExecution)) ? $sLastExecution : "";
 $cronInfo["fileLogName"] = "cron.log";
 $cronInfo["fileLogSize"] = $fileLogSize;
 $cronInfo["fileLogPath"] = $fileLog;
 
 //Workspaces
 $workspaces = System::listWorkspaces();
-$arrayAux = array ();
+$arrayAux = array();
 
 foreach ($workspaces as $index => $workspace) {
     $arrayAux[] = $workspace->name;
 }
 
-sort( $arrayAux );
+sort($arrayAux);
 
 //Status
-$arrayStatus = array (array ("ALL",G::LoadTranslation( "ID_ALL" )
-),array ("COMPLETED",G::LoadTranslation( "COMPLETED" )
-),array ("FAILED",G::LoadTranslation( "ID_FAILED" )
+$arrayStatus = array(array("ALL",G::LoadTranslation("ID_ALL")
+),array("COMPLETED",G::LoadTranslation("COMPLETED")
+),array("FAILED",G::LoadTranslation("ID_FAILED")
 )
 );
 
-$oHeadPublisher = &headPublisher::getSingleton();
-$oHeadPublisher->addContent( "setup/cron" ); //Adding a html file .html
-$oHeadPublisher->addExtJsScript( "setup/cron", false ); //Adding a javascript file .js
-$oHeadPublisher->assign( "CONFIG", $config );
-$oHeadPublisher->assign( "CRON", $cronInfo );
-$oHeadPublisher->assign( "STATUS", $arrayStatus );
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addContent("setup/cron"); //Adding a html file .html
+$oHeadPublisher->addExtJsScript("setup/cron", false); //Adding a javascript file .js
+$oHeadPublisher->assign("CONFIG", $config);
+$oHeadPublisher->assign("CRON", $cronInfo);
+$oHeadPublisher->assign("STATUS", $arrayStatus);
 
-G::RenderPage( "publish", "extJs" );
+G::RenderPage("publish", "extJs");
diff --git a/workflow/engine/methods/setup/environmentSettings.php b/workflow/engine/methods/setup/environmentSettings.php
index 2c9d68500..2e8da6e1c 100644
--- a/workflow/engine/methods/setup/environmentSettings.php
+++ b/workflow/engine/methods/setup/environmentSettings.php
@@ -1,11 +1,10 @@
 <?php
 global $RBAC;
-$RBAC->requirePermissions( 'PM_SETUP' );
+$RBAC->requirePermissions('PM_SETUP');
 
 $c = new Configurations();
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( 'setup/environmentSettings', true );
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('setup/environmentSettings', true);
 //$conf->aConfig['startCaseHideProcessInf']
-$oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
-G::RenderPage( 'publish', 'extJs' );
-
+$oHeadPublisher->assign('FORMATS', $c->getFormats());
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/setup/loginSettings.php b/workflow/engine/methods/setup/loginSettings.php
index 1e6318038..fee28991b 100644
--- a/workflow/engine/methods/setup/loginSettings.php
+++ b/workflow/engine/methods/setup/loginSettings.php
@@ -22,26 +22,25 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 global $RBAC;
-$RBAC->requirePermissions( 'PM_SETUP' );
+$RBAC->requirePermissions('PM_SETUP');
 
 $oConf = new Configurations();
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oServerConf = & ServerConf::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
+$oServerConf = ServerConf::getSingleton();
 
-$oHeadPublisher->addExtJsScript( 'setup/loginSettings', true ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'setup/loginSettings' ); //adding a html file  .html.
+$oHeadPublisher->addExtJsScript('setup/loginSettings', true); //adding a javascript file .js
+$oHeadPublisher->addContent('setup/loginSettings'); //adding a html file  .html.
 
 
-$oConf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
+$oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
 
-$forgotPasswd = isset( $oConf->aConfig['login_enableForgotPassword'] ) ? $oConf->aConfig['login_enableForgotPassword'] : false;
-$virtualKeyboad = isset( $oConf->aConfig['login_enableVirtualKeyboard'] ) ? $oConf->aConfig['login_enableVirtualKeyboard'] : false;
-$defaultLanguaje = isset( $oConf->aConfig['login_defaultLanguage'] ) ? $oConf->aConfig['login_defaultLanguage'] : 'en';
+$forgotPasswd = isset($oConf->aConfig['login_enableForgotPassword']) ? $oConf->aConfig['login_enableForgotPassword'] : false;
+$virtualKeyboad = isset($oConf->aConfig['login_enableVirtualKeyboard']) ? $oConf->aConfig['login_enableVirtualKeyboard'] : false;
+$defaultLanguaje = isset($oConf->aConfig['login_defaultLanguage']) ? $oConf->aConfig['login_defaultLanguage'] : 'en';
 
-$oHeadPublisher->assign( 'currentLang', $defaultLanguaje );
-$oHeadPublisher->assign( 'forgotPasswd', $forgotPasswd );
-$oHeadPublisher->assign( 'virtualKeyboad', $virtualKeyboad );
-
-G::RenderPage( 'publish', 'extJs' );
+$oHeadPublisher->assign('currentLang', $defaultLanguaje);
+$oHeadPublisher->assign('forgotPasswd', $forgotPasswd);
+$oHeadPublisher->assign('virtualKeyboad', $virtualKeyboad);
 
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/setup/loginSettingsAjax.php b/workflow/engine/methods/setup/loginSettingsAjax.php
index e30e75498..0d3a7c2d3 100644
--- a/workflow/engine/methods/setup/loginSettingsAjax.php
+++ b/workflow/engine/methods/setup/loginSettingsAjax.php
@@ -1,47 +1,49 @@
 <?php
-$request = isset( $_REQUEST['request'] ) ? $_REQUEST['request'] : null;
+$request = isset($_REQUEST['request']) ? $_REQUEST['request'] : null;
 
 switch ($request) {
     case 'getLangList':
 
         $Translations = new Translation();
         $result = new stdClass();
-        $result->rows = Array ();
+        $result->rows = array();
 
         $langs = $Translations->getTranslationEnvironments();
         foreach ($langs as $lang) {
-            $result->rows[] = Array ('LAN_ID' => $lang['LOCALE'],'LAN_NAME' => $lang['LANGUAGE']
+            $result->rows[] = array(
+                'LAN_ID' => $lang['LOCALE'],
+                'LAN_NAME' => $lang['LANGUAGE']
             );
         }
 
-        $result->rows[] = array ("LAN_ID" => "", "LAN_NAME" => G::LoadTranslation("ID_USE_LANGUAGE_URL"));
+        $result->rows[] = array("LAN_ID" => "", "LAN_NAME" => G::LoadTranslation("ID_USE_LANGUAGE_URL"));
 
-        print (G::json_encode( $result )) ;
+        print(G::json_encode($result));
         break;
     case 'saveSettings':
-        $memcache = & PMmemcached::getSingleton( !empty(config("system.workspace")) ? config("system.workspace") : '' );
+        $memcache = PMmemcached::getSingleton(!empty(config("system.workspace")) ? config("system.workspace") : '');
 
         $conf = new Configurations();
-        $conf->loadConfig( $obj, 'ENVIRONMENT_SETTINGS', '' );
+        $conf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
 
-        $conf->aConfig['login_enableForgotPassword'] = isset( $_REQUEST['forgotPasswd'] );
-        $conf->aConfig['login_enableVirtualKeyboard'] = isset( $_REQUEST['virtualKeyboad'] );
-        $conf->aConfig['login_defaultLanguage'] = isset( $_REQUEST['lang'] ) ? $_REQUEST['lang'] : 'en';
+        $conf->aConfig['login_enableForgotPassword'] = isset($_REQUEST['forgotPasswd']);
+        $conf->aConfig['login_enableVirtualKeyboard'] = isset($_REQUEST['virtualKeyboad']);
+        $conf->aConfig['login_defaultLanguage'] = isset($_REQUEST['lang']) ? $_REQUEST['lang'] : 'en';
 
-        $conf->saveConfig( 'ENVIRONMENT_SETTINGS', '' );
+        $conf->saveConfig('ENVIRONMENT_SETTINGS', '');
 
-        $lang = isset( $_REQUEST['lang'] ) ? $_REQUEST['lang'] : 'en';
+        $lang = isset($_REQUEST['lang']) ? $_REQUEST['lang'] : 'en';
         //remove from memcache when this value is updated/created
-        $memcache->delete( 'flagForgotPassword' );
+        $memcache->delete('flagForgotPassword');
 
         $response = new stdclass();
         $response->success = true;
 
-        $messEnableForgotPassword = (isset($conf->aConfig["login_enableForgotPassword"]) && $conf->aConfig["login_enableForgotPassword"] == "1")? G::LoadTranslation("ID_YES") : G::LoadTranslation("ID_NO");
-        G::auditLog("UpdateLoginSettings", "DefaultLanguage-> " . $lang . " EnableForgotPassword-> " . $messEnableForgotPassword);
+        $messEnableForgotPassword = (isset($conf->aConfig["login_enableForgotPassword"]) && $conf->aConfig["login_enableForgotPassword"] == "1") ? G::LoadTranslation("ID_YES") : G::LoadTranslation("ID_NO");
+        G::auditLog("UpdateLoginSettings",
+            "DefaultLanguage-> " . $lang . " EnableForgotPassword-> " . $messEnableForgotPassword);
 
-        echo G::json_encode( $response );
+        echo G::json_encode($response);
 
         break;
 }
-
diff --git a/workflow/engine/methods/setup/main.php b/workflow/engine/methods/setup/main.php
index 13a8807af..41210e0c3 100644
--- a/workflow/engine/methods/setup/main.php
+++ b/workflow/engine/methods/setup/main.php
@@ -22,28 +22,27 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 
-$RBAC->requirePermissions( 'PM_SETUP', 'PM_USERS' );
+$RBAC->requirePermissions('PM_SETUP', 'PM_USERS');
 
 $G_MAIN_MENU = 'processmaker';
 $G_ID_MENU_SELECTED = 'SETUP';
 $G_PUBLISH = new Publisher();
 
-if (isset( $_GET['i18'] ))
-    $_SESSION['DEV_FLAG'] = $_SESSION['TOOLS_VIEWTYPE'] = isset( $_GET['i18'] );
-else {
-    unset( $_SESSION['DEV_FLAG'] );
-    unset( $_SESSION['TOOLS_VIEWTYPE'] );
+if (isset($_GET['i18'])) {
+    $_SESSION['DEV_FLAG'] = $_SESSION['TOOLS_VIEWTYPE'] = isset($_GET['i18']);
+} else {
+    unset($_SESSION['DEV_FLAG']);
+    unset($_SESSION['TOOLS_VIEWTYPE']);
 }
 
-if (isset( $_GET['s'] ))
+if (isset($_GET['s'])) {
     $_SESSION['ADMIN_SELECTED'] = $_GET['s'];
-else {
-    unset( $_SESSION['ADMIN_SELECTED'] );
+} else {
+    unset($_SESSION['ADMIN_SELECTED']);
 }
 
-$G_PUBLISH->AddContent( 'view', 'setup/main_Load' );
-$oHeadPublisher = & headPublisher::getSingleton();
+$G_PUBLISH->AddContent('view', 'setup/main_Load');
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addScriptFile('/jscore/src/PM.js');
 $oHeadPublisher->addScriptFile('/jscore/src/Sessions.js');
-G::RenderPage( 'publish' );
-
+G::RenderPage('publish');
diff --git a/workflow/engine/methods/setup/main_init.php b/workflow/engine/methods/setup/main_init.php
index 41ae62eef..33ecfa9e6 100644
--- a/workflow/engine/methods/setup/main_init.php
+++ b/workflow/engine/methods/setup/main_init.php
@@ -22,32 +22,32 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 
-$RBAC->requirePermissions( "PM_SETUP", "PM_USERS" );
+$RBAC->requirePermissions("PM_SETUP", "PM_USERS");
 
 ///////
 $adminSelected = null;
 
-if (isset( $_REQUEST["s"] )) {
+if (isset($_REQUEST["s"])) {
     $adminSelected = $_REQUEST["s"];
 } else {
-    if (isset( $_SESSION["ADMIN_SELECTED"] )) {
+    if (isset($_SESSION["ADMIN_SELECTED"])) {
         $adminSelected = $_SESSION["ADMIN_SELECTED"];
     }
 }
 
 ///////
-$oHeadPublisher = &headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 
 global $G_TMP_MENU;
 
 $oMenu = new Menu();
-$oMenu->load( "setup" );
-$items = array ();
+$oMenu->load("setup");
+$items = array();
 
-$menuTypes = array_unique( $oMenu->Types );
+$menuTypes = array_unique($oMenu->Types);
 foreach ($menuTypes as $i => $v) {
     if ($v == "admToolsContent") {
-        unset( $menuTypes[$i] );
+        unset($menuTypes[$i]);
         break;
     }
 }
@@ -55,18 +55,18 @@ foreach ($menuTypes as $i => $v) {
 //sort($menuTypes);
 
 
-$tabItems = array ();
+$tabItems = array();
 $i = 0;
 
 foreach ($menuTypes as $menuType) {
     $tabItems[$i] = new stdclass();
     $tabItems[$i]->id = $menuType;
-    $LABEL_TRANSLATION = G::LoadTranslation( "ID_" . strtoupper( $menuType ) );
+    $LABEL_TRANSLATION = G::LoadTranslation("ID_" . strtoupper($menuType));
 
-    if (substr( $LABEL_TRANSLATION, 0, 2 ) !== "**") {
+    if (substr($LABEL_TRANSLATION, 0, 2) !== "**") {
         $title = $LABEL_TRANSLATION;
     } else {
-        $title = str_replace( "_", " ", ucwords( $menuType ) );
+        $title = str_replace("_", " ", ucwords($menuType));
     }
 
     $tabItems[$i]->title = $title;
@@ -79,38 +79,37 @@ $tabActive = "";
 if ($adminSelected != null) {
     foreach ($oMenu->Options as $i => $option) {
         if ($oMenu->Id[$i] == $adminSelected) {
-            $tabActive = (in_array( $oMenu->Types[$i], array ("","admToolsContent"
-            ) )) ? "plugins" : $oMenu->Types[$i];
+            $tabActive = (in_array($oMenu->Types[$i], array("","admToolsContent"
+            ))) ? "plugins" : $oMenu->Types[$i];
             break;
         }
     }
 }
 
 ///////
-$oHeadPublisher->addExtJsScript( "setup/main", true ); //adding a javascript file .js
-$oHeadPublisher->addContent( "setup/main" ); //adding a html file .html.
-$oHeadPublisher->assign( "tabActive", $tabActive );
-$oHeadPublisher->assign( "tabItems", $tabItems );
-$oHeadPublisher->assign( "_item_selected", (($adminSelected != null) ? $adminSelected : "") );
+$oHeadPublisher->addExtJsScript("setup/main", true); //adding a javascript file .js
+$oHeadPublisher->addContent("setup/main"); //adding a html file .html.
+$oHeadPublisher->assign("tabActive", $tabActive);
+$oHeadPublisher->assign("tabItems", $tabItems);
+$oHeadPublisher->assign("_item_selected", (($adminSelected != null) ? $adminSelected : ""));
 
-$oServerConf = & ServerConf::getSingleton();
-if ($oServerConf->isRtl( SYS_LANG )) {
+$oServerConf = ServerConf::getSingleton();
+if ($oServerConf->isRtl(SYS_LANG)) {
     $regionTreePanel = 'east';
     $regionDebug = 'west';
 } else {
     $regionTreePanel = 'west';
     $regionDebug = 'east';
 }
-$oHeadPublisher->assign( 'regionTreePanel', $regionTreePanel );
+$oHeadPublisher->assign('regionTreePanel', $regionTreePanel);
 
-G::RenderPage( "publish", "extJs" );
+G::RenderPage("publish", "extJs");
 
 //this patch enables the load of the plugin list panel inside de main admin panel iframe
-if (isset( $_GET["action"] ) && $_GET["action"] == "pluginsList") {
+if (isset($_GET["action"]) && $_GET["action"] == "pluginsList") {
     echo "
   <script type=\"text/javascript\">
   document.getElementById(\"setup-frame\").src = \"pluginsList\";
   </script>
   ";
 }
-
diff --git a/workflow/engine/methods/setup/pluginsImportFile.php b/workflow/engine/methods/setup/pluginsImportFile.php
index 6a194a737..3cb70b2d0 100644
--- a/workflow/engine/methods/setup/pluginsImportFile.php
+++ b/workflow/engine/methods/setup/pluginsImportFile.php
@@ -28,12 +28,12 @@ use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 global $RBAC;
-$RBAC->requirePermissions( 'PM_SETUP_ADVANCE' );
+$RBAC->requirePermissions('PM_SETUP_ADVANCE');
 
 try {
     //load the variables
-    if (! isset( $_FILES['form']['error']['PLUGIN_FILENAME'] ) || $_FILES['form']['error']['PLUGIN_FILENAME'] == 1) {
-        throw (new Exception( G::loadTranslation( 'ID_ERROR_UPLOADING_PLUGIN_FILENAME' ) ));
+    if (!isset($_FILES['form']['error']['PLUGIN_FILENAME']) || $_FILES['form']['error']['PLUGIN_FILENAME'] == 1) {
+        throw (new Exception(G::loadTranslation('ID_ERROR_UPLOADING_PLUGIN_FILENAME')));
     }
 
     //save the file
@@ -41,7 +41,7 @@ try {
         $filename = $_FILES['form']['name']['PLUGIN_FILENAME'];
         $path = PATH_DOCUMENT . 'input' . PATH_SEP;
         $tempName = $_FILES['form']['tmp_name']['PLUGIN_FILENAME'];
-        G::uploadFile( $tempName, $path, $filename );
+        G::uploadFile($tempName, $path, $filename);
     }
 
     //save the files Enterprise
@@ -49,11 +49,9 @@ try {
         $filename = $_FILES['form']['name']['PLUGIN_FILENAME'];
         $path = PATH_DOCUMENT . 'input' . PATH_SEP;
         if (strpos($filename, 'enterprise') !== false) {
-
-
-            $tar = new Archive_Tar( $path . $filename );
-            $sFileName = substr( $filename, 0, strrpos( $filename, '.' ) );
-            $sClassName = substr( $filename, 0, strpos( $filename, '-' ) );
+            $tar = new Archive_Tar($path . $filename);
+            $sFileName = substr($filename, 0, strrpos($filename, '.'));
+            $sClassName = substr($filename, 0, strpos($filename, '-'));
             $sClassName = !empty($sClassName) ? $sClassName : $sFileName;
 
             $files = $tar->listContent();
@@ -67,8 +65,8 @@ try {
                     $licenseName = trim($val['filename']);
                 }
             }
-            $tar->extractList( $listFiles,  PATH_PLUGINS . 'data');
-            $tar->extractList( $licenseName, PATH_PLUGINS);
+            $tar->extractList($listFiles, PATH_PLUGINS . 'data');
+            $tar->extractList($licenseName, PATH_PLUGINS);
 
             $pluginRegistry = PluginRegistry::loadSingleton();
             $autoPlugins = glob(PATH_PLUGINS . "data/enterprise/data/*.tar");
@@ -83,14 +81,14 @@ try {
             }
 
             $aPlugins = $autoPluginsA;
-            foreach ($aPlugins as $key=>$aPlugin) {
+            foreach ($aPlugins as $key => $aPlugin) {
                 $sClassName = substr($aPlugin["sFilename"], 0, strpos($aPlugin["sFilename"], "-"));
 
                 $oTar = new Archive_Tar(PATH_PLUGINS . "data/enterprise/data/" . $aPlugin["sFilename"]);
                 $oTar->extract(PATH_PLUGINS);
 
                 if (!(class_exists($sClassName))) {
-                    require_once (PATH_PLUGINS . $sClassName . ".php");
+                    require_once(PATH_PLUGINS . $sClassName . ".php");
                 }
 
                 $pluginDetail = $pluginRegistry->getPluginDetails($sClassName . ".php");
@@ -99,20 +97,20 @@ try {
             }
             $licfile = glob(PATH_PLUGINS . "*.dat");
 
-            if ((isset($licfile[0])) && ( is_file($licfile[0]) )) {
+            if ((isset($licfile[0])) && (is_file($licfile[0]))) {
                 $licfilename = basename($licfile[0]);
                 @copy($licfile[0], PATH_DATA_SITE . $licfilename);
                 @unlink($licfile[0]);
             }
 
-            require_once ('classes/model/AddonsStore.php');
+            require_once('classes/model/AddonsStore.php');
             AddonsStore::checkLicenseStore();
-            $licenseManager = &PmLicenseManager::getSingleton();
+            $licenseManager = PmLicenseManager::getSingleton();
             AddonsStore::updateAll(false);
 
-            $message = G::loadTranslation( 'ID_ENTERPRISE_INSTALLED') . ' ' . G::loadTranslation( 'ID_LOG_AGAIN');
+            $message = G::loadTranslation('ID_ENTERPRISE_INSTALLED') . ' ' . G::loadTranslation('ID_LOG_AGAIN');
             G::SendMessageText($message, "INFO");
-            $licenseManager = &PmLicenseManager::getSingleton();
+            $licenseManager = PmLicenseManager::getSingleton();
             die('<script type="text/javascript">parent.parent.location = "../login/login";</script>');
         }
     }
@@ -122,11 +120,9 @@ try {
         $filename = $_FILES['form']['name']['PLUGIN_FILENAME'];
         $path = PATH_DOCUMENT . 'input' . PATH_SEP;
         if (strpos($filename, 'plugins-') !== false) {
-
-
-            $tar = new Archive_Tar( $path . $filename );
-            $sFileName = substr( $filename, 0, strrpos( $filename, '.' ) );
-            $sClassName = substr( $filename, 0, strpos( $filename, '-' ) );
+            $tar = new Archive_Tar($path . $filename);
+            $sFileName = substr($filename, 0, strrpos($filename, '.'));
+            $sClassName = substr($filename, 0, strpos($filename, '-'));
             $sClassName = !empty($sClassName) ? $sClassName : $sFileName;
 
             $files = $tar->listContent();
@@ -140,8 +136,8 @@ try {
                     $licenseName = trim($val['filename']);
                 }
             }
-            $tar->extractList( $listFiles,  PATH_PLUGINS . 'data');
-            $tar->extractList( $licenseName, PATH_PLUGINS);
+            $tar->extractList($listFiles, PATH_PLUGINS . 'data');
+            $tar->extractList($licenseName, PATH_PLUGINS);
 
             $pluginRegistry = PluginRegistry::loadSingleton();
             $autoPlugins = glob(PATH_PLUGINS . "data/plugins/*.tar");
@@ -149,21 +145,20 @@ try {
 
             foreach ($autoPlugins as $filePath) {
                 $plName = basename($filePath);
-                //if (!(in_array($plName, $def))) {
                 if (strpos($plName, 'enterprise') === false) {
                     $autoPluginsA[]["sFilename"] = $plName;
                 }
             }
 
             $aPlugins = $autoPluginsA;
-            foreach ($aPlugins as $key=>$aPlugin) {
+            foreach ($aPlugins as $key => $aPlugin) {
                 $sClassName = substr($aPlugin["sFilename"], 0, strpos($aPlugin["sFilename"], "-"));
 
                 $oTar = new Archive_Tar(PATH_PLUGINS . "data/plugins/" . $aPlugin["sFilename"]);
                 $oTar->extract(PATH_PLUGINS);
 
                 if (!(class_exists($sClassName))) {
-                    require_once (PATH_PLUGINS . $sClassName . ".php");
+                    require_once(PATH_PLUGINS . $sClassName . ".php");
                 }
 
                 $pluginDetail = $pluginRegistry->getPluginDetails($sClassName . ".php");
@@ -173,48 +168,50 @@ try {
 
             $licfile = glob(PATH_PLUGINS . "*.dat");
 
-            if ((isset($licfile[0])) && ( is_file($licfile[0]) )) {
+            if ((isset($licfile[0])) && (is_file($licfile[0]))) {
                 $licfilename = basename($licfile[0]);
                 @copy($licfile[0], PATH_DATA_SITE . $licfilename);
                 @unlink($licfile[0]);
             }
 
-            require_once ('classes/model/AddonsStore.php');
+            require_once('classes/model/AddonsStore.php');
             AddonsStore::checkLicenseStore();
-            $licenseManager = &PmLicenseManager::getSingleton();
+            $licenseManager = PmLicenseManager::getSingleton();
             AddonsStore::updateAll(false);
 
-            $message = G::loadTranslation( 'ID_ENTERPRISE_INSTALLED') . ' ' . G::loadTranslation( 'ID_LOG_AGAIN');
+            $message = G::loadTranslation('ID_ENTERPRISE_INSTALLED') . ' ' . G::loadTranslation('ID_LOG_AGAIN');
             G::SendMessageText($message, "INFO");
-            $licenseManager = &PmLicenseManager::getSingleton();
+            $licenseManager = PmLicenseManager::getSingleton();
             die('<script type="text/javascript">parent.parent.location = "../login/login";</script>');
         }
     }
 
-    if (! $_FILES['form']['type']['PLUGIN_FILENAME'] == 'application/octet-stream') {
+    if (!$_FILES['form']['type']['PLUGIN_FILENAME'] == 'application/octet-stream') {
         $pluginFilename = $_FILES['form']['type']['PLUGIN_FILENAME'];
-        throw (new Exception( G::loadTranslation( 'ID_FILES_INVALID_PLUGIN_FILENAME', SYS_LANG, array ("pluginFilename" => $pluginFilename
-        ) ) ));
+        throw new Exception(G::loadTranslation('ID_FILES_INVALID_PLUGIN_FILENAME', SYS_LANG, array("pluginFilename" => $pluginFilename
+        )));
     }
 
 
-    $tar = new Archive_Tar( $path . $filename );
-    $sFileName = substr( $filename, 0, strrpos( $filename, '.' ) );
-    $sClassName = substr( $filename, 0, strpos( $filename, '-' ) );
+    $tar = new Archive_Tar($path . $filename);
+    $sFileName = substr($filename, 0, strrpos($filename, '.'));
+    $sClassName = substr($filename, 0, strpos($filename, '-'));
     $sClassName = !empty($sClassName) ? $sClassName : $sFileName;
 
     $aFiles = $tar->listContent();
     $bMainFile = false;
     $bClassFile = false;
-    if (! is_array( $aFiles )) {
-        throw (new Exception( G::loadTranslation( 'ID_FAILED_IMPORT_PLUGINS', SYS_LANG, array ("filename" => $filename
-        ) ) ));
+    if (!is_array($aFiles)) {
+        throw new Exception(G::loadTranslation('ID_FAILED_IMPORT_PLUGINS', SYS_LANG, array("filename" => $filename
+        )));
     }
     foreach ($aFiles as $key => $val) {
-        if (trim($val['filename']) == $sClassName . '.php')
+        if (trim($val['filename']) == $sClassName . '.php') {
             $bMainFile = true;
-        if (trim($val['filename']) == $sClassName . PATH_SEP . 'class.' . $sClassName . '.php')
+        }
+        if (trim($val['filename']) == $sClassName . PATH_SEP . 'class.' . $sClassName . '.php') {
             $bClassFile = true;
+        }
     }
 
     $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
@@ -229,18 +226,18 @@ try {
     if ($bMainFile && $bClassFile) {
         $sAux = $sClassName . 'Plugin';
         $fVersionOld = 0.0;
-        if (file_exists( PATH_PLUGINS . $pluginFile )) {
-            if (! class_exists( $sAux ) && ! class_exists( $sClassName . 'plugin' )) {
+        if (file_exists(PATH_PLUGINS . $pluginFile)) {
+            if (!class_exists($sAux) && !class_exists($sClassName . 'plugin')) {
                 include PATH_PLUGINS . $pluginFile;
             }
-            if (! class_exists( $sAux )) {
+            if (!class_exists($sAux)) {
                 $sAux = $sClassName . 'plugin';
             }
-            $oClass = new $sAux( $sClassName );
+            $oClass = new $sAux($sClassName);
             $fVersionOld = $oClass->iVersion;
-            unset( $oClass );
+            unset($oClass);
         }
-        $res = $tar->extract( $path );
+        $res = $tar->extract($path);
 
         //Check if is enterprise plugin
         if ($oPluginRegistry->isEnterprisePlugin($sClassName, $path)) {
@@ -262,22 +259,22 @@ try {
         /*----------------------------------********---------------------------------*/
 
         //Get contents of plugin file
-        $sContent = file_get_contents( $path . $pluginFile );
-        $sContent = str_ireplace( $sAux, $sAux . '_', $sContent );
-        $sContent = str_ireplace( 'PATH_PLUGINS', "'" . $path . "'", $sContent );
-        $sContent = preg_replace( "/\\\$oPluginRegistry\s*=\s*&\s*PMPluginRegistry::getSingleton\s*\(\s*\)\s*;/i", null, $sContent );
-        $sContent = preg_replace( "/\\\$oPluginRegistry->registerPlugin\s*\(\s*[\"\']" . $sClassName . "[\"\']\s*,\s*__FILE__\s*\)\s*;/i", null, $sContent );
+        $sContent = file_get_contents($path . $pluginFile);
+        $sContent = str_ireplace($sAux, $sAux . '_', $sContent);
+        $sContent = str_ireplace('PATH_PLUGINS', "'" . $path . "'", $sContent);
+        $sContent = preg_replace("/\\\$oPluginRegistry\s*=\s*&\s*PMPluginRegistry::getSingleton\s*\(\s*\)\s*;/i", null, $sContent);
+        $sContent = preg_replace("/\\\$oPluginRegistry->registerPlugin\s*\(\s*[\"\']" . $sClassName . "[\"\']\s*,\s*__FILE__\s*\)\s*;/i", null, $sContent);
 
         //header('Content-Type: text/plain');var_dump($sClassName, $sContent);die;
-        file_put_contents( $path . $pluginFile, $sContent );
+        file_put_contents($path . $pluginFile, $sContent);
 
         $sAux = $sAux . '_';
 
-        include ($path . $pluginFile);
+        include($path . $pluginFile);
 
-        $oClass = new $sAux( $sClassName );
+        $oClass = new $sAux($sClassName);
         $fVersionNew = $oClass->iVersion;
-        if (! isset( $oClass->iPMVersion )) {
+        if (!isset($oClass->iPMVersion)) {
             $oClass->iPMVersion = 0;
         }
         if ($oClass->iPMVersion > 0) {
@@ -287,45 +284,45 @@ try {
                 }
             }
         }
-        if (! isset( $oClass->aDependences )) {
+        if (!isset($oClass->aDependences)) {
             $oClass->aDependences = null;
         }
-        if (! empty( $oClass->aDependences )) {
+        if (!empty($oClass->aDependences)) {
             foreach ($oClass->aDependences as $aDependence) {
-                if (file_exists( PATH_PLUGINS . $aDependence['sClassName'] . '.php' )) {
+                if (file_exists(PATH_PLUGINS . $aDependence['sClassName'] . '.php')) {
                     require_once PATH_PLUGINS . $aDependence['sClassName'] . '.php';
-                    if (! $oPluginRegistry->getPluginDetails( $aDependence['sClassName'] . '.php' )) {
+                    if (!$oPluginRegistry->getPluginDetails($aDependence['sClassName'] . '.php')) {
                         $sDependence = $aDependence['sClassName'];
-                        throw new Exception( G::loadTranslation( 'ID_PLUGIN_DEPENDENCE_PLUGIN', SYS_LANG, array ("Dependence" => $sDependence
-                        ) ) );
+                        throw new Exception(G::loadTranslation('ID_PLUGIN_DEPENDENCE_PLUGIN', SYS_LANG, array("Dependence" => $sDependence
+                        )));
                     }
                 } else {
                     $sDependence = $aDependence['sClassName'];
-                    throw new Exception( G::loadTranslation( 'ID_PLUGIN_DEPENDENCE_PLUGIN', SYS_LANG, array ("Dependence" => $sDependence
-                    ) ) );
+                    throw new Exception(G::loadTranslation('ID_PLUGIN_DEPENDENCE_PLUGIN', SYS_LANG, array("Dependence" => $sDependence
+                    )));
                 }
             }
         }
-        unset( $oClass );
+        unset($oClass);
         if ($fVersionOld > $fVersionNew) {
-            throw new Exception( G::loadTranslation( 'ID_RECENT_VERSION_PLUGIN' ) );
+            throw new Exception(G::loadTranslation('ID_RECENT_VERSION_PLUGIN'));
         }
-        $res = $tar->extract( PATH_PLUGINS );
+        $res = $tar->extract(PATH_PLUGINS);
     } else {
-        throw (new Exception( G::loadTranslation( 'ID_FILE_CONTAIN_CLASS_PLUGIN', SYS_LANG, array ("filename" => $filename,"className" => $sClassName
-        ) ) ));
+        throw new Exception(G::loadTranslation('ID_FILE_CONTAIN_CLASS_PLUGIN', SYS_LANG, array("filename" => $filename, "className" => $sClassName
+        )));
     }
 
-    if (! file_exists( PATH_PLUGINS . $sClassName . '.php' )) {
-        throw (new Exception( G::loadTranslation( 'ID_FILE_PLUGIN_NOT_EXISTS', SYS_LANG, array ("pluginFile" => $pluginFile
-        ) ) ));
+    if (!file_exists(PATH_PLUGINS . $sClassName . '.php')) {
+        throw new Exception(G::loadTranslation('ID_FILE_PLUGIN_NOT_EXISTS', SYS_LANG, array("pluginFile" => $pluginFile
+        )));
     }
 
-    require_once (PATH_PLUGINS . $pluginFile);
+    require_once(PATH_PLUGINS . $pluginFile);
 
-    $oPluginRegistry->registerPlugin( $sClassName, PATH_PLUGINS . $sClassName . ".php" );
+    $oPluginRegistry->registerPlugin($sClassName, PATH_PLUGINS . $sClassName . ".php");
 
-    $details = $oPluginRegistry->getPluginDetails( $pluginFile );
+    $details = $oPluginRegistry->getPluginDetails($pluginFile);
 
     $oPluginRegistry->installPlugin($details->getNamespace());
 
@@ -334,16 +331,10 @@ try {
 
     $response = $oPluginRegistry->verifyTranslation($details->getNamespace());
     G::auditLog("InstallPlugin", "Plugin Name: " . $details->getNamespace());
-
-    //if ($response->recordsCountSuccess <= 0) {
-        //throw (new Exception( 'The plugin ' . $details->sNamespace . ' couldn\'t verify any translation item. Verified Records:' . $response->recordsCountSuccess));
-    //}
-
-    G::header( "Location: pluginsMain" );
+    G::header("Location: pluginsMain");
     die();
 } catch (Exception $e) {
     $_SESSION['__PLUGIN_ERROR__'] = $e->getMessage();
-    G::header( 'Location: pluginsMain' );
+    G::header('Location: pluginsMain');
     die();
 }
-
diff --git a/workflow/engine/methods/setup/pluginsMain.php b/workflow/engine/methods/setup/pluginsMain.php
index 8d43fd7e7..aa524b127 100644
--- a/workflow/engine/methods/setup/pluginsMain.php
+++ b/workflow/engine/methods/setup/pluginsMain.php
@@ -26,21 +26,21 @@ use ProcessMaker\Plugins\PluginRegistry;
 
 /** @var RBAC $RBAC */
 global $RBAC;
-$RBAC->requirePermissions( 'PM_SETUP' );
+$RBAC->requirePermissions('PM_SETUP');
 
-$headPublisher = & headPublisher::getSingleton();
-$headPublisher->addExtJsScript( 'setup/pluginsMain', false );
-$headPublisher->assign( "PROCESSMAKER_URL", "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN );
-$headPublisher->assign( "SYS_SKIN", SYS_SKIN );
+$headPublisher = headPublisher::getSingleton();
+$headPublisher->addExtJsScript('setup/pluginsMain', false);
+$headPublisher->assign("PROCESSMAKER_URL", "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN);
+$headPublisher->assign("SYS_SKIN", SYS_SKIN);
 
 $oPluginRegistry = PluginRegistry::loadSingleton();
 if ($oPluginRegistry->getStatusPlugin('pmWorkspaceManagement') && $oPluginRegistry->getStatusPlugin('pmWorkspaceManagement') == "enabled") {
-    $headPublisher = $oPluginRegistry->executeMethod('pmWorkspaceManagement', 'disableButtonsPluginMain', $headPublisher);
+    $headPublisher = $oPluginRegistry->executeMethod('pmWorkspaceManagement', 'disableButtonsPluginMain',
+        $headPublisher);
 }
 
-if (isset( $_SESSION['__PLUGIN_ERROR__'] )) {
-    $headPublisher->assign( '__PLUGIN_ERROR__', $_SESSION['__PLUGIN_ERROR__'] );
-    unset( $_SESSION['__PLUGIN_ERROR__'] );
+if (isset($_SESSION['__PLUGIN_ERROR__'])) {
+    $headPublisher->assign('__PLUGIN_ERROR__', $_SESSION['__PLUGIN_ERROR__']);
+    unset($_SESSION['__PLUGIN_ERROR__']);
 }
-G::RenderPage( 'publish', 'extJs' );
-
+G::RenderPage('publish', 'extJs');
\ No newline at end of file
diff --git a/workflow/engine/methods/setup/processHeartBeatAjax.php b/workflow/engine/methods/setup/processHeartBeatAjax.php
index 898a70f07..674286871 100644
--- a/workflow/engine/methods/setup/processHeartBeatAjax.php
+++ b/workflow/engine/methods/setup/processHeartBeatAjax.php
@@ -3,29 +3,27 @@
 switch ($_GET['action']) {
     case 'saveOption':
         try {
-            $oServerConf = & ServerConf::getSingleton();
+            $oServerConf = ServerConf::getSingleton();
             $response = new stdclass();
             /*you can use SYS_TEMP or SYS_SYS ON HEAR_BEAT_CONF to save for each workspace*/
-            $oServerConf->unsetHeartbeatProperty( 'HB_BEAT_TYPE', 'HEART_BEAT_CONF' );
-            if (isset( $_POST['acceptHB'] )) {
-                $oServerConf->setHeartbeatProperty( 'HB_OPTION', 1, 'HEART_BEAT_CONF' );
-                $oServerConf->unsetHeartbeatProperty( 'HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF' );
+            $oServerConf->unsetHeartbeatProperty('HB_BEAT_TYPE', 'HEART_BEAT_CONF');
+            if (isset($_POST['acceptHB'])) {
+                $oServerConf->setHeartbeatProperty('HB_OPTION', 1, 'HEART_BEAT_CONF');
+                $oServerConf->unsetHeartbeatProperty('HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF');
                 $response->enable = true;
                 G::auditLog("EnableHeartBeat");
             } else {
-                $oServerConf->setHeartbeatProperty( 'HB_OPTION', 0, 'HEART_BEAT_CONF' );
-                $oServerConf->unsetHeartbeatProperty( 'HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF' );
-                $oServerConf->setHeartbeatProperty( 'HB_BEAT_TYPE', 'endbeat', 'HEART_BEAT_CONF' );
+                $oServerConf->setHeartbeatProperty('HB_OPTION', 0, 'HEART_BEAT_CONF');
+                $oServerConf->unsetHeartbeatProperty('HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF');
+                $oServerConf->setHeartbeatProperty('HB_BEAT_TYPE', 'endbeat', 'HEART_BEAT_CONF');
                 $response->enable = false;
                 G::auditLog("DisableHeartBeat");
             }
             $response->success = true;
-
         } catch (Exception $e) {
             $response->success = false;
             $response->msg = $e->getMessage();
         }
-        echo G::json_encode( $response );
+        echo G::json_encode($response);
         break;
 }
-
diff --git a/workflow/engine/methods/setup/processHeartBeatConfig.php b/workflow/engine/methods/setup/processHeartBeatConfig.php
index 9479daccb..d69dceeac 100644
--- a/workflow/engine/methods/setup/processHeartBeatConfig.php
+++ b/workflow/engine/methods/setup/processHeartBeatConfig.php
@@ -22,18 +22,17 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 global $RBAC;
-$RBAC->requirePermissions( 'PM_SETUP', 'PM_SETUP_HEART_BEAT');
+$RBAC->requirePermissions('PM_SETUP', 'PM_SETUP_HEART_BEAT');
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oServerConf = & ServerConf::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
+$oServerConf = ServerConf::getSingleton();
 
 //you can use SYS_TEMP or SYS_SYS ON HEAR_BEAT_CONF to save for each workspace
-$sflag = $oServerConf->getHeartbeatProperty( 'HB_OPTION', 'HEART_BEAT_CONF' );
+$sflag = $oServerConf->getHeartbeatProperty('HB_OPTION', 'HEART_BEAT_CONF');
 $heartBeatChecked = $sflag == 1 ? true : false;
 
-$oHeadPublisher->addExtJsScript( 'setup/processHeartBeatConfig', true ); //adding a javascript file .js
+$oHeadPublisher->addExtJsScript('setup/processHeartBeatConfig', true); //adding a javascript file .js
 
 
-$oHeadPublisher->assign( 'heartBeatChecked', $heartBeatChecked );
-G::RenderPage( 'publish', 'extJs' );
-
+$oHeadPublisher->assign('heartBeatChecked', $heartBeatChecked);
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/setup/processHeartBeatSave.php b/workflow/engine/methods/setup/processHeartBeatSave.php
index ef99d61c9..6d30b9aff 100644
--- a/workflow/engine/methods/setup/processHeartBeatSave.php
+++ b/workflow/engine/methods/setup/processHeartBeatSave.php
@@ -1,33 +1,29 @@
 <?php
 
-if ($RBAC->userCanAccess( 'PM_SETUP' ) != 1 && $RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+if ($RBAC->userCanAccess('PM_SETUP') != 1 && $RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1) {
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
     //G::header('location: ../login/login');
     die();
 }
 try {
-    $oServerConf = & ServerConf::getSingleton();
+    $oServerConf = ServerConf::getSingleton();
     /*you can use SYS_TEMP or SYS_SYS ON HEAR_BEAT_CONF to save for each workspace*/
     $sflag = $_POST['HB_OPTION'];
-    $oServerConf->unsetHeartbeatProperty( 'HB_BEAT_TYPE', 'HEART_BEAT_CONF' );
+    $oServerConf->unsetHeartbeatProperty('HB_BEAT_TYPE', 'HEART_BEAT_CONF');
     if ($sflag) {
-        $oServerConf->setHeartbeatProperty( 'HB_OPTION', 1, 'HEART_BEAT_CONF' );
-        $oServerConf->unsetHeartbeatProperty( 'HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF' );
+        $oServerConf->setHeartbeatProperty('HB_OPTION', 1, 'HEART_BEAT_CONF');
+        $oServerConf->unsetHeartbeatProperty('HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF');
         echo "active";
     } else {
-        $oServerConf->setHeartbeatProperty( 'HB_OPTION', 0, 'HEART_BEAT_CONF' );
-        $oServerConf->unsetHeartbeatProperty( 'HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF' );
-        $oServerConf->setHeartbeatProperty( 'HB_BEAT_TYPE', 'endbeat', 'HEART_BEAT_CONF' );
+        $oServerConf->setHeartbeatProperty('HB_OPTION', 0, 'HEART_BEAT_CONF');
+        $oServerConf->unsetHeartbeatProperty('HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF');
+        $oServerConf->setHeartbeatProperty('HB_BEAT_TYPE', 'endbeat', 'HEART_BEAT_CONF');
         echo "inactive";
-
     }
     //$oServerConf->setHeartbeatProperty('HB_OPTION',$_POST['HB_OPTION'],'HEART_BEAT_CONF');
-
-
 } catch (Exception $e) {
     $G_PUBLISH = new Publisher();
     $aMessage['MESSAGE'] = $e->getMessage();
-    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-    G::RenderPage( 'publishBlank', 'blank' );
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage);
+    G::RenderPage('publishBlank', 'blank');
 }
-
diff --git a/workflow/engine/methods/setup/skinsList.php b/workflow/engine/methods/setup/skinsList.php
index eba70dcf1..3682c65d1 100644
--- a/workflow/engine/methods/setup/skinsList.php
+++ b/workflow/engine/methods/setup/skinsList.php
@@ -22,8 +22,8 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 
-if ($RBAC->userCanAccess( 'PM_SETUP' ) != 1 && $RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+if ($RBAC->userCanAccess('PM_SETUP') != 1 && $RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1) {
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
     //G::header('location: ../login/login');
     die();
 }
@@ -36,94 +36,121 @@ $G_ID_SUB_MENU_SELECTED = 'CALENDAR';
 $G_PUBLISH = new Publisher();
 
 $c = new Configurations();
-$configPage = $c->getConfiguration( 'skinList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
-$Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
+$configPage = $c->getConfiguration('skinList', 'pageSize', '', $_SESSION['USER_LOGGED']);
+$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( 'setup/skinList', false ); //adding a javascript file .js
-$oHeadPublisher->addContent( 'setup/skinList' ); //adding a html file  .html.
-$oHeadPublisher->assign( 'CONFIG', $Config );
-$oHeadPublisher->assign( 'SYS_SKIN', SYS_SKIN );
-$oHeadPublisher->assign( 'SYS_SYS', "sys".config("system.workspace") );
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('setup/skinList', false); //adding a javascript file .js
+$oHeadPublisher->addContent('setup/skinList'); //adding a html file  .html.
+$oHeadPublisher->assign('CONFIG', $Config);
+$oHeadPublisher->assign('SYS_SKIN', SYS_SKIN);
+$oHeadPublisher->assign('SYS_SYS', "sys" . config("system.workspace"));
+$oHeadPublisher->assign('FORMATS', $c->getFormats());
 
-$oHeadPublisher->assign( 'FORMATS', $c->getFormats() );
-
-G::RenderPage( 'publish', 'extJs' );
+G::RenderPage('publish', 'extJs');
 die();
 
 global $RBAC;
-$access = $RBAC->userCanAccess( 'PM_SETUP' );
+$access = $RBAC->userCanAccess('PM_SETUP');
 if ($access != 1) {
     switch ($access) {
-        case - 1:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+        case -1:
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
-        case - 2:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+        case -2:
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         default:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
     }
 }
 // lets display the items
-$items[] = array ('id' => 'char','title' => 'char','type' => 'char','creator' => 'char','modifiedBy' => 'char','filename' => 'char','size' => 'char','mime' => 'char'
-);
+$items[] = [
+    'id' => 'char',
+    'title' => 'char',
+    'type' => 'char',
+    'creator' => 'char',
+    'modifiedBy' => 'char',
+    'filename' => 'char',
+    'size' => 'char',
+    'mime' => 'char'
+];
 
 //***************** Skins **************************
-$aFiles = array ();
-if ($handle = opendir( PATH_SKINS )) {
-    while (false !== ($file = readdir( $handle ))) {
-        G::pr( $file );
-        $filename = substr( $file, 0, strrpos( $file, '.' ) );
+$aFiles = [];
+if ($handle = opendir(PATH_SKINS)) {
+    while (false !== ($file = readdir($handle))) {
+        G::pr($file);
+        $filename = substr($file, 0, strrpos($file, '.'));
 
         // list of no complete skins
-        $aFilterSkinsList = Array ('blank','green','raw','tracker','iphone','green-submenu','extJsInitLoad','extJs'
-        );
+        $aFilterSkinsList = [
+            'blank',
+            'green',
+            'raw',
+            'tracker',
+            'iphone',
+            'green-submenu',
+            'extJsInitLoad',
+            'extJs'
+        ];
 
-        if (! is_dir( PATH_SKINS . $file )) {
-            if (! in_array( $filename, $aFilterSkinsList ) /*&& /*/ && ! strpos( $file, '.tar', 1 )) {
-                if (! isset( $aFiles[$filename] ))
+        if (!is_dir(PATH_SKINS . $file)) {
+            if (!in_array($filename, $aFilterSkinsList) /*&& /*/ && !strpos($file, '.tar', 1)) {
+                if (!isset($aFiles[$filename])) {
                     $aFiles[$filename] = 0;
-                if (strpos( $file, '.php', 1 ))
+                }
+                if (strpos($file, '.php', 1)) {
                     $aFiles[$filename] += 1;
-                if (strpos( $file, '.html', 1 ))
+                }
+                if (strpos($file, '.html', 1)) {
                     $aFiles[$filename] += 2;
+                }
             }
         }
     }
 
-    closedir( $handle );
+    closedir($handle);
 
     //now walk in the array to get the .cnf file and display properties
     foreach ($aFiles as $key => $val) {
         $description = '';
         $version = '';
-        if (file_exists( PATH_SKINS . $key . '.cnf' )) {
-            $serial = file_get_contents( PATH_SKINS . $key . '.cnf' );
-            $previousErrorRep = ini_get( "error_reporting" );
-            error_reporting( E_ERROR );
-            $prop = unserialize( $serial );
-            error_reporting( $previousErrorRep );
-            if (! is_object( $prop )) {
-                @unlink( PATH_SKINS . $key . '.cnf' );
+        if (file_exists(PATH_SKINS . $key . '.cnf')) {
+            $serial = file_get_contents(PATH_SKINS . $key . '.cnf');
+            $previousErrorRep = ini_get("error_reporting");
+            error_reporting(E_ERROR);
+            $prop = unserialize($serial);
+            error_reporting($previousErrorRep);
+            if (!is_object($prop)) {
+                @unlink(PATH_SKINS . $key . '.cnf');
             }
-            if (isset( $prop ) && isset( $prop->description ))
+            if (isset($prop) && isset($prop->description)) {
                 $description = $prop->description;
-            if (isset( $prop ) && isset( $prop->version ))
+            }
+            if (isset($prop) && isset($prop->version)) {
                 $version = $prop->version;
+            }
         }
 
-        $linkPackValue = G::LoadTranslation( 'ID_EXPORT' );
+        $linkPackValue = G::LoadTranslation('ID_EXPORT');
         $link = 'skinsExport?id=' . $key;
-        $items[] = array ('id' => count( $items ),'name' => $key,'filename' => $key,'description' => $description,'version' => $version,'url' => $link,'linkPackValue' => $linkPackValue
-        );
+        $items[] = [
+            'id' => count($items),
+            'name' => $key,
+            'filename' => $key,
+            'description' => $description,
+            'version' => $version,
+            'url' => $link,
+            'linkPackValue' => $linkPackValue
+        ];
     }
     $folders['items'] = $items;
 }
@@ -131,9 +158,9 @@ if ($handle = opendir( PATH_SKINS )) {
 $_DBArray['plugins'] = $items;
 $_SESSION['_DBArray'] = $_DBArray;
 
-$c = new Criteria( 'dbarray' );
-$c->setDBArrayTable( 'plugins' );
-$c->addAscendingOrderByColumn( 'id' );
+$c = new Criteria('dbarray');
+$c->setDBArrayTable('plugins');
+$c->addAscendingOrderByColumn('id');
 
 $G_MAIN_MENU = 'processmaker';
 $G_ID_MENU_SELECTED = 'SETUP';
@@ -142,7 +169,6 @@ $G_ID_SUB_MENU_SELECTED = 'SKINS';
 
 $G_PUBLISH = new Publisher();
 
-$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'setup/skinsList', $c );
-
-G::RenderPage( 'publishBlank', 'blank' );
+$G_PUBLISH->AddContent('propeltable', 'paged-table', 'setup/skinsList', $c);
 
+G::RenderPage('publishBlank', 'blank');
diff --git a/workflow/engine/methods/setup/systemInfo.php b/workflow/engine/methods/setup/systemInfo.php
index a7f782ded..1885afa24 100644
--- a/workflow/engine/methods/setup/systemInfo.php
+++ b/workflow/engine/methods/setup/systemInfo.php
@@ -1,6 +1,6 @@
 <?php
 global $RBAC;
-$RBAC->requirePermissions( 'PM_SETUP' );
+$RBAC->requirePermissions('PM_SETUP');
 
 $option = (isset($_GET["option"]))? $_GET["option"] : null;
 
@@ -9,14 +9,14 @@ switch ($option) {
         phpinfo(INFO_GENERAL + INFO_CREDITS + INFO_CONFIGURATION + INFO_MODULES + INFO_ENVIRONMENT + INFO_VARIABLES);
         break;
     case "php":
-        $oHeadPublisher = &headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         $oHeadPublisher->addContent("setup/phpInfo"); //Adding a html file .html
         $oHeadPublisher->addExtJsScript("setup/phpInfo", false); //Adding a javascript file .js
 
         G::RenderPage("publish", "extJs");
         break;
     case "processInfo":
-        $oHeadPublisher = &headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         $oHeadPublisher->assign('skin', $_SESSION['currentSkin']);
         $oHeadPublisher->addContent("setup/dbInfo"); //Adding a html file .html
         $oHeadPublisher->addExtJsScript("setup/dbInfo", false); //Adding a javascript file .js
@@ -30,7 +30,7 @@ switch ($option) {
 
         $systemInfo = $installer->getSystemInfo();
 
-        $oHeadPublisher = &headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         $oHeadPublisher->addContent("setup/systemInfo"); //Adding a html file .html
         $oHeadPublisher->addExtJsScript("setup/systemInfo", false); //Adding a javascript file .js
 
@@ -50,4 +50,3 @@ switch ($option) {
         G::RenderPage("publish", "extJs");
         break;
 }
-
diff --git a/workflow/engine/methods/setup/upgrade_System.php b/workflow/engine/methods/setup/upgrade_System.php
index bd2c1de01..80f5fc53a 100644
--- a/workflow/engine/methods/setup/upgrade_System.php
+++ b/workflow/engine/methods/setup/upgrade_System.php
@@ -31,19 +31,19 @@ use ProcessMaker\Core\System;
  * @date May 12th, 2010
  */
 global $RBAC;
-switch ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' )) {
+switch ($RBAC->userCanAccess('PM_SETUP_ADVANCE')) {
     case - 2:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
     case - 1:
-        G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-        G::header( 'location: ../login/login' );
+        G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+        G::header('location: ../login/login');
         die();
         break;
 }
-set_time_limit( 0 );
+set_time_limit(0);
 
 $G_MAIN_MENU = 'processmaker';
 $G_SUB_MENU = 'setup';
@@ -55,27 +55,28 @@ $oSystem = new System();
 
 try {
     if (! $oSystem->verifyFileForUpgrade()) {
-        throw (new Exception( G::LoadTranslation( 'ID_ERROR_UPLOADING_FILENAME')) );
+        throw (new Exception(G::LoadTranslation('ID_ERROR_UPLOADING_FILENAME')));
     }
     $oSystem->cleanupUpgradeDirectory();
     $oSystem->getUpgradedFilesList();
 
     $ver = $oSystem->upgrade();
     $G_PUBLISH = new Publisher();
-    $aMessage['THEMESSAGE1'] = G::LoadTranslation( 'ID_UPGRADE_READY' ) . " <b>" . $ver[0] . "</b> " . G::LoadTranslation( 'ID_TO' ) . " <b>" . $ver[1] . "</b>";
-    $aMessage['THEMESSAGE2'] = file_get_contents( $oSystem->sUpgradeFileList );
+    $aMessage['THEMESSAGE1'] = G::LoadTranslation('ID_UPGRADE_READY') . " <b>" . $ver[0] . "</b> " . G::LoadTranslation('ID_TO') . " <b>" . $ver[1] . "</b>";
+    $aMessage['THEMESSAGE2'] = file_get_contents($oSystem->sUpgradeFileList);
     $aMessage['THEMESSAGE3'] = '';
 
-    if (! is_Array( $oSystem->aErrors ) || count( $oSystem->aErrors ) == 0)
-        $aMessage['THEMESSAGE4'] = G::LoadTranslation( 'ID_NONE' );
-    else
-        $aMessage['THEMESSAGE4'] = implode( "\n", $oSystem->aErrors );
-
-    $oHeadPublisher = & headPublisher::getSingleton();
-    if (file_exists( PATH_CORE . 'js' . PATH_SEP . 'setup' . PATH_SEP . 'upgrade_System.js' )) {
-        $oHeadPublisher->addScriptFile( '/jscore/setup/upgrade_System.js' );
+    if (! is_Array($oSystem->aErrors) || count($oSystem->aErrors) == 0) {
+        $aMessage['THEMESSAGE4'] = G::LoadTranslation('ID_NONE');
     } else {
-        $oHeadPublisher->addScriptCode( "function upgradeSystem(wsCount) {
+        $aMessage['THEMESSAGE4'] = implode("\n", $oSystem->aErrors);
+    }
+
+    $oHeadPublisher = headPublisher::getSingleton();
+    if (file_exists(PATH_CORE . 'js' . PATH_SEP . 'setup' . PATH_SEP . 'upgrade_System.js')) {
+        $oHeadPublisher->addScriptFile('/jscore/setup/upgrade_System.js');
+    } else {
+        $oHeadPublisher->addScriptCode("function upgradeSystem(wsCount) {
       document.getElementById('form[THETITLE3]').innerHTML = wsCount + ' workspaces to update.';
       document.getElementById('form[SUBTITLE4]').innerHTML = '&nbsp;&nbsp;<img src='/images/alert.gif' width='13' height='13' border='0'> Please wait...';
       updateWorkspace(wsCount);
@@ -93,18 +94,17 @@ try {
         updateWorkspace(id-1);
       }.extend(this);
       oRPC.make();
-    };" );
+    };");
     }
-    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showInfoUpdate', '', $aMessage );
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showInfoUpdate', '', $aMessage);
 
-    G::RenderPage( 'publishBlank', 'blank' );
-    G::evalJScript( 'upgradeSystem(' . count( $oSystem->aWorkspaces ) . ')' );
-    exit( 0 );
+    G::RenderPage('publishBlank', 'blank');
+    G::evalJScript('upgradeSystem(' . count($oSystem->aWorkspaces) . ')');
+    exit(0);
 } catch (Exception $e) {
     $G_PUBLISH = new Publisher();
     $aMessage['MESSAGE'] = $e->getMessage();
-    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-    G::RenderPage( 'publishBlank', 'blank' );
-    exit( 0 );
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage);
+    G::RenderPage('publishBlank', 'blank');
+    exit(0);
 }
-
diff --git a/workflow/engine/methods/setup/uplogo.php b/workflow/engine/methods/setup/uplogo.php
index 1c6f6de4d..c77d312a6 100644
--- a/workflow/engine/methods/setup/uplogo.php
+++ b/workflow/engine/methods/setup/uplogo.php
@@ -24,24 +24,25 @@
 
 global $RBAC;
 
-if ($RBAC->userCanAccess( 'PM_SETUP' ) != 1 && $RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) != 1) {
-    G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
+if ($RBAC->userCanAccess('PM_SETUP') != 1 && $RBAC->userCanAccess('PM_SETUP_ADVANCE') != 1) {
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
     die();
 }
 
 //calculating the max upload file size;
-$POST_MAX_SIZE = ini_get( 'post_max_size' );
-$mul = substr( $POST_MAX_SIZE, - 1 );
+$POST_MAX_SIZE = ini_get('post_max_size');
+$mul = substr($POST_MAX_SIZE, - 1);
 $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
 $postMaxSize = (int) $POST_MAX_SIZE * $mul;
 
-$UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
-$mul = substr( $UPLOAD_MAX_SIZE, - 1 );
+$UPLOAD_MAX_SIZE = ini_get('upload_max_filesize');
+$mul = substr($UPLOAD_MAX_SIZE, - 1);
 $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
 $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
 
-if ($postMaxSize < $uploadMaxSize)
+if ($postMaxSize < $uploadMaxSize) {
     $uploadMaxSize = $postMaxSize;
+}
 $Fields['MAX_FILE_SIZE'] = $uploadMaxSize . " (" . $UPLOAD_MAX_SIZE . ") ";
 
 $G_MAIN_MENU = 'processmaker';
@@ -50,11 +51,11 @@ $G_ID_MENU_SELECTED = 'SETUP';
 $G_ID_SUB_MENU_SELECTED = 'LOGO';
 
 $G_PUBLISH = new Publisher();
-$oHeadPublisher = & headPublisher::getSingleton();
-$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'setup/uplogo', '', $Fields );
+$oHeadPublisher = headPublisher::getSingleton();
+$G_PUBLISH->AddContent('xmlform', 'xmlform', 'setup/uplogo', '', $Fields);
 
-$G_PUBLISH->AddContent( 'view', 'setup/uplogo' );
-G::RenderPage( "publishBlank", "blank" );
+$G_PUBLISH->AddContent('view', 'setup/uplogo');
+G::RenderPage("publishBlank", "blank");
 
 ?>
 <script>
diff --git a/workflow/engine/methods/strategicDashboard/main.php b/workflow/engine/methods/strategicDashboard/main.php
index 9608e48be..681c313f3 100644
--- a/workflow/engine/methods/strategicDashboard/main.php
+++ b/workflow/engine/methods/strategicDashboard/main.php
@@ -1,6 +1,7 @@
 <?php
 $RBAC->requirePermissions('PM_DASHBOARD');
-$licensedFeatures = & PMLicensedFeatures::getSingleton();
+$licensedFeatures = PMLicensedFeatures::getSingleton();
+
 if (!$licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=')) {
     G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
     G::header('location: ../login/login');
@@ -12,9 +13,7 @@ $G_ID_MENU_SELECTED = 'DASHBOARD+';
 
 $G_PUBLISH = new Publisher();
 $G_PUBLISH->AddContent('view', 'strategicDashboard/load');
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addScriptFile('/jscore/src/PM.js');
 $oHeadPublisher->addScriptFile('/jscore/src/Sessions.js');
 G::RenderPage('publish');
-
-
diff --git a/workflow/engine/methods/tools/main.php b/workflow/engine/methods/tools/main.php
index 916787c0f..66d5c5269 100644
--- a/workflow/engine/methods/tools/main.php
+++ b/workflow/engine/methods/tools/main.php
@@ -1,8 +1,7 @@
 <?php
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( 'tools/main', true );
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('tools/main', true);
 
 //$oHeadPublisher->assign('_ENV_CURRENT_DATE', $conf->getSystemDate(date('Y-m-d')));
-G::RenderPage( 'publish', 'extJs' );
-
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/tracker/tracker_Ajax.php b/workflow/engine/methods/tracker/tracker_Ajax.php
index e4c4fd89f..9056dfce9 100644
--- a/workflow/engine/methods/tracker/tracker_Ajax.php
+++ b/workflow/engine/methods/tracker/tracker_Ajax.php
@@ -1,82 +1,82 @@
-<?php
-/**
- * trackerAjax.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- */
-
-use ProcessMaker\Plugins\PluginRegistry;
-
-try {
-    $filter = new InputFilter();
-    $_POST = $filter->xssFilterHard($_POST);
-    
-    if (isset( $_POST['form']['action'] )) {
-        $_POST['action'] = $_POST['form']['action'];
-    }
-    
-    switch ($_POST['action']) {
-        case 'availableCaseTrackerObjects':
-            $oProcessMap = new ProcessMap();
-            $oProcessMap->availableCaseTrackerObjects( $_POST['PRO_UID'] );
-            break;
-        case 'assignCaseTrackerObject':
-            $oProcessMap = new ProcessMap();
-            $cto_UID = $oProcessMap->assignCaseTrackerObject( $_POST['PRO_UID'], $_POST['OBJECT_TYPE'], $_POST['OBJECT_UID'] );
-            $oProcessMap->getCaseTrackerObjectsCriteria( $_POST['PRO_UID'] );
-            $infoProcess = new Process();
-            $resultProcess = $infoProcess->load($_POST['PRO_UID']);
-            G::auditLog('CaseTrackers','Assign Case Tracker Object ('.$cto_UID.' - '.$_POST['OBJECT_TYPE'].') in Process "'.$resultProcess['PRO_TITLE'].'"');
-            echo $cto_UID;
-            break;
-        case 'removeCaseTrackerObject':
-            $oProcessMap = new ProcessMap();
-            $oProcessMap->removeCaseTrackerObject( $_POST['CTO_UID'], $_POST['PRO_UID'], $_POST['STEP_POSITION'] );
-            $oProcessMap->getCaseTrackerObjectsCriteria( $_POST['PRO_UID'] );
-            $infoProcess = new Process();
-            $resultProcess = $infoProcess->load($_POST['PRO_UID']);
-            G::auditLog('CaseTrackers','Remove Case Tracker Object ('.$_POST['CTO_UID'].') in Process "'.$resultProcess['PRO_TITLE'].'"');
-            break;
-        case 'upCaseTrackerObject':
-            $oProcessMap = new ProcessMap();
-            $oProcessMap->upCaseTrackerObject( $_POST['CTO_UID'], $_POST['PRO_UID'], $_POST['STEP_POSITION'] );
-            $oProcessMap->getCaseTrackerObjectsCriteria( $_POST['PRO_UID'] );
-            $infoProcess = new Process();
-            $resultProcess = $infoProcess->load($_POST['PRO_UID']);
-            G::auditLog('CaseTrackers','Move Up Case Tracker Object ('.$_POST['CTO_UID'].') in Process "'.$resultProcess['PRO_TITLE'].'"');
-            break;
-        case 'downCaseTrackerObject':
-            $oProcessMap = new ProcessMap();
-            $oProcessMap->downCaseTrackerObject( $_POST['CTO_UID'], $_POST['PRO_UID'], $_POST['STEP_POSITION'] );
-            $oProcessMap->getCaseTrackerObjectsCriteria( $_POST['PRO_UID'] );
-            $infoProcess = new Process();
-            $resultProcess = $infoProcess->load($_POST['PRO_UID']);
-            G::auditLog('CaseTrackers','Move Down Case Tracker Object ('.$_POST['CTO_UID'].') in Process "'.$resultProcess['PRO_TITLE'].'"');
-            break;
-        case 'editStagesMap':
-            $oTemplatePower = new TemplatePower( PATH_TPL . 'tracker/stages_Map.html' );
-            $oTemplatePower->prepare();
-            $G_PUBLISH = new Publisher();
-            $G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
-            $oHeadPublisher = & headPublisher::getSingleton();
-            $oHeadPublisher->addScriptCode( '
+<?php
+/**
+ * trackerAjax.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+use ProcessMaker\Plugins\PluginRegistry;
+
+try {
+    $filter = new InputFilter();
+    $_POST = $filter->xssFilterHard($_POST);
+    
+    if (isset($_POST['form']['action'])) {
+        $_POST['action'] = $_POST['form']['action'];
+    }
+    
+    switch ($_POST['action']) {
+        case 'availableCaseTrackerObjects':
+            $oProcessMap = new ProcessMap();
+            $oProcessMap->availableCaseTrackerObjects($_POST['PRO_UID']);
+            break;
+        case 'assignCaseTrackerObject':
+            $oProcessMap = new ProcessMap();
+            $cto_UID = $oProcessMap->assignCaseTrackerObject($_POST['PRO_UID'], $_POST['OBJECT_TYPE'], $_POST['OBJECT_UID']);
+            $oProcessMap->getCaseTrackerObjectsCriteria($_POST['PRO_UID']);
+            $infoProcess = new Process();
+            $resultProcess = $infoProcess->load($_POST['PRO_UID']);
+            G::auditLog('CaseTrackers', 'Assign Case Tracker Object ('.$cto_UID.' - '.$_POST['OBJECT_TYPE'].') in Process "'.$resultProcess['PRO_TITLE'].'"');
+            echo $cto_UID;
+            break;
+        case 'removeCaseTrackerObject':
+            $oProcessMap = new ProcessMap();
+            $oProcessMap->removeCaseTrackerObject($_POST['CTO_UID'], $_POST['PRO_UID'], $_POST['STEP_POSITION']);
+            $oProcessMap->getCaseTrackerObjectsCriteria($_POST['PRO_UID']);
+            $infoProcess = new Process();
+            $resultProcess = $infoProcess->load($_POST['PRO_UID']);
+            G::auditLog('CaseTrackers', 'Remove Case Tracker Object ('.$_POST['CTO_UID'].') in Process "'.$resultProcess['PRO_TITLE'].'"');
+            break;
+        case 'upCaseTrackerObject':
+            $oProcessMap = new ProcessMap();
+            $oProcessMap->upCaseTrackerObject($_POST['CTO_UID'], $_POST['PRO_UID'], $_POST['STEP_POSITION']);
+            $oProcessMap->getCaseTrackerObjectsCriteria($_POST['PRO_UID']);
+            $infoProcess = new Process();
+            $resultProcess = $infoProcess->load($_POST['PRO_UID']);
+            G::auditLog('CaseTrackers', 'Move Up Case Tracker Object ('.$_POST['CTO_UID'].') in Process "'.$resultProcess['PRO_TITLE'].'"');
+            break;
+        case 'downCaseTrackerObject':
+            $oProcessMap = new ProcessMap();
+            $oProcessMap->downCaseTrackerObject($_POST['CTO_UID'], $_POST['PRO_UID'], $_POST['STEP_POSITION']);
+            $oProcessMap->getCaseTrackerObjectsCriteria($_POST['PRO_UID']);
+            $infoProcess = new Process();
+            $resultProcess = $infoProcess->load($_POST['PRO_UID']);
+            G::auditLog('CaseTrackers', 'Move Down Case Tracker Object ('.$_POST['CTO_UID'].') in Process "'.$resultProcess['PRO_TITLE'].'"');
+            break;
+        case 'editStagesMap':
+            $oTemplatePower = new TemplatePower(PATH_TPL . 'tracker/stages_Map.html');
+            $oTemplatePower->prepare();
+            $G_PUBLISH = new Publisher();
+            $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
+            $oHeadPublisher = headPublisher::getSingleton();
+            $oHeadPublisher->addScriptCode('
 			  var pb=leimnud.dom.capture("tag.body 0");
 			  Sm=new stagesmap();
 			  Sm.options = {
@@ -90,375 +90,375 @@ try {
 			  	rw        : true,
 			  	hideMenu  : false
 			  };
-			  Sm.make();' );
-            G::RenderPage( 'publish', 'raw' );
-            break;
-        case 'showUploadedDocumentTracker':
-            require_once 'classes/model/AppDocument.php';
-            require_once 'classes/model/AppDelegation.php';
-            require_once 'classes/model/InputDocument.php';
-            require_once 'classes/model/Users.php';
-            $oAppDocument = new AppDocument();
-            $oAppDocument->Fields = $oAppDocument->load( $_POST['APP_DOC_UID'] );
-
-            $oInputDocument = new InputDocument();
-            if ($oAppDocument->Fields['DOC_UID'] != - 1) {
-                $Fields = $oInputDocument->load( $oAppDocument->Fields['DOC_UID'] );
-            } else {
-                $Fields = array ('INP_DOC_FORM_NEEDED' => '','FILENAME' => $oAppDocument->Fields['APP_DOC_FILENAME']);
-            }
-            $oCriteria = new Criteria( 'workflow' );
-            $oCriteria->add( AppDelegationPeer::DEL_INDEX, $oAppDocument->Fields['DEL_INDEX'] );
-            $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
-            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-            $oDataset->next();
-            $aRow = $oDataset->getRow();
-            $oTask = new Task();
-            $aTask = $oTask->load( $aRow['TAS_UID'] );
-            $Fields['ORIGIN'] = $aTask['TAS_TITLE'];
-            $oUser = new Users();
-            $aUser = $oUser->load( $oAppDocument->Fields['USR_UID'] );
-            $Fields['CREATOR'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
-            switch ($Fields['INP_DOC_FORM_NEEDED']) {
-                case 'REAL':
-                    $sXmlForm = 'tracker/tracker_ViewAnyInputDocument2';
-                    break;
-                case 'VIRTUAL':
-                    $sXmlForm = 'tracker/tracker_ViewAnyInputDocument1';
-                    break;
-                case 'VREAL':
-                    $sXmlForm = 'tracker/tracker_ViewAnyInputDocument3';
-                    break;
-                default:
-                    $sXmlForm = 'tracker/tracker_ViewAnyInputDocument';
-                    break;
-            }
-            $oAppDocument->Fields['VIEW'] = G::LoadTranslation( 'ID_OPEN' );
-            $oAppDocument->Fields['FILE'] = 'tracker_ShowDocument?a=' . $_POST['APP_DOC_UID'] . '&r=' . rand();
-
-            //If plugin and trigger are defined for listing
-            if ($oPluginRegistry->existsTrigger( PM_CASE_DOCUMENT_LIST_ARR )) {
-                $oPluginRegistry = PluginRegistry::loadSingleton();
-                $filesPluginArray = $oPluginRegistry->executeTriggers( PM_CASE_DOCUMENT_LIST_ARR, $_SESSION['APPLICATION'] );
-                //Now search for the file, if exists the change the download URL
-                foreach ($filesPluginArray as $file) {
-                    if ($file->filename == $_POST['APP_DOC_UID']) {
-                        $oAppDocument->Fields['FILE'] = $file->downloadScript;
-                    }
-                }
-            }
-
-            $G_PUBLISH = new Publisher();
-            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', $sXmlForm, '', G::array_merges( $Fields, $oAppDocument->Fields ), '' );
-            G::RenderPage( 'publish', 'raw' );
-            break;
-        case 'showGeneratedDocumentTracker':
-            require_once 'classes/model/AppDocument.php';
-            require_once 'classes/model/AppDelegation.php';
-            $oAppDocument = new AppDocument();
-            $aFields = $oAppDocument->load( $_POST['APP_DOC_UID'] );
-            require_once 'classes/model/OutputDocument.php';
-            $oOutputDocument = new OutputDocument();
-            $aOD = $oOutputDocument->load( $aFields['DOC_UID'] );
-
-            $oCriteria = new Criteria( 'workflow' );
-            $oCriteria->add( AppDelegationPeer::APP_UID, $aFields['APP_UID'] );
-            $oCriteria->add( AppDelegationPeer::DEL_INDEX, $aFields['DEL_INDEX'] );
-            $oDataset = AppDelegationPeer::doSelectRS( $oCriteria );
-            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-            $oDataset->next();
-            $aRow = $oDataset->getRow();
-            $oTask = new Task();
-            $aTask = $oTask->load( $aRow['TAS_UID'] );
-            $aFields['ORIGIN'] = $aTask['TAS_TITLE'];
-            require_once 'classes/model/Users.php';
-            $oUser = new Users();
-            $aUser = $oUser->load( $aFields['USR_UID'] );
-            $aFields['CREATOR'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
-            $aFields['VIEW'] = G::LoadTranslation( 'ID_OPEN' );
-            $aFields['FILE1'] = 'tracker_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=doc&random=' . rand();
-            $aFields['FILE2'] = 'tracker_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=pdf&random=' . rand();
-
-            //If plugin and trigger are defined for listing
-            if ($oPluginRegistry->existsTrigger( PM_CASE_DOCUMENT_LIST_ARR )) {
-                $oPluginRegistry = PluginRegistry::loadSingleton();
-                $filesPluginArray = $oPluginRegistry->executeTriggers( PM_CASE_DOCUMENT_LIST_ARR, $aFields['APP_UID'] );
-                //Now search for the file, if exists the change the download URL
-                foreach ($filesPluginArray as $file) {
-                    if ($file->filename == $_POST['APP_DOC_UID']) {
-                        $aFields['FILE2'] = $file->downloadScript; // The PDF is the only one uploaded to KT
-                    }
-                }
-            }
-
-            $G_PUBLISH = new Publisher();
-            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'tracker/tracker_ViewAnyOutputDocument', '', G::array_merges( $aOD, $aFields ), '' );
-            G::RenderPage( 'publish', 'raw' );
-            break;
-        case 'load':
-            $oConnection = Propel::getConnection( 'workflow' );
-            $oStatement = $oConnection->prepareStatement( "CREATE TABLE IF NOT EXISTS `STAGE` (
+			  Sm.make();');
+            G::RenderPage('publish', 'raw');
+            break;
+        case 'showUploadedDocumentTracker':
+            require_once 'classes/model/AppDocument.php';
+            require_once 'classes/model/AppDelegation.php';
+            require_once 'classes/model/InputDocument.php';
+            require_once 'classes/model/Users.php';
+            $oAppDocument = new AppDocument();
+            $oAppDocument->Fields = $oAppDocument->load($_POST['APP_DOC_UID']);
+
+            $oInputDocument = new InputDocument();
+            if ($oAppDocument->Fields['DOC_UID'] != - 1) {
+                $Fields = $oInputDocument->load($oAppDocument->Fields['DOC_UID']);
+            } else {
+                $Fields = array('INP_DOC_FORM_NEEDED' => '','FILENAME' => $oAppDocument->Fields['APP_DOC_FILENAME']);
+            }
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->add(AppDelegationPeer::DEL_INDEX, $oAppDocument->Fields['DEL_INDEX']);
+            $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            $aRow = $oDataset->getRow();
+            $oTask = new Task();
+            $aTask = $oTask->load($aRow['TAS_UID']);
+            $Fields['ORIGIN'] = $aTask['TAS_TITLE'];
+            $oUser = new Users();
+            $aUser = $oUser->load($oAppDocument->Fields['USR_UID']);
+            $Fields['CREATOR'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
+            switch ($Fields['INP_DOC_FORM_NEEDED']) {
+                case 'REAL':
+                    $sXmlForm = 'tracker/tracker_ViewAnyInputDocument2';
+                    break;
+                case 'VIRTUAL':
+                    $sXmlForm = 'tracker/tracker_ViewAnyInputDocument1';
+                    break;
+                case 'VREAL':
+                    $sXmlForm = 'tracker/tracker_ViewAnyInputDocument3';
+                    break;
+                default:
+                    $sXmlForm = 'tracker/tracker_ViewAnyInputDocument';
+                    break;
+            }
+            $oAppDocument->Fields['VIEW'] = G::LoadTranslation('ID_OPEN');
+            $oAppDocument->Fields['FILE'] = 'tracker_ShowDocument?a=' . $_POST['APP_DOC_UID'] . '&r=' . rand();
+
+            //If plugin and trigger are defined for listing
+            if ($oPluginRegistry->existsTrigger(PM_CASE_DOCUMENT_LIST_ARR)) {
+                $oPluginRegistry = PluginRegistry::loadSingleton();
+                $filesPluginArray = $oPluginRegistry->executeTriggers(PM_CASE_DOCUMENT_LIST_ARR, $_SESSION['APPLICATION']);
+                //Now search for the file, if exists the change the download URL
+                foreach ($filesPluginArray as $file) {
+                    if ($file->filename == $_POST['APP_DOC_UID']) {
+                        $oAppDocument->Fields['FILE'] = $file->downloadScript;
+                    }
+                }
+            }
+
+            $G_PUBLISH = new Publisher();
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', $sXmlForm, '', G::array_merges($Fields, $oAppDocument->Fields), '');
+            G::RenderPage('publish', 'raw');
+            break;
+        case 'showGeneratedDocumentTracker':
+            require_once 'classes/model/AppDocument.php';
+            require_once 'classes/model/AppDelegation.php';
+            $oAppDocument = new AppDocument();
+            $aFields = $oAppDocument->load($_POST['APP_DOC_UID']);
+            require_once 'classes/model/OutputDocument.php';
+            $oOutputDocument = new OutputDocument();
+            $aOD = $oOutputDocument->load($aFields['DOC_UID']);
+
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->add(AppDelegationPeer::APP_UID, $aFields['APP_UID']);
+            $oCriteria->add(AppDelegationPeer::DEL_INDEX, $aFields['DEL_INDEX']);
+            $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            $aRow = $oDataset->getRow();
+            $oTask = new Task();
+            $aTask = $oTask->load($aRow['TAS_UID']);
+            $aFields['ORIGIN'] = $aTask['TAS_TITLE'];
+            require_once 'classes/model/Users.php';
+            $oUser = new Users();
+            $aUser = $oUser->load($aFields['USR_UID']);
+            $aFields['CREATOR'] = $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'];
+            $aFields['VIEW'] = G::LoadTranslation('ID_OPEN');
+            $aFields['FILE1'] = 'tracker_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=doc&random=' . rand();
+            $aFields['FILE2'] = 'tracker_ShowOutputDocument?a=' . $aFields['APP_DOC_UID'] . '&ext=pdf&random=' . rand();
+
+            //If plugin and trigger are defined for listing
+            if ($oPluginRegistry->existsTrigger(PM_CASE_DOCUMENT_LIST_ARR)) {
+                $oPluginRegistry = PluginRegistry::loadSingleton();
+                $filesPluginArray = $oPluginRegistry->executeTriggers(PM_CASE_DOCUMENT_LIST_ARR, $aFields['APP_UID']);
+                //Now search for the file, if exists the change the download URL
+                foreach ($filesPluginArray as $file) {
+                    if ($file->filename == $_POST['APP_DOC_UID']) {
+                        $aFields['FILE2'] = $file->downloadScript; // The PDF is the only one uploaded to KT
+                    }
+                }
+            }
+
+            $G_PUBLISH = new Publisher();
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'tracker/tracker_ViewAnyOutputDocument', '', G::array_merges($aOD, $aFields), '');
+            G::RenderPage('publish', 'raw');
+            break;
+        case 'load':
+            $oConnection = Propel::getConnection('workflow');
+            $oStatement = $oConnection->prepareStatement("CREATE TABLE IF NOT EXISTS `STAGE` (
                                                        `STG_UID` VARCHAR( 32 ) NOT NULL ,
                                                        `PRO_UID` VARCHAR( 32 ) NOT NULL ,
                                                        `STG_POSX` INT( 11 ) NOT NULL DEFAULT '0',
                                                        `STG_POSY` INT( 11 ) NOT NULL DEFAULT '0',
                                                        `STG_INDEX` INT( 11 ) NOT NULL DEFAULT '0',
                                                        PRIMARY KEY ( `STG_UID` )
-                                                     );" );
-            $oStatement->executeQuery();
-            /**
-             * ************************************************************************************************************
-             */
-            require_once 'classes/model/Stage.php';
-            require_once 'classes/model/Process.php';
-            require_once 'classes/model/Task.php';
-            require_once 'classes/model/AppDelegation.php';
-            //$oJSON = new Services_JSON();
-            $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
-            $oProcess = new Process();
-            $aRow = $oProcess->load( $oData->uid );
-            $oSM = new stdclass();
-            $oSM->title = new stdclass();
-            $oSM->title->label = strip_tags( $aRow['PRO_TITLE'] );
-            //$oSM->title->position->x = $aRow['PRO_TITLE_X'];
-            //$oSM->title->position->y = $aRow['PRO_TITLE_Y'];
-            $oSM->title->position = new stdclass();
-            $oSM->title->position->x = 10;
-            $oSM->title->position->y = 10;
-            $oSM->stages = array ();
-            $oCriteria = new Criteria( 'workflow' );
-            $oCriteria->addSelectColumn( StagePeer::STG_UID );
-            $oCriteria->addSelectColumn( ContentPeer::CON_VALUE );
-            $oCriteria->addSelectColumn( StagePeer::STG_POSX );
-            $oCriteria->addSelectColumn( StagePeer::STG_POSY );
-            $aConditions = array ();
-            $aConditions[] = array (0 => StagePeer::STG_UID,1 => ContentPeer::CON_ID);
-            $aConditions[] = array (0 => ContentPeer::CON_CATEGORY,1 => DBAdapter::getStringDelimiter() . 'STG_TITLE' . DBAdapter::getStringDelimiter());
-            $aConditions[] = array (0 => ContentPeer::CON_LANG,1 => DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter());
-            $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN );
-            $oCriteria->add( StagePeer::PRO_UID, $oData->uid );
-            $oCriteria->addAscendingOrderByColumn( StagePeer::STG_INDEX );
-            $oDataset = StagePeer::doSelectRS( $oCriteria );
-            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-            $oDataset->next();
-            while ($aRow1 = $oDataset->getRow()) {
-                $oStage = new stdclass();
-                $oStage->uid = $aRow1['STG_UID'];
-                $oStage->label = strip_tags( $aRow1['CON_VALUE'] );
-                $oStage->position = new stdclass();
-                $oStage->position->x = (int) $aRow1['STG_POSX'];
-                $oStage->position->y = (int) $aRow1['STG_POSY'];
-                $oStage->derivation = new stdclass();
-                $oStage->derivation->to = array ();
-                if (! $oData->mode) {
-                    $oCriteria = new Criteria( 'workflow' );
-                    $oCriteria->add( TaskPeer::STG_UID, $aRow1['STG_UID'] );
-                    $oDataset1 = TaskPeer::doSelectRS( $oCriteria );
-                    $oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-                    $oDataset1->next();
-                    $aTasks = array ();
-                    while ($aRow2 = $oDataset1->getRow()) {
-                        $aTasks[] = $aRow2['TAS_UID'];
-                        $oDataset1->next();
-                    }
-                    $oCriteria = new Criteria( 'workflow' );
-                    $oCriteria->add( AppDelegationPeer::APP_UID, $_SESSION['APPLICATION'] );
-                    $oCriteria->add( AppDelegationPeer::TAS_UID, $aTasks, Criteria::IN );
-                    $oCriteria->add( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL )->addOr( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_FINISH_DATE, '' ) ) );
-                    if (AppDelegationPeer::doCount( $oCriteria ) > 0) {
-                        $oStage->color = '#FF0000';
-                    } else {
-                        $oCriteria = new Criteria( 'workflow' );
-                        $oCriteria->add( AppDelegationPeer::APP_UID, $_SESSION['APPLICATION'] );
-                        $oCriteria->add( AppDelegationPeer::TAS_UID, $aTasks, Criteria::IN );
-                        $oCriteria->add( AppDelegationPeer::DEL_THREAD_STATUS, 'CLOSED' );
-                        if (AppDelegationPeer::doCount( $oCriteria ) > 0) {
-                            $oStage->color = '#006633';
-                        } else {
-                            $oCriteria = new Criteria( 'workflow' );
-                            $oCriteria->add( AppDelegationPeer::APP_UID, $_SESSION['APPLICATION'] );
-                            $oCriteria->add( AppDelegationPeer::TAS_UID, $aTasks, Criteria::IN );
-                            if (AppDelegationPeer::doCount( $oCriteria ) == 0) {
-                                $oStage->color = '#939598';
-                            }
-                        }
-
-                    }
-                }
-                $oSM->stages[] = $oStage;
-                $oDataset->next();
-            }
-            foreach ($oSM->stages as $iKey => $oStage) {
-                if (isset( $oSM->stages[$iKey + 1] )) {
-                    $oDerivation = new stdclass();
-                    $oDerivation->stage = $oSM->stages[$iKey + 1]->uid;
-                    $oSM->stages[$iKey]->derivation->to = array ($oDerivation);
-                    $oSM->stages[$iKey]->derivation->type = 0;
-                }
-            }
-            //$oJSON = new Services_JSON();
-            echo Bootstrap::json_encode( $oSM );
-            break;
-        case 'addStage':
-            require_once 'classes/model/Stage.php';
-            //$oJSON = new Services_JSON();
-            $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
-            $oCriteria = new Criteria( 'workflow' );
-            $oCriteria->addSelectColumn( 'STG_UID' );
-            $oCriteria->add( StagePeer::PRO_UID, $oData->uid );
-            $oDataset = StagePeer::doSelectRS( $oCriteria );
-            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-            $oDataset->next();
-            $aStages = array ();
-            $iStageNumber = 0;
-            while ($aRow = $oDataset->getRow()) {
-                $aStages[] = $aRow['STG_UID'];
-                $iStageNumber ++;
-                $oDataset->next();
-            }
-            if ($iStageNumber == 0) {
-                $iStageNumber = 1;
-            }
-            $iIndex = $iStageNumber + 1;
-            $bContinue = false;
-            while (! $bContinue) {
-                $oCriteria = new Criteria( 'workflow' );
-                $oCriteria->addSelectColumn( 'COUNT(*) AS TIMES' );
-                $oCriteria->add( ContentPeer::CON_ID, $aStages, Criteria::IN );
-                $oCriteria->add( ContentPeer::CON_CATEGORY, 'STG_TITLE' );
-                $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG );
-                $oCriteria->add( ContentPeer::CON_VALUE, G::LoadTranslation( 'ID_STAGE' ) . ' ' . $iStageNumber );
-                $oDataset = ContentPeer::doSelectRS( $oCriteria );
-                $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-                $oDataset->next();
-                $aRow = $oDataset->getRow();
-                if ((int) $aRow['TIMES'] > 0) {
-                    $iStageNumber += 1;
-                } else {
-                    $bContinue = true;
-                }
-            }
-            $oStage = new Stage();
-            $oNewStage = new stdclass();
-            $oNewStage->label = G::LoadTranslation( 'ID_STAGE' ) . ' ' . $iStageNumber;
-
-            if ($oData->position->x < 0)
-                $oData->position->x *= - 1;
-            if ($oData->position->y < 0)
-                $oData->position->y *= - 1;
-
-            $oNewStage->uid = $oStage->create( array ('PRO_UID' => $oData->uid,'STG_TITLE' => $oNewStage->label,'STG_POSX' => $oData->position->x,'STG_POSY' => $oData->position->y,'STG_INDEX' => $iIndex) );
-            //$oJSON = new Services_JSON();
-            echo Bootstrap::json_encode( $oNewStage );
-            break;
-        case 'saveStagePosition':
-            require_once 'classes/model/Stage.php';
-            //$oJSON = new Services_JSON();
-            $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
-            $oStage = new Stage();
-            $aFields = $oStage->load( $oData->uid );
-            $aFields['STG_UID'] = $oData->uid;
-            $aFields['STG_POSX'] = $oData->position->x;
-            $aFields['STG_POSY'] = $oData->position->y;
-            $oStage->update( $aFields );
-            break;
-        case 'deleteStage':
-            require_once 'classes/model/Stage.php';
-            //$oJSON = new Services_JSON();
-            $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
-            $oStage = new Stage();
-            $aFields = $oStage->load( $oData->stg_uid );
-            $oStage->remove( $oData->stg_uid );
-            $oStage->reorderPositions( $aFields['PRO_UID'], $aFields['STG_INDEX'] );
-            require_once 'classes/model/Task.php';
-            $oCriteria1 = new Criteria( 'workflow' );
-            $oCriteria1->add( TaskPeer::STG_UID, $oData->stg_uid );
-            $oCriteria2 = new Criteria( 'workflow' );
-            $oCriteria2->add( TaskPeer::STG_UID, '' );
-            BasePeer::doUpdate( $oCriteria1, $oCriteria2, Propel::getConnection( 'workflow' ) );
-            break;
-        case 'editStage':
-            require_once 'classes/model/Stage.php';
-            //$oJSON = new Services_JSON();
-            $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
-            $oStage = new Stage();
-            $aFields = $oStage->load( $oData->stg_uid );
-            $aFields['THEINDEX'] = $oData->theindex;
-            $aFields['action'] = 'updateStage';
-            global $G_PUBLISH;
-            $G_PUBLISH = new Publisher();
-            $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'tracker/tracker_StageEdit', '', $aFields, '../tracker/tracker_Ajax' );
-            G::RenderPage( 'publish', 'raw' );
-            break;
-        case 'updateStage':
-            require_once 'classes/model/Stage.php';
-            $oStage = new Stage();
-            $aFields = $oStage->load( $_POST['form']['STG_UID'] );
-            $aFields['STG_TITLE'] = $_POST['form']['STG_TITLE'];
-            $oStage->update( $aFields );
-            break;
-        case 'tasksAssigned':
-            require_once 'classes/model/Stage.php';
-            require_once 'classes/model/Task.php';
-            //$oJSON = new Services_JSON();
-            $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
-            $oCriteria = new Criteria( 'workflow' );
-            $oCriteria->addSelectColumn( TaskPeer::TAS_UID );
-            $oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
-            $oCriteria->add( TaskPeer::STG_UID, $oData->stg_uid );
-            $oCriteria->addAscendingOrderByColumn( TaskPeer::TAS_TITLE );
-            global $G_PUBLISH;
-            $G_PUBLISH = new Publisher();
-            $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_StageTasks', $oCriteria, array ('PRO_UID' => $oData->pro_uid,'STG_UID' => $oData->stg_uid) );
-            G::RenderPage( 'publish', 'raw' );
-            break;
-        case 'availableTasksForTheStage':
-            require_once 'classes/model/Process.php';
-            require_once 'classes/model/Task.php';
-            $oCriteria = new Criteria( 'workflow' );
-            $oCriteria->addSelectColumn( TaskPeer::TAS_UID );
-            $oCriteria->addSelectColumn( TaskPeer::TAS_TITLE );
-            $oCriteria->add( TaskPeer::PRO_UID, $_POST['PRO_UID'] );
-            $oCriteria->add( TaskPeer::STG_UID, '' );
-            $oCriteria->addAscendingOrderByColumn( TaskPeer::TAS_TITLE );
-            global $G_PUBLISH;
-            $G_PUBLISH = new Publisher();
-            $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_AvailableStageTasks', $oCriteria, array ('STG_UID' => $_POST['STG_UID']) );
-            G::RenderPage( 'publish', 'raw' );
-            break;
-        case 'assignTaskToStage':
-            require_once 'classes/model/Task.php';
-            $oCriteria1 = new Criteria( 'workflow' );
-            $oCriteria1->add( TaskPeer::TAS_UID, $_POST['TAS_UID'] );
-            $oCriteria2 = new Criteria( 'workflow' );
-            $oCriteria2->add( TaskPeer::STG_UID, $_POST['STG_UID'] );
-            BasePeer::doUpdate( $oCriteria1, $oCriteria2, Propel::getConnection( 'workflow' ) );
-            break;
-        case 'removeTaskFromTheStage':
-            require_once 'classes/model/Task.php';
-            $oCriteria1 = new Criteria( 'workflow' );
-            $oCriteria1->add( TaskPeer::TAS_UID, $_POST['TAS_UID'] );
-            $oCriteria2 = new Criteria( 'workflow' );
-            $oCriteria2->add( TaskPeer::STG_UID, '' );
-            BasePeer::doUpdate( $oCriteria1, $oCriteria2, Propel::getConnection( 'workflow' ) );
-            break;
-
-        case "processMapLegend":
-            $arrayField = array ();
-            $arrayField["sLabel1"] = G::LoadTranslation( "ID_TASK_IN_PROGRESS" );
-            $arrayField["sLabel2"] = G::LoadTranslation( "ID_COMPLETED_TASK" );
-            $arrayField["sLabel3"] = G::LoadTranslation( "ID_PENDING_TASK" );
-            $arrayField["sLabel4"] = G::LoadTranslation( "ID_PARALLEL_TASK" );
-            $arrayField["tracker"] = 1;
-            $G_PUBLISH = new Publisher();
-            $G_PUBLISH->AddContent( "smarty", "cases/cases_Leyends", "", "", $arrayField );
-            G::RenderPage( "publish", "raw" );
-            break;
-    }
-} catch (Exception $oException) {
-    $token = strtotime("now");
-    PMException::registerErrorLog($oException, $token);
-    G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
-    die;
-}
-
+                                                     );");
+            $oStatement->executeQuery();
+            /**
+             * ************************************************************************************************************
+             */
+            require_once 'classes/model/Stage.php';
+            require_once 'classes/model/Process.php';
+            require_once 'classes/model/Task.php';
+            require_once 'classes/model/AppDelegation.php';
+            //$oJSON = new Services_JSON();
+            $oData = Bootstrap::json_decode(stripslashes($_POST['data']));
+            $oProcess = new Process();
+            $aRow = $oProcess->load($oData->uid);
+            $oSM = new stdclass();
+            $oSM->title = new stdclass();
+            $oSM->title->label = strip_tags($aRow['PRO_TITLE']);
+            //$oSM->title->position->x = $aRow['PRO_TITLE_X'];
+            //$oSM->title->position->y = $aRow['PRO_TITLE_Y'];
+            $oSM->title->position = new stdclass();
+            $oSM->title->position->x = 10;
+            $oSM->title->position->y = 10;
+            $oSM->stages = array();
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->addSelectColumn(StagePeer::STG_UID);
+            $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
+            $oCriteria->addSelectColumn(StagePeer::STG_POSX);
+            $oCriteria->addSelectColumn(StagePeer::STG_POSY);
+            $aConditions = array();
+            $aConditions[] = array(0 => StagePeer::STG_UID,1 => ContentPeer::CON_ID);
+            $aConditions[] = array(0 => ContentPeer::CON_CATEGORY,1 => DBAdapter::getStringDelimiter() . 'STG_TITLE' . DBAdapter::getStringDelimiter());
+            $aConditions[] = array(0 => ContentPeer::CON_LANG,1 => DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter());
+            $oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
+            $oCriteria->add(StagePeer::PRO_UID, $oData->uid);
+            $oCriteria->addAscendingOrderByColumn(StagePeer::STG_INDEX);
+            $oDataset = StagePeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            while ($aRow1 = $oDataset->getRow()) {
+                $oStage = new stdclass();
+                $oStage->uid = $aRow1['STG_UID'];
+                $oStage->label = strip_tags($aRow1['CON_VALUE']);
+                $oStage->position = new stdclass();
+                $oStage->position->x = (int) $aRow1['STG_POSX'];
+                $oStage->position->y = (int) $aRow1['STG_POSY'];
+                $oStage->derivation = new stdclass();
+                $oStage->derivation->to = array();
+                if (! $oData->mode) {
+                    $oCriteria = new Criteria('workflow');
+                    $oCriteria->add(TaskPeer::STG_UID, $aRow1['STG_UID']);
+                    $oDataset1 = TaskPeer::doSelectRS($oCriteria);
+                    $oDataset1->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                    $oDataset1->next();
+                    $aTasks = array();
+                    while ($aRow2 = $oDataset1->getRow()) {
+                        $aTasks[] = $aRow2['TAS_UID'];
+                        $oDataset1->next();
+                    }
+                    $oCriteria = new Criteria('workflow');
+                    $oCriteria->add(AppDelegationPeer::APP_UID, $_SESSION['APPLICATION']);
+                    $oCriteria->add(AppDelegationPeer::TAS_UID, $aTasks, Criteria::IN);
+                    $oCriteria->add($oCriteria->getNewCriterion(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL)->addOr($oCriteria->getNewCriterion(AppDelegationPeer::DEL_FINISH_DATE, '')));
+                    if (AppDelegationPeer::doCount($oCriteria) > 0) {
+                        $oStage->color = '#FF0000';
+                    } else {
+                        $oCriteria = new Criteria('workflow');
+                        $oCriteria->add(AppDelegationPeer::APP_UID, $_SESSION['APPLICATION']);
+                        $oCriteria->add(AppDelegationPeer::TAS_UID, $aTasks, Criteria::IN);
+                        $oCriteria->add(AppDelegationPeer::DEL_THREAD_STATUS, 'CLOSED');
+                        if (AppDelegationPeer::doCount($oCriteria) > 0) {
+                            $oStage->color = '#006633';
+                        } else {
+                            $oCriteria = new Criteria('workflow');
+                            $oCriteria->add(AppDelegationPeer::APP_UID, $_SESSION['APPLICATION']);
+                            $oCriteria->add(AppDelegationPeer::TAS_UID, $aTasks, Criteria::IN);
+                            if (AppDelegationPeer::doCount($oCriteria) == 0) {
+                                $oStage->color = '#939598';
+                            }
+                        }
+                    }
+                }
+                $oSM->stages[] = $oStage;
+                $oDataset->next();
+            }
+            foreach ($oSM->stages as $iKey => $oStage) {
+                if (isset($oSM->stages[$iKey + 1])) {
+                    $oDerivation = new stdclass();
+                    $oDerivation->stage = $oSM->stages[$iKey + 1]->uid;
+                    $oSM->stages[$iKey]->derivation->to = array($oDerivation);
+                    $oSM->stages[$iKey]->derivation->type = 0;
+                }
+            }
+            //$oJSON = new Services_JSON();
+            echo Bootstrap::json_encode($oSM);
+            break;
+        case 'addStage':
+            require_once 'classes/model/Stage.php';
+            //$oJSON = new Services_JSON();
+            $oData = Bootstrap::json_decode(stripslashes($_POST['data']));
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->addSelectColumn('STG_UID');
+            $oCriteria->add(StagePeer::PRO_UID, $oData->uid);
+            $oDataset = StagePeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+            $oDataset->next();
+            $aStages = array();
+            $iStageNumber = 0;
+            while ($aRow = $oDataset->getRow()) {
+                $aStages[] = $aRow['STG_UID'];
+                $iStageNumber ++;
+                $oDataset->next();
+            }
+            if ($iStageNumber == 0) {
+                $iStageNumber = 1;
+            }
+            $iIndex = $iStageNumber + 1;
+            $bContinue = false;
+            while (! $bContinue) {
+                $oCriteria = new Criteria('workflow');
+                $oCriteria->addSelectColumn('COUNT(*) AS TIMES');
+                $oCriteria->add(ContentPeer::CON_ID, $aStages, Criteria::IN);
+                $oCriteria->add(ContentPeer::CON_CATEGORY, 'STG_TITLE');
+                $oCriteria->add(ContentPeer::CON_LANG, SYS_LANG);
+                $oCriteria->add(ContentPeer::CON_VALUE, G::LoadTranslation('ID_STAGE') . ' ' . $iStageNumber);
+                $oDataset = ContentPeer::doSelectRS($oCriteria);
+                $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                $oDataset->next();
+                $aRow = $oDataset->getRow();
+                if ((int) $aRow['TIMES'] > 0) {
+                    $iStageNumber += 1;
+                } else {
+                    $bContinue = true;
+                }
+            }
+            $oStage = new Stage();
+            $oNewStage = new stdclass();
+            $oNewStage->label = G::LoadTranslation('ID_STAGE') . ' ' . $iStageNumber;
+
+            if ($oData->position->x < 0) {
+                $oData->position->x *= - 1;
+            }
+            if ($oData->position->y < 0) {
+                $oData->position->y *= - 1;
+            }
+
+            $oNewStage->uid = $oStage->create(array('PRO_UID' => $oData->uid,'STG_TITLE' => $oNewStage->label,'STG_POSX' => $oData->position->x,'STG_POSY' => $oData->position->y,'STG_INDEX' => $iIndex));
+            //$oJSON = new Services_JSON();
+            echo Bootstrap::json_encode($oNewStage);
+            break;
+        case 'saveStagePosition':
+            require_once 'classes/model/Stage.php';
+            //$oJSON = new Services_JSON();
+            $oData = Bootstrap::json_decode(stripslashes($_POST['data']));
+            $oStage = new Stage();
+            $aFields = $oStage->load($oData->uid);
+            $aFields['STG_UID'] = $oData->uid;
+            $aFields['STG_POSX'] = $oData->position->x;
+            $aFields['STG_POSY'] = $oData->position->y;
+            $oStage->update($aFields);
+            break;
+        case 'deleteStage':
+            require_once 'classes/model/Stage.php';
+            //$oJSON = new Services_JSON();
+            $oData = Bootstrap::json_decode(stripslashes($_POST['data']));
+            $oStage = new Stage();
+            $aFields = $oStage->load($oData->stg_uid);
+            $oStage->remove($oData->stg_uid);
+            $oStage->reorderPositions($aFields['PRO_UID'], $aFields['STG_INDEX']);
+            require_once 'classes/model/Task.php';
+            $oCriteria1 = new Criteria('workflow');
+            $oCriteria1->add(TaskPeer::STG_UID, $oData->stg_uid);
+            $oCriteria2 = new Criteria('workflow');
+            $oCriteria2->add(TaskPeer::STG_UID, '');
+            BasePeer::doUpdate($oCriteria1, $oCriteria2, Propel::getConnection('workflow'));
+            break;
+        case 'editStage':
+            require_once 'classes/model/Stage.php';
+            //$oJSON = new Services_JSON();
+            $oData = Bootstrap::json_decode(stripslashes($_POST['data']));
+            $oStage = new Stage();
+            $aFields = $oStage->load($oData->stg_uid);
+            $aFields['THEINDEX'] = $oData->theindex;
+            $aFields['action'] = 'updateStage';
+            global $G_PUBLISH;
+            $G_PUBLISH = new Publisher();
+            $G_PUBLISH->AddContent('xmlform', 'xmlform', 'tracker/tracker_StageEdit', '', $aFields, '../tracker/tracker_Ajax');
+            G::RenderPage('publish', 'raw');
+            break;
+        case 'updateStage':
+            require_once 'classes/model/Stage.php';
+            $oStage = new Stage();
+            $aFields = $oStage->load($_POST['form']['STG_UID']);
+            $aFields['STG_TITLE'] = $_POST['form']['STG_TITLE'];
+            $oStage->update($aFields);
+            break;
+        case 'tasksAssigned':
+            require_once 'classes/model/Stage.php';
+            require_once 'classes/model/Task.php';
+            //$oJSON = new Services_JSON();
+            $oData = Bootstrap::json_decode(stripslashes($_POST['data']));
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->addSelectColumn(TaskPeer::TAS_UID);
+            $oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
+            $oCriteria->add(TaskPeer::STG_UID, $oData->stg_uid);
+            $oCriteria->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
+            global $G_PUBLISH;
+            $G_PUBLISH = new Publisher();
+            $G_PUBLISH->AddContent('propeltable', 'paged-table', 'tracker/tracker_StageTasks', $oCriteria, array('PRO_UID' => $oData->pro_uid,'STG_UID' => $oData->stg_uid));
+            G::RenderPage('publish', 'raw');
+            break;
+        case 'availableTasksForTheStage':
+            require_once 'classes/model/Process.php';
+            require_once 'classes/model/Task.php';
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->addSelectColumn(TaskPeer::TAS_UID);
+            $oCriteria->addSelectColumn(TaskPeer::TAS_TITLE);
+            $oCriteria->add(TaskPeer::PRO_UID, $_POST['PRO_UID']);
+            $oCriteria->add(TaskPeer::STG_UID, '');
+            $oCriteria->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
+            global $G_PUBLISH;
+            $G_PUBLISH = new Publisher();
+            $G_PUBLISH->AddContent('propeltable', 'paged-table', 'tracker/tracker_AvailableStageTasks', $oCriteria, array('STG_UID' => $_POST['STG_UID']));
+            G::RenderPage('publish', 'raw');
+            break;
+        case 'assignTaskToStage':
+            require_once 'classes/model/Task.php';
+            $oCriteria1 = new Criteria('workflow');
+            $oCriteria1->add(TaskPeer::TAS_UID, $_POST['TAS_UID']);
+            $oCriteria2 = new Criteria('workflow');
+            $oCriteria2->add(TaskPeer::STG_UID, $_POST['STG_UID']);
+            BasePeer::doUpdate($oCriteria1, $oCriteria2, Propel::getConnection('workflow'));
+            break;
+        case 'removeTaskFromTheStage':
+            require_once 'classes/model/Task.php';
+            $oCriteria1 = new Criteria('workflow');
+            $oCriteria1->add(TaskPeer::TAS_UID, $_POST['TAS_UID']);
+            $oCriteria2 = new Criteria('workflow');
+            $oCriteria2->add(TaskPeer::STG_UID, '');
+            BasePeer::doUpdate($oCriteria1, $oCriteria2, Propel::getConnection('workflow'));
+            break;
+
+        case "processMapLegend":
+            $arrayField = array();
+            $arrayField["sLabel1"] = G::LoadTranslation("ID_TASK_IN_PROGRESS");
+            $arrayField["sLabel2"] = G::LoadTranslation("ID_COMPLETED_TASK");
+            $arrayField["sLabel3"] = G::LoadTranslation("ID_PENDING_TASK");
+            $arrayField["sLabel4"] = G::LoadTranslation("ID_PARALLEL_TASK");
+            $arrayField["tracker"] = 1;
+            $G_PUBLISH = new Publisher();
+            $G_PUBLISH->AddContent("smarty", "cases/cases_Leyends", "", "", $arrayField);
+            G::RenderPage("publish", "raw");
+            break;
+    }
+} catch (Exception $oException) {
+    $token = strtotime("now");
+    PMException::registerErrorLog($oException, $token);
+    G::outRes(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)));
+    die;
+}
diff --git a/workflow/engine/methods/tracker/tracker_Show.php b/workflow/engine/methods/tracker/tracker_Show.php
index 294f91280..a15cbdcbc 100644
--- a/workflow/engine/methods/tracker/tracker_Show.php
+++ b/workflow/engine/methods/tracker/tracker_Show.php
@@ -29,13 +29,13 @@
 *
 */
 
-if (! isset( $_SESSION['PROCESS'] )) {
-    G::header( 'location: login' );
+if (! isset($_SESSION['PROCESS'])) {
+    G::header('location: login');
 }
 
 global $_DBArray;
-if (! isset( $_DBArray )) {
-    $_DBArray = array ();
+if (! isset($_DBArray)) {
+    $_DBArray = array();
 }
 
 $G_MAIN_MENU = 'caseTracker';
@@ -46,7 +46,7 @@ switch ($_GET['CTO_TYPE_OBJ']) {
     case 'DYNAFORM':
 
         $oCase = new Cases();
-        $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+        $Fields = $oCase->loadCase($_SESSION['APPLICATION']);
         $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = '';
         $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = '';
         $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#';
@@ -59,7 +59,6 @@ switch ($_GET['CTO_TYPE_OBJ']) {
         $arrayDynaFormData = $dynaForm->Load($_GET["CTO_UID_OBJ"]);
 
         if (isset($arrayDynaFormData["DYN_VERSION"]) && $arrayDynaFormData["DYN_VERSION"] == 2) {
-
             $Fields["PRO_UID"] = $_SESSION["PROCESS"];
             $Fields["CURRENT_DYNAFORM"] = $_GET["CTO_UID_OBJ"];
 
@@ -77,27 +76,26 @@ switch ($_GET['CTO_TYPE_OBJ']) {
     case 'INPUT_DOCUMENT':
 
         $oCase = new Cases();
-        $c = $oCase->getAllUploadedDocumentsCriteriaTracker( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_GET['CTO_UID_OBJ'] );
+        $c = $oCase->getAllUploadedDocumentsCriteriaTracker($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_GET['CTO_UID_OBJ']);
 
-        $oHeadPublisher = & headPublisher::getSingleton();
-        $oHeadPublisher->addScriptFile( '/jscore/tracker/tracker.js' );
+        $oHeadPublisher = headPublisher::getSingleton();
+        $oHeadPublisher->addScriptFile('/jscore/tracker/tracker.js');
 
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_Inputdocs', $c );
-        G::RenderPage( 'publish' );
+        $G_PUBLISH->AddContent('propeltable', 'paged-table', 'tracker/tracker_Inputdocs', $c);
+        G::RenderPage('publish');
         break;
 
     case 'OUTPUT_DOCUMENT':
 
         $oCase = new Cases();
-        $c = $oCase->getAllGeneratedDocumentsCriteriaTracker( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_GET['CTO_UID_OBJ'] );
+        $c = $oCase->getAllGeneratedDocumentsCriteriaTracker($_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_GET['CTO_UID_OBJ']);
 
-        $oHeadPublisher = & headPublisher::getSingleton();
-        $oHeadPublisher->addScriptFile( '/jscore/tracker/tracker.js' );
+        $oHeadPublisher = headPublisher::getSingleton();
+        $oHeadPublisher->addScriptFile('/jscore/tracker/tracker.js');
 
         $G_PUBLISH = new Publisher();
-        $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_Outputdocs', $c );
-        G::RenderPage( 'publish' );
+        $G_PUBLISH->AddContent('propeltable', 'paged-table', 'tracker/tracker_Outputdocs', $c);
+        G::RenderPage('publish');
         break;
 }
-
diff --git a/workflow/engine/methods/tracker/tracker_ViewMap.php b/workflow/engine/methods/tracker/tracker_ViewMap.php
index 96caa42c9..45eebfba6 100644
--- a/workflow/engine/methods/tracker/tracker_ViewMap.php
+++ b/workflow/engine/methods/tracker/tracker_ViewMap.php
@@ -29,8 +29,8 @@
  *
  */
 require_once 'classes/model/Process.php';
-if (! isset( $_SESSION['PROCESS'] ) || ! isset( $_SESSION['APPLICATION'] )) {
-    G::header( 'location: login' );
+if (! isset($_SESSION['PROCESS']) || ! isset($_SESSION['APPLICATION'])) {
+    G::header('location: login');
     die;
 }
 $G_MAIN_MENU = 'caseTracker';
@@ -38,13 +38,13 @@ $G_ID_MENU_SELECTED = 'MAP';
 
 require_once 'classes/model/CaseTracker.php';
 $oCaseTracker = new CaseTracker();
-$aCaseTracker = $oCaseTracker->load( $_SESSION['PROCESS'] );
+$aCaseTracker = $oCaseTracker->load($_SESSION['PROCESS']);
 
 $idProcess = $_SESSION['PROCESS'];
 $oProcess = new Process();
-$aProcessFieds = $oProcess->load( $idProcess );
+$aProcessFieds = $oProcess->load($idProcess);
 $noShowTitle = 0;
-if (isset( $aProcessFieds['PRO_SHOW_MESSAGE'] )) {
+if (isset($aProcessFieds['PRO_SHOW_MESSAGE'])) {
     $noShowTitle = $aProcessFieds['PRO_SHOW_MESSAGE'];
 }
 
@@ -67,12 +67,12 @@ switch (($aCaseTracker['CT_MAP_TYPE'])) {
     case 'PROCESSMAP':
 
         $oCase = new Cases();
-        $aFields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+        $aFields = $oCase->loadCase($_SESSION['APPLICATION']);
         if (in_array($aFields['PRO_UID'], $bpmnProjects)) {
             //bpmb
             $_SESSION["APPLICATION"] = $aFields["APP_UID"];
             $G_PUBLISH = new Publisher();
-            $G_PUBLISH->AddContent( 'view', 'tracker/viewMap' );
+            $G_PUBLISH->AddContent('view', 'tracker/viewMap');
 
             $urlTrackerProcessMap = "../designer?prj_uid=" . $_SESSION["PROCESS"] . "&prj_readonly=true&app_uid=" . $_SESSION["APPLICATION"] . "&tracker_designer=1";
 
@@ -114,24 +114,24 @@ switch (($aCaseTracker['CT_MAP_TYPE'])) {
 
             break;
         }
-        if (isset( $aFields['TITLE'] )) {
+        if (isset($aFields['TITLE'])) {
             $aFields['APP_TITLE'] = $aFields['TITLE'];
         }
         if ($aFields['APP_PROC_CODE'] != '') {
             $aFields['APP_NUMBER'] = $aFields['APP_PROC_CODE'];
         }
-        $aFields['CASE'] = G::LoadTranslation( 'ID_CASE' );
-        $aFields['TITLE'] = G::LoadTranslation( 'ID_TITLE' );
-        $oTemplatePower = new TemplatePower( PATH_TPL . 'processes/processes_Map.html' );
+        $aFields['CASE'] = G::LoadTranslation('ID_CASE');
+        $aFields['TITLE'] = G::LoadTranslation('ID_TITLE');
+        $oTemplatePower = new TemplatePower(PATH_TPL . 'processes/processes_Map.html');
         $oTemplatePower->prepare();
         $G_PUBLISH = new Publisher();
         if ($noShowTitle == 0) {
-            $G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $aFields );
+            $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields);
         }
-        $G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
-        $oHeadPublisher = & headPublisher::getSingleton();
-        $oHeadPublisher->addScriptCode( '
-        var maximunX = ' . ProcessMap::getMaximunTaskX( $_SESSION['PROCESS'] ) . ';
+        $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
+        $oHeadPublisher = headPublisher::getSingleton();
+        $oHeadPublisher->addScriptCode('
+        var maximunX = ' . ProcessMap::getMaximunTaskX($_SESSION['PROCESS']) . ';
         leimnud.event.add(window,"load",function(){
           var pb = leimnud.dom.capture("tag.body 0");
           pm = new processmap();
@@ -191,39 +191,39 @@ switch (($aCaseTracker['CT_MAP_TYPE'])) {
           }.extend(this);
 
           rpcRequest.make();
-        });' );
-        G::RenderPage( 'publish' );
+        });');
+        G::RenderPage('publish');
         break;
     case 'STAGES':
 
         $oCase = new Cases();
-        $aFields = $oCase->loadCase( $_SESSION['APPLICATION'] );
+        $aFields = $oCase->loadCase($_SESSION['APPLICATION']);
         if (in_array($aFields['PRO_UID'], $bpmnProjects)) {
             //bpmb
             $_SESSION["APP_UID"] = $aFields["APP_UID"];
             $G_PUBLISH = new Publisher();
-            $G_PUBLISH->AddContent( 'view', 'tracker/viewMap' );
-            G::RenderPage( 'publish' );
+            $G_PUBLISH->AddContent('view', 'tracker/viewMap');
+            G::RenderPage('publish');
             //note: url processmap "../designer?prj_uid=$_SESSION['PROCESS']&prj_readonly=true&app_uid=$_SESSION['APP_UID']"
             break;
         }
-        if (isset( $aFields['TITLE'] )) {
+        if (isset($aFields['TITLE'])) {
             $aFields['APP_TITLE'] = $aFields['TITLE'];
         }
         if ($aFields['APP_PROC_CODE'] != '') {
             $aFields['APP_NUMBER'] = $aFields['APP_PROC_CODE'];
         }
-        $aFields['CASE'] = G::LoadTranslation( 'ID_CASE' );
-        $aFields['TITLE'] = G::LoadTranslation( 'ID_TITLE' );
-        $oTemplatePower = new TemplatePower( PATH_TPL . 'tracker/stages_Map.html' );
+        $aFields['CASE'] = G::LoadTranslation('ID_CASE');
+        $aFields['TITLE'] = G::LoadTranslation('ID_TITLE');
+        $oTemplatePower = new TemplatePower(PATH_TPL . 'tracker/stages_Map.html');
         $oTemplatePower->prepare();
         $G_PUBLISH = new Publisher();
         if ($noShowTitle == 0) {
-            $G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $aFields );
+            $G_PUBLISH->AddContent('smarty', 'cases/cases_title', '', '', $aFields);
         }
-        $G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
-        $oHeadPublisher = & headPublisher::getSingleton();
-        $oHeadPublisher->addScriptCode( '
+        $G_PUBLISH->AddContent('template', '', '', '', $oTemplatePower);
+        $oHeadPublisher = headPublisher::getSingleton();
+        $oHeadPublisher->addScriptCode('
         leimnud.Package.Load("stagesmap",{Type:"file",Absolute:true,Path:"/jscore/stagesmap/core/stagesmap.js"});
         leimnud.event.add(window,"load",function(){
           var pb=leimnud.dom.capture("tag.body 0");
@@ -283,7 +283,7 @@ switch (($aCaseTracker['CT_MAP_TYPE'])) {
 
           rpcRequest.make();
 
-        });' );
-        G::RenderPage( 'publish' );
+        });');
+        G::RenderPage('publish');
         break;
 }
diff --git a/workflow/engine/methods/triggers/triggerCopy.php b/workflow/engine/methods/triggers/triggerCopy.php
index f74b9928c..05830ccdf 100644
--- a/workflow/engine/methods/triggers/triggerCopy.php
+++ b/workflow/engine/methods/triggers/triggerCopy.php
@@ -7,7 +7,7 @@ if (($RBAC_Response = $RBAC->userCanAccess("PM_FACTORY")) != 1) {
 
 
 
-require_once ("classes/model/Triggers.php");
+require_once("classes/model/Triggers.php");
 
 
 
@@ -25,15 +25,14 @@ if (isset($_GET["TRI_UID"]) && !empty($_GET["TRI_UID"])) {
 
 $G_PUBLISH = new Publisher();
 $G_PUBLISH->AddContent("xmlform", "xmlform", "triggers/triggerCopy", "", $arrayField, "../triggers/triggers_Save");
-$oHeadPublisher =& headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 //$oHeadPublisher->addScriptFile('/js/codemirror/js/codemirror.js', 1);
 $oHeadPublisher->addScriptFile('/js/codemirror/lib/codemirror.js', 1);
-$oHeadPublisher->addScriptFile("/js/codemirror/addon/edit/matchbrackets.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/htmlmixed/htmlmixed.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/xml/xml.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/javascript/javascript.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/css/css.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/clike/clike.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/php/php.js",1);
+$oHeadPublisher->addScriptFile("/js/codemirror/addon/edit/matchbrackets.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/htmlmixed/htmlmixed.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/xml/xml.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/javascript/javascript.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/css/css.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/clike/clike.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/php/php.js", 1);
 G::RenderPage("publish", "raw");
-
diff --git a/workflow/engine/methods/triggers/triggers_Edit.php b/workflow/engine/methods/triggers/triggers_Edit.php
index d3bdb79df..fc0fb7f89 100644
--- a/workflow/engine/methods/triggers/triggers_Edit.php
+++ b/workflow/engine/methods/triggers/triggers_Edit.php
@@ -21,26 +21,26 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_FACTORY" )) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess("PM_FACTORY")) != 1) {
     return $RBAC_Response;
 }
-require_once ('classes/model/Triggers.php');
+require_once('classes/model/Triggers.php');
 
-if (isset( $_GET['TRI_UID'] )) {
+if (isset($_GET['TRI_UID'])) {
     $oTrigger = new Triggers();
     // check if its necessary bypass the wizard editor
-    if (isset( $_GET['BYPASS'] ) && $_GET['BYPASS'] == '1') {
+    if (isset($_GET['BYPASS']) && $_GET['BYPASS'] == '1') {
         $editWizardSource = true;
     } else {
         $editWizardSource = false;
     }
-    $aFields = $oTrigger->load( $_GET['TRI_UID'] );
-    $aTriggerData = unserialize( $aFields['TRI_PARAM'] );
+    $aFields = $oTrigger->load($_GET['TRI_UID']);
+    $aTriggerData = unserialize($aFields['TRI_PARAM']);
     // if trigger has been created with the wizard the TRI_PARAM field cant be empty
     if ($aFields['TRI_PARAM'] != '' && ! $editWizardSource) {
-        $aTriggerData = unserialize( $aFields['TRI_PARAM'] );
+        $aTriggerData = unserialize($aFields['TRI_PARAM']);
         // if the trigger has been modified manually, it cant be edited with the wizard.
-        if (G::encryptOld( $aFields['TRI_WEBBOT'] ) == $aTriggerData['hash']) {
+        if (G::encryptOld($aFields['TRI_WEBBOT']) == $aTriggerData['hash']) {
             $triUid = $_GET['TRI_UID'];
             $STEP_UID = isset($_GET['STEP_UID'])?$_GET['STEP_UID']:'';
             $ST_TYPE = isset($_GET['ST_TYPE'])?$_GET['ST_TYPE']:'';
@@ -49,7 +49,7 @@ if (isset( $_GET['TRI_UID'] )) {
             $_GET['PRO_UID'] = $aFields['PRO_UID'];
             $_GET['STEP_UID']=$STEP_UID;
             $_GET['ST_TYPE']=$ST_TYPE;
-            require_once ('triggers_EditWizard.php');
+            require_once('triggers_EditWizard.php');
             die();
         } else {
             // custom trigger edit
@@ -72,25 +72,24 @@ $aFields['STEP_UID'] = isset($_GET['STEP_UID'])?$_GET['STEP_UID']:'';
 $aFields['ST_TYPE'] = isset($_GET['ST_TYPE'])?$_GET['ST_TYPE']:'';
 
 $G_PUBLISH = new Publisher();
-$G_PUBLISH->AddContent( 'xmlform', 'xmlform', $xmlform, '', $aFields, $xmlform_action );
-$oHeadPublisher =& headPublisher::getSingleton();
+$G_PUBLISH->AddContent('xmlform', 'xmlform', $xmlform, '', $aFields, $xmlform_action);
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addCssFile('/js/codemirror/lib/codemirror.css', 1);
 $oHeadPublisher->addCssFile('/js/codemirror/addon/hint/show-hint.css', 1);
 $oHeadPublisher->addScriptFile('/js/codemirror/lib/codemirror.js', 1);
-$oHeadPublisher->addScriptFile("/js/codemirror/addon/edit/matchbrackets.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/xml/xml.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/javascript/javascript.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/css/css.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/clike/clike.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/addon/hint/show-hint.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/addon/hint/php-hint.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/php/php.js",1);
+$oHeadPublisher->addScriptFile("/js/codemirror/addon/edit/matchbrackets.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/xml/xml.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/javascript/javascript.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/css/css.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/clike/clike.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/addon/hint/show-hint.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/addon/hint/php-hint.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/php/php.js", 1);
 
 //Hack: CodeMirror needed to run Internet Explorer
-$ie = (strrpos($_SERVER['HTTP_USER_AGENT'], "MSIE") === false ) ? false : true;
+$ie = (strrpos($_SERVER['HTTP_USER_AGENT'], "MSIE") === false) ? false : true;
 if ($ie) {
     echo "<!DOCTYPE html>\n";
 }
 
-G::RenderPage( 'publish', 'blank' );
-
+G::RenderPage('publish', 'blank');
diff --git a/workflow/engine/methods/triggers/triggers_EditCustom.php b/workflow/engine/methods/triggers/triggers_EditCustom.php
index f9d8b6f5a..144dbc4c6 100644
--- a/workflow/engine/methods/triggers/triggers_EditCustom.php
+++ b/workflow/engine/methods/triggers/triggers_EditCustom.php
@@ -21,34 +21,33 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_FACTORY" )) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess("PM_FACTORY")) != 1) {
     return $RBAC_Response;
 }
-require_once ('classes/model/Triggers.php');
+require_once('classes/model/Triggers.php');
 
 $aFields['PRO_UID'] = $_GET['PRO_UID'];
 $aFields['TRI_TYPE'] = 'SCRIPT';
 $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
 $aFields['PARTNER_FLAG'] = $partnerFlag;
-if (isset( $_GET['TRI_UID'] ) && ($_GET['TRI_UID'] != "")) {
+if (isset($_GET['TRI_UID']) && ($_GET['TRI_UID'] != "")) {
     $oTrigger = new Triggers();
-    $aFields = $oTrigger->load( $_GET['TRI_UID'] );
+    $aFields = $oTrigger->load($_GET['TRI_UID']);
 }
 $xmlform = 'triggers/triggersCustom';
 
 $G_PUBLISH = new Publisher();
-$G_PUBLISH->AddContent( 'xmlform', 'xmlform', $xmlform, '', $aFields, '../triggers/triggers_Save' );
-$oHeadPublisher =& headPublisher::getSingleton();
+$G_PUBLISH->AddContent('xmlform', 'xmlform', $xmlform, '', $aFields, '../triggers/triggers_Save');
+$oHeadPublisher = headPublisher::getSingleton();
 //$oHeadPublisher->addScriptFile('/js/codemirror/js/codemirror.js', 1);
 $oHeadPublisher->addScriptFile('/js/codemirror/lib/codemirror.js', 1);
-$oHeadPublisher->addScriptFile("/js/codemirror/addon/edit/matchbrackets.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/htmlmixed/htmlmixed.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/xml/xml.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/javascript/javascript.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/css/css.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/clike/clike.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/addon/hint/show-hint.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/addon/hint/php-hint.js",1);
-$oHeadPublisher->addScriptFile("/js/codemirror/mode/php/php.js",1);
-G::RenderPage( 'publish', 'raw' );
-
+$oHeadPublisher->addScriptFile("/js/codemirror/addon/edit/matchbrackets.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/htmlmixed/htmlmixed.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/xml/xml.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/javascript/javascript.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/css/css.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/clike/clike.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/addon/hint/show-hint.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/addon/hint/php-hint.js", 1);
+$oHeadPublisher->addScriptFile("/js/codemirror/mode/php/php.js", 1);
+G::RenderPage('publish', 'raw');
diff --git a/workflow/engine/methods/users/myInfo.php b/workflow/engine/methods/users/myInfo.php
index 62cf69fef..2e4a827db 100644
--- a/workflow/engine/methods/users/myInfo.php
+++ b/workflow/engine/methods/users/myInfo.php
@@ -25,15 +25,14 @@
 $G_MAIN_MENU = 'processmaker';
 $G_ID_MENU_SELECTED = 'MY_ACCOUNT';
 $G_PUBLISH = new Publisher();
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 $oHeadPublisher->addScriptFile('/jscore/src/PM.js');
 $oHeadPublisher->addScriptFile('/jscore/src/Sessions.js');
 
-if (isset( $_GET['type'] )) {
-    $G_PUBLISH->AddContent( 'view', 'users/usersReload' );
-    G::RenderPage( "publishBlank", "blank" );
+if (isset($_GET['type'])) {
+    $G_PUBLISH->AddContent('view', 'users/usersReload');
+    G::RenderPage("publishBlank", "blank");
 } else {
-    $G_PUBLISH->AddContent( 'view', 'users/usersLoad' );
-    G::RenderPage( "publish" );
+    $G_PUBLISH->AddContent('view', 'users/usersLoad');
+    G::RenderPage("publish");
 }
-
diff --git a/workflow/engine/methods/users/userMain.php b/workflow/engine/methods/users/userMain.php
index a700ba780..dcf5cc6d8 100644
--- a/workflow/engine/methods/users/userMain.php
+++ b/workflow/engine/methods/users/userMain.php
@@ -1,8 +1,7 @@
 <?php
-$headPublisher = &headPublisher::getSingleton();
+$headPublisher = headPublisher::getSingleton();
 $headPublisher->addContent("users" . PATH_SEP . "userMain"); //Adding a html file .html
 $headPublisher->addExtJsScript("users" . PATH_SEP . "userMain", true); //Adding a javascript file .js
 $headPublisher->assign("CREATE_CLIENT", (isset($_GET["create_app"]))? 1 : 0);
 
 G::RenderPage("publish", "extJs");
-
diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php
index 2532da641..76a2413a1 100644
--- a/workflow/engine/methods/users/usersAjax.php
+++ b/workflow/engine/methods/users/usersAjax.php
@@ -2,11 +2,11 @@
 
 $filter = new InputFilter();
 $_POST = $filter->xssFilterHard($_POST);
-if(isset($_SESSION['USER_LOGGED'])) {
-	$_SESSION['USER_LOGGED'] = $filter->xssFilterHard($_SESSION['USER_LOGGED']);
+if (isset($_SESSION['USER_LOGGED'])) {
+    $_SESSION['USER_LOGGED'] = $filter->xssFilterHard($_SESSION['USER_LOGGED']);
 }
-if(isset($_SESSION['USR_USERNAME'])) {
-	$_SESSION['USR_USERNAME'] = $filter->xssFilterHard($_SESSION['USR_USERNAME']);
+if (isset($_SESSION['USR_USERNAME'])) {
+    $_SESSION['USR_USERNAME'] = $filter->xssFilterHard($_SESSION['USR_USERNAME']);
 }
 
 global $RBAC;
@@ -14,35 +14,35 @@ $result = new StdClass();
 
 switch ($_POST['action']) {
     case 'countryList':
-        require_once ("classes/model/IsoCountry.php");
+        require_once("classes/model/IsoCountry.php");
         $c = new Criteria();
         $c->add(IsoCountryPeer::IC_UID, null, Criteria::ISNOTNULL);
         $c->addAscendingOrderByColumn(IsoCountryPeer::IC_NAME);
 
         $countries = IsoCountryPeer::doSelect($c);
         foreach ($countries as $rowid => $row) {
-            $oData[] = Array('IC_UID' => $row->getICUid(), 'IC_NAME' => $row->getICName());
+            $oData[] = array('IC_UID' => $row->getICUid(), 'IC_NAME' => $row->getICName());
         }
-        print (G::json_encode($oData));
+        print(G::json_encode($oData));
         break;
     case 'stateList':
-        require_once ("classes/model/IsoSubdivision.php");
+        require_once("classes/model/IsoSubdivision.php");
         $c = new Criteria();
         $country = $_POST['IC_UID'];
         $c->add(IsoSubdivisionPeer::IC_UID, $country, Criteria::EQUAL);
         $c->addAscendingOrderByColumn(IsoSubdivisionPeer::IS_NAME);
         $locations = IsoSubdivisionPeer::doSelect($c);
 
-        $oData = Array();
+        $oData = array();
         foreach ($locations as $rowid => $row) {
             if (($row->getISUid() != '') && ($row->getISName() != '')) {
-                $oData[] = Array('IS_UID' => $row->getISUid(), 'IS_NAME' => $row->getISName());
+                $oData[] = array('IS_UID' => $row->getISUid(), 'IS_NAME' => $row->getISName());
             }
         }
-        print (G::json_encode($oData));
+        print(G::json_encode($oData));
         break;
     case 'locationList':
-        require_once ("classes/model/IsoLocation.php");
+        require_once("classes/model/IsoLocation.php");
         $c = new Criteria();
         $country = $_POST['IC_UID'];
         $state = $_POST['IS_UID'];
@@ -51,13 +51,13 @@ switch ($_POST['action']) {
         $c->addAscendingOrderByColumn(IsoLocationPeer::IL_NAME);
         $locations = IsoLocationPeer::doSelect($c);
 
-        $oData = Array();
+        $oData = array();
         foreach ($locations as $rowid => $row) {
             if (($row->getILUid() != '') && ($row->getILName() != '')) {
-                $oData[] = Array('IL_UID' => $row->getILUid(), 'IL_NAME' => $row->getILName());
+                $oData[] = array('IL_UID' => $row->getILUid(), 'IL_NAME' => $row->getILName());
             }
         }
-        print (G::json_encode($oData));
+        print(G::json_encode($oData));
         break;
     case 'usersList':
         $filter = (isset($_POST['filter']))? $_POST['filter'] : '';
@@ -95,7 +95,7 @@ switch ($_POST['action']) {
                 $oData[] = array('CALENDAR_UID' => $row['CALENDAR_UID'], 'CALENDAR_NAME' => $row['CALENDAR_NAME']);
             }
         }
-        print (G::json_encode($oData));
+        print(G::json_encode($oData));
         break;
     case 'rolesList':
         require_once PATH_RBAC . "model/Roles.php";
@@ -104,13 +104,13 @@ switch ($_POST['action']) {
         foreach ($rolesData as $rowid => $row) {
             $oData[] = array('ROL_UID' => $row['ROL_CODE'], 'ROL_CODE' => $row['ROL_NAME']);
         }
-        print (G::json_encode($oData));
+        print(G::json_encode($oData));
         break;
     case 'getUserLogedRole':
         require_once 'classes/model/Users.php';
         $oUser = new Users();
         $aUserLog = $oUser->loadDetailed($_SESSION['USER_LOGGED']);
-        print (G::json_encode(array(
+        print(G::json_encode(array(
             'USR_UID' => $aUserLog['USR_UID'],
             'USR_USERNAME' => $aUserLog['USR_USERNAME'],
             'USR_ROLE' => $aUserLog['USR_ROLE']
@@ -121,10 +121,10 @@ switch ($_POST['action']) {
         $langs = $Translations->getTranslationEnvironments();
         $oData[] = array('LAN_ID' => '', 'LAN_NAME' => '- ' . G::LoadTranslation('ID_NONE') . ' -');
         foreach ($langs as $lang) {
-            $oData[] = array ('LAN_ID' => $lang['LOCALE'],'LAN_NAME' => $lang['LANGUAGE']
+            $oData[] = array('LAN_ID' => $lang['LOCALE'],'LAN_NAME' => $lang['LANGUAGE']
             );
         }
-        print (G::json_encode($oData));
+        print(G::json_encode($oData));
         break;
     case 'saveUser':
     case 'savePersonalInfo':
@@ -136,7 +136,7 @@ switch ($_POST['action']) {
             $form = $user->checkPermissionForEdit($_SESSION['USER_LOGGED'], $permissionsToSaveData, $form);
 
             switch ($_POST['action']) {
-                case 'saveUser';
+                case 'saveUser':
                     if (!$user->checkPermission($_SESSION['USER_LOGGED'], 'PM_USERS')) {
                         throw new Exception(G::LoadTranslation('ID_USER_NOT_HAVE_PERMISSION', [$_SESSION['USER_LOGGED']]));
                     }
@@ -180,7 +180,7 @@ switch ($_POST['action']) {
             $def_menu = isset($form['PREF_DEFAULT_MENUSELECTED']) ? $form['PREF_DEFAULT_MENUSELECTED'] : '';
             $def_cases_menu = isset($form['PREF_DEFAULT_CASES_MENUSELECTED']) ? $form['PREF_DEFAULT_CASES_MENUSELECTED'] : '';
             $oConf = new Configurations();
-            $aConf = Array('DEFAULT_LANG' => $def_lang, 'DEFAULT_MENU' => $def_menu, 'DEFAULT_CASES_MENU' => $def_cases_menu);
+            $aConf = array('DEFAULT_LANG' => $def_lang, 'DEFAULT_MENU' => $def_menu, 'DEFAULT_CASES_MENU' => $def_cases_menu);
             $oConf->aConfig = $aConf;
             $oConf->saveConfig('USER_PREFERENCES', '', '', $userUid);
 
@@ -205,12 +205,12 @@ switch ($_POST['action']) {
 
             $result = new stdClass();
             $result->success = true;
-            print (G::json_encode($result));
+            print(G::json_encode($result));
         } catch (Exception $e) {
             $result = new stdClass();
             $result->success = false;
             $result->error = $e->getMessage();
-            print (G::json_encode($result));
+            print(G::json_encode($result));
         }
         break;
     case 'userData':
@@ -302,7 +302,6 @@ switch ($_POST['action']) {
 
         if ($aFields['PREF_DEFAULT_CASES_MENUSELECTED'] != '') {
             foreach ($oMenu->Id as $i => $item) {
-
                 if ($aFields['PREF_DEFAULT_CASES_MENUSELECTED'] == $item) {
                     $casesMenuSelected = $oMenu->Labels[$i];
                 }
@@ -333,39 +332,39 @@ switch ($_POST['action']) {
         $result->user = $aFields;
         $result->permission = $permissions;
 
-        print (G::json_encode($result));
+        print(G::json_encode($result));
         break;
     case 'defaultMainMenuOptionList':
         foreach ($RBAC->aUserInfo['PROCESSMAKER']['PERMISSIONS'] as $permission) {
             switch ($permission['PER_CODE']) {
                 case 'PM_USERS':
                 case 'PM_SETUP':
-                    $rows[] = Array('id' => 'PM_SETUP', 'name' => strtoupper(G::LoadTranslation('ID_SETUP'))
+                    $rows[] = array('id' => 'PM_SETUP', 'name' => strtoupper(G::LoadTranslation('ID_SETUP'))
                     );
                     break;
                 case 'PM_CASES':
-                    $rows[] = Array('id' => 'PM_CASES', 'name' => strtoupper(G::LoadTranslation('ID_CASES'))
+                    $rows[] = array('id' => 'PM_CASES', 'name' => strtoupper(G::LoadTranslation('ID_CASES'))
                     );
                     break;
                 case 'PM_FACTORY':
-                    $rows[] = Array('id' => 'PM_FACTORY', 'name' => strtoupper(G::LoadTranslation('ID_APPLICATIONS'))
+                    $rows[] = array('id' => 'PM_FACTORY', 'name' => strtoupper(G::LoadTranslation('ID_APPLICATIONS'))
                     );
                     break;
                 case 'PM_DASHBOARD':
-                    $rows[] = Array('id' => 'PM_DASHBOARD', 'name' => strtoupper(G::LoadTranslation('ID_DASHBOARD'))
+                    $rows[] = array('id' => 'PM_DASHBOARD', 'name' => strtoupper(G::LoadTranslation('ID_DASHBOARD'))
                     );
                     /*----------------------------------********---------------------------------*/
                     // NEW DASHBOARD MODULE
-                    $licensedFeatures = & PMLicensedFeatures::getSingleton();
+                    $licensedFeatures = PMLicensedFeatures::getSingleton();
                     if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=')) {
-                        $rows[] = Array('id' => 'PM_STRATEGIC_DASHBOARD', 'name' => strtoupper(G::LoadTranslation('ID_STRATEGIC_DASHBOARD'))
+                        $rows[] = array('id' => 'PM_STRATEGIC_DASHBOARD', 'name' => strtoupper(G::LoadTranslation('ID_STRATEGIC_DASHBOARD'))
                         );
                     }
                     /*----------------------------------********---------------------------------*/
                     break;
             }
         }
-        print (G::json_encode($rows));
+        print(G::json_encode($rows));
         break;
     case 'defaultCasesMenuOptionList':
 
@@ -374,10 +373,10 @@ switch ($_POST['action']) {
 
         foreach ($oMenu->Id as $i => $item) {
             if ($oMenu->Types[$i] != 'blockHeader') {
-                $rowsCasesMenu[] = Array('id' => $item, 'name' => $oMenu->Labels[$i]);
+                $rowsCasesMenu[] = array('id' => $item, 'name' => $oMenu->Labels[$i]);
             }
         }
-        print (G::json_encode($rowsCasesMenu));
+        print(G::json_encode($rowsCasesMenu));
         break;
     case 'testPassword':
         require_once 'classes/model/UsersProperties.php';
@@ -430,7 +429,7 @@ switch ($_POST['action']) {
         $span = '<span style="color: ' . $color . '; font: 9px tahoma,arial,helvetica,sans-serif;">';
         $gif = '<img width="13" height="13" border="0" src="' . $img . '">';
         $aFields['DESCRIPTION'] = $span . $gif . $aFields['DESCRIPTION'];
-        print (G::json_encode($aFields));
+        print(G::json_encode($aFields));
         break;
     case 'testUsername':
         require_once 'classes/model/Users.php';
@@ -475,7 +474,7 @@ switch ($_POST['action']) {
         $password = $_POST["password"];
         $resultLogin = $RBAC->VerifyLogin($_SESSION["USR_USERNAME"], $password);
 
-        if($resultLogin ==  $_SESSION["USER_LOGGED"]) {
+        if ($resultLogin ==  $_SESSION["USER_LOGGED"]) {
             $messageResultLogin = "OK";
         } else {
             $messageResultLogin = "ERROR";
diff --git a/workflow/engine/methods/users/usersEdit.php b/workflow/engine/methods/users/usersEdit.php
index 991d67410..7da8ea820 100644
--- a/workflow/engine/methods/users/usersEdit.php
+++ b/workflow/engine/methods/users/usersEdit.php
@@ -9,13 +9,13 @@ if (isset($_GET['USR_UID']) && RBAC::isGuestUserUid($_GET['USR_UID'])) {
 //calculating the max upload file size;
 use ProcessMaker\Core\System;
 
-$POST_MAX_SIZE = ini_get( 'post_max_size' );
-$mul = substr( $POST_MAX_SIZE, - 1 );
+$POST_MAX_SIZE = ini_get('post_max_size');
+$mul = substr($POST_MAX_SIZE, - 1);
 $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
 $postMaxSize = (int) $POST_MAX_SIZE * $mul;
 
-$UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
-$mul = substr( $UPLOAD_MAX_SIZE, - 1 );
+$UPLOAD_MAX_SIZE = ini_get('upload_max_filesize');
+$mul = substr($UPLOAD_MAX_SIZE, - 1);
 $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
 $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
 
@@ -25,16 +25,16 @@ if ($postMaxSize < $uploadMaxSize) {
 //Add year by expiration date
 $expirationDate = 1;
 $envFile = PATH_CONFIG . 'env.ini';
-if (file_exists($envFile) ) {
+if (file_exists($envFile)) {
     $sysConf = System::getSystemConfiguration($envFile);
-    if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){
-       $expirationDate = abs($sysConf['expiration_year']);
+    if (isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0) {
+        $expirationDate = abs($sysConf['expiration_year']);
     }
 }
 
 $languageManagement = 0;
 /*----------------------------------********---------------------------------*/
-$licensedFeatures = & PMLicensedFeatures::getSingleton();
+$licensedFeatures = PMLicensedFeatures::getSingleton();
 if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkdKR3ROS0VzWGdoLzNQYz0=')) {
     $languageManagement = 1;
 }
@@ -42,17 +42,18 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
 
 $arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
-$oHeadPublisher->assign( 'USR_UID', $_GET['USR_UID'] );
-$oHeadPublisher->assign( 'MODE', $_GET['MODE'] );
-$oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' );
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('users/users', true); //adding a javascript file .js
+$oHeadPublisher->assign('USR_UID', $_GET['USR_UID']);
+$oHeadPublisher->assign('MODE', $_GET['MODE']);
+$oHeadPublisher->assign('MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ');
 $oHeadPublisher->assign('SYSTEM_TIME_ZONE', $arraySystemConfiguration['time_zone']);
-$oHeadPublisher->assign('TIME_ZONE_DATA', array_map(function ($value) { return [$value, $value]; }, DateTimeZone::listIdentifiers()));
+$oHeadPublisher->assign('TIME_ZONE_DATA', array_map(function ($value) {
+    return [$value, $value];
+}, DateTimeZone::listIdentifiers()));
 $oHeadPublisher->assign('__SYSTEM_UTC_TIME_ZONE__', (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__'])? 1 : 0);
 $oHeadPublisher->assign('EXPIRATION_DATE', $expirationDate);
 $oHeadPublisher->assign('LANGUAGE_MANAGEMENT', $languageManagement);
 $oHeadPublisher->assign('__ACTION__', 'saveUser');
 
-G::RenderPage( 'publish', 'extJs' );
-
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/users/usersGroups.php b/workflow/engine/methods/users/usersGroups.php
index 9767f0210..8d15ecd6e 100644
--- a/workflow/engine/methods/users/usersGroups.php
+++ b/workflow/engine/methods/users/usersGroups.php
@@ -22,27 +22,27 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
-if (($RBAC_Response = $RBAC->userCanAccess( "PM_LOGIN" )) != 1) {
+if (($RBAC_Response = $RBAC->userCanAccess("PM_LOGIN")) != 1) {
     return $RBAC_Response;
 }
 global $RBAC;
 
-$access = $RBAC->userCanAccess( 'PM_USERS' );
+$access = $RBAC->userCanAccess('PM_USERS');
 if ($access != 1) {
     switch ($access) {
         case - 1:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         case - 2:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
         default:
-            G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
-            G::header( 'location: ../login/login' );
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
             die();
             break;
     }
@@ -55,16 +55,16 @@ $G_ID_SUB_MENU_SELECTED = 'USERS';
 $G_PUBLISH = new Publisher();
 
 $c = new Configurations();
-$configEnv = $c->getConfiguration( 'ENVIRONMENT_SETTINGS', '' );
-$Config['fullNameFormat'] = isset( $configEnv['format'] ) ? $configEnv['format'] : '@firstName @lastName (@userName)';
+$configEnv = $c->getConfiguration('ENVIRONMENT_SETTINGS', '');
+$Config['fullNameFormat'] = isset($configEnv['format']) ? $configEnv['format'] : '@firstName @lastName (@userName)';
 
 $oCriteria = new Criteria();
-$oCriteria->addSelectColumn( UsersPeer::USR_FIRSTNAME );
-$oCriteria->addSelectColumn( UsersPeer::USR_LASTNAME );
-$oCriteria->addSelectColumn( UsersPeer::USR_USERNAME );
-$oCriteria->add( UsersPeer::USR_UID, $_GET['uUID'] );
-$oDataset = UsersPeer::doSelectRS( $oCriteria );
-$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+$oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
+$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
+$oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
+$oCriteria->add(UsersPeer::USR_UID, $_GET['uUID']);
+$oDataset = UsersPeer::doSelectRS($oCriteria);
+$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 $oDataset->next();
 $aRow = $oDataset->getRow();
 
@@ -91,12 +91,11 @@ $users["USR_AUTH_SOURCE"] = (isset($arrayAuthSources[$_GET["uUID"]]))? $arrayAut
 $users["fullNameFormat"]  = $Config["fullNameFormat"];
 $users["CURRENT_TAB"] = $ctab;
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( 'users/usersGroups', false ); //adding a javascript file .js
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('users/usersGroups', false); //adding a javascript file .js
 // $oHeadPublisher->addContent('users/usersGroups'); //adding a html file  .html.
-$oHeadPublisher->assign( 'USERS', $users );
+$oHeadPublisher->assign('USERS', $users);
 
-$oHeadPublisher->assign( 'hasAuthPerm', ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' ) == 1) );
-
-G::RenderPage( 'publish', 'extJs' );
+$oHeadPublisher->assign('hasAuthPerm', ($RBAC->userCanAccess('PM_SETUP_ADVANCE') == 1));
 
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/users/usersInit.php b/workflow/engine/methods/users/usersInit.php
index 5d2cb136f..2cde34963 100644
--- a/workflow/engine/methods/users/usersInit.php
+++ b/workflow/engine/methods/users/usersInit.php
@@ -4,11 +4,11 @@ global $RBAC;
 use ProcessMaker\Core\System;
 
 require_once 'classes/model/Users.php';
-unset( $_SESSION['CURRENT_USER'] );
+unset($_SESSION['CURRENT_USER']);
 $oUser = new Users();
-$aFields = $oUser->load( $_SESSION['USER_LOGGED'] );
+$aFields = $oUser->load($_SESSION['USER_LOGGED']);
 
-if ($RBAC->userCanAccess( 'PM_EDITPERSONALINFO' ) == 1) { //he has permitions for edit his profile
+if ($RBAC->userCanAccess('PM_EDITPERSONALINFO') == 1) { //he has permitions for edit his profile
     $canEdit = false;
 } else { //he has not permitions for edit his profile, so just view mode will be displayed
     $canEdit = true;
@@ -17,13 +17,13 @@ $canEditCalendar = $RBAC->userCanAccess('PM_EDITPERSONALINFO') == 1 &&
         $RBAC->userCanAccess('PM_EDITPERSONALINFO_CALENDAR') == 1;
 
 //calculating the max upload file size;
-$POST_MAX_SIZE = ini_get( 'post_max_size' );
-$mul = substr( $POST_MAX_SIZE, - 1 );
+$POST_MAX_SIZE = ini_get('post_max_size');
+$mul = substr($POST_MAX_SIZE, - 1);
 $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
 $postMaxSize = (int) $POST_MAX_SIZE * $mul;
 
-$UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
-$mul = substr( $UPLOAD_MAX_SIZE, - 1 );
+$UPLOAD_MAX_SIZE = ini_get('upload_max_filesize');
+$mul = substr($UPLOAD_MAX_SIZE, - 1);
 $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
 $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
 
@@ -33,16 +33,16 @@ if ($postMaxSize < $uploadMaxSize) {
 //Add year by expiration date
 $expirationDate = 1;
 $envFile = PATH_CONFIG . 'env.ini';
-if (file_exists($envFile) ) {
+if (file_exists($envFile)) {
     $sysConf = System::getSystemConfiguration($envFile);
-    if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){
-       $expirationDate = abs($sysConf['expiration_year']);
+    if (isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0) {
+        $expirationDate = abs($sysConf['expiration_year']);
     }
 }
 
 $languageManagement = 0;
 /*----------------------------------********---------------------------------*/
-$licensedFeatures = & PMLicensedFeatures::getSingleton();
+$licensedFeatures = PMLicensedFeatures::getSingleton();
 if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkdKR3ROS0VzWGdoLzNQYz0=')) {
     $languageManagement = 1;
 }
@@ -50,21 +50,23 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
 
 $arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('users/users', true); //adding a javascript file .js
 // $oHeadPublisher->addContent('users/users'); //adding a html file  .html.
-$oHeadPublisher->assign( 'USR_UID', $aFields['USR_UID'] );
-$oHeadPublisher->assign( 'infoMode', true );
-$oHeadPublisher->assign( 'EDITPROFILE', 1);
-$oHeadPublisher->assign( 'canEdit', $canEdit );
+$oHeadPublisher->assign('USR_UID', $aFields['USR_UID']);
+$oHeadPublisher->assign('infoMode', true);
+$oHeadPublisher->assign('EDITPROFILE', 1);
+$oHeadPublisher->assign('canEdit', $canEdit);
 $oHeadPublisher->assign('canEditCalendar', $canEditCalendar);
-$oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' );
-$oHeadPublisher->assign( 'MODE', '' );
+$oHeadPublisher->assign('MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ');
+$oHeadPublisher->assign('MODE', '');
 $oHeadPublisher->assign('SYSTEM_TIME_ZONE', $arraySystemConfiguration['time_zone']);
-$oHeadPublisher->assign('TIME_ZONE_DATA', array_map(function ($value) { return [$value, $value]; }, DateTimeZone::listIdentifiers()));
+$oHeadPublisher->assign('TIME_ZONE_DATA', array_map(function ($value) {
+    return [$value, $value];
+}, DateTimeZone::listIdentifiers()));
 $oHeadPublisher->assign('__SYSTEM_UTC_TIME_ZONE__', (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__'])? 1 : 0);
 $oHeadPublisher->assign('EXPIRATION_DATE', $expirationDate);
 $oHeadPublisher->assign('LANGUAGE_MANAGEMENT', $languageManagement);
 $oHeadPublisher->assign('__ACTION__', 'savePersonalInfo');
 
-G::RenderPage( 'publish', 'extJs' );
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/users/usersNew.php b/workflow/engine/methods/users/usersNew.php
index ed48f5cea..41b2c8b0e 100644
--- a/workflow/engine/methods/users/usersNew.php
+++ b/workflow/engine/methods/users/usersNew.php
@@ -3,16 +3,16 @@ global $RBAC;
 
 use ProcessMaker\Core\System;
 
-$RBAC->requirePermissions( 'PM_USERS' );
+$RBAC->requirePermissions('PM_USERS');
 
 //calculating the max upload file size;
-$POST_MAX_SIZE = ini_get( 'post_max_size' );
-$mul = substr( $POST_MAX_SIZE, - 1 );
+$POST_MAX_SIZE = ini_get('post_max_size');
+$mul = substr($POST_MAX_SIZE, - 1);
 $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
 $postMaxSize = (int) $POST_MAX_SIZE * $mul;
 
-$UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' );
-$mul = substr( $UPLOAD_MAX_SIZE, - 1 );
+$UPLOAD_MAX_SIZE = ini_get('upload_max_filesize');
+$mul = substr($UPLOAD_MAX_SIZE, - 1);
 $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1)));
 $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul;
 
@@ -22,17 +22,17 @@ if ($postMaxSize < $uploadMaxSize) {
 //Add year by expiration date
 $expirationDate = 1;
 $envFile = PATH_CONFIG . 'env.ini';
-if (file_exists($envFile) ) {
+if (file_exists($envFile)) {
     $sysConf = System::getSystemConfiguration($envFile);
-    if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){
-       $expirationDate = abs($sysConf['expiration_year']);
+    if (isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0) {
+        $expirationDate = abs($sysConf['expiration_year']);
     }
 }
 
 $languageManagement = 0;
 
 /*----------------------------------********---------------------------------*/
-$licensedFeatures = & PMLicensedFeatures::getSingleton();
+$licensedFeatures = PMLicensedFeatures::getSingleton();
 if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkdKR3ROS0VzWGdoLzNQYz0=')) {
     $languageManagement = 1;
 }
@@ -40,17 +40,18 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
 
 $arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
 
-$oHeadPublisher = & headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('users/users', true); //adding a javascript file .js
 $oHeadPublisher->assign('USR_UID', '');
 $oHeadPublisher->assign('MODE', $_GET['MODE']);
 $oHeadPublisher->assign('MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ');
 $oHeadPublisher->assign('SYSTEM_TIME_ZONE', $arraySystemConfiguration['time_zone']);
-$oHeadPublisher->assign('TIME_ZONE_DATA', array_map(function ($value) { return [$value, $value]; }, DateTimeZone::listIdentifiers()));
+$oHeadPublisher->assign('TIME_ZONE_DATA', array_map(function ($value) {
+    return [$value, $value];
+}, DateTimeZone::listIdentifiers()));
 $oHeadPublisher->assign('__SYSTEM_UTC_TIME_ZONE__', (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__'])? 1 : 0);
 $oHeadPublisher->assign('EXPIRATION_DATE', $expirationDate);
 $oHeadPublisher->assign('LANGUAGE_MANAGEMENT', $languageManagement);
 $oHeadPublisher->assign('__ACTION__', 'saveUser');
 
-G::RenderPage( 'publish', 'extJs' );
-
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/users/users_List.php b/workflow/engine/methods/users/users_List.php
index af0a7d1ba..d6c96b9d7 100644
--- a/workflow/engine/methods/users/users_List.php
+++ b/workflow/engine/methods/users/users_List.php
@@ -1,68 +1,68 @@
-<?php
-/**
- * users_List.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- */
-$RBAC_Response = $RBAC->requirePermissions('PM_USERS');
-if (!$RBAC_Response)
-    return $RBAC_Response;
-global $RBAC;
-
-$access = $RBAC->userCanAccess('PM_USERS');
-if ($access != 1) {
-    switch ($access) {
-        case -1:
-            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-            G::header('location: ../login/login');
-            die();
-            break;
-        case -2:
-            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
-            G::header('location: ../login/login');
-            die();
-            break;
-        default:
-            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-            G::header('location: ../login/login');
-            die();
-            break;
-    }
-}
-
-$G_MAIN_MENU = 'processmaker';
-$G_SUB_MENU = 'users';
-$G_ID_MENU_SELECTED = 'USERS';
-$G_ID_SUB_MENU_SELECTED = 'USERS';
-
-$G_PUBLISH = new Publisher();
-
-$c = new Configurations();
-$configPage = $c->getConfiguration('usersList', 'pageSize', '', $_SESSION['USER_LOGGED']);
-$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
-
-$oHeadPublisher = &headPublisher::getSingleton();
-$oHeadPublisher->addExtJsScript('users/usersList', false); //adding a javascript file .js
-$oHeadPublisher->addContent('users/usersList'); //adding a html file  .html.
-$oHeadPublisher->assign('CONFIG', $Config);
-$oHeadPublisher->assign('FORMATS', $c->getFormats());
-
-G::RenderPage( 'publish', 'extJs' );
-
+<?php
+/**
+ * users_List.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ */
+$RBAC_Response = $RBAC->requirePermissions('PM_USERS');
+if (!$RBAC_Response) {
+    return $RBAC_Response;
+}
+global $RBAC;
+
+$access = $RBAC->userCanAccess('PM_USERS');
+if ($access != 1) {
+    switch ($access) {
+        case -1:
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
+            die();
+            break;
+        case -2:
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', 'error', 'labels');
+            G::header('location: ../login/login');
+            die();
+            break;
+        default:
+            G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
+            G::header('location: ../login/login');
+            die();
+            break;
+    }
+}
+
+$G_MAIN_MENU = 'processmaker';
+$G_SUB_MENU = 'users';
+$G_ID_MENU_SELECTED = 'USERS';
+$G_ID_SUB_MENU_SELECTED = 'USERS';
+
+$G_PUBLISH = new Publisher();
+
+$c = new Configurations();
+$configPage = $c->getConfiguration('usersList', 'pageSize', '', $_SESSION['USER_LOGGED']);
+$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
+
+$oHeadPublisher = headPublisher::getSingleton();
+$oHeadPublisher->addExtJsScript('users/usersList', false); //adding a javascript file .js
+$oHeadPublisher->addContent('users/usersList'); //adding a html file  .html.
+$oHeadPublisher->assign('CONFIG', $Config);
+$oHeadPublisher->assign('FORMATS', $c->getFormats());
+
+G::RenderPage('publish', 'extJs');
diff --git a/workflow/engine/methods/webentry/access.php b/workflow/engine/methods/webentry/access.php
index a2f925d3d..168aa021b 100644
--- a/workflow/engine/methods/webentry/access.php
+++ b/workflow/engine/methods/webentry/access.php
@@ -27,7 +27,7 @@ $webEntryModel = \WebEntryPeer::retrieveByPK($weUid);
         <META HTTP-EQUIV="Expires" CONTENT="-1">
         <script src="/js/bluebird/bluebird.min.js"></script>
         <?php
-            $oHeadPublisher = & headPublisher::getSingleton();
+            $oHeadPublisher = headPublisher::getSingleton();
             echo $oHeadPublisher->getExtJsStylesheets(SYS_SKIN);
         ?>
         <style>
diff --git a/workflow/engine/plugins/charts.php b/workflow/engine/plugins/charts.php
index cd6002cad..4d790e270 100644
--- a/workflow/engine/plugins/charts.php
+++ b/workflow/engine/plugins/charts.php
@@ -1,35 +1,29 @@
 <?php
-  
- class chartsPlugin extends PMPlugin 
+
+ class chartsPlugin extends PMPlugin
  {
-    function chartsPlugin($sNamespace, $sFilename = null) 
-    {
-        $res = parent::PMPlugin($sNamespace, $sFilename);
-        $this->sFriendlyName = 'Charts Plugin';
-        $this->sDescription  = 'This plugin shows generic charts for ProcessMaker';
-        $this->sPluginFolder = 'charts';
-        $this->sSetupPage    = 'setupPage';
-        $this->aWorkspaces = array (  );
-        $this->iVersion = 0.45;
-        $this->bPrivate = true;
-        return $res;
-    }
+     public function chartsPlugin($sNamespace, $sFilename = null)
+     {
+         $res = parent::PMPlugin($sNamespace, $sFilename);
+         $this->sFriendlyName = 'Charts Plugin';
+         $this->sDescription  = 'This plugin shows generic charts for ProcessMaker';
+         $this->sPluginFolder = 'charts';
+         $this->sSetupPage    = 'setupPage';
+         $this->aWorkspaces = array(  );
+         $this->iVersion = 0.45;
+         $this->bPrivate = true;
+         return $res;
+     }
 
-    function setup()
-    {
-      $this->registerTrigger( 10000, 'createCaseFolder' );
-    }
+     public function setup()
+     {
+         $this->registerTrigger(10000, 'createCaseFolder');
+     }
 
-    function install()
-    {
-      
-    }
-  }
+     public function install()
+     {
+     }
+ }
 
- $oPluginRegistry =& PMPluginRegistry::getSingleton();
+ $oPluginRegistry = PMPluginRegistry::getSingleton();
  $oPluginRegistry->registerPlugin('charts', __FILE__);
-
-
-
-  
-  
diff --git a/workflow/engine/plugins/processTemplate.php b/workflow/engine/plugins/processTemplate.php
index 43aaebfa7..13d907907 100644
--- a/workflow/engine/plugins/processTemplate.php
+++ b/workflow/engine/plugins/processTemplate.php
@@ -1,10 +1,10 @@
 <?php 
 /**
  * processTemplate.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * 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
@@ -14,54 +14,48 @@
  * 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., 
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
+ *
  */
 
- class processTemplatePlugin extends PMPlugin 
+ class processTemplatePlugin extends PMPlugin
  {
-    function processTemplatePlugin($sNamespace, $sFilename = null) 
-    {
-        $res = parent::PMPlugin($sNamespace, $sFilename);
-        $this->sFriendlyName = 'Process Map Templates';
-        $this->sDescription  = 'This plugin includes various templates for quick and easy Process Map creation. Users can customize Process Maps based on pre-defined templates of common process designs (including Parallel, Dual Start Task, and Selection).';
-        $this->sPluginFolder = 'processTemplate';
-        $this->sSetupPage    = null;
-        $this->iVersion      = 0.78;
-        $this->bPrivate      = true;
-        $this->aWorkspaces   = array ( '__' );
-        return $res;
-    }
+     public function processTemplatePlugin($sNamespace, $sFilename = null)
+     {
+         $res = parent::PMPlugin($sNamespace, $sFilename);
+         $this->sFriendlyName = 'Process Map Templates';
+         $this->sDescription  = 'This plugin includes various templates for quick and easy Process Map creation. Users can customize Process Maps based on pre-defined templates of common process designs (including Parallel, Dual Start Task, and Selection).';
+         $this->sPluginFolder = 'processTemplate';
+         $this->sSetupPage    = null;
+         $this->iVersion      = 0.78;
+         $this->bPrivate      = true;
+         $this->aWorkspaces   = array( '__' );
+         return $res;
+     }
 
-    function setup()
-    {
-      //$this->registerTrigger( PM_NEW_PROCESS_LIST, 'getNewProcessTemplateList' );
+     public function setup()
+     {
+         //$this->registerTrigger( PM_NEW_PROCESS_LIST, 'getNewProcessTemplateList' );
       //$this->registerTrigger( PM_NEW_PROCESS_SAVE, 'saveNewProcess' );
       //$this->registerTrigger( PM_NEW_DYNAFORM_LIST, 'getNewDynaformTemplateList' );
       //$this->registerTrigger( PM_NEW_DYNAFORM_SAVE, 'saveNewDynaform' );
-    }
+     }
     
-    function install()
-    {
-      
-    }
-    function enable(){
-      
-    }
-    function disable(){
-      
-    }
-  }
+     public function install()
+     {
+     }
+     public function enable()
+     {
+     }
+     public function disable()
+     {
+     }
+ }
 
- $oPluginRegistry =& PMPluginRegistry::getSingleton();
+ $oPluginRegistry = PMPluginRegistry::getSingleton();
  $oPluginRegistry->registerPlugin('processTemplate', __FILE__);
-
-
-
-  
-  
diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php
index a299596fe..036670c33 100644
--- a/workflow/engine/skinEngine/skinEngine.php
+++ b/workflow/engine/skinEngine/skinEngine.php
@@ -3,6 +3,7 @@
  * Class SkinEngine
  *
  * This class load and dispatch the main systems layouts
+ *
  * @author Erik Amaru Ortiz <erik@colosa.com>
  * @author Hugo Loza
  */
@@ -118,7 +119,6 @@ class SkinEngine
         if ($skinObject && file_exists($skinObject . PATH_SEP . 'config.xml')
             && file_exists($skinObject . PATH_SEP . 'layout.html')
         ) {
-
             $configurationFile = $skinObject . PATH_SEP . 'config.xml';
             $layoutFile = $skinObject . PATH_SEP . 'layout.html';
 
@@ -204,7 +204,7 @@ class SkinEngine
         G::verifyPath(PATH_SMARTY_CACHE, true);
 
         $smarty = new Smarty();
-        $oHeadPublisher =& headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
 
         $smarty->template_dir = $this->layoutFileRaw['dirname'];
         $smarty->compile_dir = PATH_SMARTY_C;
@@ -222,15 +222,14 @@ class SkinEngine
 
     private function _plain()
     {
-        $oHeadPublisher = &headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
         echo $oHeadPublisher->renderExtJs();
     }
 
     private function _extjs()
     {
-
-        $oServerConf =& ServerConf::getSingleton();
-        $oHeadPublisher =& headPublisher::getSingleton();
+        $oServerConf = ServerConf::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
 
         if ($oHeadPublisher->extJsInit === true) {
             $header = $oHeadPublisher->getExtJsVariablesScript();
@@ -271,13 +270,19 @@ class SkinEngine
         $meta = null;
         $dirBody = null;
 
-        if (isset($_SERVER["HTTP_USER_AGENT"]) && preg_match("/^.*\(.*Trident.(\d+)\..+\).*$/",
-                $_SERVER["HTTP_USER_AGENT"], $arrayMatch)
+        if (isset($_SERVER["HTTP_USER_AGENT"]) && preg_match(
+                "/^.*\(.*Trident.(\d+)\..+\).*$/",
+                $_SERVER["HTTP_USER_AGENT"],
+                $arrayMatch
+            )
         ) {
 
             //Get the IE version
-            if (preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"],
-                    $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)
+            if (preg_match(
+                    "/^.*\(.*MSIE (\d+)\..+\).*$/",
+                    $_SERVER["HTTP_USER_AGENT"],
+                    $arrayMatch
+                ) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)
             ) {
                 $ie = intval($arrayMatch[1]);
             }
@@ -308,7 +313,7 @@ class SkinEngine
             }
         }
 
-        $serverConf = &ServerConf::getSingleton();
+        $serverConf = ServerConf::getSingleton();
 
         if ($serverConf->isRtl(SYS_LANG)) {
             $dirBody = "dir=\"RTL\"";
@@ -331,7 +336,7 @@ class SkinEngine
         G::verifyPath(PATH_SMARTY_CACHE, true);
 
         $smarty = new Smarty();
-        $oHeadPublisher =& headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
 
         $smarty->template_dir = $this->layoutFileBlank['dirname'];
         $smarty->compile_dir = PATH_SMARTY_C;
@@ -367,7 +372,7 @@ class SkinEngine
         G::verifyPath(PATH_SMARTY_CACHE, true);
 
         $smarty = new Smarty();
-        $oHeadPublisher = &headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
 
         $smarty->template_dir = $this->layoutFileSubmenu['dirname'];
         $smarty->compile_dir = PATH_SMARTY_C;
@@ -415,8 +420,13 @@ class SkinEngine
             }
 
             $oMenu = new Menu();
-            $menus = $oMenu->generateArrayForTemplate($G_MAIN_MENU, 'SelectedMenu', 'mainMenu', $G_MENU_SELECTED,
-                $G_ID_MENU_SELECTED);
+            $menus = $oMenu->generateArrayForTemplate(
+                $G_MAIN_MENU,
+                'SelectedMenu',
+                'mainMenu',
+                $G_MENU_SELECTED,
+                $G_ID_MENU_SELECTED
+            );
             $smarty->assign('menus', $menus);
 
             if (substr(SYS_SKIN, 0, 2) == 'ux') {
@@ -425,8 +435,13 @@ class SkinEngine
             }
 
             $oSubMenu = new Menu();
-            $subMenus = $oSubMenu->generateArrayForTemplate($G_SUB_MENU, 'selectedSubMenu', 'subMenu',
-                $G_SUB_MENU_SELECTED, $G_ID_SUB_MENU_SELECTED);
+            $subMenus = $oSubMenu->generateArrayForTemplate(
+                $G_SUB_MENU,
+                'selectedSubMenu',
+                'subMenu',
+                $G_SUB_MENU_SELECTED,
+                $G_ID_SUB_MENU_SELECTED
+            );
             $smarty->assign('subMenus', $subMenus);
 
             if (!defined('NO_DISPLAY_USERNAME')) {
@@ -444,9 +459,15 @@ class SkinEngine
 
                 $conf = new Configurations();
                 $conf->getFormats();
-                $name = $conf->userNameFormat(isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '',
-                    isset($_SESSION['USR_FULLNAME']) ? htmlentities($_SESSION['USR_FULLNAME'], ENT_QUOTES,
-                        'UTF-8') : '', isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : '');
+                $name = $conf->userNameFormat(
+                    isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '',
+                    isset($_SESSION['USR_FULLNAME']) ? htmlentities(
+                        $_SESSION['USR_FULLNAME'],
+                        ENT_QUOTES,
+                        'UTF-8'
+                    ) : '',
+                    isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : ''
+                );
                 $smarty->assign('user', $name);
             }
 
@@ -482,7 +503,7 @@ class SkinEngine
         G::verifyPath(PATH_SMARTY_CACHE, true);
 
         $smarty = new Smarty();
-        $oHeadPublisher =& headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
 
         $smarty->template_dir = PATH_SKINS;
         $smarty->compile_dir = PATH_SMARTY_C;
@@ -530,13 +551,23 @@ class SkinEngine
             global $G_ID_SUB_MENU_SELECTED;
 
             $oMenu = new Menu();
-            $menus = $oMenu->generateArrayForTemplate($G_MAIN_MENU, 'SelectedMenu', 'mainMenu', $G_MENU_SELECTED,
-                $G_ID_MENU_SELECTED);
+            $menus = $oMenu->generateArrayForTemplate(
+                $G_MAIN_MENU,
+                'SelectedMenu',
+                'mainMenu',
+                $G_MENU_SELECTED,
+                $G_ID_MENU_SELECTED
+            );
             $smarty->assign('menus', $menus);
 
             $oSubMenu = new Menu();
-            $subMenus = $oSubMenu->generateArrayForTemplate($G_SUB_MENU, 'selectedSubMenu', 'subMenu',
-                $G_SUB_MENU_SELECTED, $G_ID_SUB_MENU_SELECTED);
+            $subMenus = $oSubMenu->generateArrayForTemplate(
+                $G_SUB_MENU,
+                'selectedSubMenu',
+                'subMenu',
+                $G_SUB_MENU_SELECTED,
+                $G_ID_SUB_MENU_SELECTED
+            );
             $smarty->assign('subMenus', $subMenus);
 
             $smarty->assign('user', isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '');
@@ -561,9 +592,8 @@ class SkinEngine
 
     private function _mvc()
     {
-
-        $oServerConf =& ServerConf::getSingleton();
-        $oHeadPublisher =& headPublisher::getSingleton();
+        $oServerConf = ServerConf::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
 
         $smarty = new Smarty();
 
@@ -647,7 +677,7 @@ class SkinEngine
         G::verifyPath(PATH_SMARTY_CACHE, true);
 
         $smarty = new Smarty();
-        $oHeadPublisher = &headPublisher::getSingleton();
+        $oHeadPublisher = headPublisher::getSingleton();
 
         $smarty->compile_dir = PATH_SMARTY_C;
         $smarty->cache_dir = PATH_SMARTY_CACHE;
@@ -655,13 +685,13 @@ class SkinEngine
 
         //To setup en extJS Theme for this Skin
 
-        $oServerConf =& ServerConf::getSingleton();
+        $oServerConf = ServerConf::getSingleton();
         $extSkin = $oServerConf->getProperty("extSkin");
 
         if (!$extSkin) {
             $extSkin = [SYS_SKIN => "xtheme-gray"];
             $oServerConf->setProperty("extSkin", $extSkin);
-        } else if (empty($extSkin[SYS_SKIN])) {
+        } elseif (empty($extSkin[SYS_SKIN])) {
             $extSkin[SYS_SKIN] = "xtheme-gray";
             $oServerConf->setProperty("extSkin", $extSkin);
         }
@@ -682,9 +712,15 @@ class SkinEngine
             if (preg_match("/^.*\(.*Trident.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arrayMatch)) {
 
                 //Get the IE version
-                if (preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"],
-                        $arrayMatch) || preg_match("/^.*\(.*rv.(\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"],
-                        $arrayMatch)
+                if (preg_match(
+                        "/^.*\(.*MSIE (\d+)\..+\).*$/",
+                        $_SERVER["HTTP_USER_AGENT"],
+                        $arrayMatch
+                    ) || preg_match(
+                        "/^.*\(.*rv.(\d+)\..+\).*$/",
+                        $_SERVER["HTTP_USER_AGENT"],
+                        $arrayMatch
+                    )
                 ) {
                     $ie = intval($arrayMatch[1]);
                 }
@@ -740,13 +776,23 @@ class SkinEngine
             }
 
             $oMenu = new Menu();
-            $menus = $oMenu->generateArrayForTemplate($G_MAIN_MENU, 'SelectedMenu', 'mainMenu', $G_MENU_SELECTED,
-                $G_ID_MENU_SELECTED);
+            $menus = $oMenu->generateArrayForTemplate(
+                $G_MAIN_MENU,
+                'SelectedMenu',
+                'mainMenu',
+                $G_MENU_SELECTED,
+                $G_ID_MENU_SELECTED
+            );
             $smarty->assign('menus', $menus);
 
             $oSubMenu = new Menu();
-            $subMenus = $oSubMenu->generateArrayForTemplate($G_SUB_MENU, 'selectedSubMenu', 'subMenu',
-                $G_SUB_MENU_SELECTED, $G_ID_SUB_MENU_SELECTED);
+            $subMenus = $oSubMenu->generateArrayForTemplate(
+                $G_SUB_MENU,
+                'selectedSubMenu',
+                'subMenu',
+                $G_SUB_MENU_SELECTED,
+                $G_ID_SUB_MENU_SELECTED
+            );
             $smarty->assign('subMenus', $subMenus);
 
             if (!defined('NO_DISPLAY_USERNAME')) {
@@ -757,11 +803,15 @@ class SkinEngine
 
                 $smarty->assign('user_logged', (isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : ''));
                 if (SYS_SKIN == 'neoclassic') {
-                    $smarty->assign('tracker',
-                        (SYS_COLLECTION == 'tracker') ? (($G_PUBLISH->Parts[0]['File'] != 'tracker/loginpm3') ? true : '') : '');
+                    $smarty->assign(
+                        'tracker',
+                        (SYS_COLLECTION == 'tracker') ? (($G_PUBLISH->Parts[0]['File'] != 'tracker/loginpm3') ? true : '') : ''
+                    );
                 } else {
-                    $smarty->assign('tracker',
-                        (SYS_COLLECTION == 'tracker') ? (($G_PUBLISH->Parts[0]['File'] != 'tracker/login') ? true : '') : '');
+                    $smarty->assign(
+                        'tracker',
+                        (SYS_COLLECTION == 'tracker') ? (($G_PUBLISH->Parts[0]['File'] != 'tracker/login') ? true : '') : ''
+                    );
                 }
                 $smarty->assign('switch_interface', $switch_interface);
                 $smarty->assign('switch_interface_label', G::LoadTranslation('ID_SWITCH_INTERFACE'));
@@ -774,14 +824,20 @@ class SkinEngine
 
                 $conf = new Configurations();
                 $conf->getFormats();
-                $name = $conf->userNameFormat(isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '',
-                    isset($_SESSION['USR_FULLNAME']) ? htmlentities($_SESSION['USR_FULLNAME'], ENT_QUOTES,
-                        'UTF-8') : '', isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : '');
+                $name = $conf->userNameFormat(
+                    isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '',
+                    isset($_SESSION['USR_FULLNAME']) ? htmlentities(
+                        $_SESSION['USR_FULLNAME'],
+                        ENT_QUOTES,
+                        'UTF-8'
+                    ) : '',
+                    isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : ''
+                );
                 $smarty->assign('user', $name);
             }
 
             if (!empty(config("system.workspace"))) {
-                $pmLicenseManagerO = &PmLicenseManager::getSingleton();
+                $pmLicenseManagerO = PmLicenseManager::getSingleton();
                 $expireIn = $pmLicenseManagerO->getExpireIn();
                 $expireInLabel = $pmLicenseManagerO->getExpireInLabel();
 
@@ -790,8 +846,10 @@ class SkinEngine
                     $RBAC->aUserInfo['PROCESSMAKER']['ROLE']['ROL_CODE'] == 'PROCESSMAKER_ADMIN'
                 ) {
                     if ($expireInLabel != '') {
-                        $smarty->assign('msgVer',
-                            '<label class="textBlack">' . $expireInLabel . '</label>&nbsp;&nbsp;');
+                        $smarty->assign(
+                            'msgVer',
+                            '<label class="textBlack">' . $expireInLabel . '</label>&nbsp;&nbsp;'
+                        );
                     }
                 }
             }
@@ -819,7 +877,8 @@ class SkinEngine
             }
             if (class_exists('ProcessMaker\Plugins\PluginRegistry') && !empty(config("system.workspace"))) {
                 $oPluginRegistry = PluginRegistry::loadSingleton();
-                if (isset($sFotoSelect) && $sFotoSelect != '' && !(strcmp($sWspaceSelect, config("system.workspace")))) {
+                if (isset($sFotoSelect) && $sFotoSelect != '' && !(strcmp($sWspaceSelect,
+                        config("system.workspace")))) {
                     $sCompanyLogo = $oPluginRegistry->getCompanyLogo($sFotoSelect);
                     $sCompanyLogo = "/sys" . config("system.workspace") . "/" . SYS_LANG . "/" . SYS_SKIN . "/setup/showLogoFile.php?id=" . base64_encode($sCompanyLogo);
                 } else {
@@ -836,4 +895,3 @@ class SkinEngine
         }
     }
 }
-
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php
index 68444e554..4ac78cad0 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/ChangeLog.php
@@ -102,11 +102,19 @@ class ChangeLog
             }
             if ($index < $start) {
                 $index += $this->updateData(
-                    $data, $row, $this->hasPermission($row['DYN_UID']), false);
+                    $data,
+                    $row,
+                    $this->hasPermission($row['DYN_UID']),
+                    false
+                );
                 continue;
             }
-            $a = $this->updateData($data, $row,
-                                   $this->hasPermission($row['DYN_UID']), true);
+            $a = $this->updateData(
+                $data,
+                $row,
+                                   $this->hasPermission($row['DYN_UID']),
+                true
+            );
             $limit-= $a;
             $index+= $a;
         }
@@ -154,12 +162,12 @@ class ChangeLog
                     $node = new StdClass();
                     $node->field = $key;
                     $previousValue = !isset($this->values[$key]) ? null : $this->values[$key];
-                    if(!is_array($previousValue)){
+                    if (!is_array($previousValue)) {
                         $node->previousValue = (string) $previousValue;
                     } else {
                         $node->previousValue = "<br />".nl2br(print_r($previousValue, true));
                     }
-                    if(!is_array($value)){
+                    if (!is_array($value)) {
                         $node->currentValue = (string) $value;
                     } else {
                         $node->currentValue = "<br />".nl2br(print_r($value, true));
@@ -250,7 +258,7 @@ class ChangeLog
      */
     private function hasPermission($uid)
     {
-        if(array_search($uid, $this->reservedSteps)!==false) {
+        if (array_search($uid, $this->reservedSteps)!==false) {
             return false;
         }
         foreach ($this->permissions as $type => $ids) {
@@ -260,4 +268,4 @@ class ChangeLog
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php
index 131de7047..48f7d44fd 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php
@@ -81,8 +81,10 @@ class OutputDocument
                 $criteria2->add(\ObjectPermissionPeer::OP_OBJ_TYPE, "OUTPUT", \Criteria::EQUAL);
                 $criteria2->add(
                     $criteria2->getNewCriterion(\ObjectPermissionPeer::OP_OBJ_UID, $outputDocumentUid, \Criteria::EQUAL)->addOr(
-                    $criteria2->getNewCriterion(\ObjectPermissionPeer::OP_OBJ_UID, "0", \Criteria::EQUAL))->addOr(
-                    $criteria2->getNewCriterion(\ObjectPermissionPeer::OP_OBJ_UID, "", \Criteria::EQUAL))
+                    $criteria2->getNewCriterion(\ObjectPermissionPeer::OP_OBJ_UID, "0", \Criteria::EQUAL)
+                    )->addOr(
+                    $criteria2->getNewCriterion(\ObjectPermissionPeer::OP_OBJ_UID, "", \Criteria::EQUAL)
+                    )
                 );
                 $criteria2->add(\ObjectPermissionPeer::OP_ACTION, "DELETE", \Criteria::EQUAL);
 
@@ -203,16 +205,16 @@ class OutputDocument
     {
         try {
             $oCase = new \Cases();
-            $fields = $oCase->loadCase( $applicationUid );
+            $fields = $oCase->loadCase($applicationUid);
             $sProcessUID = $fields['PRO_UID'];
             $sTaskUID = '';
             $oCriteria = new \ProcessMaker\BusinessModel\Cases();
-            $oCriteria->getAllGeneratedDocumentsCriteria( $sProcessUID, $applicationUid, $sTaskUID, $userUid);
-            $result = array ();
+            $oCriteria->getAllGeneratedDocumentsCriteria($sProcessUID, $applicationUid, $sTaskUID, $userUid);
+            $result = array();
             global $_DBArray;
             foreach ($_DBArray['outputDocuments'] as $key => $row) {
-                if (isset( $row['DOC_VERSION'] )) {
-                    $docrow = array ();
+                if (isset($row['DOC_VERSION'])) {
+                    $docrow = array();
                     $docrow['app_doc_uid'] = $row['APP_DOC_UID'];
                     $docrow['app_doc_filename'] = $row['DOWNLOAD_FILE'];
                     $docrow['doc_uid'] = $row['DOC_UID'];
@@ -246,16 +248,16 @@ class OutputDocument
             $sApplicationUID = $applicationUid;
             $sUserUID = $userUid;
             $oCase = new \Cases();
-            $fields = $oCase->loadCase( $sApplicationUID );
+            $fields = $oCase->loadCase($sApplicationUID);
             $sProcessUID = $fields['PRO_UID'];
             $sTaskUID = '';
             $oCaseRest = new \ProcessMaker\BusinessModel\Cases();
-            $oCaseRest->getAllGeneratedDocumentsCriteria( $sProcessUID, $sApplicationUID, $sTaskUID, $sUserUID );
-            $result = array ();
+            $oCaseRest->getAllGeneratedDocumentsCriteria($sProcessUID, $sApplicationUID, $sTaskUID, $sUserUID);
+            $result = array();
             global $_DBArray;
             foreach ($_DBArray['outputDocuments'] as $key => $row) {
-                if (isset( $row['DOC_VERSION'] )) {
-                    $docrow = array ();
+                if (isset($row['DOC_VERSION'])) {
+                    $docrow = array();
                     $docrow['app_doc_uid'] = $row['APP_DOC_UID'];
                     $docrow['app_doc_filename'] = $row['DOWNLOAD_FILE'];
                     $docrow['doc_uid'] = $row['DOC_UID'];
@@ -266,8 +268,8 @@ class OutputDocument
                     $docrow['app_doc_index'] = $row['APP_DOC_INDEX'];
                     $docrow['app_doc_link'] = $row['DOWNLOAD_LINK'];
                     if ($docrow['app_doc_uid'] == $applicationDocumentUid) {
-                        $oAppDocument = \AppDocumentPeer::retrieveByPK( $applicationDocumentUid, $row['DOC_VERSION'] );
-                        if (is_null( $oAppDocument )) {
+                        $oAppDocument = \AppDocumentPeer::retrieveByPK($applicationDocumentUid, $row['DOC_VERSION']);
+                        if (is_null($oAppDocument)) {
                             throw new \Exception(\G::LoadTranslation("ID_CASES_OUTPUT_DOES_NOT_EXIST", array($applicationDocumentUid)));
                         }
                         $result = $docrow;
@@ -413,12 +415,12 @@ class OutputDocument
         try {
             $oAppDocumentVersion = new \AppDocument();
             $lastDocVersion = $oAppDocumentVersion->getLastAppDocVersion($applicationDocumentUid);
-            $oAppDocument = \AppDocumentPeer::retrieveByPK( $applicationDocumentUid, $lastDocVersion);
-            if (is_null( $oAppDocument ) || $oAppDocument->getAppDocStatus() == 'DELETED') {
+            $oAppDocument = \AppDocumentPeer::retrieveByPK($applicationDocumentUid, $lastDocVersion);
+            if (is_null($oAppDocument) || $oAppDocument->getAppDocStatus() == 'DELETED') {
                 throw new \Exception(\G::LoadTranslation("ID_CASES_OUTPUT_DOES_NOT_EXIST", array($applicationDocumentUid)));
             }
-            $aFields = array ('APP_DOC_UID' => $applicationDocumentUid,'DOC_VERSION' => $lastDocVersion,'APP_DOC_STATUS' => 'DELETED');
-            $oAppDocument->update( $aFields );
+            $aFields = array('APP_DOC_UID' => $applicationDocumentUid,'DOC_VERSION' => $lastDocVersion,'APP_DOC_STATUS' => 'DELETED');
+            $oAppDocument->update($aFields);
         } catch (\Exception $e) {
             throw $e;
         }
@@ -443,47 +445,47 @@ class OutputDocument
             $g = new \G();
             $g->sessionVarSave();
             $oCase = new \Cases();
-            $oCase->thisIsTheCurrentUser( $sApplication, $index, $sUserLogged, '', 'casesListExtJs' );
+            $oCase->thisIsTheCurrentUser($sApplication, $index, $sUserLogged, '', 'casesListExtJs');
             //require_once 'classes/model/OutputDocument.php';
             $oOutputDocument = new \OutputDocument();
-            $aOD = $oOutputDocument->load( $outputID );
-            $Fields = $oCase->loadCase( $sApplication );
-            $sFilename = preg_replace( '[^A-Za-z0-9_]', '_', \G::replaceDataField( $aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA'] ) );
-            require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppFolder.php");
-            require_once (PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppDocument.php");
+            $aOD = $oOutputDocument->load($outputID);
+            $Fields = $oCase->loadCase($sApplication);
+            $sFilename = preg_replace('[^A-Za-z0-9_]', '_', \G::replaceDataField($aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA']));
+            require_once(PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppFolder.php");
+            require_once(PATH_TRUNK . "workflow" . PATH_SEP . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "AppDocument.php");
             //Get the Custom Folder ID (create if necessary)
             $oFolder = new \AppFolder();
-            $folderId = $oFolder->createFromPath( $aOD['OUT_DOC_DESTINATION_PATH'], $sApplication );
+            $folderId = $oFolder->createFromPath($aOD['OUT_DOC_DESTINATION_PATH'], $sApplication);
             //Tags
-            $fileTags = $oFolder->parseTags( $aOD['OUT_DOC_TAGS'], $sApplication );
+            $fileTags = $oFolder->parseTags($aOD['OUT_DOC_TAGS'], $sApplication);
             //Get last Document Version and apply versioning if is enabled
             $oAppDocument = new \AppDocument();
-            $lastDocVersion = $oAppDocument->getLastDocVersion( $outputID, $sApplication );
-            $oCriteria = new \Criteria( 'workflow' );
-            $oCriteria->add( \AppDocumentPeer::APP_UID, $sApplication );
-            $oCriteria->add( \AppDocumentPeer::DOC_UID, $outputID );
-            $oCriteria->add( \AppDocumentPeer::DOC_VERSION, $lastDocVersion );
-            $oCriteria->add( \AppDocumentPeer::APP_DOC_TYPE, 'OUTPUT' );
-            $oDataset = \AppDocumentPeer::doSelectRS( $oCriteria );
-            $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
+            $lastDocVersion = $oAppDocument->getLastDocVersion($outputID, $sApplication);
+            $oCriteria = new \Criteria('workflow');
+            $oCriteria->add(\AppDocumentPeer::APP_UID, $sApplication);
+            $oCriteria->add(\AppDocumentPeer::DOC_UID, $outputID);
+            $oCriteria->add(\AppDocumentPeer::DOC_VERSION, $lastDocVersion);
+            $oCriteria->add(\AppDocumentPeer::APP_DOC_TYPE, 'OUTPUT');
+            $oDataset = \AppDocumentPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
             if (($aOD['OUT_DOC_VERSIONING']) && ($lastDocVersion != 0)) {
                 //Create new Version of current output
                 $lastDocVersion ++;
                 if ($aRow = $oDataset->getRow()) {
-                    $aFields = array ('APP_DOC_UID' => $aRow['APP_DOC_UID'],'APP_UID' => $sApplication,'DEL_INDEX' => $index,'DOC_UID' => $outputID,'DOC_VERSION' => $lastDocVersion + 1,'USR_UID' => $sUserLogged,'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags);
+                    $aFields = array('APP_DOC_UID' => $aRow['APP_DOC_UID'],'APP_UID' => $sApplication,'DEL_INDEX' => $index,'DOC_UID' => $outputID,'DOC_VERSION' => $lastDocVersion + 1,'USR_UID' => $sUserLogged,'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date('Y-m-d H:i:s'),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags);
                     $oAppDocument = new \AppDocument();
-                    $oAppDocument->create( $aFields );
+                    $oAppDocument->create($aFields);
                     $sDocUID = $aRow['APP_DOC_UID'];
                 }
             } else {
                 ////No versioning so Update a current Output or Create new if no exist
                 if ($aRow = $oDataset->getRow()) {
                     //Update
-                    $aFields = array ('APP_DOC_UID' => $aRow['APP_DOC_UID'],'APP_UID' => $sApplication,'DEL_INDEX' => $index,'DOC_UID' => $outputID,'DOC_VERSION' => $lastDocVersion,'USR_UID' => $sUserLogged,'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags
+                    $aFields = array('APP_DOC_UID' => $aRow['APP_DOC_UID'],'APP_UID' => $sApplication,'DEL_INDEX' => $index,'DOC_UID' => $outputID,'DOC_VERSION' => $lastDocVersion,'USR_UID' => $sUserLogged,'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date('Y-m-d H:i:s'),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags
                     );
                     $oAppDocument = new \AppDocument();
-                    $oAppDocument->update( $aFields );
+                    $oAppDocument->update($aFields);
                     $sDocUID = $aRow['APP_DOC_UID'];
                 } else {
                     //we are creating the appdocument row
@@ -491,92 +493,92 @@ class OutputDocument
                     if ($lastDocVersion == 0) {
                         $lastDocVersion ++;
                     }
-                    $aFields = array ('APP_UID' => $sApplication,'DEL_INDEX' => $index,'DOC_UID' => $outputID,'DOC_VERSION' => $lastDocVersion,'USR_UID' => $sUserLogged,'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date( 'Y-m-d H:i:s' ),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags
+                    $aFields = array('APP_UID' => $sApplication,'DEL_INDEX' => $index,'DOC_UID' => $outputID,'DOC_VERSION' => $lastDocVersion,'USR_UID' => $sUserLogged,'APP_DOC_TYPE' => 'OUTPUT','APP_DOC_CREATE_DATE' => date('Y-m-d H:i:s'),'APP_DOC_FILENAME' => $sFilename,'FOLDER_UID' => $folderId,'APP_DOC_TAGS' => $fileTags
                     );
                     $oAppDocument = new \AppDocument();
-                    $aFields['APP_DOC_UID'] = $sDocUID = $oAppDocument->create( $aFields );
+                    $aFields['APP_DOC_UID'] = $sDocUID = $oAppDocument->create($aFields);
                 }
             }
             $sFilename = $aFields['APP_DOC_UID'] . "_" . $lastDocVersion;
             $pathOutput = PATH_DOCUMENT . \G::getPathFromUID($sApplication) . PATH_SEP . 'outdocs' . PATH_SEP; //G::pr($sFilename);die;
-            \G::mk_dir( $pathOutput );
-            $aProperties = array ();
-            if (! isset( $aOD['OUT_DOC_MEDIA'] )) {
+            \G::mk_dir($pathOutput);
+            $aProperties = array();
+            if (! isset($aOD['OUT_DOC_MEDIA'])) {
                 $aOD['OUT_DOC_MEDIA'] = 'Letter';
             }
-            if (! isset( $aOD['OUT_DOC_LEFT_MARGIN'] )) {
+            if (! isset($aOD['OUT_DOC_LEFT_MARGIN'])) {
                 $aOD['OUT_DOC_LEFT_MARGIN'] = '15';
             }
-            if (! isset( $aOD['OUT_DOC_RIGHT_MARGIN'] )) {
+            if (! isset($aOD['OUT_DOC_RIGHT_MARGIN'])) {
                 $aOD['OUT_DOC_RIGHT_MARGIN'] = '15';
             }
-            if (! isset( $aOD['OUT_DOC_TOP_MARGIN'] )) {
+            if (! isset($aOD['OUT_DOC_TOP_MARGIN'])) {
                 $aOD['OUT_DOC_TOP_MARGIN'] = '15';
             }
-            if (! isset( $aOD['OUT_DOC_BOTTOM_MARGIN'] )) {
+            if (! isset($aOD['OUT_DOC_BOTTOM_MARGIN'])) {
                 $aOD['OUT_DOC_BOTTOM_MARGIN'] = '15';
             }
             $aProperties['media'] = $aOD['OUT_DOC_MEDIA'];
-            $aProperties['margins'] = array ('left' => $aOD['OUT_DOC_LEFT_MARGIN'],'right' => $aOD['OUT_DOC_RIGHT_MARGIN'],'top' => $aOD['OUT_DOC_TOP_MARGIN'],'bottom' => $aOD['OUT_DOC_BOTTOM_MARGIN']
+            $aProperties['margins'] = array('left' => $aOD['OUT_DOC_LEFT_MARGIN'],'right' => $aOD['OUT_DOC_RIGHT_MARGIN'],'top' => $aOD['OUT_DOC_TOP_MARGIN'],'bottom' => $aOD['OUT_DOC_BOTTOM_MARGIN']
             );
             if (isset($aOD['OUT_DOC_REPORT_GENERATOR'])) {
                 $aProperties['report_generator'] = $aOD['OUT_DOC_REPORT_GENERATOR'];
             }
-            $this->generate( $outputID, $Fields['APP_DATA'], $pathOutput, $sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean) $aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'], $aProperties , $applicationUid);
+            $this->generate($outputID, $Fields['APP_DATA'], $pathOutput, $sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean) $aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'], $aProperties, $applicationUid);
 
             //Plugin Hook PM_UPLOAD_DOCUMENT for upload document
             $oPluginRegistry = PluginRegistry::loadSingleton();
-            if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT ) && class_exists( 'uploadDocumentData' )) {
-                $triggerDetail = $oPluginRegistry->getTriggerInfo( PM_UPLOAD_DOCUMENT );
+            if ($oPluginRegistry->existsTrigger(PM_UPLOAD_DOCUMENT) && class_exists('uploadDocumentData')) {
+                $triggerDetail = $oPluginRegistry->getTriggerInfo(PM_UPLOAD_DOCUMENT);
                 $aFields['APP_DOC_PLUGIN'] = $triggerDetail->getNamespace();
                 $oAppDocument1 = new \AppDocument();
-                $oAppDocument1->update( $aFields );
+                $oAppDocument1->update($aFields);
                 $sPathName = PATH_DOCUMENT . \G::getPathFromUID($sApplication) . PATH_SEP;
                 $oData['APP_UID'] = $sApplication;
                 $oData['ATTACHMENT_FOLDER'] = true;
                 switch ($aOD['OUT_DOC_GENERATE']) {
                     case "BOTH":
-                        $documentData = new \uploadDocumentData( $sApplication, $sUserLogged, $pathOutput . $sFilename . '.pdf', $sFilename . '.pdf', $sDocUID, $oAppDocument->getDocVersion() );
+                        $documentData = new \uploadDocumentData($sApplication, $sUserLogged, $pathOutput . $sFilename . '.pdf', $sFilename . '.pdf', $sDocUID, $oAppDocument->getDocVersion());
                         $documentData->sFileType = "PDF";
                         $documentData->bUseOutputFolder = true;
-                        $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
+                        $uploadReturn = $oPluginRegistry->executeTriggers(PM_UPLOAD_DOCUMENT, $documentData);
                         if ($uploadReturn) {
                             //Only delete if the file was saved correctly
-                            unlink( $pathOutput . $sFilename . '.pdf' );
+                            unlink($pathOutput . $sFilename . '.pdf');
                         }
-                        $documentData = new \uploadDocumentData( $sApplication, $sUserLogged, $pathOutput . $sFilename . '.doc', $sFilename . '.doc', $sDocUID, $oAppDocument->getDocVersion() );
+                        $documentData = new \uploadDocumentData($sApplication, $sUserLogged, $pathOutput . $sFilename . '.doc', $sFilename . '.doc', $sDocUID, $oAppDocument->getDocVersion());
                         $documentData->sFileType = "DOC";
                         $documentData->bUseOutputFolder = true;
-                        $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
+                        $uploadReturn = $oPluginRegistry->executeTriggers(PM_UPLOAD_DOCUMENT, $documentData);
                         if ($uploadReturn) {
                             //Only delete if the file was saved correctly
-                            unlink( $pathOutput . $sFilename . '.doc' );
+                            unlink($pathOutput . $sFilename . '.doc');
                         }
                         break;
                     case "PDF":
-                        $documentData = new \uploadDocumentData( $sApplication, $sUserLogged, $pathOutput . $sFilename . '.pdf', $sFilename . '.pdf', $sDocUID, $oAppDocument->getDocVersion() );
+                        $documentData = new \uploadDocumentData($sApplication, $sUserLogged, $pathOutput . $sFilename . '.pdf', $sFilename . '.pdf', $sDocUID, $oAppDocument->getDocVersion());
                         $documentData->sFileType = "PDF";
                         $documentData->bUseOutputFolder = true;
-                        $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
+                        $uploadReturn = $oPluginRegistry->executeTriggers(PM_UPLOAD_DOCUMENT, $documentData);
                         if ($uploadReturn) {
                             //Only delete if the file was saved correctly
-                            unlink( $pathOutput . $sFilename . '.pdf' );
+                            unlink($pathOutput . $sFilename . '.pdf');
                         }
                         break;
                     case "DOC":
-                        $documentData = new \uploadDocumentData( $sApplication, $sUserLogged, $pathOutput . $sFilename . '.doc', $sFilename . '.doc', $sDocUID, $oAppDocument->getDocVersion() );
+                        $documentData = new \uploadDocumentData($sApplication, $sUserLogged, $pathOutput . $sFilename . '.doc', $sFilename . '.doc', $sDocUID, $oAppDocument->getDocVersion());
                         $documentData->sFileType = "DOC";
                         $documentData->bUseOutputFolder = true;
-                        $uploadReturn = $oPluginRegistry->executeTriggers( PM_UPLOAD_DOCUMENT, $documentData );
+                        $uploadReturn = $oPluginRegistry->executeTriggers(PM_UPLOAD_DOCUMENT, $documentData);
                         if ($uploadReturn) {
                             //Only delete if the file was saved correctly
-                            unlink( $pathOutput . $sFilename . '.doc' );
+                            unlink($pathOutput . $sFilename . '.doc');
                         }
                         break;
                 }
             }
             $g->sessionVarRestore();
-            $oAppDocument = \AppDocumentPeer::retrieveByPK( $aFields['APP_DOC_UID'], $lastDocVersion);
+            $oAppDocument = \AppDocumentPeer::retrieveByPK($aFields['APP_DOC_UID'], $lastDocVersion);
             if ($oAppDocument->getAppDocStatus() == 'DELETED') {
                 $oAppDocument->setAppDocStatus('ACTIVE');
                 $oAppDocument->save();
@@ -746,7 +748,13 @@ class OutputDocument
             /* End - Create .pdf */
         } else {
             return \PEAR::raiseError(
-                null, G_ERROR_USER_UID, null, null, 'You tried to call to a generate method without send the Output Document UID, fields to use and the file path!', 'G_Error', true
+                null,
+                G_ERROR_USER_UID,
+                null,
+                null,
+                'You tried to call to a generate method without send the Output Document UID, fields to use and the file path!',
+                'G_Error',
+                true
             );
         }
     }
@@ -764,8 +772,8 @@ class OutputDocument
         define("MAX_FREE_FRACTION", 1);
         define('PATH_OUTPUT_FILE_DIRECTORY', PATH_HTML . 'files/' . $sApplication . '/outdocs/');
         \G::verifyPath(PATH_OUTPUT_FILE_DIRECTORY, true);
-        require_once (PATH_THIRDPARTY . 'html2ps_pdf/config.inc.php');
-        require_once (PATH_THIRDPARTY . 'html2ps_pdf/pipeline.factory.class.php');
+        require_once(PATH_THIRDPARTY . 'html2ps_pdf/config.inc.php');
+        require_once(PATH_THIRDPARTY . 'html2ps_pdf/pipeline.factory.class.php');
         parse_config_file(PATH_THIRDPARTY . 'html2ps_pdf/html2ps.config');
         $GLOBALS['g_config'] = array(
             'cssmedia' => 'screen',
@@ -803,14 +811,16 @@ class OutputDocument
                 $GLOBALS['g_config']['pdfSecurity']['openPassword'] != ""
             ) {
                 $GLOBALS['g_config']['pdfSecurity']['openPassword'] = G::decrypt(
-                    $GLOBALS['g_config']['pdfSecurity']['openPassword'], $sUID
+                    $GLOBALS['g_config']['pdfSecurity']['openPassword'],
+                    $sUID
                 );
             }
             if (isset($GLOBALS['g_config']['pdfSecurity']['ownerPassword']) &&
                 $GLOBALS['g_config']['pdfSecurity']['ownerPassword'] != ""
             ) {
                 $GLOBALS['g_config']['pdfSecurity']['ownerPassword'] = G::decrypt(
-                    $GLOBALS['g_config']['pdfSecurity']['ownerPassword'], $sUID
+                    $GLOBALS['g_config']['pdfSecurity']['ownerPassword'],
+                    $sUID
                 );
             }
             $g_media->set_security($GLOBALS['g_config']['pdfSecurity']);
@@ -887,7 +897,7 @@ class OutputDocument
         }
         $pipeline->output_driver->set_watermark($watermark_text);
         if ($watermark_text != '') {
-            $dispatcher = & $pipeline->getDispatcher();
+            $dispatcher = $pipeline->getDispatcher();
         }
         if ($GLOBALS['g_config']['debugbox']) {
             $pipeline->output_driver->set_debug_boxes(true);
@@ -964,7 +974,7 @@ class OutputDocument
         $arrayAllObjectsFrom = $case->getAllObjectsFrom($processUid, $applicationUid, null, $userUid, $action, $delIndex);
 
         if (array_key_exists('OUTPUT_DOCUMENTS', $arrayAllObjectsFrom) && !empty($arrayAllObjectsFrom['OUTPUT_DOCUMENTS'])) {
-            foreach($arrayAllObjectsFrom['OUTPUT_DOCUMENTS'] as $value) {
+            foreach ($arrayAllObjectsFrom['OUTPUT_DOCUMENTS'] as $value) {
                 if ($value == $appDocumentUid) {
                     return true;
                 }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php
index fea7bf37e..c86ad95a8 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php
@@ -1,17 +1,19 @@
 <?php
+
 namespace ProcessMaker\BusinessModel;
+
 use DynaformHandler;
 
 class DynaForm
 {
     private $arrayFieldDefinition = array(
-        "DYN_UID"         => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(),                  "fieldNameAux" => "dynaFormUid"),
+        "DYN_UID" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "dynaFormUid"),
 
-        "DYN_TITLE"       => array("type" => "string", "required" => true,  "empty" => false, "defaultValues" => array(),                  "fieldNameAux" => "dynaFormTitle"),
-        "DYN_DESCRIPTION" => array("type" => "string", "required" => false, "empty" => true,  "defaultValues" => array(),                  "fieldNameAux" => "dynaFormDescription"),
-        "DYN_TYPE"        => array("type" => "string", "required" => true,  "empty" => false, "defaultValues" => array("xmlform", "grid"), "fieldNameAux" => "dynaFormType"),
-        "DYN_CONTENT"     => array("type" => "string", "required" => false, "empty" => true,  "defaultValues" => array(),                  "fieldNameAux" => "dynaFormContent"),
-        "DYN_VERSION"     => array("type" => "int",    "required" => false,  "empty" => true, "defaultValues" => array(1 ,2),              "fieldNameAux" => "dynaFormVersion")
+        "DYN_TITLE" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "dynaFormTitle"),
+        "DYN_DESCRIPTION" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "dynaFormDescription"),
+        "DYN_TYPE" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array("xmlform", "grid"), "fieldNameAux" => "dynaFormType"),
+        "DYN_CONTENT" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "dynaFormContent"),
+        "DYN_VERSION" => array("type" => "int", "required" => false, "empty" => true, "defaultValues" => array(1, 2), "fieldNameAux" => "dynaFormVersion")
     );
 
     private $formatFieldNameInUppercase = true;
@@ -82,7 +84,7 @@ class DynaForm
     public function getFieldNameByFormatFieldName($fieldName)
     {
         try {
-            return ($this->formatFieldNameInUppercase)? strtoupper($fieldName) : strtolower($fieldName);
+            return ($this->formatFieldNameInUppercase) ? strtoupper($fieldName) : strtolower($fieldName);
         } catch (\Exception $e) {
             throw $e;
         }
@@ -91,8 +93,8 @@ class DynaForm
     /**
      * Verify if exists the title of a DynaForm
      *
-     * @param string $processUid         Unique id of Process
-     * @param string $dynaFormTitle      Title
+     * @param string $processUid Unique id of Process
+     * @param string $dynaFormTitle Title
      * @param string $dynaFormUidExclude Unique id of DynaForm to exclude
      *
      * return bool Return true if exists the title of a DynaForm, false otherwise
@@ -127,18 +129,18 @@ class DynaForm
      * Verify if a DynaForm is assigned some Steps
      *
      * @param string $dynaFormUid Unique id of DynaForm
-     * @param string $processUid  Unique id of Process
+     * @param string $processUid Unique id of Process
      *
      * return bool Return true if a DynaForm is assigned some Steps, false otherwise
      */
     public function dynaFormDepends($dynUid, $proUid)
     {
         $oCriteria = new \Criteria();
-        $oCriteria->addSelectColumn( \DynaformPeer::DYN_TYPE );
-        $oCriteria->add( \DynaformPeer::DYN_UID, $dynUid );
-        $oCriteria->add( \DynaformPeer::PRO_UID, $proUid );
-        $oDataset = \DynaformPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
+        $oCriteria->addSelectColumn(\DynaformPeer::DYN_TYPE);
+        $oCriteria->add(\DynaformPeer::DYN_UID, $dynUid);
+        $oCriteria->add(\DynaformPeer::PRO_UID, $proUid);
+        $oDataset = \DynaformPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         $dataDyna = $oDataset->getRow();
 
@@ -146,23 +148,23 @@ class DynaForm
             $formsDepend = array();
 
 
-            $oCriteria = new \Criteria( 'workflow' );
-            $oCriteria->addSelectColumn( \DynaformPeer::DYN_UID );
-            $oCriteria->addSelectColumn( \DynaformPeer::DYN_TITLE );
-            $oCriteria->add( \DynaformPeer::PRO_UID, $proUid );
-            $oCriteria->add( \DynaformPeer::DYN_TYPE, "xmlform" );
-            $oDataset = \DynaformPeer::doSelectRS( $oCriteria );
-            $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
+            $oCriteria = new \Criteria('workflow');
+            $oCriteria->addSelectColumn(\DynaformPeer::DYN_UID);
+            $oCriteria->addSelectColumn(\DynaformPeer::DYN_TITLE);
+            $oCriteria->add(\DynaformPeer::PRO_UID, $proUid);
+            $oCriteria->add(\DynaformPeer::DYN_TYPE, "xmlform");
+            $oDataset = \DynaformPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
 
             while ($oDataset->next()) {
                 $dataForms = $oDataset->getRow();
                 $dynHandler = new DynaformHandler(PATH_DYNAFORM . $proUid . PATH_SEP . $dataForms["DYN_UID"] . ".xml");
                 $dynFields = $dynHandler->getFields();
                 foreach ($dynFields as $field) {
-                    $sType = \Step::getAttribute( $field, 'type' );
+                    $sType = \Step::getAttribute($field, 'type');
                     if ($sType == 'grid') {
-                        $sxmlgrid = \Step::getAttribute( $field, 'xmlgrid' );
-                        $aGridInfo = explode( "/", $sxmlgrid );
+                        $sxmlgrid = \Step::getAttribute($field, 'xmlgrid');
+                        $aGridInfo = explode("/", $sxmlgrid);
                         if ($aGridInfo[0] == $proUid && $aGridInfo[1] == $dynUid) {
                             $formsDepend[] = $dataForms["DYN_TITLE"];
                         }
@@ -258,7 +260,7 @@ class DynaForm
     /**
      * Throw the exception "The DynaForm doesn't exist"
      *
-     * @param string $dynaFormUid           Unique id of DynaForm
+     * @param string $dynaFormUid Unique id of DynaForm
      * @param string $fieldNameForException Field name for the exception
      *
      * @return void
@@ -273,8 +275,8 @@ class DynaForm
     /**
      * Verify if doesn't exists the DynaForm in table DYNAFORM
      *
-     * @param string $dynaFormUid           Unique id of DynaForm
-     * @param string $processUid            Unique id of Process
+     * @param string $dynaFormUid Unique id of DynaForm
+     * @param string $processUid Unique id of Process
      * @param string $fieldNameForException Field name for the exception
      *
      * return void Throw exception if doesn't exists the DynaForm in table DYNAFORM
@@ -305,10 +307,10 @@ class DynaForm
     /**
      * Verify if exists the title of a DynaForm
      *
-     * @param string $processUid            Unique id of Process
-     * @param string $dynaFormTitle         Title
+     * @param string $processUid Unique id of Process
+     * @param string $dynaFormTitle Title
      * @param string $fieldNameForException Field name for the exception
-     * @param string $dynaFormUidExclude    Unique id of DynaForm to exclude
+     * @param string $dynaFormUidExclude Unique id of DynaForm to exclude
      *
      * return void Throw exception if exists the title of a DynaForm
      */
@@ -326,7 +328,7 @@ class DynaForm
     /**
      * Verify if is not grid DynaForm
      *
-     * @param string $dynaFormUid           Unique id of DynaForm
+     * @param string $dynaFormUid Unique id of DynaForm
      * @param string $fieldNameForException Field name for the exception
      *
      * return void Throw exception if is not grid DynaForm
@@ -350,9 +352,9 @@ class DynaForm
     /**
      * Get DynaForm record
      *
-     * @param string $dynaFormUid                   Unique id of DynaForm
-     * @param array  $arrayVariableNameForException Variable name for exception
-     * @param bool   $throwException Flag to throw the exception if the main parameters are invalid or do not exist
+     * @param string $dynaFormUid Unique id of DynaForm
+     * @param array $arrayVariableNameForException Variable name for exception
+     * @param bool $throwException Flag to throw the exception if the main parameters are invalid or do not exist
      *                               (TRUE: throw the exception; FALSE: returns FALSE)
      *
      * @return array Returns an array with DynaForm record, ThrowTheException/FALSE otherwise
@@ -383,7 +385,7 @@ class DynaForm
      * Create DynaForm for a Process
      *
      * @param string $processUid Unique id of Process
-     * @param array  $arrayData  Data
+     * @param array $arrayData Data
      *
      * return array Return data of the new DynaForm created
      */
@@ -431,7 +433,7 @@ class DynaForm
      * Update DynaForm
      *
      * @param string $dynaFormUid Unique id of DynaForm
-     * @param array  $arrayData   Data
+     * @param array $arrayData Data
      *
      * return array Return data of the DynaForm updated
      */
@@ -532,7 +534,7 @@ class DynaForm
      * Copy/Import a DynaForm
      *
      * @param string $processUid Unique id of Process
-     * @param array  $arrayData  Data
+     * @param array $arrayData Data
      *
      * return array Return data of the new DynaForm created
      */
@@ -578,7 +580,7 @@ class DynaForm
             $this->throwExceptionIfExistsTitle($processUid, $arrayData["DYN_TITLE"], $this->arrayFieldNameForException["dynaFormTitle"]);
 
             //Copy/Import Uids
-            $processUidCopyImport  = $arrayData["COPY_IMPORT"]["PRJ_UID"];
+            $processUidCopyImport = $arrayData["COPY_IMPORT"]["PRJ_UID"];
             $dynaFormUidCopyImport = $arrayData["COPY_IMPORT"]["DYN_UID"];
 
             //Verify data
@@ -633,8 +635,8 @@ class DynaForm
                         $dynaFormGrid = new \Dynaform();
 
                         $arrayDataAux = array(
-                            "PRO_UID"   => $processUid,
-                            "DYN_TITLE" => $dynGrdTitleCopyImport . (($this->existsTitle($processUid, $dynGrdTitleCopyImport))? " (" . $arrayData["DYN_TITLE"] . ")" : ""),
+                            "PRO_UID" => $processUid,
+                            "DYN_TITLE" => $dynGrdTitleCopyImport . (($this->existsTitle($processUid, $dynGrdTitleCopyImport)) ? " (" . $arrayData["DYN_TITLE"] . ")" : ""),
                             "DYN_DESCRIPTION" => $dynGrdDescriptionCopyImport,
                             "DYN_TYPE" => "grid"
                         );
@@ -720,7 +722,7 @@ class DynaForm
      * Create a Dynaform based on a PMTable
      *
      * @param string $processUid Unique id of Process
-     * @param array  $arrayData  Data
+     * @param array $arrayData Data
      *
      * return array Return data of the new DynaForm created
      */
@@ -830,7 +832,7 @@ class DynaForm
             }
 
             //Set data
-            $tableUid    = $arrayData["PMTABLE"]["TAB_UID"];
+            $tableUid = $arrayData["PMTABLE"]["TAB_UID"];
             $arrayFields = $arrayData["PMTABLE"]["FIELDS"];
 
             unset($arrayData["PMTABLE"]);
@@ -866,7 +868,7 @@ class DynaForm
      * Defines the method for create a DynaForm
      *
      * @param string $processUid Unique id of Process
-     * @param array  $arrayData  Data
+     * @param array $arrayData Data
      *
      * return array Return data of the new DynaForm created
      */
@@ -883,14 +885,14 @@ class DynaForm
 
             if (isset($arrayData["COPY_IMPORT"])) {
                 $count = $count + 1;
-                $msgMethod = $msgMethod . (($msgMethod != "")? ", " : "") . "COPY_IMPORT";
+                $msgMethod = $msgMethod . (($msgMethod != "") ? ", " : "") . "COPY_IMPORT";
 
                 $option = "COPY_IMPORT";
             }
 
             if (isset($arrayData["PMTABLE"])) {
                 $count = $count + 1;
-                $msgMethod = $msgMethod . (($msgMethod != "")? ", " : "") . "PMTABLE";
+                $msgMethod = $msgMethod . (($msgMethod != "") ? ", " : "") . "PMTABLE";
 
                 $option = "PMTABLE";
             }
@@ -953,20 +955,22 @@ class DynaForm
     public function getDynaFormDataFromRecord($record)
     {
         try {
-            if ($record["DYN_VERSION"] == 0) {
-                $record["DYN_VERSION"] = 1;
+            if ($record['DYN_VERSION'] === 0) {
+                $record['DYN_VERSION'] = 1;
             }
 
-            $record["DYN_CONTENT"] = preg_replace("/\\\\u([a-f0-9]{4})/e", "iconv('UCS-4LE','UTF-8',pack('V', hexdec('U$1')))", $record["DYN_CONTENT"]);
+            $record['DYN_CONTENT'] = preg_replace_callback("/\\\\u([a-f0-9]{4})/", function ($m) {
+                return "iconv('UCS-4LE','UTF-8',pack('V', hexdec('U$m[1]')))";
+            }, $record['DYN_CONTENT']);
 
             return array(
-                $this->getFieldNameByFormatFieldName("DYN_UID")         => $record["DYN_UID"],
-                $this->getFieldNameByFormatFieldName("DYN_TITLE")       => $record["DYN_TITLE"],
-                $this->getFieldNameByFormatFieldName("DYN_DESCRIPTION") => $record["DYN_DESCRIPTION"] . "",
-                $this->getFieldNameByFormatFieldName("DYN_TYPE")        => $record["DYN_TYPE"] . "",
-                $this->getFieldNameByFormatFieldName("DYN_CONTENT")     => $record["DYN_CONTENT"] . "",
-                $this->getFieldNameByFormatFieldName("DYN_VERSION")     => (int)($record["DYN_VERSION"]),
-                $this->getFieldNameByFormatFieldName("DYN_UPDATE_DATE")     => $record["DYN_UPDATE_DATE"]
+                $this->getFieldNameByFormatFieldName('DYN_UID') => $record['DYN_UID'],
+                $this->getFieldNameByFormatFieldName('DYN_TITLE') => $record['DYN_TITLE'],
+                $this->getFieldNameByFormatFieldName('DYN_DESCRIPTION') => $record['DYN_DESCRIPTION'] . '',
+                $this->getFieldNameByFormatFieldName('DYN_TYPE') => $record['DYN_TYPE'] . '',
+                $this->getFieldNameByFormatFieldName('DYN_CONTENT') => $record['DYN_CONTENT'] . '',
+                $this->getFieldNameByFormatFieldName('DYN_VERSION') => (int)$record['DYN_VERSION'],
+                $this->getFieldNameByFormatFieldName('DYN_UPDATE_DATE') => $record['DYN_UPDATE_DATE']
             );
         } catch (\Exception $e) {
             throw $e;
@@ -1030,20 +1034,20 @@ class DynaForm
             $rsCriteria->next();
 
             $aRow = $rsCriteria->getRow();
-            $contentDecode = json_decode($aRow['DYN_CONTENT'],true);
+            $contentDecode = json_decode($aRow['DYN_CONTENT'], true);
 
             $content = $contentDecode['items'][0]['items'];
 
             foreach ($content as $key => $value) {
 
-                $valueType = (isset($value[0]["valueType"])) ? $value[0]["valueType"]:null;
-                $maxLength = (isset($value[0]["maxLength"])) ? $value[0]["maxLength"]:null;
-                $label = (isset($value[0]["label"])) ? $value[0]["label"]:null;
-                $defaultValue = (isset($value[0]["defaultValue"])) ? $value[0]["defaultValue"]:null;
-                $required = (isset($value[0]["required"])) ? $value[0]["required"]:null;
-                $dbConnection = (isset($value[0]["dbConnection"])) ? $value[0]["dbConnection"]:null;
-                $sql = (isset($value[0]["sql"])) ? $value[0]["sql"]:null;
-                $options = (isset($value[0]["options"])) ? $value[0]["options"]:null;
+                $valueType = (isset($value[0]["valueType"])) ? $value[0]["valueType"] : null;
+                $maxLength = (isset($value[0]["maxLength"])) ? $value[0]["maxLength"] : null;
+                $label = (isset($value[0]["label"])) ? $value[0]["label"] : null;
+                $defaultValue = (isset($value[0]["defaultValue"])) ? $value[0]["defaultValue"] : null;
+                $required = (isset($value[0]["required"])) ? $value[0]["required"] : null;
+                $dbConnection = (isset($value[0]["dbConnection"])) ? $value[0]["dbConnection"] : null;
+                $sql = (isset($value[0]["sql"])) ? $value[0]["sql"] : null;
+                $options = (isset($value[0]["options"])) ? $value[0]["options"] : null;
 
                 if (isset($value[0]["variable"])) {
                     $variable = $value[0]["variable"];
@@ -1070,19 +1074,19 @@ class DynaForm
                         $maxLengthMerged = ($maxLength == null && $maxLength == '') ? (int)$aRow['VAR_FIELD_SIZE'] : $maxLength;
                         $labelMerged = ($label == null && $label == '') ? $aRow['VAR_LABEL'] : $label;
                         $defaultValueMerged = ($defaultValue == null && $defaultValue == '') ? $aRow['VAR_DEFAULT'] : $defaultValue;
-                        $requiredMerged =  ($required == null && $required == '') ? ($aRow['VAR_NULL']==1) ? false: true : $required;
+                        $requiredMerged = ($required == null && $required == '') ? ($aRow['VAR_NULL'] == 1) ? false : true : $required;
                         $dbConnectionMerged = ($dbConnection == null && $dbConnection == '') ? $aRow['VAR_DBCONNECTION'] : $dbConnection;
                         $sqlMerged = ($sql == null && $sql == '') ? $aRow['VAR_SQL'] : $sql;
                         $optionsMerged = ($options == null && $options == '') ? $aRow['VAR_ACCEPTED_VALUES'] : $options;
 
                         $aVariables = array('valueType' => $valueTypeMerged,
-                                            'maxLength' => $maxLengthMerged,
-                                            'label' => $labelMerged,
-                                            'defaultValue' => $defaultValueMerged,
-                                            'required' => $requiredMerged,
-                                            'dbConnection' => $dbConnectionMerged,
-                                            'sql' => $sqlMerged,
-                                            'options' => $optionsMerged);
+                            'maxLength' => $maxLengthMerged,
+                            'label' => $labelMerged,
+                            'defaultValue' => $defaultValueMerged,
+                            'required' => $requiredMerged,
+                            'dbConnection' => $dbConnectionMerged,
+                            'sql' => $sqlMerged,
+                            'options' => $optionsMerged);
 
                         //fields properties
                         if (isset($value[0]["pickType"])) {
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
index 8b1c4ef9a..cf38f3d09 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
@@ -44,6 +44,7 @@ class Light
      * Method get list start case
      *
      * @param $userId User id
+     *
      * @return array
      * @throws Exception
      */
@@ -105,8 +106,11 @@ class Light
                         $tempTreeChild['text'] = $keyChild; //ellipsis ( $keyChild, 50 );
                         $tempTreeChild['processId'] = $processInfoChild['pro_uid'];
                         $tempTreeChild['taskId'] = $processInfoChild['uid'];
-                        list($tempTreeChild['offlineEnabled'], $tempTreeChild['autoRoot']) = $task->getColumnValues($processInfoChild['pro_uid'],
-                            $processInfoChild['uid'], array('TAS_OFFLINE', 'TAS_AUTO_ROOT'));
+                        list($tempTreeChild['offlineEnabled'], $tempTreeChild['autoRoot']) = $task->getColumnValues(
+                            $processInfoChild['pro_uid'],
+                            $processInfoChild['uid'],
+                            array('TAS_OFFLINE', 'TAS_AUTO_ROOT')
+                        );
                         //Add process category
                         $tempTreeChild['categoryName'] = $processInfoChild['catname'];
                         $tempTreeChild['categoryId'] = $processInfoChild['cat'];
@@ -127,8 +131,11 @@ class Light
                                 $newForm[$c]['stepMode'] = $form['step_mode'];
                                 $newForm[$c]['stepCondition'] = $form['step_condition'];
                                 $newForm[$c]['stepPosition'] = $form['step_position'];
-                                $trigger = $this->statusTriggers($step->doGetActivityStepTriggers($form["step_uid"],
-                                    $tempTreeChild['taskId'], $tempTreeChild['processId']));
+                                $trigger = $this->statusTriggers($step->doGetActivityStepTriggers(
+                                    $form["step_uid"],
+                                    $tempTreeChild['taskId'],
+                                    $tempTreeChild['processId']
+                                ));
                                 $newForm[$c]["triggers"] = $trigger;
                                 $c++;
                             }
@@ -150,7 +157,9 @@ class Light
 
     /**
      * Get status trigger case
+     *
      * @param $triggers
+     *
      * @return array
      */
     public function statusTriggers($triggers)
@@ -170,7 +179,9 @@ class Light
 
     /**
      * Get counters each type of list
+     *
      * @param $userId
+     *
      * @return array
      * @throws Exception
      */
@@ -180,7 +191,7 @@ class Light
             $userUid = (isset($userId) && $userId != '') ? $userId : null;
             $oAppCache = new AppCacheView();
 
-            $aTypes = Array();
+            $aTypes = array();
             $aTypes['to_do'] = 'toDo';
             $aTypes['draft'] = 'draft';
             $aTypes['cancelled'] = 'cancelled';
@@ -191,7 +202,7 @@ class Light
 
             $aCount = $oAppCache->getAllCounters(array_keys($aTypes), $userUid);
 
-            $response = Array();
+            $response = array();
             foreach ($aCount as $type => $count) {
                 $response[$aTypes[$type]] = $count;
             }
@@ -204,6 +215,7 @@ class Light
 
     /**
      * @param $sAppUid
+     *
      * @return Criteria
      */
     public function getTransferHistoryCriteria($sAppUid)
@@ -219,7 +231,6 @@ class Light
         ///-- $c->addAsColumn('USR_NAME', "CONCAT(USR_LASTNAME, ' ', USR_FIRSTNAME)");
         $sDataBase = 'database_' . strtolower(DB_ADAPTER);
         if (G::LoadSystemExist($sDataBase)) {
-
             $oDataBase = new database();
             $c->addAsColumn('USR_NAME', $oDataBase->concatString("USR_LASTNAME", "' '", "USR_FIRSTNAME"));
             $c->addAsColumn(
@@ -227,7 +238,8 @@ class Light
                 $oDataBase->getCaseWhen("DEL_FINISH_DATE IS NULL", "'-'", AppDelegationPeer::DEL_FINISH_DATE)
             );
             $c->addAsColumn(
-                'APP_TYPE', $oDataBase->getCaseWhen("DEL_FINISH_DATE IS NULL", "'IN_PROGRESS'", AppDelayPeer::APP_TYPE)
+                'APP_TYPE',
+                $oDataBase->getCaseWhen("DEL_FINISH_DATE IS NULL", "'IN_PROGRESS'", AppDelayPeer::APP_TYPE)
             );
         }
         $c->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE);
@@ -260,6 +272,7 @@ class Light
      * GET history of case
      *
      * @param $app_uid
+     *
      * @return array
      * @throws Exception
      */
@@ -268,7 +281,7 @@ class Light
 
         //global $G_PUBLISH;
         $c = $this->getTransferHistoryCriteria($app_uid);
-        $aProcesses = Array();
+        $aProcesses = array();
 
         $rs = GulliverBasePeer::doSelectRs($c);
         $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -298,6 +311,7 @@ class Light
      * @param string $userId
      * @param string $proUid
      * @param string $taskUid
+     *
      * @return array
      * @throws Exception
      */
@@ -328,7 +342,8 @@ class Light
 
             //Log
             Bootstrap::registerMonolog('MobileCreateCase', 200, "Create case",
-                ['application_uid' => $aData['APPLICATION'], 'usr_uid' => $userId], config("system.workspace"), 'processmaker.log');
+                ['application_uid' => $aData['APPLICATION'], 'usr_uid' => $userId], config("system.workspace"),
+                'processmaker.log');
         } catch (Exception $e) {
             $response['status'] = 'failure';
             $response['message'] = $e->getMessage();
@@ -370,7 +385,6 @@ class Light
         }
 
         return 1;
-
     }
 
     /**
@@ -404,8 +418,13 @@ class Light
         $Fields['APP_DATA'] = array_merge($Fields['APP_DATA'], G::getSystemConstants());
         $triggers = $oCase->loadTriggers($act_uid, 'DYNAFORM', $step_uid_obj, strtoupper($type));
         if ($triggers) {
-            $Fields['APP_DATA'] = $oCase->ExecuteTriggers($act_uid, 'DYNAFORM', $step_uid_obj, strtoupper($type),
-                $Fields['APP_DATA']);
+            $Fields['APP_DATA'] = $oCase->ExecuteTriggers(
+                $act_uid,
+                'DYNAFORM',
+                $step_uid_obj,
+                strtoupper($type),
+                $Fields['APP_DATA']
+            );
         }
         $Fields['TAS_UID'] = $act_uid;
         $Fields['CURRENT_DYNAFORM'] = $step_uid_obj;
@@ -438,8 +457,13 @@ class Light
             $triggers = $oCase->loadTriggers($tas_uid, 'ASSIGN_TASK', '-1', 'BEFORE');
             if (isset($triggers)) {
                 $Fields['APP_DATA'] = array_merge($Fields['APP_DATA'], G::getSystemConstants());
-                $Fields['APP_DATA'] = $oCase->ExecuteTriggers($tas_uid, 'DYNAFORM', '-1', 'BEFORE',
-                    $Fields['APP_DATA']);
+                $Fields['APP_DATA'] = $oCase->ExecuteTriggers(
+                    $tas_uid,
+                    'DYNAFORM',
+                    '-1',
+                    'BEFORE',
+                    $Fields['APP_DATA']
+                );
                 $oCase->updateCase($app_uid, $Fields);
             }
             $oDerivation = new \Derivation();
@@ -454,10 +478,16 @@ class Light
                 $sPriority = ''; //set priority value
                 if ($derive[$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'] != '') {
                     //TO DO: review this type of assignment
-                    if (isset($aData['APP_DATA'][str_replace('@@', '',
-                            $derive[$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'])])) {
-                        $sPriority = $aData['APP_DATA'][str_replace('@@', '',
-                            $derive[$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE'])];
+                    if (isset($aData['APP_DATA'][str_replace(
+                            '@@',
+                            '',
+                            $derive[$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE']
+                        )])) {
+                        $sPriority = $aData['APP_DATA'][str_replace(
+                            '@@',
+                            '',
+                            $derive[$sKey]['NEXT_TASK']['TAS_PRIORITY_VARIABLE']
+                        )];
                     }
                 } //set priority value
 
@@ -545,10 +575,10 @@ class Light
      * Route Case
      *
      * @param string $applicationUid Unique id of Case
-     * @param string $userUid Unique id of User
+     * @param string $userUid        Unique id of User
      * @param string $delIndex
-     * @param string $tasks
-     * @param boolean $executeTriggersBeforeAssignment
+     * @param array  $tasks
+     * @param string $bExecuteTriggersBeforeAssignment
      *
      * return array Return an array with Task Case
      */
@@ -581,7 +611,8 @@ class Light
 
             //Log
             Bootstrap::registerMonolog('MobileRouteCase', 200, 'Route case',
-                ['application_uid' => $applicationUid, 'usr_uid' => $userUid], config("system.workspace"), 'processmaker.log');
+                ['application_uid' => $applicationUid, 'usr_uid' => $userUid], config("system.workspace"),
+                'processmaker.log');
         } catch (Exception $e) {
             throw $e;
         }
@@ -593,7 +624,7 @@ class Light
      * Get user Data
      *
      * @param string $applicationUid Unique id of Case
-     * @param string $userUid Unique id of User
+     * @param string $userUid        Unique id of User
      * @param string $delIndex
      * @param string $bExecuteTriggersBeforeAssignment
      *
@@ -668,8 +699,12 @@ class Light
                         case 'gif':
                         case 'png':
                             $arrayFiles[$key]['fileId'] = $fileData['fileId'];
-                            $arrayFiles[$key]['fileContent'] = base64_encode($this->imagesThumbnails($realPath, $ext,
-                                $width, $height));
+                            $arrayFiles[$key]['fileContent'] = base64_encode($this->imagesThumbnails(
+                                $realPath,
+                                $ext,
+                                $width,
+                                $height
+                            ));
                             break;
                         default:
                             $fileTmp = fopen($realPath, "r");
@@ -686,8 +721,12 @@ class Light
                         case 'gif':
                         case 'png':
                             $arrayFiles[$key]['fileId'] = $fileData['fileId'];
-                            $arrayFiles[$key]['fileContent'] = $this->imagesThumbnails($realPath1, $ext, $width,
-                                $height);
+                            $arrayFiles[$key]['fileContent'] = $this->imagesThumbnails(
+                                $realPath1,
+                                $ext,
+                                $width,
+                                $height
+                            );
                             break;
                         default:
                             $fileTmp = fopen($realPath, "r");
@@ -709,10 +748,11 @@ class Light
     /**
      * resize image if send width or height
      *
-     * @param $path
-     * @param $extensions
+     * @param      $path
+     * @param      $extensions
      * @param null $newWidth
      * @param null $newHeight
+     *
      * @return string
      */
     public function imagesThumbnails($path, $extensions, $newWidth = null, $newHeight = null)
@@ -814,7 +854,8 @@ class Light
         session_start();
         session_regenerate_id();
 
-        setcookie("workspaceSkin", SYS_SKIN, time() + (24 * 60 * 60), "/sys" . config("system.workspace"), null, false, true);
+        setcookie("workspaceSkin", SYS_SKIN, time() + (24 * 60 * 60), "/sys" . config("system.workspace"), null, false,
+            true);
 
         if (strlen($msg) > 0) {
             $_SESSION['G_MESSAGE'] = $msg;
@@ -829,9 +870,11 @@ class Light
 
         /*----------------------------------********---------------------------------*/
 
-        $licenseManager =& PmLicenseManager::getSingleton();
-        if (in_array(md5($licenseManager->result),
-            array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) {
+        $licenseManager = PmLicenseManager::getSingleton();
+        if (in_array(
+            md5($licenseManager->result),
+            array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb')
+        )) {
             $G_PUBLISH = new \Publisher();
             $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpired', '', array(), 'licenseUpdate');
             G::RenderPage('publish');
@@ -850,7 +893,6 @@ class Light
         }
 
         return $response;
-
     }
 
     /**
@@ -859,6 +901,7 @@ class Light
      * @param $userUid
      * @param $type
      * @param $app_uid
+     *
      * @throws Exception
      */
     public function getInformation($userUid, $type, $app_uid)
@@ -894,6 +937,7 @@ class Light
      * @param $userUid
      * @param $Fields
      * @param $type
+     *
      * @throws Exception
      */
     public function getInfoResume($userUid, $Fields, $type)
@@ -929,7 +973,8 @@ class Light
      *
      * @param string $userUid
      * @param string $appUid
-     * @param array $requestData
+     * @param array  $requestData
+     *
      * @return array $response
      * @throws Exception
      */
@@ -993,9 +1038,12 @@ class Light
                 $userInfo = '***';
                 if ($userUid !== '-1') {
                     $arrayUserData = $user->load($userUid);
-                    $userInfo = $config->usersNameFormatBySetParameters($confEnvSetting["format"],
-                        $arrayUserData["USR_USERNAME"], $arrayUserData["USR_FIRSTNAME"],
-                        $arrayUserData["USR_LASTNAME"]);
+                    $userInfo = $config->usersNameFormatBySetParameters(
+                        $confEnvSetting["format"],
+                        $arrayUserData["USR_USERNAME"],
+                        $arrayUserData["USR_FIRSTNAME"],
+                        $arrayUserData["USR_LASTNAME"]
+                    );
                 }
                 $response[$k]['appDocCreateUser'] = $userInfo;
             }
@@ -1011,6 +1059,7 @@ class Light
      * @param $userUid
      * @param $Fields
      * @param $type
+     *
      * @throws Exception
      */
     public function documentUploadFiles($userUid, $app_uid, $app_doc_uid, $request_data)
@@ -1081,6 +1130,7 @@ class Light
      * @param $userUid
      * @param $Fields
      * @param $type
+     *
      * @throws Exception
      */
     public function claimCaseUser($userUid, $sAppUid)
@@ -1134,6 +1184,7 @@ class Light
      * @param $action
      * @param $categoryUid
      * @param $userUid
+     *
      * @return array
      * @throws PropelException
      */
@@ -1242,7 +1293,6 @@ class Light
      */
     public function getUsersToReassign($usr_uid, $task_uid)
     {
-
         $memcache = PMmemcached::getSingleton(config("system.workspace"));
         $RBAC = RBAC::getSingleton(PATH_DATA, session_id());
         $RBAC->sSystem = 'PROCESSMAKER';
@@ -1326,6 +1376,7 @@ class Light
 
     /**
      * Get configuration
+     *
      * @return mixed
      */
     public function getConfiguration($params)
@@ -1334,15 +1385,18 @@ class Light
         $multiTimeZone = false;
         //Set Time Zone
         /*----------------------------------********---------------------------------*/
-        if (\PMLicensedFeatures::getSingleton()->verifyfeature
-        ('oq3S29xemxEZXJpZEIzN01qenJUaStSekY4cTdJVm5vbWtVM0d4S2lJSS9qUT0=')) {
+        if (\PMLicensedFeatures::getSingleton()->verifyfeature('oq3S29xemxEZXJpZEIzN01qenJUaStSekY4cTdJVm5vbWtVM0d4S2lJSS9qUT0=')) {
             $multiTimeZone = (int)($sysConf['system_utc_time_zone']) == 1;
         }
         /*----------------------------------********---------------------------------*/
         $tz = isset($_SESSION['USR_TIME_ZONE']) ? $_SESSION['USR_TIME_ZONE'] : $sysConf['time_zone'];
         $offset = timezone_offset_get(new \DateTimeZone($tz), new \DateTime());
-        $response['timeZone'] = sprintf("GMT%s%02d:%02d", ($offset >= 0) ? '+' : '-', abs($offset / 3600),
-            abs(($offset % 3600) / 60));
+        $response['timeZone'] = sprintf(
+            "GMT%s%02d:%02d",
+            ($offset >= 0) ? '+' : '-',
+            abs($offset / 3600),
+            abs(($offset % 3600) / 60)
+        );
         $response['multiTimeZone'] = $multiTimeZone;
         $fields = System::getSysInfo();
         $response['version'] = $fields['PM_VERSION'];
@@ -1435,10 +1489,12 @@ class Light
 
     /**
      * This function check if the $data are in the corresponding cases list
+     *
      * @param string $userUid
-     * @param array $data
+     * @param array  $data
      * @param string $listName
      * @param string $action
+     *
      * @return array $response
      */
     public function getListCheck($userUid, $data, $listName = 'inbox', $action = 'todo')
@@ -1469,14 +1525,13 @@ class Light
         foreach ($data as $key => $val) {
             $flagRemoved = true;
             foreach ($response['data'] as $row) {
-                $row = array_change_key_case($row,CASE_UPPER);
+                $row = array_change_key_case($row, CASE_UPPER);
                 if (isset($row['APP_UID']) && isset($row['DEL_INDEX'])) {
-                    if ($val['caseId'] === $row['APP_UID'] && $val['delIndex'] === $row['DEL_INDEX'] ) {
+                    if ($val['caseId'] === $row['APP_UID'] && $val['delIndex'] === $row['DEL_INDEX']) {
                         $flagRemoved = false;
                         continue;
                     }
                 }
-
             }
             if ($flagRemoved) {
                 $result[] = [
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php b/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
index 23f2be320..f1a1ceb08 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
@@ -1,14 +1,18 @@
 <?php
+
 namespace ProcessMaker\BusinessModel;
+
 use \G;
 use \Criteria;
 use \UsersPeer;
+use \PMLicensedFeatures;
 
 /**
  * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
  * @copyright Colosa - Bolivia
  */
-class Lists {
+class Lists
+{
 
     /**
      * @var array
@@ -82,17 +86,17 @@ class Lists {
      * Get list for Cases
      *
      * @access public
-     * @param array $dataList, Data for list
+     * @param array $dataList , Data for list
      * @return array
      *
      * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
      * @copyright Colosa - Bolivia
-    */
+     */
     public function getList($listName = 'inbox', $dataList = array(), $total = false)
     {
         Validator::isArray($dataList, '$dataList');
         if (!isset($dataList["userId"])) {
-            throw (new \Exception(\G::LoadTranslation("ID_USER_NOT_EXIST", array('userId',''))));
+            throw (new \Exception(\G::LoadTranslation("ID_USER_NOT_EXIST", array('userId', ''))));
         } else {
             Validator::usrUid($dataList["userId"], "userId");
         }
@@ -156,7 +160,7 @@ class Lists {
         $filters["start"] = (int)$filters["start"];
         $filters["start"] = abs($filters["start"]);
         if ($filters["start"] != 0) {
-            $filters["start"]+1;
+            $filters["start"] + 1;
         }
 
         $filters["limit"] = (int)$filters["limit"];
@@ -205,25 +209,25 @@ class Lists {
         if (!empty($result)) {
             foreach ($result as &$value) {
                 if (isset($value['DEL_PREVIOUS_USR_UID'])) {
-                    $value['PREVIOUS_USR_UID']       = $value['DEL_PREVIOUS_USR_UID'];
-                    $value['PREVIOUS_USR_USERNAME']  = $value['DEL_PREVIOUS_USR_USERNAME'];
+                    $value['PREVIOUS_USR_UID'] = $value['DEL_PREVIOUS_USR_UID'];
+                    $value['PREVIOUS_USR_USERNAME'] = $value['DEL_PREVIOUS_USR_USERNAME'];
                     $value['PREVIOUS_USR_FIRSTNAME'] = $value['DEL_PREVIOUS_USR_FIRSTNAME'];
-                    $value['PREVIOUS_USR_LASTNAME']  = $value['DEL_PREVIOUS_USR_LASTNAME'];
+                    $value['PREVIOUS_USR_LASTNAME'] = $value['DEL_PREVIOUS_USR_LASTNAME'];
                 }
                 if (isset($value['DEL_DUE_DATE'])) {
                     $value['DEL_TASK_DUE_DATE'] = $value['DEL_DUE_DATE'];
                 }
                 if (isset($value['APP_PAUSED_DATE'])) {
-                    $value['APP_UPDATE_DATE']   = $value['APP_PAUSED_DATE'];
+                    $value['APP_UPDATE_DATE'] = $value['APP_PAUSED_DATE'];
                 }
                 if (isset($value['DEL_CURRENT_USR_USERNAME'])) {
-                    $value['USR_USERNAME']      = $value['DEL_CURRENT_USR_USERNAME'];
-                    $value['USR_FIRSTNAME']     = $value['DEL_CURRENT_USR_FIRSTNAME'];
-                    $value['USR_LASTNAME']      = $value['DEL_CURRENT_USR_LASTNAME'];
-                    $value['APP_UPDATE_DATE']   = $value['DEL_DELEGATE_DATE'];
+                    $value['USR_USERNAME'] = $value['DEL_CURRENT_USR_USERNAME'];
+                    $value['USR_FIRSTNAME'] = $value['DEL_CURRENT_USR_FIRSTNAME'];
+                    $value['USR_LASTNAME'] = $value['DEL_CURRENT_USR_LASTNAME'];
+                    $value['APP_UPDATE_DATE'] = $value['DEL_DELEGATE_DATE'];
                 }
                 if (isset($value['APP_STATUS'])) {
-                    $value['APP_STATUS_LABEL']  = G::LoadTranslation( "ID_{$value['APP_STATUS']}" );
+                    $value['APP_STATUS_LABEL'] = G::LoadTranslation("ID_{$value['APP_STATUS']}");
                 }
 
 
@@ -233,19 +237,19 @@ class Lists {
         $response = array();
         if ($filters["paged"]) {
             $filtersData = array();
-            $filtersData['start']       = $filters["start"];
-            $filtersData['limit']       = $filters["limit"];
-            $filtersData['sort']        = G::toLower($filters["sort"]);
-            $filtersData['dir']         = G::toLower($filters["dir"]);
-            $filtersData['cat_uid']     = $filters["category"];
-            $filtersData['pro_uid']     = $filters["process"];
-            $filtersData['search']      = $filters["search"];
-            $filtersData['date_from']   = $filters["dateFrom"];
-            $filtersData['date_to']     = $filters["dateTo"];
-            $response['filters']        = $filtersData;
-            $response['data']           = $result;
-            $filtersData['action']      = $filters["action"];
-            $response['totalCount']     = $list->getCountList($userUid, $filtersData);
+            $filtersData['start'] = $filters["start"];
+            $filtersData['limit'] = $filters["limit"];
+            $filtersData['sort'] = G::toLower($filters["sort"]);
+            $filtersData['dir'] = G::toLower($filters["dir"]);
+            $filtersData['cat_uid'] = $filters["category"];
+            $filtersData['pro_uid'] = $filters["process"];
+            $filtersData['search'] = $filters["search"];
+            $filtersData['date_from'] = $filters["dateFrom"];
+            $filtersData['date_to'] = $filters["dateTo"];
+            $response['filters'] = $filtersData;
+            $response['data'] = $result;
+            $filtersData['action'] = $filters["action"];
+            $response['totalCount'] = $list->getCountList($userUid, $filtersData);
         } else {
             $response = $result;
         }
@@ -264,12 +268,12 @@ class Lists {
         foreach ($list as $listObject => $item) {
             switch ($listObject) {
                 case 'ListDraft':
-                    $total = $this->$listObject->getCountList($userId, array('action'=>'draft'));
+                    $total = $this->$listObject->getCountList($userId, array('action' => 'draft'));
                     array_push($response, (array('count' => $total, 'item' => $item)));
                     break;
                 /*----------------------------------********---------------------------------*/
                 case 'ListConsolidated':
-                    $licensedFeatures = &\PMLicensedFeatures::getSingleton();
+                    $licensedFeatures = PMLicensedFeatures::getSingleton();
                     if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) {
                         $total = $this->$listObject->getCountList($userId);
                         array_push($response, (array('count' => $total, 'item' => $item)));
@@ -284,4 +288,4 @@ class Lists {
         }
         return $response;
     }
-}
\ No newline at end of file
+}
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
index 988e234ae..20794c213 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Process.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ProcessMaker\BusinessModel;
 
 use G;
@@ -10,38 +11,224 @@ use ResultSet;
 class Process
 {
     private $arrayFieldDefinition = array(
-        "PRO_UID"                   => array("type" => "string",   "required" => false, "empty" => false, "defaultValues" => array(),  "fieldNameAux" => "processUid"),
+        "PRO_UID" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processUid"
+        ),
 
-        "PRO_TITLE"                 => array("type" => "string",   "required" => true,  "empty" => false, "defaultValues" => array(),  "fieldNameAux" => "processTitle"),
-        "PRO_DESCRIPTION"           => array("type" => "string",   "required" => false, "empty" => true,  "defaultValues" => array(),  "fieldNameAux" => "processDescription"),
-        "PRO_PARENT"                => array("type" => "string",   "required" => true,  "empty" => false, "defaultValues" => array(),  "fieldNameAux" => "processParent"),
-        "PRO_TIME"                  => array("type" => "int",      "required" => false, "empty" => false, "defaultValues" => array(1), "fieldNameAux" => "processTime"),
-        "PRO_TIMEUNIT"              => array("type" => "string",   "required" => false, "empty" => false, "defaultValues" => array("DAYS"),               "fieldNameAux" => "processTimeunit"),
-        "PRO_STATUS"                => array("type" => "string",   "required" => true,  "empty" => false, "defaultValues" => array("ACTIVE", "INACTIVE"), "fieldNameAux" => "processStatus"),
-        "PRO_TYPE_DAY"              => array("type" => "string",   "required" => false, "empty" => true,  "defaultValues" => array(),                     "fieldNameAux" => "processTypeDay"),
-        "PRO_TYPE"                  => array("type" => "string",   "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "processType"),
-        "PRO_ASSIGNMENT"            => array("type" => "int",      "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "processAssignment"),
-        "PRO_SHOW_MAP"              => array("type" => "int",      "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "processShowMap"),
-        "PRO_SHOW_MESSAGE"          => array("type" => "int",      "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "processShowMessage"),
-        "PRO_SUBPROCESS"            => array("type" => "int",      "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "processSubprocess"),
-        "PRO_TRI_DELETED"           => array("type" => "string",   "required" => false, "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processTriDeleted"),
-        "PRO_TRI_CANCELED"          => array("type" => "string",   "required" => false, "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processTriCanceled"),
-        "PRO_TRI_PAUSED"            => array("type" => "string",   "required" => false, "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processTriPaused"),
-        "PRO_TRI_UNPAUSED"          => array("type" => "string",   "required" => false, "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processTriUnpaused"),
-        "PRO_TRI_REASSIGNED"        => array("type" => "string",   "required" => false, "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processTriReassigned"),
-        "PRO_TRI_CREATE"            => array("type" => "string",   "required" => false, "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processTriCreate"),
-        "PRO_SHOW_DELEGATE"         => array("type" => "int",      "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "processShowDelegate"),
-        "PRO_SHOW_DYNAFORM"         => array("type" => "int",      "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "processShowDynaform"),
-        "PRO_CATEGORY"              => array("type" => "string",   "required" => false, "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processCategory"),
-        "PRO_SUB_CATEGORY"          => array("type" => "string",   "required" => false, "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processSubCategory"),
-        "PRO_INDUSTRY"              => array("type" => "int",      "required" => false, "empty" => false, "defaultValues" => array(0),    "fieldNameAux" => "processIndustry"),
-        "PRO_UPDATE_DATE"           => array("type" => "datetime", "required" => false, "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processUpdateDate"),
-        "PRO_CREATE_DATE"           => array("type" => "datetime", "required" => false, "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processCreateDate"),
-        "PRO_CREATE_USER"           => array("type" => "string",   "required" => true,  "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processCreateUser"),
-        "PRO_DEBUG"                 => array("type" => "int",      "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "processDebug"),
-        "PRO_DERIVATION_SCREEN_TPL" => array("type" => "string",   "required" => false, "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processDerivationScreenTpl"),
-        "PRO_SUMMARY_DYNAFORM"      => array("type" => "string",   "required" => false, "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processSummaryDynaform"),
-        "PRO_CALENDAR"              => array("type" => "string",   "required" => false, "empty" => true,  "defaultValues" => array(),     "fieldNameAux" => "processCalendar")
+        "PRO_TITLE" => array(
+            "type" => "string",
+            "required" => true,
+            "empty" => false,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processTitle"
+        ),
+        "PRO_DESCRIPTION" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processDescription"
+        ),
+        "PRO_PARENT" => array(
+            "type" => "string",
+            "required" => true,
+            "empty" => false,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processParent"
+        ),
+        "PRO_TIME" => array(
+            "type" => "int",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array(1),
+            "fieldNameAux" => "processTime"
+        ),
+        "PRO_TIMEUNIT" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array("DAYS"),
+            "fieldNameAux" => "processTimeunit"
+        ),
+        "PRO_STATUS" => array(
+            "type" => "string",
+            "required" => true,
+            "empty" => false,
+            "defaultValues" => array("ACTIVE", "INACTIVE"),
+            "fieldNameAux" => "processStatus"
+        ),
+        "PRO_TYPE_DAY" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processTypeDay"
+        ),
+        "PRO_TYPE" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processType"
+        ),
+        "PRO_ASSIGNMENT" => array(
+            "type" => "int",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array(0, 1),
+            "fieldNameAux" => "processAssignment"
+        ),
+        "PRO_SHOW_MAP" => array(
+            "type" => "int",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array(0, 1),
+            "fieldNameAux" => "processShowMap"
+        ),
+        "PRO_SHOW_MESSAGE" => array(
+            "type" => "int",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array(0, 1),
+            "fieldNameAux" => "processShowMessage"
+        ),
+        "PRO_SUBPROCESS" => array(
+            "type" => "int",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array(0, 1),
+            "fieldNameAux" => "processSubprocess"
+        ),
+        "PRO_TRI_DELETED" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processTriDeleted"
+        ),
+        "PRO_TRI_CANCELED" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processTriCanceled"
+        ),
+        "PRO_TRI_PAUSED" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processTriPaused"
+        ),
+        "PRO_TRI_UNPAUSED" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processTriUnpaused"
+        ),
+        "PRO_TRI_REASSIGNED" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processTriReassigned"
+        ),
+        "PRO_TRI_CREATE" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processTriCreate"
+        ),
+        "PRO_SHOW_DELEGATE" => array(
+            "type" => "int",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array(0, 1),
+            "fieldNameAux" => "processShowDelegate"
+        ),
+        "PRO_SHOW_DYNAFORM" => array(
+            "type" => "int",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array(0, 1),
+            "fieldNameAux" => "processShowDynaform"
+        ),
+        "PRO_CATEGORY" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processCategory"
+        ),
+        "PRO_SUB_CATEGORY" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processSubCategory"
+        ),
+        "PRO_INDUSTRY" => array(
+            "type" => "int",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array(0),
+            "fieldNameAux" => "processIndustry"
+        ),
+        "PRO_UPDATE_DATE" => array(
+            "type" => "datetime",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processUpdateDate"
+        ),
+        "PRO_CREATE_DATE" => array(
+            "type" => "datetime",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processCreateDate"
+        ),
+        "PRO_CREATE_USER" => array(
+            "type" => "string",
+            "required" => true,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processCreateUser"
+        ),
+        "PRO_DEBUG" => array(
+            "type" => "int",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array(0, 1),
+            "fieldNameAux" => "processDebug"
+        ),
+        "PRO_DERIVATION_SCREEN_TPL" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processDerivationScreenTpl"
+        ),
+        "PRO_SUMMARY_DYNAFORM" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processSummaryDynaform"
+        ),
+        "PRO_CALENDAR" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "processCalendar"
+        )
     );
 
     private $formatFieldNameInUppercase = true;
@@ -112,7 +299,7 @@ class Process
     public function getFieldNameByFormatFieldName($fieldName)
     {
         try {
-            return ($this->formatFieldNameInUppercase)? strtoupper($fieldName) : strtolower($fieldName);
+            return ($this->formatFieldNameInUppercase) ? strtoupper($fieldName) : strtolower($fieldName);
         } catch (\Exception $e) {
             throw $e;
         }
@@ -164,14 +351,18 @@ class Process
      *
      * return void Throw exception if data has an invalid value
      */
-    public function throwExceptionIfDataNotMetFieldDefinition($arrayData, $arrayFieldDefinition, $arrayFieldNameForException, $flagValidateRequired = true)
-    {
+    public function throwExceptionIfDataNotMetFieldDefinition(
+        $arrayData,
+        $arrayFieldDefinition,
+        $arrayFieldNameForException,
+        $flagValidateRequired = true
+    ) {
         try {
             if ($flagValidateRequired) {
                 foreach ($arrayFieldDefinition as $key => $value) {
                     $fieldName = $key;
 
-                    $fieldNameAux = (isset($arrayFieldNameForException[$arrayFieldDefinition[$fieldName]['fieldNameAux']]))? $arrayFieldNameForException[$arrayFieldDefinition[$fieldName]['fieldNameAux']] : $fieldName;
+                    $fieldNameAux = (isset($arrayFieldNameForException[$arrayFieldDefinition[$fieldName]['fieldNameAux']])) ? $arrayFieldNameForException[$arrayFieldDefinition[$fieldName]['fieldNameAux']] : $fieldName;
 
                     if ($arrayFieldDefinition[$fieldName]["required"] && !isset($arrayData[$fieldName])) {
                         throw new \Exception(\G::LoadTranslation('ID_UNDEFINED_VALUE_IS_REQUIRED', [$fieldNameAux]));
@@ -180,10 +371,17 @@ class Process
             }
 
             $arrayType1 = [
-                'int', 'integer', 'float', 'real', 'double',
-                'bool', 'boolean',
+                'int',
+                'integer',
+                'float',
+                'real',
+                'double',
+                'bool',
+                'boolean',
                 'string',
-                'date', 'hour', 'datetime'
+                'date',
+                'hour',
+                'datetime'
             ];
             $arrayType2 = ['array', 'object'];
 
@@ -192,19 +390,22 @@ class Process
                 $fieldValue = $value;
 
                 if (isset($arrayFieldDefinition[$fieldName])) {
-                    $fieldNameAux = (isset($arrayFieldNameForException[$arrayFieldDefinition[$fieldName]['fieldNameAux']]))? $arrayFieldNameForException[$arrayFieldDefinition[$fieldName]['fieldNameAux']] : $fieldName;
+                    $fieldNameAux = (isset($arrayFieldNameForException[$arrayFieldDefinition[$fieldName]['fieldNameAux']])) ? $arrayFieldNameForException[$arrayFieldDefinition[$fieldName]['fieldNameAux']] : $fieldName;
 
                     $arrayFieldDefinition[$fieldName]["type"] = strtolower($arrayFieldDefinition[$fieldName]["type"]);
 
                     $optionType = 0;
-                    $optionType = ($optionType == 0 && in_array($arrayFieldDefinition[$fieldName]["type"], $arrayType1))? 1 : $optionType;
-                    $optionType = ($optionType == 0 && in_array($arrayFieldDefinition[$fieldName]["type"], $arrayType2))? 2 : $optionType;
+                    $optionType = ($optionType == 0 && in_array($arrayFieldDefinition[$fieldName]["type"],
+                            $arrayType1)) ? 1 : $optionType;
+                    $optionType = ($optionType == 0 && in_array($arrayFieldDefinition[$fieldName]["type"],
+                            $arrayType2)) ? 2 : $optionType;
 
                     switch ($optionType) {
                         case 1:
                             //empty
                             if (!$arrayFieldDefinition[$fieldName]['empty'] && trim($fieldValue) == '') {
-                                throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE_CAN_NOT_BE_EMPTY', [$fieldNameAux]));
+                                throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE_CAN_NOT_BE_EMPTY',
+                                    [$fieldNameAux]));
                             }
 
                             //defaultValues
@@ -212,11 +413,12 @@ class Process
                                 !empty($arrayFieldDefinition[$fieldName]['defaultValues']) &&
                                 !in_array($fieldValue, $arrayFieldDefinition[$fieldName]['defaultValues'], true)
                             ) {
-                                throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE_ONLY_ACCEPTS_VALUES', [$fieldNameAux, implode('|', $arrayFieldDefinition[$fieldName]['defaultValues'])]));
+                                throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE_ONLY_ACCEPTS_VALUES',
+                                    [$fieldNameAux, implode('|', $arrayFieldDefinition[$fieldName]['defaultValues'])]));
                             }
 
                             //type
-                            $fieldValue = (!is_array($fieldValue))? $fieldValue : '';
+                            $fieldValue = (!is_array($fieldValue)) ? $fieldValue : '';
 
                             if ($arrayFieldDefinition[$fieldName]["empty"] && $fieldValue . "" == "") {
                                 //
@@ -229,7 +431,8 @@ class Process
                                 switch ($arrayFieldDefinition[$fieldName]["type"]) {
                                     case "date":
                                         if (!preg_match("/^" . $regexpDate . "$/", $fieldValue)) {
-                                            throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE', [$fieldNameAux]));
+                                            throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE',
+                                                [$fieldNameAux]));
                                         }
                                         break;
                                     case "hour":
@@ -240,12 +443,14 @@ class Process
                                         }
 
                                         if (!preg_match($regexpTime, $fieldValue)) {
-                                            throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE', [$fieldNameAux]));
+                                            throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE',
+                                                [$fieldNameAux]));
                                         }
                                         break;
                                     case "datetime":
                                         if (!preg_match("/^" . $regexpDatetime . "$/", $fieldValue)) {
-                                            throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE', [$fieldNameAux]));
+                                            throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE',
+                                                [$fieldNameAux]));
                                         }
                                         break;
                                 }
@@ -259,8 +464,10 @@ class Process
 
                                     //type
                                     if (!is_array($fieldValue)) {
-                                        if ($fieldValue != "" && !preg_match("/^" . $regexpArray1 . ".*" . $regexpArray2 . "$/", $fieldValue)) {
-                                            throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE_THIS_MUST_BE_ARRAY', [$fieldNameAux]));
+                                        if ($fieldValue != "" && !preg_match("/^" . $regexpArray1 . ".*" . $regexpArray2 . "$/",
+                                                $fieldValue)) {
+                                            throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE_THIS_MUST_BE_ARRAY',
+                                                [$fieldNameAux]));
                                         }
                                     }
 
@@ -275,7 +482,8 @@ class Process
                                         if (is_string($fieldValue) && trim($fieldValue) != '') {
                                             //eval("\$arrayAux = $fieldValue;");
 
-                                            if (preg_match("/^" . $regexpArray1 . "(.*)" . $regexpArray2 . "$/", $fieldValue, $arrayMatch)) {
+                                            if (preg_match("/^" . $regexpArray1 . "(.*)" . $regexpArray2 . "$/",
+                                                $fieldValue, $arrayMatch)) {
                                                 if (trim($arrayMatch[1], " ,") != "") {
                                                     $arrayAux = [0];
                                                 }
@@ -283,7 +491,8 @@ class Process
                                         }
 
                                         if (empty($arrayAux)) {
-                                            throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE_CAN_NOT_BE_EMPTY', [$fieldNameAux]));
+                                            throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE_CAN_NOT_BE_EMPTY',
+                                                [$fieldNameAux]));
                                         }
                                     }
 
@@ -302,8 +511,13 @@ class Process
                                         }
 
                                         foreach ($arrayAux as $value) {
-                                            if (!in_array($value, $arrayFieldDefinition[$fieldName]["defaultValues"], true)) {
-                                                throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE_ONLY_ACCEPTS_VALUES', [$fieldNameAux, implode('|', $arrayFieldDefinition[$fieldName]['defaultValues'])]));
+                                            if (!in_array($value, $arrayFieldDefinition[$fieldName]["defaultValues"],
+                                                true)) {
+                                                throw new \Exception(\G::LoadTranslation('ID_INVALID_VALUE_ONLY_ACCEPTS_VALUES',
+                                                    [
+                                                        $fieldNameAux,
+                                                        implode('|', $arrayFieldDefinition[$fieldName]['defaultValues'])
+                                                    ]));
                                             }
                                         }
                                     }
@@ -330,7 +544,8 @@ class Process
     {
         try {
             $result = \ProcessMaker\BusinessModel\Validator::validatePagerDataByPagerDefinition(
-                $arrayData, $arrayFieldNameForException
+                $arrayData,
+                $arrayFieldNameForException
             );
 
             if ($result !== true) {
@@ -355,7 +570,8 @@ class Process
             $process = new \Process();
 
             if (!$process->processExists($processUid)) {
-                throw new \Exception(\G::LoadTranslation("ID_PROJECT_DOES_NOT_EXIST", array($fieldNameForException, $processUid)));
+                throw new \Exception(\G::LoadTranslation("ID_PROJECT_DOES_NOT_EXIST",
+                    array($fieldNameForException, $processUid)));
             }
         } catch (\Exception $e) {
             throw $e;
@@ -376,7 +592,8 @@ class Process
             $user = new \Users();
 
             if (!$user->userExists($userUid)) {
-                throw new \Exception(\G::LoadTranslation("ID_USER_DOES_NOT_EXIST", array($fieldNameForException, $userUid)));
+                throw new \Exception(\G::LoadTranslation("ID_USER_DOES_NOT_EXIST",
+                    array($fieldNameForException, $userUid)));
             }
         } catch (\Exception $e) {
             throw $e;
@@ -396,7 +613,8 @@ class Process
     {
         try {
             if ($this->existsTitle($processTitle, $processUidExclude)) {
-                throw new \Exception(\G::LoadTranslation("ID_PROJECT_TITLE_ALREADY_EXISTS", array($fieldNameForException, $processTitle)));
+                throw new \Exception(\G::LoadTranslation("ID_PROJECT_TITLE_ALREADY_EXISTS",
+                    array($fieldNameForException, $processTitle)));
             }
         } catch (\Exception $e) {
             throw $e;
@@ -417,7 +635,8 @@ class Process
             $obj = \ProcessCategoryPeer::retrieveByPK($processCategoryUid);
 
             if (!(is_object($obj) && get_class($obj) == "ProcessCategory")) {
-                throw new \Exception(\G::LoadTranslation("ID_PROJECT_CATEGORY_DOES_NOT_EXIST", array($fieldNameForException, $processCategoryUid)));
+                throw new \Exception(\G::LoadTranslation("ID_PROJECT_CATEGORY_DOES_NOT_EXIST",
+                    array($fieldNameForException, $processCategoryUid)));
             }
         } catch (\Exception $e) {
             throw $e;
@@ -438,7 +657,8 @@ class Process
             $obj = \AdditionalTablesPeer::retrieveByPK($additionalTableUid);
 
             if (!(is_object($obj) && get_class($obj) == "AdditionalTables")) {
-                throw new \Exception(\G::LoadTranslation("ID_PMTABLE_DOES_NOT_EXIST", array($fieldNameForException, $additionalTableUid)));
+                throw new \Exception(\G::LoadTranslation("ID_PMTABLE_DOES_NOT_EXIST",
+                    array($fieldNameForException, $additionalTableUid)));
             }
         } catch (\Exception $e) {
             throw $e;
@@ -457,7 +677,6 @@ class Process
     public function throwExceptionIfNotExistsRoutingScreenTemplate($processUid, $fileName, $fieldNameForException)
     {
         try {
-
             $arrayFile = \Processes::getProcessFiles($processUid, "mail");
             $flag = 0;
 
@@ -469,7 +688,8 @@ class Process
             }
 
             if ($flag == 0) {
-                throw new \Exception(\G::LoadTranslation("ID_ROUTING_SCREEN_TEMPLATE_DOES_NOT_EXIST", array($fieldNameForException, $fileName)));
+                throw new \Exception(\G::LoadTranslation("ID_ROUTING_SCREEN_TEMPLATE_DOES_NOT_EXIST",
+                    array($fieldNameForException, $fileName)));
             }
         } catch (\Exception $e) {
             throw $e;
@@ -490,7 +710,8 @@ class Process
             $obj = \PermissionsPeer::retrieveByPK($permissionUid);
 
             if (is_null($obj)) {
-                throw new \Exception(\G::LoadTranslation("ID_PERMISSION_DOES_NOT_EXIST", array($fieldNameForException, $permissionUid)));
+                throw new \Exception(\G::LoadTranslation("ID_PERMISSION_DOES_NOT_EXIST",
+                    array($fieldNameForException, $permissionUid)));
             }
         } catch (\Exception $e) {
             throw $e;
@@ -513,30 +734,37 @@ class Process
             //Verify data
             $this->throwExceptionIfNotExistsProcess($processUid, $this->arrayFieldNameForException["processUid"]);
 
-            $this->throwExceptionIfDataNotMetFieldDefinition($arrayData, $this->arrayFieldDefinition, $this->arrayFieldNameForException, false);
+            $this->throwExceptionIfDataNotMetFieldDefinition($arrayData, $this->arrayFieldDefinition,
+                $this->arrayFieldNameForException, false);
 
             if (isset($arrayData["PRO_TITLE"])) {
-                $this->throwExceptionIfExistsTitle($arrayData["PRO_TITLE"], $this->arrayFieldNameForException["processTitle"], $processUid);
+                $this->throwExceptionIfExistsTitle($arrayData["PRO_TITLE"],
+                    $this->arrayFieldNameForException["processTitle"], $processUid);
             }
 
             if (isset($arrayData["PRO_CALENDAR"]) && $arrayData["PRO_CALENDAR"] . "" != "") {
                 $calendar = new \ProcessMaker\BusinessModel\Calendar();
 
-                $calendar->throwExceptionIfNotExistsCalendar($arrayData["PRO_CALENDAR"], $this->arrayFieldNameForException["processCalendar"]);
+                $calendar->throwExceptionIfNotExistsCalendar($arrayData["PRO_CALENDAR"],
+                    $this->arrayFieldNameForException["processCalendar"]);
             }
 
             if (isset($arrayData["PRO_CATEGORY"]) && $arrayData["PRO_CATEGORY"] . "" != "") {
-                $this->throwExceptionIfNotExistsProcessCategory($arrayData["PRO_CATEGORY"], $this->arrayFieldNameForException["processCategory"]);
+                $this->throwExceptionIfNotExistsProcessCategory($arrayData["PRO_CATEGORY"],
+                    $this->arrayFieldNameForException["processCategory"]);
             }
 
             if (isset($arrayData["PRO_SUMMARY_DYNAFORM"]) && $arrayData["PRO_SUMMARY_DYNAFORM"] . "" != "") {
                 $dynaForm = new \ProcessMaker\BusinessModel\DynaForm();
 
-                $dynaForm->throwExceptionIfNotExistsDynaForm($arrayData["PRO_SUMMARY_DYNAFORM"], $processUid, $this->arrayFieldNameForException["processSummaryDynaform"]);
+                $dynaForm->throwExceptionIfNotExistsDynaForm($arrayData["PRO_SUMMARY_DYNAFORM"], $processUid,
+                    $this->arrayFieldNameForException["processSummaryDynaform"]);
             }
 
             if (isset($arrayData["PRO_DERIVATION_SCREEN_TPL"]) && $arrayData["PRO_DERIVATION_SCREEN_TPL"] . "" != "") {
-                $this->throwExceptionIfNotExistsRoutingScreenTemplate($processUid, $arrayData["PRO_DERIVATION_SCREEN_TPL"], $this->arrayFieldNameForException["processDerivationScreenTpl"]);
+                $this->throwExceptionIfNotExistsRoutingScreenTemplate($processUid,
+                    $arrayData["PRO_DERIVATION_SCREEN_TPL"],
+                    $this->arrayFieldNameForException["processDerivationScreenTpl"]);
             }
 
             $trigger = new \ProcessMaker\BusinessModel\Trigger();
@@ -549,58 +777,60 @@ class Process
              */
             if (isset($arrayData["PRO_TRI_DELETED"]) && $arrayData["PRO_TRI_DELETED"] . "" != "") {
                 try {
-                    $trigger->throwExceptionIfNotExistsTrigger($arrayData["PRO_TRI_DELETED"], $processUid, $this->arrayFieldNameForException["processTriDeleted"]);
+                    $trigger->throwExceptionIfNotExistsTrigger($arrayData["PRO_TRI_DELETED"], $processUid,
+                        $this->arrayFieldNameForException["processTriDeleted"]);
                 } catch (\Exception $e) {
-
                 }
             }
 
             if (isset($arrayData["PRO_TRI_CANCELED"]) && $arrayData["PRO_TRI_CANCELED"] . "" != "") {
                 try {
-                    $trigger->throwExceptionIfNotExistsTrigger($arrayData["PRO_TRI_CANCELED"], $processUid, $this->arrayFieldNameForException["processTriCanceled"]);
+                    $trigger->throwExceptionIfNotExistsTrigger($arrayData["PRO_TRI_CANCELED"], $processUid,
+                        $this->arrayFieldNameForException["processTriCanceled"]);
                 } catch (\Exception $e) {
-
                 }
             }
 
             if (isset($arrayData["PRO_TRI_PAUSED"]) && $arrayData["PRO_TRI_PAUSED"] . "" != "") {
                 try {
-                    $trigger->throwExceptionIfNotExistsTrigger($arrayData["PRO_TRI_PAUSED"], $processUid, $this->arrayFieldNameForException["processTriPaused"]);
+                    $trigger->throwExceptionIfNotExistsTrigger($arrayData["PRO_TRI_PAUSED"], $processUid,
+                        $this->arrayFieldNameForException["processTriPaused"]);
                 } catch (\Exception $e) {
-
                 }
             }
 
             if (isset($arrayData["PRO_TRI_UNPAUSED"]) && $arrayData["PRO_TRI_UNPAUSED"] . "" != "") {
                 try {
-                    $trigger->throwExceptionIfNotExistsTrigger($arrayData["PRO_TRI_UNPAUSED"], $processUid, $this->arrayFieldNameForException["processTriUnpaused"]);
+                    $trigger->throwExceptionIfNotExistsTrigger($arrayData["PRO_TRI_UNPAUSED"], $processUid,
+                        $this->arrayFieldNameForException["processTriUnpaused"]);
                 } catch (\Exception $e) {
-
                 }
             }
 
             if (isset($arrayData["PRO_TRI_REASSIGNED"]) && $arrayData["PRO_TRI_REASSIGNED"] . "" != "") {
                 try {
-                    $trigger->throwExceptionIfNotExistsTrigger($arrayData["PRO_TRI_REASSIGNED"], $processUid, $this->arrayFieldNameForException["processTriReassigned"]);
+                    $trigger->throwExceptionIfNotExistsTrigger($arrayData["PRO_TRI_REASSIGNED"], $processUid,
+                        $this->arrayFieldNameForException["processTriReassigned"]);
                 } catch (\Exception $e) {
-
                 }
             }
 
             if (isset($arrayData["PRO_PARENT"])) {
-                $this->throwExceptionIfNotExistsProcess($arrayData["PRO_PARENT"], $this->arrayFieldNameForException["processParent"]);
+                $this->throwExceptionIfNotExistsProcess($arrayData["PRO_PARENT"],
+                    $this->arrayFieldNameForException["processParent"]);
             }
 
             if (isset($arrayData["PRO_CREATE_USER"]) && $arrayData["PRO_CREATE_USER"] . "" != "") {
-                $this->throwExceptionIfNotExistsUser($arrayData["PRO_CREATE_USER"], $this->arrayFieldNameForException["processCreateUser"]);
+                $this->throwExceptionIfNotExistsUser($arrayData["PRO_CREATE_USER"],
+                    $this->arrayFieldNameForException["processCreateUser"]);
             }
 
             //Update name in table Bpmn_Project and Bpmn_Process
             $oProject = new BpmnProject();
-            $oProject->update($processUid, array('PRJ_NAME'=>$arrayData['PRO_TITLE']));
+            $oProject->update($processUid, array('PRJ_NAME' => $arrayData['PRO_TITLE']));
             $oProcess = new BpmnProcess();
             //The relationship Bpmn_Project with Bpmn_Process is 1:n
-            $oProcess->updateAllProcessesByProject($processUid, array('PRO_NAME'=>$arrayData['PRO_TITLE']));
+            $oProcess->updateAllProcessesByProject($processUid, array('PRO_NAME' => $arrayData['PRO_TITLE']));
             //Update
             $process = new \Process();
 
@@ -609,11 +839,11 @@ class Process
             $arrayData["PRO_UID"] = $processUid;
 
             if (isset($arrayData["PRO_ASSIGNMENT"])) {
-                $arrayData["PRO_ASSIGNMENT"] = ($arrayData["PRO_ASSIGNMENT"] == 1)? "TRUE" : "FALSE";
+                $arrayData["PRO_ASSIGNMENT"] = ($arrayData["PRO_ASSIGNMENT"] == 1) ? "TRUE" : "FALSE";
             }
 
             $arrayData["PRO_DYNAFORMS"] = array();
-            $arrayData["PRO_DYNAFORMS"]["PROCESS"] = (isset($arrayData["PRO_SUMMARY_DYNAFORM"]))? $arrayData["PRO_SUMMARY_DYNAFORM"] : "";
+            $arrayData["PRO_DYNAFORMS"]["PROCESS"] = (isset($arrayData["PRO_SUMMARY_DYNAFORM"])) ? $arrayData["PRO_SUMMARY_DYNAFORM"] : "";
 
             unset($arrayData["PRO_SUMMARY_DYNAFORM"]);
 
@@ -622,7 +852,8 @@ class Process
             if (isset($arrayData["PRO_CALENDAR"])) {
                 $calendar = new \Calendar();
 
-                $calendar->assignCalendarTo($processUid, $arrayData["PRO_CALENDAR"], "PROCESS"); //Save Calendar ID for this process
+                $calendar->assignCalendarTo($processUid, $arrayData["PRO_CALENDAR"],
+                    "PROCESS"); //Save Calendar ID for this process
             }
 
             $arrayData = $arrayDataBackup;
@@ -659,11 +890,11 @@ class Process
             $arrayProcessData = $process->load($processUid);
             $arrayCalendarInfo = $calendar->getCalendarFor($processUid, $processUid, $processUid);
 
-            $arrayProcessData["PRO_ASSIGNMENT"] = ($arrayProcessData["PRO_ASSIGNMENT"] == "TRUE")? 1 : 0;
-            $arrayProcessData["PRO_SUMMARY_DYNAFORM"] = (isset($arrayProcessData["PRO_DYNAFORMS"]["PROCESS"])? $arrayProcessData["PRO_DYNAFORMS"]["PROCESS"] : "");
+            $arrayProcessData["PRO_ASSIGNMENT"] = ($arrayProcessData["PRO_ASSIGNMENT"] == "TRUE") ? 1 : 0;
+            $arrayProcessData["PRO_SUMMARY_DYNAFORM"] = (isset($arrayProcessData["PRO_DYNAFORMS"]["PROCESS"]) ? $arrayProcessData["PRO_DYNAFORMS"]["PROCESS"] : "");
 
             //If the function returns a DEFAULT calendar it means that this object doesn't have assigned any calendar
-            $arrayProcessData["PRO_CALENDAR"] = ($arrayCalendarInfo["CALENDAR_APPLIED"] != "DEFAULT")? $arrayCalendarInfo["CALENDAR_UID"] : "";
+            $arrayProcessData["PRO_CALENDAR"] = ($arrayCalendarInfo["CALENDAR_APPLIED"] != "DEFAULT") ? $arrayCalendarInfo["CALENDAR_UID"] : "";
 
             //Return
             unset($arrayProcessData["PRO_DYNAFORMS"]);
@@ -680,7 +911,11 @@ class Process
             unset($arrayProcessData["PRO_TITLE"]);
             unset($arrayProcessData["PRO_DESCRIPTION"]);
 
-            $arrayProcessData = array_merge(array("PRO_UID" => $processUid, "PRO_TITLE" => $processTitle, "PRO_DESCRIPTION" => $processDescription), $arrayProcessData);
+            $arrayProcessData = array_merge(array(
+                "PRO_UID" => $processUid,
+                "PRO_TITLE" => $processTitle,
+                "PRO_DESCRIPTION" => $processDescription
+            ), $arrayProcessData);
 
             if (!$this->formatFieldNameInUppercase) {
                 $arrayProcessData = array_change_key_case($arrayProcessData, CASE_LOWER);
@@ -721,7 +956,6 @@ class Process
         }
 
         if ($delete || $type == "SEQUENTIAL" || $type == "SEC-JOIN" || $type == "DISCRIMINATOR") {
-
             $tasks = new \Tasks();
 
             $tasks->deleteAllRoutesOfTask($processUid, $taskUid);
@@ -786,11 +1020,12 @@ class Process
         }
 
         if (isset($arrayProcessData["PRO_TITLE"]) && $process->existsByProTitle($arrayProcessData["PRO_TITLE"])) {
-            throw (new \Exception(\G::LoadTranslation("ID_PROCESSTITLE_ALREADY_EXISTS", SYS_LANG, array("PRO_TITLE" => $arrayProcessData["PRO_TITLE"]))));
+            throw (new \Exception(\G::LoadTranslation("ID_PROCESSTITLE_ALREADY_EXISTS", SYS_LANG,
+                array("PRO_TITLE" => $arrayProcessData["PRO_TITLE"]))));
         }
 
-        $arrayProcessData["PRO_DYNAFORMS"] = array ();
-        $arrayProcessData["PRO_DYNAFORMS"]["PROCESS"] = (isset($arrayProcessData["PRO_SUMMARY_DYNAFORM"]))? $arrayProcessData["PRO_SUMMARY_DYNAFORM"] : "";
+        $arrayProcessData["PRO_DYNAFORMS"] = array();
+        $arrayProcessData["PRO_DYNAFORMS"]["PROCESS"] = (isset($arrayProcessData["PRO_SUMMARY_DYNAFORM"])) ? $arrayProcessData["PRO_SUMMARY_DYNAFORM"] : "";
 
         unset($arrayProcessData["PRO_SUMMARY_DYNAFORM"]);
 
@@ -833,12 +1068,12 @@ class Process
                     case "CREATE":
                         //Create task
                         $arrayDataAux = array(
-                            "TAS_UID"   => $arrayData["TAS_UID"],
-                            "PRO_UID"   => $arrayData["PRO_UID"],
+                            "TAS_UID" => $arrayData["TAS_UID"],
+                            "PRO_UID" => $arrayData["PRO_UID"],
                             "TAS_TITLE" => $arrayData["TAS_TITLE"],
                             "TAS_DESCRIPTION" => $arrayData["TAS_DESCRIPTION"],
-                            "TAS_POSX"  => $arrayData["TAS_POSX"],
-                            "TAS_POSY"  => $arrayData["TAS_POSY"],
+                            "TAS_POSX" => $arrayData["TAS_POSX"],
+                            "TAS_POSY" => $arrayData["TAS_POSY"],
                             "TAS_START" => $arrayData["TAS_START"]
                         );
 
@@ -857,7 +1092,8 @@ class Process
 
                         //Update array routes
                         if (isset($arrayDefineProcessData["process"]["routes"]) && count($arrayDefineProcessData["process"]["routes"]) > 0) {
-                            $arrayDefineProcessData["process"]["routes"] = $this->routeUpdateTaskUidInArray($arrayDefineProcessData["process"]["routes"], $taskUid, $t["TAS_UID"]);
+                            $arrayDefineProcessData["process"]["routes"] = $this->routeUpdateTaskUidInArray($arrayDefineProcessData["process"]["routes"],
+                                $taskUid, $t["TAS_UID"]);
                         }
                         break;
                     case "UPDATE":
@@ -966,15 +1202,15 @@ class Process
 
         $process = new \Process();
 
-        $memcache = &\PMmemcached::getSingleton(config("system.workspace"));
-
+        $memcache = PMmemcached::getSingleton(config("system.workspace"));
         $memkey = "no memcache";
         $memcacheUsed = "not used";
         $totalCount = 0;
 
         if (isset($arrayFilterData["category"]) && $arrayFilterData["category"] !== "<reset>") {
             if (isset($arrayFilterData["processName"])) {
-                $proData = $process->getAllProcesses($start, $limit, $arrayFilterData["category"], $arrayFilterData["processName"]);
+                $proData = $process->getAllProcesses($start, $limit, $arrayFilterData["category"],
+                    $arrayFilterData["processName"]);
             } else {
                 $proData = $process->getAllProcesses($start, $limit, $arrayFilterData["category"]);
             }
@@ -1004,9 +1240,9 @@ class Process
         }
 
         $arrayData = array(
-            "memkey"     => $memkey,
-            "memcache"   => $memcacheUsed,
-            "data"       => $proData,
+            "memkey" => $memkey,
+            "memcache" => $memcacheUsed,
+            "data" => $proData,
             "totalCount" => $totalCount
         );
 
@@ -1032,10 +1268,10 @@ class Process
         $arrayProcessData = $process->load($processUid);
 
         $arrayDefineProcessData["process"] = array(
-            "PRO_UID"   => $processUid,
+            "PRO_UID" => $processUid,
             "PRO_TITLE" => $arrayProcessData["PRO_TITLE"],
             "PRO_DESCRIPTION" => $arrayProcessData["PRO_DESCRIPTION"],
-            "PRO_CATEGORY"    => $arrayProcessData["PRO_CATEGORY"]
+            "PRO_CATEGORY" => $arrayProcessData["PRO_CATEGORY"]
         );
 
         //Load data
@@ -1044,7 +1280,7 @@ class Process
         $arrayData = (array)(\Bootstrap::json_decode($processMap->load($processUid)));
 
         //Tasks & Routes
-        $arrayDefineProcessData["process"]["tasks"]  = array();
+        $arrayDefineProcessData["process"]["tasks"] = array();
         $arrayDefineProcessData["process"]["routes"] = array();
 
         if (isset($arrayData["task"]) && count($arrayData["task"]) > 0) {
@@ -1060,11 +1296,11 @@ class Process
 
                 //Set task
                 $arrayDefineProcessData["process"]["tasks"][] = array(
-                    "TAS_UID"   => $taskUid,
+                    "TAS_UID" => $taskUid,
                     "TAS_TITLE" => $arrayTaskData["TAS_TITLE"],
                     "TAS_DESCRIPTION" => $arrayTaskData["TAS_DESCRIPTION"],
-                    "TAS_POSX"  => $arrayTaskData["TAS_POSX"],
-                    "TAS_POSY"  => $arrayTaskData["TAS_POSY"],
+                    "TAS_POSX" => $arrayTaskData["TAS_POSX"],
+                    "TAS_POSY" => $arrayTaskData["TAS_POSY"],
                     "TAS_START" => $arrayTaskData["TAS_START"]
                 );
 
@@ -1161,33 +1397,33 @@ class Process
      * return bool   Return true, if is succesfully
      *
      * @access public
-
-    DEPRECATED
-    public function deleteProcess($processUid, $checkCases = true)
-    {
-        if ($checkCases) {
-            $process = new \Process();
-
-            $arrayCases = $process->getCasesCountInAllProcesses($processUid);
-
-            $sum = 0;
-
-            if (isset($arrayCases[$processUid]) && count($arrayCases[$processUid]) > 0) {
-                foreach ($arrayCases[$processUid] as $value) {
-                    $sum = $sum + $value;
-                }
-            }
-
-            if ($sum > 0) {
-                throw (new \Exception("You can't delete the process, because it has $sum cases"));
-            }
-        }
-
-        $processMap = new \processMap();
-
-        return $processMap->deleteProcess($processUid);
-
-    }*/
+     *
+     * DEPRECATED
+     * public function deleteProcess($processUid, $checkCases = true)
+     * {
+     * if ($checkCases) {
+     * $process = new \Process();
+     *
+     * $arrayCases = $process->getCasesCountInAllProcesses($processUid);
+     *
+     * $sum = 0;
+     *
+     * if (isset($arrayCases[$processUid]) && count($arrayCases[$processUid]) > 0) {
+     * foreach ($arrayCases[$processUid] as $value) {
+     * $sum = $sum + $value;
+     * }
+     * }
+     *
+     * if ($sum > 0) {
+     * throw (new \Exception("You can't delete the process, because it has $sum cases"));
+     * }
+     * }
+     *
+     * $processMap = new \processMap();
+     *
+     * return $processMap->deleteProcess($processUid);
+     *
+     * }*/
 
     public function deleteProcess($sProcessUID)
     {
@@ -1321,7 +1557,8 @@ class Process
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $oDataset->next();
             while ($aRow = $oDataset->getRow()) {
-                $oConfiguration->remove($aRow['CFG_UID'], $aRow['OBJ_UID'], $aRow['PRO_UID'], $aRow['USR_UID'], $aRow['APP_UID']);
+                $oConfiguration->remove($aRow['CFG_UID'], $aRow['OBJ_UID'], $aRow['PRO_UID'], $aRow['USR_UID'],
+                    $aRow['APP_UID']);
                 $oDataset->next();
             }
             //Delete the DB sources of process
@@ -1527,10 +1764,10 @@ class Process
     {
         try {
             return array(
-                $this->getFieldNameByFormatFieldName("VAR_NAME")  => trim($record["name"]),
+                $this->getFieldNameByFormatFieldName("VAR_NAME") => trim($record["name"]),
                 $this->getFieldNameByFormatFieldName("VAR_LABEL") => trim($record["label"]),
-                $this->getFieldNameByFormatFieldName("VAR_TYPE")  => trim($record["type"]),
-                $this->getFieldNameByFormatFieldName("VAR_SOURCE")  => trim($record["source"])
+                $this->getFieldNameByFormatFieldName("VAR_TYPE") => trim($record["type"]),
+                $this->getFieldNameByFormatFieldName("VAR_SOURCE") => trim($record["source"])
             );
         } catch (\Exception $e) {
             throw $e;
@@ -1560,22 +1797,33 @@ class Process
                     $arrayVar = self::getGridsVars($processUid);
 
                     foreach ($arrayVar as $key => $value) {
-                        $arrayVariableAux = $this->getVariableDataFromRecord(array("name" => $value["sName"], "label" => "[ " . \G::LoadTranslation("ID_GRID") . " ]", "type" => "grid"));
+                        $arrayVariableAux = $this->getVariableDataFromRecord(array(
+                            "name" => $value["sName"],
+                            "label" => "[ " . \G::LoadTranslation("ID_GRID") . " ]",
+                            "type" => "grid"
+                        ));
 
-                        $arrayVariable[] = array_merge($arrayVariableAux, array($this->getFieldNameByFormatFieldName("GRID_UID") => $value["sXmlForm"]));
+                        $arrayVariable[] = array_merge($arrayVariableAux,
+                            array($this->getFieldNameByFormatFieldName("GRID_UID") => $value["sXmlForm"]));
                     }
                     break;
                 case "GRIDVARS":
                     //Verify data
                     $dynaForm = new \ProcessMaker\BusinessModel\DynaForm();
 
-                    $dynaForm->throwExceptionIfNotExistsDynaForm($gridUid, $processUid, $this->arrayFieldNameForException["gridUid"]);
-                    $dynaForm->throwExceptionIfNotIsGridDynaForm($gridUid, $this->arrayFieldNameForException["gridUid"]);
+                    $dynaForm->throwExceptionIfNotExistsDynaForm($gridUid, $processUid,
+                        $this->arrayFieldNameForException["gridUid"]);
+                    $dynaForm->throwExceptionIfNotIsGridDynaForm($gridUid,
+                        $this->arrayFieldNameForException["gridUid"]);
 
                     //Get data
                     $fields = self::getVarsGrid($processUid, $gridUid);
                     foreach ($fields as $field) {
-                        $arrayVariable[] = $this->getVariableDataFromRecord(array("name" => $field["sName"], "label" => $field["sLabel"], "type" => $field["sType"]));
+                        $arrayVariable[] = $this->getVariableDataFromRecord(array(
+                            "name" => $field["sName"],
+                            "label" => $field["sLabel"],
+                            "type" => $field["sType"]
+                        ));
                     }
 
                     break;
@@ -1584,7 +1832,12 @@ class Process
                     $arrayVar = self::getDynaformsVars($processUid);
 
                     foreach ($arrayVar as $key => $value) {
-                        $arrayVariable[] = $this->getVariableDataFromRecord(array("name" => $value["sName"], "label" => $value["sLabel"], "type" => $value["sType"], "source" => $value["sUid"]));
+                        $arrayVariable[] = $this->getVariableDataFromRecord(array(
+                            "name" => $value["sName"],
+                            "label" => $value["sLabel"],
+                            "type" => $value["sType"],
+                            "source" => $value["sUid"]
+                        ));
                     }
 
                     $arrayHtmlVariable = self::getHtmlFormVars($processUid);
@@ -1625,7 +1878,8 @@ class Process
             ksort($library);
 
             foreach ($library as $key => $value) {
-                $libraryName = (preg_match("/^class\.?(.*)\.pmFunctions\.php$/", $key, $arrayMatch))? ((isset($arrayMatch[1]) && $arrayMatch[1] != "")? $arrayMatch[1] : "pmFunctions") : $key;
+                $libraryName = (preg_match("/^class\.?(.*)\.pmFunctions\.php$/", $key,
+                    $arrayMatch)) ? ((isset($arrayMatch[1]) && $arrayMatch[1] != "") ? $arrayMatch[1] : "pmFunctions") : $key;
 
                 $arrayLibrary[] = $triggerWizard->getLibrary($libraryName);
             }
@@ -1641,40 +1895,57 @@ class Process
      * Function getDynaformsVars
      *
      * @access public
+     *
      * @param eter string $sProcessUID
      * @param eter boolean $bSystemVars
+     *
      * @return array
      */
-    public static function getDynaformsVars ($sProcessUID, $bSystemVars = true, $bIncMulSelFields = 0)
+    public static function getDynaformsVars($sProcessUID, $bSystemVars = true, $bIncMulSelFields = 0)
     {
-        $aFields = array ();
-        $aFieldsNames = array ();
+        $aFields = array();
+        $aFieldsNames = array();
         if ($bSystemVars) {
             $aAux = G::getSystemConstants();
             foreach ($aAux as $sName => $sValue) {
-                $aFields[] = array ('sName' => $sName,'sType' => 'system','sLabel' => G::LoadTranslation('ID_TINY_SYSTEM_VARIABLE'), 'sUid' => '');
+                $aFields[] = array(
+                    'sName' => $sName,
+                    'sType' => 'system',
+                    'sLabel' => G::LoadTranslation('ID_TINY_SYSTEM_VARIABLE'),
+                    'sUid' => ''
+                );
             }
             //we're adding the pin variable to the system list
-            $aFields[] = array ('sName' => 'PIN','sType' => 'system','sLabel' => G::LoadTranslation('ID_TINY_SYSTEM_VARIABLE'), 'sUid' => '');
-            
+            $aFields[] = array(
+                'sName' => 'PIN',
+                'sType' => 'system',
+                'sLabel' => G::LoadTranslation('ID_TINY_SYSTEM_VARIABLE'),
+                'sUid' => ''
+            );
+
             //we're adding the app_number variable to the system list
-            $aFields[] = array('sName' => 'APP_NUMBER', 'sType' => 'system', 'sLabel' => G::LoadTranslation('ID_TINY_SYSTEM_VARIABLE'), 'sUid' => '');
+            $aFields[] = array(
+                'sName' => 'APP_NUMBER',
+                'sType' => 'system',
+                'sLabel' => G::LoadTranslation('ID_TINY_SYSTEM_VARIABLE'),
+                'sUid' => ''
+            );
         }
 
         $aInvalidTypes = array("title", "subtitle", "file", "button", "reset", "submit", "javascript");
         $aMultipleSelectionFields = array("listbox", "checkgroup", "grid");
 
         if ($bIncMulSelFields != 0) {
-            $aInvalidTypes = array_merge( $aInvalidTypes, $aMultipleSelectionFields );
+            $aInvalidTypes = array_merge($aInvalidTypes, $aMultipleSelectionFields);
         }
 
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->addSelectColumn( \DynaformPeer::DYN_FILENAME );
-        $oCriteria->addSelectColumn( \DynaformPeer::DYN_UID );
-        $oCriteria->add( \DynaformPeer::PRO_UID, $sProcessUID );
-        $oCriteria->add( \DynaformPeer::DYN_TYPE, 'xmlform' );
-        $oDataset = \DynaformPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn(\DynaformPeer::DYN_FILENAME);
+        $oCriteria->addSelectColumn(\DynaformPeer::DYN_UID);
+        $oCriteria->add(\DynaformPeer::PRO_UID, $sProcessUID);
+        $oCriteria->add(\DynaformPeer::DYN_TYPE, 'xmlform');
+        $oDataset = \DynaformPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
 
         while ($aRow = $oDataset->getRow()) {
@@ -1692,17 +1963,19 @@ class Process
                 foreach ($fields as $field) {
                     $label = "";
                     if ($field->hasChildNodes()) {
-                        $child = $field->getElementsByTagName(SYS_LANG)->length ? $field->getElementsByTagName(SYS_LANG): $field->getElementsByTagName("en");
+                        $child = $field->getElementsByTagName(SYS_LANG)->length ? $field->getElementsByTagName(SYS_LANG) : $field->getElementsByTagName("en");
                         $label = $child->item(0) ? $child->item(0)->textContent : "";
                     }
 
-                    if (! in_array($field->getAttribute("type"), $aInvalidTypes) && ! in_array($field->tagName, $aFieldsNames)) {
+                    if (!in_array($field->getAttribute("type"), $aInvalidTypes) && !in_array($field->tagName,
+                            $aFieldsNames)) {
                         $aFieldsNames[] = $field->tagName;
-                        $aFields[] = array (
+                        $aFields[] = array(
                             'sName' => $field->tagName,
                             'sType' => $field->getAttribute("type"),
                             'sLabel' => ($field->getAttribute("type") != 'grid' ? $label : '[ ' . G::LoadTranslation('ID_GRID') . ' ]'),
-                            'sUid' => $aRow['DYN_UID']);
+                            'sUid' => $aRow['DYN_UID']
+                        );
                     }
                 }
             }
@@ -1716,19 +1989,21 @@ class Process
      * Function getGridsVars
      *
      * @access public
+     *
      * @param eter string $sProcessUID
+     *
      * @return array
      */
-    public static function getGridsVars ($sProcessUID)
+    public static function getGridsVars($sProcessUID)
     {
-        $aFields = array ();
-        $aFieldsNames = array ();
+        $aFields = array();
+        $aFieldsNames = array();
 
-        $oCriteria = new Criteria( 'workflow' );
-        $oCriteria->addSelectColumn( \DynaformPeer::DYN_FILENAME );
-        $oCriteria->add( \DynaformPeer::PRO_UID, $sProcessUID );
-        $oDataset = \DynaformPeer::doSelectRS( $oCriteria );
-        $oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn(\DynaformPeer::DYN_FILENAME);
+        $oCriteria->add(\DynaformPeer::PRO_UID, $sProcessUID);
+        $oDataset = \DynaformPeer::doSelectRS($oCriteria);
+        $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
         $oDataset->next();
         while ($aRow = $oDataset->getRow()) {
             if (is_file(PATH_DYNAFORM . $aRow['DYN_FILENAME'] . ".xml")) {
@@ -1746,9 +2021,9 @@ class Process
                     if ($field->getAttribute("type") !== "grid") {
                         continue;
                     }
-                    if (! in_array($field->tagName, $aFieldsNames)) {
+                    if (!in_array($field->tagName, $aFieldsNames)) {
                         $aFieldsNames[] = $field->tagName;
-                        $aFields[] = array (
+                        $aFields[] = array(
                             'sName' => $field->tagName,
                             'sXmlForm' => $aRow['DYN_FILENAME']
                         );
@@ -1765,20 +2040,22 @@ class Process
      * Function getVarsGrid returns all variables of Grid
      *
      * @access public
+     *
      * @param string proUid process ID
      * @param string dynUid dynaform ID
+     *
      * @return array
      */
-    public static function getVarsGrid ($proUid, $dynUid)
+    public static function getVarsGrid($proUid, $dynUid)
     {
-        $dynaformFields = array ();
+        $dynaformFields = array();
         $aFieldsNames = array();
         $aFields = array();
         $aInvalidTypes = array("title", "subtitle", "file", "button", "reset", "submit", "javascript");
         $aMultipleSelectionFields = array("listbox", "checkgroup", "grid");
 
-        if (is_file( PATH_DATA . '/sites/'. config("system.workspace") .'/xmlForms/'. $proUid .'/'.$dynUid. '.xml' ) && filesize( PATH_DATA . '/sites/'. config("system.workspace") .'/xmlForms/'. $proUid .'/'. $dynUid .'.xml' ) > 0) {
-            $dyn = new DynaformHandler( PATH_DATA . '/sites/'. config("system.workspace") .'/xmlForms/' .$proUid. '/' . $dynUid .'.xml' );
+        if (is_file(PATH_DATA . '/sites/' . config("system.workspace") . '/xmlForms/' . $proUid . '/' . $dynUid . '.xml') && filesize(PATH_DATA . '/sites/' . config("system.workspace") . '/xmlForms/' . $proUid . '/' . $dynUid . '.xml') > 0) {
+            $dyn = new DynaformHandler(PATH_DATA . '/sites/' . config("system.workspace") . '/xmlForms/' . $proUid . '/' . $dynUid . '.xml');
             $dynaformFields[] = $dyn->getFields();
 
             $fields = $dyn->getFields();
@@ -1787,9 +2064,10 @@ class Process
                 if ($field->getAttribute("type") !== "grid") {
                     continue;
                 }
-                if (! in_array($field->getAttribute("type"), $aInvalidTypes) && ! in_array($field->tagName, $aFieldsNames)) {
+                if (!in_array($field->getAttribute("type"), $aInvalidTypes) && !in_array($field->tagName,
+                        $aFieldsNames)) {
                     $aFieldsNames[] = $field->tagName;
-                    $aFields[] = array (
+                    $aFields[] = array(
                         'sName' => $field->tagName,
                         'sType' => $field->getAttribute("type"),
                         'sLabel' => ($field->getAttribute("type") != 'grid' ? $label : '[ ' . G::LoadTranslation('ID_GRID') . ' ]')
@@ -1805,10 +2083,12 @@ class Process
      * Function getHtmlFormVars
      *
      * @access public
+     *
      * @param string $sProcessUID
+     *
      * @return array
      */
-    public static function getHtmlFormVars ($sProcessUID)
+    public static function getHtmlFormVars($sProcessUID)
     {
         //Get data
         $criteria = new \Criteria("workflow");
@@ -1828,15 +2108,16 @@ class Process
         $arrayVariables = array();
 
         while ($aRow = $rsCriteria->getRow()) {
-            $arrayVariables[] = array(  'var_name' => $aRow['VAR_NAME'],
-                                        'var_label' => $aRow['VAR_LABEL'],
-                                        'var_type' => $aRow['VAR_FIELD_TYPE'],
-                                        'var_source' => $aRow['VAR_UID']);
+            $arrayVariables[] = array(
+                'var_name' => $aRow['VAR_NAME'],
+                'var_label' => $aRow['VAR_LABEL'],
+                'var_type' => $aRow['VAR_FIELD_TYPE'],
+                'var_source' => $aRow['VAR_UID']
+            );
             $rsCriteria->next();
         }
         //Return
         return $arrayVariables;
-
     }
 
     /**
@@ -1878,5 +2159,4 @@ class Process
 
         return $processes;
     }
-
 }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php b/workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php
index 02357469f..18b9469a0 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ProcessMaker\BusinessModel;
 
 use \G;
@@ -17,28 +18,28 @@ class ReportingIndicators
      *
      * return decimal  value
      */
-    public function getHistoricData($indicatorUid,  $initDate, $endDate, $periodicity, $language)
+    public function getHistoricData($indicatorUid, $initDate, $endDate, $periodicity, $language)
     {
-		$retval = "";
+        $retval = "";
         $calculator = new \IndicatorsCalculator();
         $arr = $calculator->indicatorData($indicatorUid);
         $indicator = $arr[0];
-		$processesId = $indicator['DAS_UID_PROCESS'];
-		$indicatorType = $indicator['DAS_IND_TYPE'];
-		switch ($indicatorType) {
-			case \ReportingIndicatorTypeEnum::PEI:
-				$retval = $calculator->peiHistoric($processesId, $initDate, $endDate, \ReportingPeriodicityEnum::fromValue($periodicity));
-				break;
-			case \ReportingIndicatorTypeEnum::UEI:
-				$retval = $calculator->ueiHistoric($processesId, $initDate, $endDate, \ReportingPeriodicityEnum::fromValue($periodicity));
-				break;
-			default:
-				throw new Exception("Can't retrive historic Data becasuse de indicator type " + $indicator['DAS_IND_TYPE'] + " has no operation associated.");
-				break;
-		}
+        $processesId = $indicator['DAS_UID_PROCESS'];
+        $indicatorType = $indicator['DAS_IND_TYPE'];
+        switch ($indicatorType) {
+            case \ReportingIndicatorTypeEnum::PEI:
+                $retval = $calculator->peiHistoric($processesId, $initDate, $endDate, \ReportingPeriodicityEnum::fromValue($periodicity));
+                break;
+            case \ReportingIndicatorTypeEnum::UEI:
+                $retval = $calculator->ueiHistoric($processesId, $initDate, $endDate, \ReportingPeriodicityEnum::fromValue($periodicity));
+                break;
+            default:
+                throw new Exception("Can't retrive historic Data becasuse de indicator type " + $indicator['DAS_IND_TYPE'] + " has no operation associated.");
+                break;
+        }
         return $retval;
     }
-	
+
 
     /**
      * Lists tasks of a process and it's statistics (efficiency, average times, etc.)
@@ -50,24 +51,30 @@ class ReportingIndicators
      *
      * return decimal  value
      */
-    public function getPeiCompleteData($indicatorUid,  $compareDate, $measureDate, $language)
+    public function getPeiCompleteData($indicatorUid, $compareDate, $measureDate, $language)
     {
         $calculator = new \IndicatorsCalculator();
         $processes = $calculator->peiProcesses($indicatorUid, $measureDate, $measureDate, $language);
         $arr = $calculator->indicatorData($indicatorUid);
         $indicator = $arr[0];
-		$processesId = $indicator['DAS_UID_PROCESS'];
-		$peiValue = current(reset($calculator->peiHistoric($processesId, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
-		$peiCost = current(reset($calculator->peiCostHistoric($processesId, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
-		$peiCompare = current(reset($calculator->peiHistoric($processesId, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE)));
+        $processesId = $indicator['DAS_UID_PROCESS'];
+        $peiValue = $calculator->peiHistoric($processesId, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE);
+        $peiValue = reset($peiValue);
+        $peiValue = current($peiValue);
+        $peiCost = $calculator->peiCostHistoric($processesId, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE);
+        $peiCost = reset($peiCost);
+        $peiCost = current($peiCost);
+        $peiCompare = $calculator->peiHistoric($processesId, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE);
+        $peiCompare = reset($peiCompare);
+        $peiCompare = current($peiCompare);
 
-		$retval = array(
-						"id" => $indicatorUid,
-						"efficiencyIndex" => $peiValue,
-						"efficiencyIndexToCompare" => $peiCompare,
-						"efficiencyVariation" => ($peiValue-$peiCompare),
-						"inefficiencyCost" => $peiCost,
-						"data"=>$processes);
+        $retval = array(
+            "id" => $indicatorUid,
+            "efficiencyIndex" => $peiValue,
+            "efficiencyIndexToCompare" => $peiCompare,
+            "efficiencyVariation" => ($peiValue - $peiCompare),
+            "inefficiencyCost" => $peiCost,
+            "data" => $processes);
         return $retval;
     }
 
@@ -81,25 +88,31 @@ class ReportingIndicators
      *
      * return decimal  value
      */
-    public function getUeiCompleteData($indicatorUid, $compareDate, $measureDate,$language)
+    public function getUeiCompleteData($indicatorUid, $compareDate, $measureDate, $language)
     {
         $calculator = new \IndicatorsCalculator();
         $groups = $calculator->ueiUserGroups($indicatorUid, $measureDate, $measureDate, $language);
 
         //TODO think what if each indicators has a group or user subset assigned. Now are all
-        $ueiValue = current(reset($calculator->ueiHistoric(null, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
+        $ueiValue = $calculator->ueiHistoric(null, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE);
+        $ueiValue = reset($ueiValue);
+        $ueiValue = current($ueiValue);
         $arrCost = $calculator->ueiUserGroups($indicatorUid, $measureDate, $measureDate, $language);
 
-		$ueiCost = current(reset($calculator->ueiCostHistoric(null, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
-        $ueiCompare = current(reset($calculator->ueiHistoric(null, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE)));
+        $ueiCost = $calculator->ueiCostHistoric(null, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE);
+        $ueiCost = reset($ueiCost);
+        $ueiCost = is_array($ueiCost) ? current($ueiCost) : $ueiCost;
+        $ueiCompare = $calculator->ueiHistoric(null, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE);
+        $ueiCompare = reset($ueiCompare);
+        $ueiCompare = current($ueiCompare);
 
-		$retval = array(
-						"id" => $indicatorUid,
-						"efficiencyIndex" => $ueiValue,
-                        "efficiencyVariation" => ($ueiValue-$ueiCompare),
-                        "inefficiencyCost" => $ueiCost,
-                        "efficiencyIndexToCompare" => $ueiCompare,
-                        "data"=>$groups);
+        $retval = array(
+            'id' => $indicatorUid,
+            'efficiencyIndex' => $ueiValue,
+            'efficiencyVariation' => $ueiValue - $ueiCompare,
+            'inefficiencyCost' => $ueiCost,
+            'efficiencyIndexToCompare' => $ueiCompare,
+            'data' => $groups);
         return $retval;
     }
 
@@ -154,27 +167,33 @@ class ReportingIndicators
         $arr = $calculator->generalIndicatorData($indicatorId, $initDate, $endDate, \ReportingPeriodicityEnum::NONE);
         $value = $arr[0]['value'];
         $dataList1 = $calculator->
-			generalIndicatorData($indicatorId, 
-				$initDate, $endDate, 
-				\ReportingPeriodicityEnum::fromValue($arr[0]['frequency1Type']));
+        generalIndicatorData(
+            $indicatorId,
+            $initDate,
+            $endDate,
+            \ReportingPeriodicityEnum::fromValue($arr[0]['frequency1Type'])
+        );
 
         $dataList2 = $calculator->
-			generalIndicatorData($indicatorId, 
-				$initDate, $endDate, 
-				\ReportingPeriodicityEnum::fromValue($arr[0]['frequency2Type']));
+        generalIndicatorData(
+            $indicatorId,
+            $initDate,
+            $endDate,
+            \ReportingPeriodicityEnum::fromValue($arr[0]['frequency2Type'])
+        );
 
         $returnValue = array("index" => $value,
-			"graph1XLabel"=>$arr[0]['graph1XLabel'],  
-			"graph1YLabel"=>$arr[0]['graph1YLabel'], 
-			"graph2XLabel"=>$arr[0]['graph2XLabel'],  
-			"graph2YLabel"=>$arr[0]['graph2YLabel'], 
-			"graph1Type"=>$arr[0]['graph1Type'],
-			"graph2Type"=>$arr[0]['graph2Type'],
-			"frequency1Type"=>$arr[0]['frequency1Type'],
-			"frequency2Type"=>$arr[0]['frequency2Type'],
-			"graph1Data"=>$dataList1,
-			"graph2Data"=>$dataList2
-		);
+            "graph1XLabel" => $arr[0]['graph1XLabel'],
+            "graph1YLabel" => $arr[0]['graph1YLabel'],
+            "graph2XLabel" => $arr[0]['graph2XLabel'],
+            "graph2YLabel" => $arr[0]['graph2YLabel'],
+            "graph1Type" => $arr[0]['graph1Type'],
+            "graph2Type" => $arr[0]['graph2Type'],
+            "frequency1Type" => $arr[0]['frequency1Type'],
+            "frequency2Type" => $arr[0]['frequency2Type'],
+            "graph1Data" => $dataList1,
+            "graph2Data" => $dataList2
+        );
         return $returnValue;
     }
 
@@ -182,7 +201,7 @@ class ReportingIndicators
      * Get list status indicator
      *
      * @access public
-     * @param array $options, Data for list
+     * @param array $options , Data for list
      * @return array
      *
      * @author Marco Antonio Nina <marco.antonio.nina@colosa.com>
@@ -192,11 +211,10 @@ class ReportingIndicators
     {
         Validator::isArray($options, '$options');
 
-        $usrUid = isset( $options["usrUid"] ) ? $options["usrUid"] : "";
+        $usrUid = isset($options["usrUid"]) ? $options["usrUid"] : "";
 
         $calculator = new \IndicatorsCalculator();
         $result = $calculator->statusIndicator($usrUid);
         return $result;
     }
 }
-
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/User.php b/workflow/engine/src/ProcessMaker/BusinessModel/User.php
index 90a3ce24c..6f25fb6de 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/User.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/User.php
@@ -45,35 +45,197 @@ use UsersRolesPeer;
 class User
 {
     private $arrayFieldDefinition = array(
-        "USR_UID" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "usrUid"),
-        "USR_FIRSTNAME" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "usrFirstname"),
-        "USR_LASTNAME" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "usrLastname"),
-        "USR_USERNAME" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "usrUsername"),
-        "USR_EMAIL" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "usrEmail"),
-        "USR_ADDRESS" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrAddress"),
-        "USR_ZIP_CODE" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrZipCode"),
-        "USR_COUNTRY" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrCountry"),
-        "USR_CITY" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrCity"),
-        "USR_LOCATION" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrLocation"),
-        "USR_PHONE" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrPhone"),
-        "USR_POSITION" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrPosition"),
-        "USR_REPLACED_BY" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrReplacedBy"),
-        "USR_DUE_DATE" => array("type" => "date", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "usrDueDate"),
-        "USR_CALENDAR" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrCalendar"),
-        "USR_STATUS" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array("ACTIVE", "INACTIVE", "VACATION"), "fieldNameAux" => "usrStatus"),
-        "USR_ROLE" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "usrRole"),
-        "USR_NEW_PASS" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "usrNewPass"),
-        "USR_UX" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array("NORMAL", "SIMPLIFIED", "SWITCHABLE", "SINGLE"), "fieldNameAux" => "usrUx"),
-        "DEP_UID" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "depUid"),
-        "USR_BIRTHDAY" => array("type" => "date", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrBirthday"),
-        "USR_FAX" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrFax"),
-        "USR_CELLULAR" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrCellular"),
+        "USR_UID" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrUid"
+        ),
+        "USR_FIRSTNAME" => array(
+            "type" => "string",
+            "required" => true,
+            "empty" => false,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrFirstname"
+        ),
+        "USR_LASTNAME" => array(
+            "type" => "string",
+            "required" => true,
+            "empty" => false,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrLastname"
+        ),
+        "USR_USERNAME" => array(
+            "type" => "string",
+            "required" => true,
+            "empty" => false,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrUsername"
+        ),
+        "USR_EMAIL" => array(
+            "type" => "string",
+            "required" => true,
+            "empty" => false,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrEmail"
+        ),
+        "USR_ADDRESS" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrAddress"
+        ),
+        "USR_ZIP_CODE" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrZipCode"
+        ),
+        "USR_COUNTRY" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrCountry"
+        ),
+        "USR_CITY" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrCity"
+        ),
+        "USR_LOCATION" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrLocation"
+        ),
+        "USR_PHONE" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrPhone"
+        ),
+        "USR_POSITION" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrPosition"
+        ),
+        "USR_REPLACED_BY" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrReplacedBy"
+        ),
+        "USR_DUE_DATE" => array(
+            "type" => "date",
+            "required" => true,
+            "empty" => false,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrDueDate"
+        ),
+        "USR_CALENDAR" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrCalendar"
+        ),
+        "USR_STATUS" => array(
+            "type" => "string",
+            "required" => true,
+            "empty" => false,
+            "defaultValues" => array("ACTIVE", "INACTIVE", "VACATION"),
+            "fieldNameAux" => "usrStatus"
+        ),
+        "USR_ROLE" => array(
+            "type" => "string",
+            "required" => true,
+            "empty" => false,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrRole"
+        ),
+        "USR_NEW_PASS" => array(
+            "type" => "string",
+            "required" => true,
+            "empty" => false,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrNewPass"
+        ),
+        "USR_UX" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => false,
+            "defaultValues" => array("NORMAL", "SIMPLIFIED", "SWITCHABLE", "SINGLE"),
+            "fieldNameAux" => "usrUx"
+        ),
+        "DEP_UID" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "depUid"
+        ),
+        "USR_BIRTHDAY" => array(
+            "type" => "date",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrBirthday"
+        ),
+        "USR_FAX" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrFax"
+        ),
+        "USR_CELLULAR" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrCellular"
+        ),
         /*----------------------------------********---------------------------------*/
-        "USR_COST_BY_HOUR" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrCostByHour"),
-        "USR_UNIT_COST" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrUnitCost"),
+        "USR_COST_BY_HOUR" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrCostByHour"
+        ),
+        "USR_UNIT_COST" => array(
+            "type" => "string",
+            "required" => false,
+            "empty" => true,
+            "defaultValues" => array(),
+            "fieldNameAux" => "usrUnitCost"
+        ),
         /*----------------------------------********---------------------------------*/
-        'USR_LOGGED_NEXT_TIME' => ['type' => 'int', 'required' => false, 'empty' => false, 'defaultValues' => [0, 1], 'fieldNameAux' => 'usrLoggedNextTime'],
-        'USR_TIME_ZONE' => ['type' => 'string', 'required' => false, 'empty' => true, 'defaultValues' => [], 'fieldNameAux' => 'usrTimeZone']
+        'USR_LOGGED_NEXT_TIME' => [
+            'type' => 'int',
+            'required' => false,
+            'empty' => false,
+            'defaultValues' => [0, 1],
+            'fieldNameAux' => 'usrLoggedNextTime'
+        ],
+        'USR_TIME_ZONE' => [
+            'type' => 'string',
+            'required' => false,
+            'empty' => true,
+            'defaultValues' => [],
+            'fieldNameAux' => 'usrTimeZone'
+        ]
     );
 
     private $formatFieldNameInUppercase = true;
@@ -148,7 +310,9 @@ class User
 
     /**
      * Set the format of the fields name (uppercase, lowercase)
+     *
      * @param bool $flag Value that set the format
+     *
      * @throws Exception
      */
     public function setFormatFieldNameInUppercase($flag)
@@ -164,7 +328,9 @@ class User
 
     /**
      * Set exception users for fields
+     *
      * @param array $arrayData Data with the fields
+     *
      * @throws Exception
      */
     public function setArrayFieldNameForException(array $arrayData)
@@ -180,7 +346,9 @@ class User
 
     /**
      * Get the name of the field according to the format
+     *
      * @param string $fieldName Field name
+     *
      * @return string Return the field name according the format
      * @throws Exception
      */
@@ -195,8 +363,10 @@ class User
 
     /**
      * Verify if exists the Name of a User
-     * @param string $userName Name
+     *
+     * @param string $userName         Name
      * @param string $userUidToExclude Unique id of User to exclude
+     *
      * @return bool Return true if exists the Name of a User, false otherwise
      * @throws Exception
      */
@@ -223,16 +393,19 @@ class User
 
     /**
      * Verify if exists the Name of a User
-     * @param string $userName Name
+     *
+     * @param string $userName              Name
      * @param string $fieldNameForException Field name for the exception
-     * @param string $userUidToExclude Unique id of User to exclude
+     * @param string $userUidToExclude      Unique id of User to exclude
+     *
      * @throws Exception if exists the title of a User
      */
     public function throwExceptionIfExistsName($userName, $fieldNameForException, $userUidToExclude = "")
     {
         try {
             if ($this->existsName($userName, $userUidToExclude)) {
-                throw new Exception(G::LoadTranslation("ID_USER_NAME_ALREADY_EXISTS", array($fieldNameForException, $userName)));
+                throw new Exception(G::LoadTranslation("ID_USER_NAME_ALREADY_EXISTS",
+                    array($fieldNameForException, $userName)));
             }
         } catch (Exception $e) {
             throw $e;
@@ -241,8 +414,10 @@ class User
 
     /**
      * Verify password
-     * @param string $userPassword Password
+     *
+     * @param string $userPassword          Password
      * @param string $fieldNameForException Field name for the exception
+     *
      * @throws Exception if password is invalid
      */
     public function throwExceptionIfPasswordIsInvalid($userPassword, $fieldNameForException)
@@ -260,8 +435,10 @@ class User
 
     /**
      * Validate the data if they are invalid (INSERT and UPDATE)
-     * @param string $userUid Unique id of User
-     * @param array $arrayData Data
+     *
+     * @param string $userUid   Unique id of User
+     * @param array  $arrayData Data
+     *
      * @throws Exception if data has an invalid value
      */
     public function throwExceptionIfDataIsInvalid($userUid, array $arrayData)
@@ -276,11 +453,13 @@ class User
             //Verify data - Field definition.
             $process = new Process();
 
-            $process->throwExceptionIfDataNotMetFieldDefinition($arrayData, $this->arrayFieldDefinition, $this->arrayFieldNameForException, $flagInsert);
+            $process->throwExceptionIfDataNotMetFieldDefinition($arrayData, $this->arrayFieldDefinition,
+                $this->arrayFieldNameForException, $flagInsert);
 
             //Verify data
             if (isset($arrayData["USR_USERNAME"])) {
-                $this->throwExceptionIfExistsName($arrayData["USR_USERNAME"], $this->arrayFieldNameForException["usrUsername"], $userUid);
+                $this->throwExceptionIfExistsName($arrayData["USR_USERNAME"],
+                    $this->arrayFieldNameForException["usrUsername"], $userUid);
             }
 
             if (isset($arrayData["USR_EMAIL"])) {
@@ -290,14 +469,16 @@ class User
             }
 
             if (isset($arrayData["USR_NEW_PASS"])) {
-                $this->throwExceptionIfPasswordIsInvalid($arrayData["USR_NEW_PASS"], $this->arrayFieldNameForException["usrNewPass"]);
+                $this->throwExceptionIfPasswordIsInvalid($arrayData["USR_NEW_PASS"],
+                    $this->arrayFieldNameForException["usrNewPass"]);
             }
 
             if (isset($arrayData["USR_REPLACED_BY"]) && $arrayData["USR_REPLACED_BY"] != "") {
                 $obj = UsersPeer::retrieveByPK($arrayData["USR_REPLACED_BY"]);
 
                 if (is_null($obj)) {
-                    throw new Exception(G::LoadTranslation("ID_USER_DOES_NOT_EXIST", array($this->arrayFieldNameForException["usrReplacedBy"], $arrayData["USR_REPLACED_BY"])));
+                    throw new Exception(G::LoadTranslation("ID_USER_DOES_NOT_EXIST",
+                        array($this->arrayFieldNameForException["usrReplacedBy"], $arrayData["USR_REPLACED_BY"])));
                 }
             }
 
@@ -322,7 +503,8 @@ class User
                 $rsCriteria = RolesPeer::doSelectRS($criteria);
 
                 if (!$rsCriteria->next()) {
-                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_FOR", array($this->arrayFieldNameForException["usrRole"])));
+                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_FOR",
+                        array($this->arrayFieldNameForException["usrRole"])));
                 }
             }
 
@@ -330,31 +512,36 @@ class User
                 $obj = IsoCountryPeer::retrieveByPK($arrayData["USR_COUNTRY"]);
 
                 if (is_null($obj)) {
-                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_FOR", array($this->arrayFieldNameForException["usrCountry"])));
+                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_FOR",
+                        array($this->arrayFieldNameForException["usrCountry"])));
                 }
             }
 
             if (isset($arrayData["USR_CITY"]) && $arrayData["USR_CITY"] != "") {
                 if (!isset($arrayFinalData["USR_COUNTRY"]) || $arrayFinalData["USR_COUNTRY"] == "") {
-                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_FOR", array($this->arrayFieldNameForException["usrCountry"])));
+                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_FOR",
+                        array($this->arrayFieldNameForException["usrCountry"])));
                 }
 
                 $obj = IsoSubdivisionPeer::retrieveByPK($arrayFinalData["USR_COUNTRY"], $arrayData["USR_CITY"]);
 
                 if (is_null($obj)) {
-                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_FOR", array($this->arrayFieldNameForException["usrCity"])));
+                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_FOR",
+                        array($this->arrayFieldNameForException["usrCity"])));
                 }
             }
 
             if (isset($arrayData["USR_LOCATION"]) && $arrayData["USR_LOCATION"] != "") {
                 if (!isset($arrayFinalData["USR_COUNTRY"]) || $arrayFinalData["USR_COUNTRY"] == "") {
-                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_FOR", array($this->arrayFieldNameForException["usrCountry"])));
+                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_FOR",
+                        array($this->arrayFieldNameForException["usrCountry"])));
                 }
 
                 $obj = IsoLocationPeer::retrieveByPK($arrayFinalData["USR_COUNTRY"], $arrayData["USR_LOCATION"]);
 
                 if (is_null($obj)) {
-                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_FOR", array($this->arrayFieldNameForException["usrLocation"])));
+                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_FOR",
+                        array($this->arrayFieldNameForException["usrLocation"])));
                 }
             }
 
@@ -362,7 +549,8 @@ class User
                 $obj = CalendarDefinitionPeer::retrieveByPK($arrayData["USR_CALENDAR"]);
 
                 if (is_null($obj)) {
-                    throw new Exception(G::LoadTranslation("ID_CALENDAR_DOES_NOT_EXIST", array($this->arrayFieldNameForException["usrCalendar"], $arrayData["USR_CALENDAR"])));
+                    throw new Exception(G::LoadTranslation("ID_CALENDAR_DOES_NOT_EXIST",
+                        array($this->arrayFieldNameForException["usrCalendar"], $arrayData["USR_CALENDAR"])));
                 }
             }
 
@@ -370,13 +558,15 @@ class User
                 $department = new Department();
 
                 if (!$department->existsDepartment($arrayData["DEP_UID"])) {
-                    throw new Exception(G::LoadTranslation("ID_DEPARTMENT_NOT_EXIST", array($this->arrayFieldNameForException["depUid"], $arrayData["DEP_UID"])));
+                    throw new Exception(G::LoadTranslation("ID_DEPARTMENT_NOT_EXIST",
+                        array($this->arrayFieldNameForException["depUid"], $arrayData["DEP_UID"])));
                 }
             }
 
             if (isset($arrayData['USR_TIME_ZONE']) && $arrayData['USR_TIME_ZONE'] != '') {
                 if (!in_array($arrayData['USR_TIME_ZONE'], DateTimeZone::listIdentifiers())) {
-                    throw new Exception(G::LoadTranslation('ID_TIME_ZONE_DOES_NOT_EXIST', [$this->arrayFieldNameForException['usrTimeZone'], $arrayData['USR_TIME_ZONE']]));
+                    throw new Exception(G::LoadTranslation('ID_TIME_ZONE_DOES_NOT_EXIST',
+                        [$this->arrayFieldNameForException['usrTimeZone'], $arrayData['USR_TIME_ZONE']]));
                 }
             }
         } catch (Exception $e) {
@@ -386,8 +576,10 @@ class User
 
     /**
      * Verify if does not exist the User in table USERS
-     * @param string $userUid Unique id of Email Server
+     *
+     * @param string $userUid               Unique id of Email Server
      * @param string $fieldNameForException Field name for the exception
+     *
      * @throws Exception if does not exist the User in table USERS
      */
     public function throwExceptionIfNotExistsUser($userUid, $fieldNameForException)
@@ -396,7 +588,8 @@ class User
             $obj = UsersPeer::retrieveByPK($userUid);
 
             if (is_null($obj) || $obj->getUsrUsername() == "") {
-                throw new Exception(G::LoadTranslation("ID_USER_DOES_NOT_EXIST", array($fieldNameForException, $userUid)));
+                throw new Exception(G::LoadTranslation("ID_USER_DOES_NOT_EXIST",
+                    array($fieldNameForException, $userUid)));
             }
         } catch (Exception $e) {
             throw $e;
@@ -405,10 +598,13 @@ class User
 
     /**
      * Get User record
-     * @param string $userUid Unique id of User
-     * @param array $arrayVariableNameForException Variable name for exception
-     * @param bool $throwException Flag to throw the exception if the main parameters are invalid or do not exist
-     *                               (TRUE: throw the exception; FALSE: returns FALSE)
+     *
+     * @param string $userUid                       Unique id of User
+     * @param array  $arrayVariableNameForException Variable name for exception
+     * @param bool   $throwException                Flag to throw the exception if the main parameters are invalid or
+     *                                              do not exist
+     *                                              (TRUE: throw the exception; FALSE: returns FALSE)
+     *
      * @return array|bool Returns an array with User record, ThrowTheException/FALSE otherwise
      * @throws Exception
      */
@@ -437,7 +633,9 @@ class User
 
     /**
      * Get custom record
+     *
      * @param array $record Record
+     *
      * @return array Return an array with custom record
      * @throws Exception
      */
@@ -504,6 +702,7 @@ class User
 
     /**
      * Get criteria for User
+     *
      * @return object
      * @throws Exception
      */
@@ -553,7 +752,9 @@ class User
 
     /**
      * Create User
+     *
      * @param array $arrayData Data
+     *
      * @return array Return data of the new User created
      * @throws Exception
      */
@@ -617,7 +818,8 @@ class User
                 //User Properties
                 $userProperty = new UsersProperties();
 
-                $aUserProperty = $userProperty->loadOrCreateIfNotExists($arrayData["USR_UID"], array("USR_PASSWORD_HISTORY" => serialize(array(Bootstrap::hashPassword($arrayData["USR_PASSWORD"])))));
+                $aUserProperty = $userProperty->loadOrCreateIfNotExists($arrayData["USR_UID"],
+                    array("USR_PASSWORD_HISTORY" => serialize(array(Bootstrap::hashPassword($arrayData["USR_PASSWORD"])))));
                 $aUserProperty["USR_LOGGED_NEXT_TIME"] = $arrayData["USR_LOGGED_NEXT_TIME"];
 
                 $userProperty->update($aUserProperty);
@@ -644,9 +846,11 @@ class User
 
     /**
      * Update User
-     * @param string $userUid Unique id of User
-     * @param array $arrayData Data
+     *
+     * @param string $userUid       Unique id of User
+     * @param array  $arrayData     Data
      * @param string $userUidLogged Unique id of User logged
+     *
      * @return array data of the User updated
      * @throws Exception
      */
@@ -731,13 +935,13 @@ class User
 
                 if (isset($arrayData["USR_PASSWORD"])) {
                     if ($arrayData["USR_PASSWORD"] != "") {
-                        //require_once 'classes/model/UsersProperties.php';
 
                         $userProperty = new UsersProperties();
-                        $aUserProperty = $userProperty->loadOrCreateIfNotExists($userUid, array("USR_PASSWORD_HISTORY" => serialize(array(Bootstrap::hashPassword($arrayData["USR_PASSWORD"])))));
+                        $aUserProperty = $userProperty->loadOrCreateIfNotExists($userUid,
+                            array("USR_PASSWORD_HISTORY" => serialize(array(Bootstrap::hashPassword($arrayData["USR_PASSWORD"])))));
 
                         $memKey = "rbacSession" . session_id();
-                        $memcache = &PMmemcached::getSingleton(!empty(config("system.workspace")) ? config("system.workspace") : "");
+                        $memcache = PMmemcached::getSingleton(!empty(config("system.workspace")) ? config("system.workspace") : "");
 
                         if (($rbac->aUserInfo = $memcache->get($memKey)) == false) {
                             $rbac->loadUserRolePermission("PROCESSMAKER", $userUidLogged);
@@ -803,7 +1007,8 @@ class User
                     $oUser = new Users();
                     $aUser = $oUser->load($userUid);
                     $oUserProperty = new UsersProperties();
-                    $aUserProperty = $oUserProperty->loadOrCreateIfNotExists($userUid, array("USR_PASSWORD_HISTORY" => serialize(array($oUser->getUsrPassword()))));
+                    $aUserProperty = $oUserProperty->loadOrCreateIfNotExists($userUid,
+                        array("USR_PASSWORD_HISTORY" => serialize(array($oUser->getUsrPassword()))));
                     $aUserProperty["USR_LOGGED_NEXT_TIME"] = $arrayData["USR_LOGGED_NEXT_TIME"];
                     $oUserProperty->update($aUserProperty);
                 }
@@ -847,8 +1052,10 @@ class User
 
     /**
      * Get data of a User
-     * @param string $userUid Unique id of User
-     * @param bool $flagGetRecord Value that set the getting
+     *
+     * @param string $userUid       Unique id of User
+     * @param bool   $flagGetRecord Value that set the getting
+     *
      * @return array Return an array with data of a User
      * @throws Exception
      */
@@ -881,7 +1088,9 @@ class User
 
     /**
      * Create User Uid
+     *
      * @param array $userData Data
+     *
      * @return int
      * @throws Exception
      */
@@ -917,8 +1126,10 @@ class User
      * to put role an user
      *
      * @access public
+     *
      * @param string $sUserUID
      * @param string $sRolCode
+     *
      * @return void
      */
     public function assignRoleToUser($sUserUID = '', $sRolCode = '')
@@ -933,7 +1144,9 @@ class User
      * to test Password
      *
      * @access public
+     *
      * @param string $sPassword
+     *
      * @return array
      */
     public function testPassword($sPassword = '')
@@ -979,7 +1192,9 @@ class User
 
     /**
      * change status of an user
+     *
      * @access public
+     *
      * @param string $sUserUID
      * @param string $sStatus
      */
@@ -998,7 +1213,9 @@ class User
      * remove a role from an user
      *
      * @access public
+     *
      * @param string $sUserUID
+     *
      * @return void
      */
     public function removeRolesFromUser($sUserUID = '')
@@ -1012,8 +1229,10 @@ class User
      * updated an user
      *
      * @access public
-     * @param array $userData
+     *
+     * @param array  $userData
      * @param string $sRolCode
+     *
      * @return void
      */
     public function updateUser($userData = array(), $sRolCode = '')
@@ -1040,7 +1259,8 @@ class User
      * @access public
      *
      * @param string $sSystem the system
-     * @param string $sUser the user
+     * @param string $sUser   the user
+     *
      * @return $this->aUserInfo[ $sSystem ]
      */
     public function loadUserRolePermission($sSystem, $sUser)
@@ -1063,7 +1283,9 @@ class User
 
     /**
      * Authenticate User
+     *
      * @param array $arrayUserData Data
+     *
      * @throws Exception
      */
     public function authenticate($arrayUserData)
@@ -1076,7 +1298,9 @@ class User
 
     /**
      * Delete User
+     *
      * @param string $usrUid Unique id of User
+     *
      * @throws Exception
      */
     public function delete($usrUid)
@@ -1134,15 +1358,17 @@ class User
 
     /**
      * Get all Users
-     * @param array $arrayWhere Where (Condition and filters)
-     * @param string $sortField Field name to sort
-     * @param string $sortDir Direction of sorting (ASC, DESC)
-     * @param int $start Start
-     * @param int $limit Limit
-     * @param bool $flagRecord Flag that set the "getting" of record
-     * @param bool $throwException Flag to throw the exception (This only if the parameters are invalid)
+     *
+     * @param array  $arrayWhere     Where (Condition and filters)
+     * @param string $sortField      Field name to sort
+     * @param string $sortDir        Direction of sorting (ASC, DESC)
+     * @param int    $start          Start
+     * @param int    $limit          Limit
+     * @param bool   $flagRecord     Flag that set the "getting" of record
+     * @param bool   $throwException Flag to throw the exception (This only if the parameters are invalid)
      *                               (TRUE: throw the exception; FALSE: returns FALSE)
-     * @param string $status The user's status, which can be "ACTIVE", "INACTIVE" or "VACATION"
+     * @param string $status         The user's status, which can be "ACTIVE", "INACTIVE" or "VACATION"
+     *
      * @return array Return an array with all Users, ThrowTheException/FALSE otherwise
      * @throws Exception
      */
@@ -1299,7 +1525,9 @@ class User
 
     /**
      * Upload image User
+     *
      * @param string $userUid Unique id of User
+     *
      * @throws Exception
      */
     public function uploadImage($userUid)
@@ -1313,14 +1541,17 @@ class User
             }
 
             if (!isset($_FILES["USR_PHOTO"])) {
-                throw new Exception(G::LoadTranslation("ID_UNDEFINED_VALUE_IS_REQUIRED", array($this->arrayFieldNameForException["usrPhoto"])));
+                throw new Exception(G::LoadTranslation("ID_UNDEFINED_VALUE_IS_REQUIRED",
+                    array($this->arrayFieldNameForException["usrPhoto"])));
             }
 
             if ($_FILES['USR_PHOTO']['error'] != 1) {
                 if ($_FILES['USR_PHOTO']['tmp_name'] != '') {
                     $aAux = explode('.', $_FILES['USR_PHOTO']['name']);
-                    G::uploadFile($_FILES['USR_PHOTO']['tmp_name'], PATH_IMAGES_ENVIRONMENT_USERS, $userUid . '.' . $aAux[1]);
-                    G::resizeImage(PATH_IMAGES_ENVIRONMENT_USERS . $userUid . '.' . $aAux[1], 96, 96, PATH_IMAGES_ENVIRONMENT_USERS . $userUid . '.gif');
+                    G::uploadFile($_FILES['USR_PHOTO']['tmp_name'], PATH_IMAGES_ENVIRONMENT_USERS,
+                        $userUid . '.' . $aAux[1]);
+                    G::resizeImage(PATH_IMAGES_ENVIRONMENT_USERS . $userUid . '.' . $aAux[1], 96, 96,
+                        PATH_IMAGES_ENVIRONMENT_USERS . $userUid . '.gif');
                 }
             } else {
                 throw new Exception(G::LoadTranslation('ID_ERROR') . ' ' . $_FILES['USR_PHOTO']['error']);
@@ -1334,9 +1565,11 @@ class User
      * change Bookmarks of an user
      *
      * @access public
+     *
      * @param $userUID
      * @param $tasUid
      * @param $type
+     *
      * @return void
      */
     public function updateBookmark($userUID, $tasUid, $type)
@@ -1356,8 +1589,9 @@ class User
     }
 
     /**
-     * @param $userUid
+     * @param       $userUid
      * @param array $arrayPermission
+     *
      * @return User
      * @throws Exception
      */
@@ -1378,6 +1612,7 @@ class User
 
     /**
      * @param $aFields
+     *
      * @return array
      * @throws Exception
      */
@@ -1395,7 +1630,8 @@ class User
                 return $resultPermissionsForUser;
             } else {
                 $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
-                throw (new Exception(G::LoadTranslation("ID_USER_UID_DOESNT_EXIST", $lang, array("USR_UID" => $aFields['USR_UID']))));
+                throw (new Exception(G::LoadTranslation("ID_USER_UID_DOESNT_EXIST", $lang,
+                    array("USR_UID" => $aFields['USR_UID']))));
             }
         } catch (Exception $oError) {
             throw ($oError);
@@ -1404,8 +1640,10 @@ class User
 
     /**
      * Check permission
-     * @param string $userUid Unique uid of User
+     *
+     * @param string $userUid        Unique uid of User
      * @param string $permissionCode Permission code
+     *
      * @return bool
      * @throws Exception
      */
@@ -1432,6 +1670,7 @@ class User
 
     /**
      * Get User-Logged Time Zone
+     *
      * @return string Return the User-Logged Time Zone; Time Zone system settings otherwise
      * @throws Exception
      */
@@ -1455,9 +1694,11 @@ class User
 
     /**
      * Get the User's Manager
-     * @param string $userUid Unique id of User
-     * @param bool $throwException Flag to throw the exception if the main parameters are invalid or do not exist
+     *
+     * @param string $userUid        Unique id of User
+     * @param bool   $throwException Flag to throw the exception if the main parameters are invalid or do not exist
      *                               (TRUE: throw the exception; FALSE: returns FALSE)
+     *
      * @return string Returns an string with Unique id of User (Manager), ThrowTheException/FALSE otherwise
      * @throws Exception
      */
@@ -1520,25 +1761,34 @@ class User
 
     /**
      * AuditLog
-     * @param string $option Option
-     * @param array $arrayData Data
+     *
+     * @param string $option    Option
+     * @param array  $arrayData Data
+     *
      * @throws Exception
      */
     public function auditLog($option, array $arrayData)
     {
         try {
-            $firstName = (array_key_exists('USR_FIRSTNAME', $arrayData)) ? ' - First Name: ' . $arrayData['USR_FIRSTNAME'] : '';
-            $lastName = (array_key_exists('USR_LASTNAME', $arrayData)) ? ' - Last Name: ' . $arrayData['USR_LASTNAME'] : '';
+            $firstName = (array_key_exists('USR_FIRSTNAME',
+                $arrayData)) ? ' - First Name: ' . $arrayData['USR_FIRSTNAME'] : '';
+            $lastName = (array_key_exists('USR_LASTNAME',
+                $arrayData)) ? ' - Last Name: ' . $arrayData['USR_LASTNAME'] : '';
             $email = (array_key_exists('USR_EMAIL', $arrayData)) ? ' - Email: ' . $arrayData['USR_EMAIL'] : '';
-            $dueDate = (array_key_exists('USR_DUE_DATE', $arrayData)) ? ' - Due Date: ' . $arrayData['USR_DUE_DATE'] : '';
+            $dueDate = (array_key_exists('USR_DUE_DATE',
+                $arrayData)) ? ' - Due Date: ' . $arrayData['USR_DUE_DATE'] : '';
             $status = (array_key_exists('USR_STATUS', $arrayData)) ? ' - Status: ' . $arrayData['USR_STATUS'] : '';
             $address = (array_key_exists('USR_ADDRESS', $arrayData)) ? ' - Address: ' . $arrayData['USR_ADDRESS'] : '';
             $phone = (array_key_exists('USR_PHONE', $arrayData)) ? ' - Phone: ' . $arrayData['USR_PHONE'] : '';
-            $zipCode = (array_key_exists('USR_ZIP_CODE', $arrayData)) ? ' - Zip Code: ' . $arrayData['USR_ZIP_CODE'] : '';
-            $position = (array_key_exists('USR_POSITION', $arrayData)) ? ' - Position: ' . $arrayData['USR_POSITION'] : '';
+            $zipCode = (array_key_exists('USR_ZIP_CODE',
+                $arrayData)) ? ' - Zip Code: ' . $arrayData['USR_ZIP_CODE'] : '';
+            $position = (array_key_exists('USR_POSITION',
+                $arrayData)) ? ' - Position: ' . $arrayData['USR_POSITION'] : '';
             $role = (array_key_exists('USR_ROLE', $arrayData)) ? ' - Role: ' . $arrayData['USR_ROLE'] : '';
-            $languageDef = (array_key_exists('USR_DEFAULT_LANG', $arrayData)) ? ' - Default Language: ' . $arrayData['USR_DEFAULT_LANG'] : '';
-            $timeZone = (array_key_exists('USR_TIME_ZONE', $arrayData)) ? ' - Time Zone: ' . $arrayData['USR_TIME_ZONE'] : '';
+            $languageDef = (array_key_exists('USR_DEFAULT_LANG',
+                $arrayData)) ? ' - Default Language: ' . $arrayData['USR_DEFAULT_LANG'] : '';
+            $timeZone = (array_key_exists('USR_TIME_ZONE',
+                $arrayData)) ? ' - Time Zone: ' . $arrayData['USR_TIME_ZONE'] : '';
 
             $str = 'User Name: ' . $arrayData['USR_USERNAME'] . ' - User ID: (' . $arrayData['USR_UID'] . ')' .
                 $firstName . $lastName . $email . $dueDate . $status . $address . $phone . $zipCode . $position . $role . $timeZone . $languageDef;
@@ -1551,12 +1801,14 @@ class User
 
     /**
      * This function get the list of users
+     *
      * @param string $authSource , authentication source
      * @param string $filter
      * @param string $sort
-     * @param int $start
-     * @param int $limit
-     * @param string $dir related to order the column
+     * @param int    $start
+     * @param int    $limit
+     * @param string $dir        related to order the column
+     *
      * @return array
      * @throws Exception
      */
@@ -1579,7 +1831,8 @@ class User
             $cc = $oCriteria->getNewCriterion(UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE)
                 ->addOr($oCriteria->getNewCriterion(UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE)
                     ->addOr($oCriteria->getNewCriterion(UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE)
-                        ->addOr($oCriteria->getNewCriterion(UsersPeer::USR_EMAIL, '%' . $filter . '%', Criteria::LIKE))));
+                        ->addOr($oCriteria->getNewCriterion(UsersPeer::USR_EMAIL, '%' . $filter . '%',
+                            Criteria::LIKE))));
             $oCriteria->add($cc);
         }
         $oCriteria->add(UsersPeer::USR_STATUS, array('CLOSED'), Criteria::NOT_IN);
@@ -1622,7 +1875,8 @@ class User
             $cc = $oCriteria->getNewCriterion(UsersPeer::USR_USERNAME, '%' . $filter . '%', Criteria::LIKE)
                 ->addOr($oCriteria->getNewCriterion(UsersPeer::USR_FIRSTNAME, '%' . $filter . '%', Criteria::LIKE)
                     ->addOr($oCriteria->getNewCriterion(UsersPeer::USR_LASTNAME, '%' . $filter . '%', Criteria::LIKE)
-                        ->addOr($oCriteria->getNewCriterion(UsersPeer::USR_EMAIL, '%' . $filter . '%', Criteria::LIKE))));
+                        ->addOr($oCriteria->getNewCriterion(UsersPeer::USR_EMAIL, '%' . $filter . '%',
+                            Criteria::LIKE))));
             $oCriteria->add($cc);
         }
         if (sizeof($aUsers) > 0) {
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
index ce7ab42a6..3b2abc685 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ProcessMaker\BusinessModel;
 
 use G;
@@ -15,7 +16,7 @@ class Variable
      * Create Variable for a Process
      *
      * @param string $processUid Unique id of Process
-     * @param array  $arrayData  Data
+     * @param array $arrayData Data
      *
      * @return array, return data of the new Variable created
      * @throws Exception
@@ -44,13 +45,13 @@ class Variable
                     if (isset($arrayData["VAR_NAME"])) {
                         $variable->setVarName($arrayData["VAR_NAME"]);
                     } else {
-                        throw new Exception(G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('$var_name' )));
+                        throw new Exception(G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('$var_name')));
                     }
                     if (isset($arrayData["VAR_FIELD_TYPE"])) {
                         $arrayData["VAR_FIELD_TYPE"] = $this->validateVarFieldType($arrayData["VAR_FIELD_TYPE"]);
                         $variable->setVarFieldType($arrayData["VAR_FIELD_TYPE"]);
                     } else {
-                        throw new Exception(G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('$var_field_type' )));
+                        throw new Exception(G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('$var_field_type')));
                     }
                     if (isset($arrayData["VAR_FIELD_SIZE"])) {
                         $variable->setVarFieldSize($arrayData["VAR_FIELD_SIZE"]);
@@ -58,7 +59,7 @@ class Variable
                     if (isset($arrayData["VAR_LABEL"])) {
                         $variable->setVarLabel($arrayData["VAR_LABEL"]);
                     } else {
-                        throw new Exception(G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('$var_label' )));
+                        throw new Exception(G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('$var_label')));
                     }
                     if (isset($arrayData["VAR_DBCONNECTION"])) {
                         $variable->setVarDbconnection($arrayData["VAR_DBCONNECTION"]);
@@ -88,16 +89,14 @@ class Variable
                     $variable->save();
                     $cnn->commit();
                 } else {
-
                     $msg = "";
 
                     foreach ($variable->getValidationFailures() as $validationFailure) {
-                        $msg = $msg . (($msg != "")? "\n" : "") . $validationFailure->getMessage();
+                        $msg = $msg . (($msg != "") ? "\n" : "") . $validationFailure->getMessage();
                     }
 
                     throw new Exception(G::LoadTranslation("ID_RECORD_CANNOT_BE_CREATED") . "\n" . $msg);
                 }
-
             } catch (Exception $e) {
                 $cnn->rollback();
 
@@ -108,7 +107,6 @@ class Variable
             $variable = $this->getVariable($processUid, $sPkProcessVariables);
 
             return $variable;
-
         } catch (Exception $e) {
             throw $e;
         }
@@ -119,7 +117,7 @@ class Variable
      *
      * @param string $processUid Unique id of Process
      * @param string $variableUid Unique id of Variable
-     * @param array  $arrayData   Data
+     * @param array $arrayData Data
      *
      * @return array,return data of the Variable updated
      * @throws Exception
@@ -199,16 +197,14 @@ class Variable
                     $pmDynaform = new PmDynaform();
                     $pmDynaform->synchronizeVariable($processUid, $newVariable, $oldVariable);
                 } else {
-
                     $msg = "";
 
                     foreach ($variable->getValidationFailures() as $validationFailure) {
-                        $msg = $msg . (($msg != "")? "\n" : "") . $validationFailure->getMessage();
+                        $msg = $msg . (($msg != "") ? "\n" : "") . $validationFailure->getMessage();
                     }
 
                     throw new Exception(G::LoadTranslation("ID_RECORD_CANNOT_BE_CREATED") . "\n" . $msg);
                 }
-
             } catch (Exception $e) {
                 $cnn->rollback();
 
@@ -241,14 +237,13 @@ class Variable
             $pmDynaform = new PmDynaform();
             $isUsed = $pmDynaform->isUsed($processUid, $variable);
             if ($isUsed !== false) {
-                $titleDynaform=$pmDynaform->getDynaformTitle($isUsed);
+                $titleDynaform = $pmDynaform->getDynaformTitle($isUsed);
                 throw new Exception(G::LoadTranslation("ID_VARIABLE_IN_USE", array($titleDynaform)));
             }
             //Delete
             $criteria = new \Criteria("workflow");
             $criteria->add(\ProcessVariablesPeer::VAR_UID, $variableUid);
             \ProcessVariablesPeer::doDelete($criteria);
-
         } catch (Exception $e) {
             throw $e;
         }
@@ -295,10 +290,11 @@ class Variable
             $rsCriteria->next();
             $arrayVariables = array();
             while ($aRow = $rsCriteria->getRow()) {
-
                 $VAR_ACCEPTED_VALUES = G::json_decode($aRow['VAR_ACCEPTED_VALUES'], true);
-                if(sizeof($VAR_ACCEPTED_VALUES)) {
-                    $encodeAcceptedValues = preg_replace("/\\\\u([a-f0-9]{4})/e", "iconv('UCS-4LE','UTF-8',pack('V', hexdec('U$1')))", G::json_encode($VAR_ACCEPTED_VALUES));
+                if (count($VAR_ACCEPTED_VALUES)) {
+                    $encodeAcceptedValues = preg_replace_callback("/\\\\u([a-f0-9]{4})/", function ($m) {
+                        return iconv('UCS-4LE', 'UTF-8', pack('V', hexdec('U' . $m[1])));
+                    }, G::json_encode($VAR_ACCEPTED_VALUES));
                 } else {
                     $encodeAcceptedValues = $aRow['VAR_ACCEPTED_VALUES'];
                 }
@@ -320,9 +316,8 @@ class Variable
             }
             //Return
             return $arrayVariables;
-
         } catch (Exception $e) {
-             throw $e;
+            throw $e;
         }
     }
 
@@ -366,10 +361,11 @@ class Variable
             $rsCriteria->next();
             $arrayVariables = array();
             while ($aRow = $rsCriteria->getRow()) {
-
                 $VAR_ACCEPTED_VALUES = G::json_decode($aRow['VAR_ACCEPTED_VALUES'], true);
-                if(sizeof($VAR_ACCEPTED_VALUES)) {
-                    $encodeAcceptedValues = preg_replace("/\\\\u([a-f0-9]{4})/e", "iconv('UCS-4LE','UTF-8',pack('V', hexdec('U$1')))", G::json_encode($VAR_ACCEPTED_VALUES));
+                if (count($VAR_ACCEPTED_VALUES)) {
+                    $encodeAcceptedValues = preg_replace_callback("/\\\\u([a-f0-9]{4})/", function ($m) {
+                        return iconv('UCS-4LE', 'UTF-8', pack('V', hexdec($m[1])));
+                    }, G::json_encode($VAR_ACCEPTED_VALUES));
                 } else {
                     $encodeAcceptedValues = $aRow['VAR_ACCEPTED_VALUES'];
                 }
@@ -391,7 +387,6 @@ class Variable
             }
             //Return
             return $arrayVariables;
-
         } catch (Exception $e) {
             throw $e;
         }
@@ -430,8 +425,8 @@ class Variable
             }
             if (isset($aData["VAR_NULL"])) {
                 Validator::isInteger($aData['VAR_NULL'], '$var_null');
-                if ($aData["VAR_NULL"] != 0 && $aData["VAR_NULL"] !=1 ) {
-                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_ONLY_ACCEPTS_VALUES", array('$var_null','0, 1' )));
+                if ($aData["VAR_NULL"] != 0 && $aData["VAR_NULL"] != 1) {
+                    throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_ONLY_ACCEPTS_VALUES", array('$var_null', '0, 1')));
                 }
             }
         } catch (Exception $e) {
@@ -442,8 +437,8 @@ class Variable
     /**
      * Verify if exists the name of a variable
      *
-     * @param string $processUid, unique id of Process
-     * @param string $variableName, name of variable
+     * @param string $processUid , unique id of Process
+     * @param string $variableName , name of variable
      * @param string $variableUidToExclude
      * @throws Exception
      *
@@ -502,9 +497,9 @@ class Variable
     /**
      * Verify if some required variable in the SQL is missing in the variables
      *
-     * @param string $variableName  Variable name
-     * @param string $variableSql   SQL
-     * @param array  $arrayVariable The variables
+     * @param string $variableName Variable name
+     * @param string $variableSql SQL
+     * @param array $arrayVariable The variables
      *
      * @return void Throw exception if some required variable in the SQL is missing in the variables
      * @throws Exception
@@ -524,9 +519,9 @@ class Variable
     /**
      * Get all records by execute SQL
      *
-     * @param string $processUid    Unique id of Process
-     * @param string $variableName  Variable name
-     * @param array  $arrayVariable The variables
+     * @param string $processUid Unique id of Process
+     * @param string $variableName Variable name
+     * @param array $arrayVariable The variables
      *
      * @return array, return an array with all records
      * @throws Exception
@@ -543,7 +538,7 @@ class Variable
     /**
      * Verify if does not exist the variable in table PROCESS_VARIABLES
      *
-     * @param string $variableUid           Unique id of variable
+     * @param string $variableUid Unique id of variable
      *
      * @return void
      * @throws Exception, throw exception if does not exist the variable in table PROCESS_VARIABLES
@@ -554,7 +549,7 @@ class Variable
             $obj = \ProcessVariablesPeer::retrieveByPK($variableUid);
 
             if (is_null($obj)) {
-                throw new Exception('var_uid: '.$variableUid. ' '.G::LoadTranslation("ID_DOES_NOT_EXIST"));
+                throw new Exception('var_uid: ' . $variableUid . ' ' . G::LoadTranslation("ID_DOES_NOT_EXIST"));
             }
         } catch (Exception $e) {
             throw $e;
@@ -593,8 +588,8 @@ class Variable
     /**
      * Verify if the variable is being used in a Dynaform
      *
-     * @param string $processUid, Unique id of Process
-     * @param string $variableUid, Unique id of Variable
+     * @param string $processUid , Unique id of Process
+     * @param string $variableUid , Unique id of Variable
      * @return void
      * @throws Exception
      *
@@ -602,7 +597,6 @@ class Variable
     public function verifyUse($processUid, $variableUid)
     {
         try {
-
             $criteria = new \Criteria("workflow");
             $criteria->addSelectColumn(\DynaformPeer::DYN_CONTENT);
             $criteria->addSelectColumn(\DynaformPeer::DYN_UID);
@@ -633,7 +627,6 @@ class Variable
                     }
                 }
             }
-
         } catch (Exception $e) {
             throw $e;
         }
@@ -642,9 +635,9 @@ class Variable
     /**
      * Get all records by execute SQL suggest
      *
-     * @param string $processUid    Unique id of Process
-     * @param string $variableName  Variable name
-     * @param array  $arrayVariable The variables
+     * @param string $processUid Unique id of Process
+     * @param string $variableName Variable name
+     * @param array $arrayVariable The variables
      *
      * @return array, return an array with all records
      * @throws Exception
@@ -674,7 +667,7 @@ class Variable
             $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
             if ($rsCriteria->next()) {
                 $row = $rsCriteria->getRow();
-                return sizeof($row) ? $row : false;
+                return count($row) ? $row : false;
             }
             return false;
         } catch (Exception $e) {
@@ -685,10 +678,10 @@ class Variable
     /**
      * Get Variable record by name
      *
-     * @param string $projectUid                    Unique id of Project
-     * @param string $variableName                  Variable name
-     * @param array  $arrayVariableNameForException Variable name for exception
-     * @param bool   $throwException Flag to throw the exception if the main parameters are invalid or do not exist
+     * @param string $projectUid Unique id of Project
+     * @param string $variableName Variable name
+     * @param array $arrayVariableNameForException Variable name for exception
+     * @param bool $throwException Flag to throw the exception if the main parameters are invalid or do not exist
      *                               (TRUE: throw the exception; FALSE: returns FALSE)
      *
      * @return array, returns an array with Variable record
@@ -699,7 +692,8 @@ class Variable
         $variableName,
         array $arrayVariableNameForException,
         $throwException = true
-    ) {
+    )
+    {
         try {
             $criteria = new \Criteria('workflow');
             $criteria->add(\ProcessVariablesPeer::PRJ_UID, $projectUid, \Criteria::EQUAL);
@@ -711,7 +705,7 @@ class Variable
             } else {
                 if ($throwException) {
                     throw new Exception(
-                        $arrayVariableNameForException['$variableName'] . ': ' . $variableName. ' ' .
+                        $arrayVariableNameForException['$variableName'] . ': ' . $variableName . ' ' .
                         G::LoadTranslation('ID_DOES_NOT_EXIST')
                     );
                 } else {
@@ -729,23 +723,23 @@ class Variable
     public function validateVarFieldType($type)
     {
         $vType = strtolower($type);
-        if(!in_array($vType, $this->variableTypes)) {
+        if (!in_array($vType, $this->variableTypes)) {
             throw new Exception(G::LoadTranslation("ID_RECORD_CANNOT_BE_CREATED"));
         }
         return $vType;
     }
-    
+
     /**
-     * Executes the sql string of a control and returns the data in the queryOutputData 
-     * property of the control. The control returned by the pmDynaform :: searchField 
-     * function is the php representation of the json definition, which can be 
+     * Executes the sql string of a control and returns the data in the queryOutputData
+     * property of the control. The control returned by the pmDynaform :: searchField
+     * function is the php representation of the json definition, which can be
      * supported by the pmDynaform :: jsonr function.
-     * The params parameter must contain: dyn_uid, field_id and optionally 
-     * app_uid, del_index, filter, start, limit, and so many related control variables 
-     * to be sent and their corresponding value. 
-     * The parameters: filter, start and limit, are only necessary for the suggest 
+     * The params parameter must contain: dyn_uid, field_id and optionally
+     * app_uid, del_index, filter, start, limit, and so many related control variables
+     * to be sent and their corresponding value.
+     * The parameters: filter, start and limit, are only necessary for the suggest
      * control.
-     * If app_uid is not sent you can not get the appData in an environment where 
+     * If app_uid is not sent you can not get the appData in an environment where
      * only endPoint is used, it is always advisable to send the app_uid and _index.
      * Note: You do not get triguer execution values where only endPoint is used.
      * @param type $proUid
@@ -756,7 +750,7 @@ class Variable
     public function executeSqlControl($proUid, array $params = array())
     {
         try {
-            //Get and clear vector data that does not correspond to variables 
+            //Get and clear vector data that does not correspond to variables
             //related to a control.
             $dynUid = $params["dyn_uid"];
             $fieldId = $params["field_id"];
@@ -764,7 +758,7 @@ class Variable
             $start = isset($params["start"]) ? $params["start"] : 0;
             $limit = isset($params["limit"]) ? $params["limit"] : 10;
             $appUid = empty($params["app_uid"]) ? null : $params["app_uid"];
-            $delIndex = (int) isset($params["del_index"]) ? $params["del_index"] : 0;
+            $delIndex = (int)isset($params["del_index"]) ? $params["del_index"] : 0;
             unset($params["dyn_uid"]);
             unset($params["field_id"]);
             unset($params["app_uid"]);
@@ -791,7 +785,7 @@ class Variable
             $pmDynaform = new PmDynaform(array("APP_DATA" => $params));
 
             //Get control from dynaform.
-            //The parameters: queryFilter, queryStart, queryLimit, are only necessary 
+            //The parameters: queryFilter, queryStart, queryLimit, are only necessary
             //for the suggest control, the rest of the controls are ignored.
             $field = $pmDynaform->searchField($dynUid, $fieldId, $proUid);
             $field->queryField = true;
@@ -800,8 +794,8 @@ class Variable
             $field->queryStart = $start;
             $field->queryLimit = $limit;
             //Grids only access the global variables of 'ProcessMaker', other variables are removed.
-            //The property 'columnWidth' is only present in the controls of a grid, 
-            //in the current change there is no specific property that indicates 
+            //The property 'columnWidth' is only present in the controls of a grid,
+            //in the current change there is no specific property that indicates
             //if the control is in the grid.
             if (isset($field->columnWidth)) {
                 $pmDynaform->fields["APP_DATA"] = $globalVariables;
@@ -821,5 +815,4 @@ class Variable
             throw $e;
         }
     }
-
 }
diff --git a/workflow/engine/src/ProcessMaker/Core/Installer.php b/workflow/engine/src/ProcessMaker/Core/Installer.php
index e912963c5..89a9e8a2b 100644
--- a/workflow/engine/src/ProcessMaker/Core/Installer.php
+++ b/workflow/engine/src/ProcessMaker/Core/Installer.php
@@ -10,11 +10,10 @@ use G;
 
 class Installer
 {
-
-    public $options = Array();
-    public $result = Array();
-    public $error = Array();
-    public $report = Array();
+    public $options = [];
+    public $result = [];
+    public $error = [];
+    public $report = [];
     private $connection_database;
 
     /**
@@ -34,14 +33,14 @@ class Installer
      * @param boolean $confirmed
      * @return void
      */
-    public function create_site($config = Array(), $confirmed = false)
+    public function create_site($config = array(), $confirmed = false)
     {
-        $this->options = G::array_concat(Array('isset' => false, 'password' => G::generate_password(15), 'path_data' => @PATH_DATA, 'path_compiled' => @PATH_C, 'name' => $config['name'], 'database' => Array(), 'admin' => Array('username' => 'admin', 'password' => 'admin'
-        ), 'advanced' => Array('ao_db_wf' => 'wf_' . $config['name'], 'ao_db_rb' => 'rb_' . $config['name'], 'ao_db_rp' => 'rp_' . $config['name'], 'ao_db_drop' => false
+        $this->options = G::array_concat(array('isset' => false, 'password' => G::generate_password(15), 'path_data' => @PATH_DATA, 'path_compiled' => @PATH_C, 'name' => $config['name'], 'database' => array(), 'admin' => array('username' => 'admin', 'password' => 'admin'
+        ), 'advanced' => array('ao_db_wf' => 'wf_' . $config['name'], 'ao_db_rb' => 'rb_' . $config['name'], 'ao_db_rp' => 'rp_' . $config['name'], 'ao_db_drop' => false
         )
         ), $config);
         $a = @explode(SYSTEM_HASH, G::decrypt(HASH_INSTALLATION, SYSTEM_HASH));
-        $this->options['database'] = G::array_concat(Array('username' => @$a[1], 'password' => @$a[2], 'hostname' => @$a[0]
+        $this->options['database'] = G::array_concat(array('username' => @$a[1], 'password' => @$a[2], 'hostname' => @$a[0]
         ), $this->options['database']);
         return ($confirmed === true) ? $this->make_site() : $this->create_site_test();
     }
@@ -73,14 +72,14 @@ class Installer
     private function create_site_test()
     {
         $name = (preg_match('/^[\w]+$/i', trim($this->options['name']))) ? true : false;
-        $result = Array('path_data' => $this->is_dir_writable($this->options['path_data']), 'path_compiled' => $this->is_dir_writable($this->options['path_compiled']), 'database' => $this->check_connection(), 'access_level' => $this->cc_status, 'isset' => ($this->options['isset'] == true) ? $this->isset_site($this->options['name']) : false, 'microtime' => microtime(), 'workspace' => $this->options['name'], 'name' => array('status' => $name, 'message' => ($name) ? 'PASSED' : 'Workspace name invalid'
+        $result = array('path_data' => $this->is_dir_writable($this->options['path_data']), 'path_compiled' => $this->is_dir_writable($this->options['path_compiled']), 'database' => $this->check_connection(), 'access_level' => $this->cc_status, 'isset' => ($this->options['isset'] == true) ? $this->isset_site($this->options['name']) : false, 'microtime' => microtime(), 'workspace' => $this->options['name'], 'name' => array('status' => $name, 'message' => ($name) ? 'PASSED' : 'Workspace name invalid'
         ), 'admin' => array('username' => (preg_match('/^[\w@\.-]+$/i', trim($this->options['admin']['username']))) ? true : false, 'password' => ((trim($this->options['admin']['password']) == '') ? false : true)
         )
         );
         $result['name']['message'] = ($result['isset']) ? 'Workspace already exist' : $result['name']['message'];
         $result['name']['status'] = ($result['isset']) ? false : $result['name']['status'];
-        //print_r($result);
-        return Array('created' => G::var_compare(true,
+        return array('created' => G::var_compare(
+            true,
             $result['path_data'],
             $result['database']['connection'],
             $result['name']['status'],
@@ -88,7 +87,8 @@ class Installer
             $result['database']['ao']['ao_db_wf']['status'],
             $result['admin']['username'],
             (($result['isset']) ? false : true),
-            $result['admin']['password']),
+            $result['admin']['password']
+        ),
             'result' => $result
         );
     }
@@ -138,7 +138,7 @@ class Installer
             $myPort = $myPortA[1];
             $this->options['database']['hostname'] = $myPortA[0];
 
-            mysql_select_db($wf, $this->connection_database);
+            mysqli_select_db($this->connection_database, $wf);
             $pws = PATH_WORKFLOW_MYSQL_DATA . $schema;
             $qws = $this->query_sql_file(PATH_WORKFLOW_MYSQL_DATA . $schema, $this->connection_database);
             $this->log($qws, isset($qws['errors']));
@@ -166,13 +166,13 @@ class Installer
 
             /* Dump schema rbac && data  */
             $pws = PATH_RBAC_MYSQL_DATA . $schema;
-            mysql_select_db($rb, $this->connection_database);
+            mysqli_select_db($this->connection_database, $rb);
             $qrs = $this->query_sql_file(PATH_RBAC_MYSQL_DATA . $schema, $this->connection_database);
             $this->log($qrs, isset($qrs['errors']));
             $qrv = $this->query_sql_file(PATH_RBAC_MYSQL_DATA . $values, $this->connection_database);
             $this->log($qrv, isset($qrv['errors']));
 
-            mysql_select_db($wf, $this->connection_database);
+            mysqli_select_db($this->connection_database, $wf);
 
             require_once("propel/Propel.php");
             require_once('classes/model/AppCacheView.php');
@@ -246,7 +246,7 @@ class Installer
             // Execute sql for partner
             $pathMysqlPartner = PATH_CORE . 'data' . PATH_SEP . 'partner' . PATH_SEP . 'mysql' . PATH_SEP;
             if (G::verifyPath($pathMysqlPartner)) {
-                $res = array();
+                $res = [];
                 $filesSlq = glob($pathMysqlPartner . '*.sql');
                 foreach ($filesSlq as $value) {
                     $this->query_sql_file($value, $this->connection_database);
@@ -256,7 +256,7 @@ class Installer
             // Execute to change of skin
             $pathSkinPartner = PATH_CORE . 'data' . PATH_SEP . 'partner' . PATH_SEP . 'skin' . PATH_SEP;
             if (G::verifyPath($pathSkinPartner)) {
-                $res = array();
+                $res = [];
                 $fileTar = glob($pathSkinPartner . '*.tar');
                 foreach ($fileTar as $value) {
                     $dataFile = pathinfo($value);
@@ -331,7 +331,7 @@ class Installer
             curl_close($ch);
 
             $ch = curl_init();
-            $postData = array();
+            $postData = [];
             // resolv the plugin name
             $plugins = glob(PATH_CORE . "plugins/*.tar");
             if (count($plugins) > 0) {
@@ -356,10 +356,10 @@ class Installer
         }
     }
 
-    function copyFile($fromDir, $toDir, $chmod = 0777)
+    public function copyFile($fromDir, $toDir, $chmod = 0777)
     {
-        $errors = array();
-        $messages = array();
+        $errors = [];
+        $messages = [];
 
         if (!is_writable($toDir)) {
             $errors[] = 'target ' . $toDir . ' is not writable';
@@ -419,7 +419,7 @@ class Installer
                         $value['PRO_UID'] . "', '" .
                         $value['USR_UID'] . "', '" .
                         $value['APP_UID'] . "')";
-                    mysql_select_db($this->wf_site_name, $this->connection_database);
+                    mysqli_select_db($this->connection_database, $this->wf_site_name);
                     $this->run_query($query, "Copy configuracion environment");
                     break;
                 }
@@ -434,16 +434,16 @@ class Installer
      */
     public function setAdmin()
     {
-        mysql_select_db($this->wf_site_name, $this->connection_database);
+        mysqli_select_db($this->connection_database, $this->wf_site_name);
         //  The mysql_escape_string function has been DEPRECATED as of PHP 5.3.0.
-        //  $this->run_query('UPDATE USERS SET USR_USERNAME = \''.mysql_escape_string($this->options['admin']['username']).'\', `USR_PASSWORD` = \''.md5($this->options['admin']['password']).'\' WHERE `USR_UID` = \'00000000000000000000000000000001\' LIMIT 1',
+        //  $this->run_query('UPDATE USERS SET USR_USERNAME = \''.mysqli_escape_string($this->options['admin']['username']).'\', `USR_PASSWORD` = \''.md5($this->options['admin']['password']).'\' WHERE `USR_UID` = \'00000000000000000000000000000001\' LIMIT 1',
         //    "Add 'admin' user in ProcessMaker (wf)");
-        $this->run_query('UPDATE USERS SET USR_USERNAME = \'' . mysql_real_escape_string($this->options['admin']['username']) . '\', ' . '  `USR_PASSWORD` = \'' . G::encryptHash($this->options['admin']['password']) . '\' ' . '  WHERE `USR_UID` = \'00000000000000000000000000000001\' LIMIT 1', "Add 'admin' user in ProcessMaker (wf)");
-        mysql_select_db($this->rbac_site_name, $this->connection_database);
+        $this->run_query('UPDATE USERS SET USR_USERNAME = \'' . mysqli_real_escape_string($this->connection_database, $this->options['admin']['username']) . '\', ' . '  `USR_PASSWORD` = \'' . G::encryptHash($this->options['admin']['password']) . '\' ' . '  WHERE `USR_UID` = \'00000000000000000000000000000001\' LIMIT 1', "Add 'admin' user in ProcessMaker (wf)");
+        mysqli_select_db($this->connection_database, $this->rbac_site_name);
         // The mysql_escape_string function has been DEPRECATED as of PHP 5.3.0.
-        // $this->run_query('UPDATE USERS SET USR_USERNAME = \''.mysql_escape_string($this->options['admin']['username']).'\', `USR_PASSWORD` = \''.md5($this->options['admin']['password']).'\' WHERE `USR_UID` = \'00000000000000000000000000000001\' LIMIT 1',
+        // $this->run_query('UPDATE USERS SET USR_USERNAME = \''.mysqli_escape_string($this->options['admin']['username']).'\', `USR_PASSWORD` = \''.md5($this->options['admin']['password']).'\' WHERE `USR_UID` = \'00000000000000000000000000000001\' LIMIT 1',
         //   "Add 'admin' user in ProcessMaker (rb)");
-        $this->run_query('UPDATE RBAC_USERS SET USR_USERNAME = \'' . mysql_real_escape_string($this->options['admin']['username']) . '\', ' . '  `USR_PASSWORD` = \'' . G::encryptHash($this->options['admin']['password']) . '\' ' . '  WHERE `USR_UID` = \'00000000000000000000000000000001\' LIMIT 1', "Add 'admin' user in ProcessMaker (rb)");
+        $this->run_query('UPDATE RBAC_USERS SET USR_USERNAME = \'' . mysqli_real_escape_string($this->connection_database, $this->options['admin']['username']) . '\', ' . '  `USR_PASSWORD` = \'' . G::encryptHash($this->options['admin']['password']) . '\' ' . '  WHERE `USR_UID` = \'00000000000000000000000000000001\' LIMIT 1', "Add 'admin' user in ProcessMaker (rb)");
     }
 
     /**
@@ -455,8 +455,8 @@ class Installer
      */
     private function run_query($query, $description = null)
     {
-        $result = @mysql_query($query, $this->connection_database);
-        $error = ($result) ? false : mysql_error();
+        $result = mysqli_query($this->connection_database, $query);
+        $error = $result ? false : mysqli_error($this->connection_database);
         $this->log(($description ? $description : $query) . " => " . (($error) ? $error : "OK") . "\n", $error);
     }
 
@@ -472,7 +472,7 @@ class Installer
         $lines = file($file);
         $previous = null;
         $errors = '';
-        @mysql_query("SET NAMES 'utf8';");
+        mysqli_query($connection, "SET NAMES 'utf8';");
         foreach ($lines as $j => $line) {
             $line = trim($line); // Remove comments from the script
 
@@ -507,7 +507,7 @@ class Installer
             }
 
             $line = substr($line, 0, strrpos($line, ";"));
-            @mysql_query($line, $connection);
+            mysqli_query($connection, $line);
         }
     }
 
@@ -577,7 +577,7 @@ class Installer
      */
     public function getDirectoryFiles($dir, $extension)
     {
-        $filesArray = array();
+        $filesArray = [];
         if (file_exists($dir)) {
             if ($handle = opendir($dir)) {
                 while (false !== ($file = readdir($handle))) {
@@ -600,50 +600,41 @@ class Installer
      */
     public function check_db_empty($dbName)
     {
-        $a = @mysql_select_db($dbName, $this->connection_database);
+        $a = mysqli_select_db($this->connection_database, $dbName);
         if (!$a) {
             return true;
         }
-        $q = @mysql_query('SHOW TABLES', $this->connection_database);
-        return (@mysql_num_rows($q) > 0) ? false : true;
+        $q = mysqli_query($this->connection_database, 'SHOW TABLES');
+        return !(mysqli_num_rows($q) > 0);
     }
 
     /**
      * check_db
      *
      * @param string $dbName
-     * @return Array Array('status' => true or false,'message' => string)
+     * @return array Array('status' => true or false,'message' => string)
      */
     public function check_db($dbName)
     {
+        $response = [];
+        $response['status'] = false;
+        $response['message'] = '';
         if (!$this->connection_database) {
-            //erik: new verification if the mysql extension is enabled
-            $error = class_exists('mysql_error') ? mysql_error() : 'Mysql Module for PHP is not enabled!';
-            return Array('status' => false, 'message' => $error
-            );
+            //new verification if the mysql extension is enabled
+            $response['message'] = class_exists('mysql_error') ? mysqli_error() : 'Mysql Module for PHP is not enabled!';
         } else {
-            if (!mysql_select_db($dbName, $this->connection_database) && $this->cc_status != 1) {
-                return Array('status' => false, 'message' => mysql_error()
-                );
+            if (!mysqli_select_db($this->connection_database, $dbName) && $this->cc_status != 1) {
+                $response['message'] = mysqli_error($this->connection_database);
             } else {
-                /*        var_dump($this->options['advanced']['ao_db_drop'],$this->cc_status,$this->check_db_empty($dbName));
-                  if(($this->options['advanced']['ao_db_drop']===false && $this->cc_status!=1 && !$this->check_db_empty($dbName)) )
-                  {
-                  return Array('status'=>false,'message'=>'Database is not empty');
-                  }
-                  else
-                  {
-                  return Array('status'=>true,'message'=>'OK');
-                  } */
                 if ($this->options['advanced']['ao_db_drop'] === true || $this->check_db_empty($dbName)) {
-                    return Array('status' => true, 'message' => 'PASSED'
-                    );
+                    $response['status'] = true;
+                    $response['message'] = 'PASSED';
                 } else {
-                    return Array('status' => false, 'message' => 'Database is not empty'
-                    );
+                    $response['message'] = 'Database is not empty';
                 }
             }
         }
+        return $response;
     }
 
     /**
@@ -653,58 +644,51 @@ class Installer
      */
     private function check_connection()
     {
-        if (!function_exists("mysql_connect")) {
+        if (!function_exists('mysqli_connect')) {
             $this->cc_status = 0;
-            $rt = Array('connection' => false, 'grant' => 0, 'version' => false, 'message' => "ERROR: Mysql Module for PHP is not enabled, try install <b>php-mysql</b> package.", 'ao' => Array('ao_db_wf' => false, 'ao_db_rb' => false, 'ao_db_rp' => false
+            $rt = array('connection' => false, 'grant' => 0, 'version' => false, 'message' => "ERROR: Mysql Module for PHP is not enabled, try install <b>php-mysql</b> package.", 'ao' => array('ao_db_wf' => false, 'ao_db_rb' => false, 'ao_db_rp' => false
             )
             );
         } else {
-            $this->connection_database = @mysql_connect($this->options['database']['hostname'], $this->options['database']['username'], $this->options['database']['password']);
-            $rt = Array('version' => false, 'ao' => Array('ao_db_wf' => false, 'ao_db_rb' => false, 'ao_db_rp' => false
+            $this->connection_database = mysqli_connect($this->options['database']['hostname'], $this->options['database']['username'], $this->options['database']['password']);
+            $rt = array('version' => false, 'ao' => array('ao_db_wf' => false, 'ao_db_rb' => false, 'ao_db_rp' => false
             )
             );
             if (!$this->connection_database) {
                 $this->cc_status = 0;
                 $rt['connection'] = false;
                 $rt['grant'] = 0;
-                $rt['message'] = "Mysql error: " . mysql_error();
+                $rt['message'] = 'Mysql error: ' . mysqli_error($this->connection_database);
             } else {
-                preg_match('@[0-9]+\.[0-9]+\.[0-9]+@', mysql_get_server_info($this->connection_database), $version);
-                $rt['version'] = version_compare(@$version[0], "4.1.0", ">=");
+                preg_match('@[0-9]+\.[0-9]+\.[0-9]+@', mysqli_get_server_info($this->connection_database), $version);
+                $rt['version'] = version_compare(@$version[0], '4.1.0', '>=');
                 $rt['connection'] = true;
 
-                $dbNameTest = "PROCESSMAKERTESTDC";
-                $db = @mysql_query("CREATE DATABASE " . $dbNameTest, $this->connection_database);
+                $dbNameTest = 'PROCESSMAKERTESTDC';
+                $db = mysqli_query($this->connection_database, 'CREATE DATABASE ' . $dbNameTest);
                 if (!$db) {
                     $this->cc_status = 3;
                     $rt['grant'] = 3;
-                    //$rt['message'] = "Db GRANTS error:  ".mysql_error();
-                    $rt['message'] = "Successful connection";
+                    $rt['message'] = 'Successful connection';
                 } else {
-
-                    //@mysql_drop_db("processmaker_testGA");
                     $usrTest = "wfrbtest";
                     $chkG = "GRANT ALL PRIVILEGES ON `" . $dbNameTest . "`.* TO " . $usrTest . "@'%' IDENTIFIED BY 'sample' WITH GRANT OPTION";
-                    $ch = @mysql_query($chkG, $this->connection_database);
+                    $ch = mysqli_query($this->connection_database, $chkG);
                     if (!$ch) {
                         $this->cc_status = 2;
                         $rt['grant'] = 2;
-                        //$rt['message'] = "USER PRIVILEGES ERROR";
-                        $rt['message'] = "Successful connection";
+                        $rt['message'] = 'Successful connection';
                     } else {
                         $this->cc_status = 1;
-                        @mysql_query("DROP USER " . $usrTest . "@'%'", $this->connection_database);
+                        mysqli_query($this->connection_database, "DROP USER " . $usrTest . "@'%'");
                         $rt['grant'] = 1;
-                        $rt['message'] = "Successful connection";
+                        $rt['message'] = 'Successful connection';
                     }
-                    @mysql_query("DROP DATABASE " . $dbNameTest, $this->connection_database);
+                    mysqli_query($this->connection_database, 'DROP DATABASE ' . $dbNameTest);
                 }
-                //        var_dump($wf,$rb,$rp);
             }
         }
         $rt['ao']['ao_db_wf'] = $this->check_db($this->options['advanced']['ao_db_wf']);
-        //$rt['ao']['ao_db_rb'] = $this->check_db($this->options['advanced']['ao_db_rb']);
-        //$rt['ao']['ao_db_rp'] = $this->check_db($this->options['advanced']['ao_db_rp']);
         return $rt;
     }
 
@@ -722,4 +706,3 @@ class Installer
         }
     }
 }
-
diff --git a/workflow/engine/src/ProcessMaker/Core/System.php b/workflow/engine/src/ProcessMaker/Core/System.php
index 6c5dde774..12e785ce7 100644
--- a/workflow/engine/src/ProcessMaker/Core/System.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -1195,7 +1195,7 @@ class System
      * @return string $result
      * @throws Exception
      */
-    public function updateIndexFile($conf)
+    public static function updateIndexFile($conf)
     {
         if (!file_exists(PATH_HTML . 'index.html')) {
             throw new Exception('The public index file "' . PATH_HTML . 'index.html" does not exist!');
diff --git a/workflow/engine/src/ProcessMaker/Facades/DB.php b/workflow/engine/src/ProcessMaker/Facades/DB.php
new file mode 100644
index 000000000..0ab4b077c
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/Facades/DB.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Our own DB Facade that supports loading the database for workspaces as well as
+ * external database connections.
+ */
+
+class DB extends \Illuminate\Support\Facades\DB
+{
+
+}
\ No newline at end of file
diff --git a/workflow/engine/src/ProcessMaker/Model/DbSource.php b/workflow/engine/src/ProcessMaker/Model/DbSource.php
new file mode 100644
index 000000000..31e3b8c41
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/Model/DbSource.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace ProcessMaker\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class DbSource
+ * @package ProcessMaker\Model
+ *
+ * Represents an external database connection. Each DB Source is related to a owner process.
+ */
+class DbSource extends Model
+{
+    // Set our table name
+    protected $table = 'DB_SOURCE';
+    // We do not store timestamps
+    public $timestamps = false;
+
+}
\ No newline at end of file
diff --git a/workflow/engine/src/ProcessMaker/Model/Process.php b/workflow/engine/src/ProcessMaker/Model/Process.php
new file mode 100644
index 000000000..f131fb318
--- /dev/null
+++ b/workflow/engine/src/ProcessMaker/Model/Process.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace ProcessMaker\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class Process
+ * @package ProcessMaker\Model
+ *
+ * Represents a business process object in the system.
+ */
+class Process extends Model
+{
+    // Set our table name
+    protected $table = 'PROCESS';
+    // We do have a created at, but we don't store an updated at
+    const CREATED_AT = 'PRO_CREATE_DATE';
+    const UPDATED_AT = null;
+
+}
\ No newline at end of file
diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index 53e01c50b..df1476723 100644
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ProcessMaker\Project\Adapter;
 
 use ProcessMaker\Plugins\PluginRegistry;
@@ -18,22 +19,22 @@ class BpmnWorkflow extends Project\Bpmn
      */
     protected $wp;
 
-    const BPMN_GATEWAY_COMPLEX    = "COMPLEX";
-    const BPMN_GATEWAY_PARALLEL   = "PARALLEL";
-    const BPMN_GATEWAY_INCLUSIVE  = "INCLUSIVE";
-    const BPMN_GATEWAY_EXCLUSIVE  = "EXCLUSIVE";
+    const BPMN_GATEWAY_COMPLEX = "COMPLEX";
+    const BPMN_GATEWAY_PARALLEL = "PARALLEL";
+    const BPMN_GATEWAY_INCLUSIVE = "INCLUSIVE";
+    const BPMN_GATEWAY_EXCLUSIVE = "EXCLUSIVE";
     const BPMN_GATEWAY_EVENTBASED = "EVENTBASED";
 
     private $arrayTaskAttribute = array(
-        "gateway-to-gateway"               => array("type" => "GATEWAYTOGATEWAY",                 "prefix" => "gtg-"),
-        "end-message-event"                => array("type" => "END-MESSAGE-EVENT",                "prefix" => "eme-"),
-        "start-message-event"              => array("type" => "START-MESSAGE-EVENT",              "prefix" => "sme-"),
+        "gateway-to-gateway" => array("type" => "GATEWAYTOGATEWAY", "prefix" => "gtg-"),
+        "end-message-event" => array("type" => "END-MESSAGE-EVENT", "prefix" => "eme-"),
+        "start-message-event" => array("type" => "START-MESSAGE-EVENT", "prefix" => "sme-"),
         "intermediate-throw-message-event" => array("type" => "INTERMEDIATE-THROW-MESSAGE-EVENT", "prefix" => "itme-"),
         "intermediate-catch-message-event" => array("type" => "INTERMEDIATE-CATCH-MESSAGE-EVENT", "prefix" => "icme-"),
-        "start-timer-event"                => array("type" => "START-TIMER-EVENT",                "prefix" => "ste-"),
-        "intermediate-catch-timer-event"   => array("type" => "INTERMEDIATE-CATCH-TIMER-EVENT",   "prefix" => "icte-"),
-        "end-email-event"                  => array("type" => "END-EMAIL-EVENT",                  "prefix" => "eee-"),
-        "intermediate-throw-email-event"   => array("type" => "INTERMEDIATE-THROW-EMAIL-EVENT",   "prefix" => "itee-")
+        "start-timer-event" => array("type" => "START-TIMER-EVENT", "prefix" => "ste-"),
+        "intermediate-catch-timer-event" => array("type" => "INTERMEDIATE-CATCH-TIMER-EVENT", "prefix" => "icte-"),
+        "end-email-event" => array("type" => "END-EMAIL-EVENT", "prefix" => "eee-"),
+        "intermediate-throw-email-event" => array("type" => "INTERMEDIATE-THROW-EMAIL-EVENT", "prefix" => "itee-")
     );
 
     private $arrayElementTaskRelation = array();
@@ -44,9 +45,7 @@ class BpmnWorkflow extends Project\Bpmn
 
     public static function load($prjUid)
     {
-
         $parent = parent::load($prjUid);
-        //return new BpmnWorkflow();
 
         $me = new BpmnWorkflow();
 
@@ -104,19 +103,17 @@ class BpmnWorkflow extends Project\Bpmn
 
             //Add Audit Log
             $ogetProcess = new \Process();
-            $getprocess=$ogetProcess->load($this->getUid());
-            $nameProcess=$getprocess['PRO_TITLE'];
-            \G::auditLog("ImportProcess", 'PMX File Imported '.$nameProcess. ' ('.$this->getUid().')');
-
+            $getprocess = $ogetProcess->load($this->getUid());
+            $nameProcess = $getprocess['PRO_TITLE'];
+            \G::auditLog("ImportProcess", 'PMX File Imported ' . $nameProcess . ' (' . $this->getUid() . ')');
         } catch (\Exception $e) {
             $prjUid = $this->getUid();
-            //$this->remove();
             $bpmnProject = Project\Bpmn::load($prjUid);
             $bpmnProject->remove();
 
             throw new \RuntimeException(sprintf(
-                "Can't create Bpmn Project with prj_uid: %s, workflow creation fails." . PHP_EOL . $e->getMessage()
-                , $prjUid
+                "Can't create Bpmn Project with prj_uid: %s, workflow creation fails." . PHP_EOL . $e->getMessage(),
+                $prjUid
             ));
         }
     }
@@ -284,18 +281,18 @@ class BpmnWorkflow extends Project\Bpmn
 
         $taskData = self::__updateServiceTask($activityBefore, $activityCurrent, $taskData);
 
-        if($activityCurrent->getActLoopType() == "PARALLEL"){
-           $task = \TaskPeer::retrieveByPK($actUid);
-           if($task->getTasAssignType() == "BALANCED" || $task->getTasAssignType() == "MANUAL" || $task->getTasAssignType() == "EVALUATE" || $task->getTasAssignType() == "REPORT_TO" || $task->getTasAssignType() == "SELF_SERVICE"){
-               $taskData["TAS_ASSIGN_TYPE"] = "MULTIPLE_INSTANCE";
-           }
+        if ($activityCurrent->getActLoopType() == "PARALLEL") {
+            $task = \TaskPeer::retrieveByPK($actUid);
+            if ($task->getTasAssignType() == "BALANCED" || $task->getTasAssignType() == "MANUAL" || $task->getTasAssignType() == "EVALUATE" || $task->getTasAssignType() == "REPORT_TO" || $task->getTasAssignType() == "SELF_SERVICE") {
+                $taskData["TAS_ASSIGN_TYPE"] = "MULTIPLE_INSTANCE";
+            }
         }
 
-        if($activityCurrent->getActLoopType() == "EMPTY"){
-           $task = \TaskPeer::retrieveByPK($actUid);
-           if($task->getTasAssignType() == "MULTIPLE_INSTANCE_VALUE_BASED" || $task->getTasAssignType() == "MULTIPLE_INSTANCE"){
-               $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";
-           }
+        if ($activityCurrent->getActLoopType() == "EMPTY") {
+            $task = \TaskPeer::retrieveByPK($actUid);
+            if ($task->getTasAssignType() == "MULTIPLE_INSTANCE_VALUE_BASED" || $task->getTasAssignType() == "MULTIPLE_INSTANCE") {
+                $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";
+            }
         }
 
         $this->wp->updateTask($actUid, $taskData);
@@ -324,7 +321,7 @@ class BpmnWorkflow extends Project\Bpmn
      * @param $taskData
      * @return mixed
      */
-    static function __updateServiceTask($activityBefore, $activityCurrent, $taskData)
+    public static function __updateServiceTask($activityBefore, $activityCurrent, $taskData)
     {
         $registry = PluginRegistry::loadSingleton();
         if ($activityBefore->getActTaskType() != "SERVICETASK" && $activityCurrent->getActTaskType() == "SERVICETASK") {
@@ -341,7 +338,7 @@ class BpmnWorkflow extends Project\Bpmn
         if ($activityBefore->getActTaskType() == "SERVICETASK" && $activityCurrent->getActTaskType() != "SERVICETASK") {
             $taskData["TAS_TYPE"] = "NORMAL";
             $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";
-            if($activityCurrent->getActTaskType() == "SCRIPTTASK"){
+            if ($activityCurrent->getActTaskType() == "SCRIPTTASK") {
                 $taskData["TAS_TYPE"] = "SCRIPT-TASK";
             }
             //The plugin pmConnectors will be moved to the core in pm.3.3
@@ -380,8 +377,8 @@ class BpmnWorkflow extends Project\Bpmn
 
             $arrayElementTaskRelationData = $elementTaskRelation->getElementTaskRelationWhere(
                 array(
-                    \ElementTaskRelationPeer::PRJ_UID      => $this->wp->getUid(),
-                    \ElementTaskRelationPeer::ELEMENT_UID  => $elementUid,
+                    \ElementTaskRelationPeer::PRJ_UID => $this->wp->getUid(),
+                    \ElementTaskRelationPeer::ELEMENT_UID => $elementUid,
                     \ElementTaskRelationPeer::ELEMENT_TYPE => $elementType
                 ),
                 true
@@ -461,7 +458,7 @@ class BpmnWorkflow extends Project\Bpmn
         return $floUid;
     }
 
-    public function updateFlow($floUid, $data, $flows)
+    public function updateFlow($floUid, $data, $flows = null)
     {
         $flowBefore = \BpmnFlowPeer::retrieveByPK($floUid);
 
@@ -538,7 +535,7 @@ class BpmnWorkflow extends Project\Bpmn
             $messageEventRelation = new \ProcessMaker\BusinessModel\MessageEventRelation();
 
             $messageEventRelation->deleteWhere(array(
-                \MessageEventRelationPeer::PRJ_UID       => $flowBefore->getPrjUid(),
+                \MessageEventRelationPeer::PRJ_UID => $flowBefore->getPrjUid(),
                 \MessageEventRelationPeer::EVN_UID_THROW => $flowBefore->getFloElementOrigin(),
                 \MessageEventRelationPeer::EVN_UID_CATCH => $flowBefore->getFloElementDest()
             ));
@@ -563,10 +560,10 @@ class BpmnWorkflow extends Project\Bpmn
             $flow->getFloElementDestType() == "bpmnActivity"
         ) {
             $bpmnFlow = \BpmnFlow::findOneBy(array(
-                \BpmnFlowPeer::FLO_ELEMENT_ORIGIN      => $flow->getFloElementOrigin(),
+                \BpmnFlowPeer::FLO_ELEMENT_ORIGIN => $flow->getFloElementOrigin(),
                 \BpmnFlowPeer::FLO_ELEMENT_ORIGIN_TYPE => "bpmnEvent",
-                \BpmnFlowPeer::FLO_ELEMENT_DEST        => $flow->getFloElementDest(),
-                \BpmnFlowPeer::FLO_ELEMENT_DEST_TYPE   => "bpmnActivity"
+                \BpmnFlowPeer::FLO_ELEMENT_DEST => $flow->getFloElementDest(),
+                \BpmnFlowPeer::FLO_ELEMENT_DEST_TYPE => "bpmnActivity"
             ));
 
             if (is_null($bpmnFlow)) {
@@ -617,7 +614,7 @@ class BpmnWorkflow extends Project\Bpmn
                                 $messageEventRelation = new \ProcessMaker\BusinessModel\MessageEventRelation();
 
                                 $messageEventRelation->deleteWhere(array(
-                                    \MessageEventRelationPeer::PRJ_UID       => $flow->getPrjUid(),
+                                    \MessageEventRelationPeer::PRJ_UID => $flow->getPrjUid(),
                                     \MessageEventRelationPeer::EVN_UID_THROW => $flow->getFloElementOrigin(),
                                     \MessageEventRelationPeer::EVN_UID_CATCH => $flow->getFloElementDest()
                                 ));
@@ -637,8 +634,8 @@ class BpmnWorkflow extends Project\Bpmn
             if ($bpmnEvent->getEvnType() == "START") {
                 //Flows
                 $arrayFlow = \BpmnFlow::findAllBy(array(
-                    \BpmnFlowPeer::FLO_TYPE                => array("MESSAGE", \Criteria::NOT_EQUAL),
-                    \BpmnFlowPeer::FLO_ELEMENT_ORIGIN      => $bpmnEvent->getEvnUid(),
+                    \BpmnFlowPeer::FLO_TYPE => array("MESSAGE", \Criteria::NOT_EQUAL),
+                    \BpmnFlowPeer::FLO_ELEMENT_ORIGIN => $bpmnEvent->getEvnUid(),
                     \BpmnFlowPeer::FLO_ELEMENT_ORIGIN_TYPE => "bpmnEvent"
                 ));
 
@@ -679,7 +676,7 @@ class BpmnWorkflow extends Project\Bpmn
             }
 
             //Message-Event-Definition - Delete
-            $arrayEventType   = array("START", "END", "INTERMEDIATE");
+            $arrayEventType = array("START", "END", "INTERMEDIATE");
             $arrayEventMarker = array("MESSAGETHROW", "MESSAGECATCH");
 
             if (in_array($bpmnEvent->getEvnType(), $arrayEventType) && in_array($bpmnEvent->getEvnMarker(), $arrayEventMarker)) {
@@ -693,7 +690,7 @@ class BpmnWorkflow extends Project\Bpmn
             }
 
             //Timer-Event - Delete
-            $arrayEventType   = array("START", "INTERMEDIATE");
+            $arrayEventType = array("START", "INTERMEDIATE");
             $arrayEventMarker = array("TIMER");
 
             if (in_array($bpmnEvent->getEvnType(), $arrayEventType) && in_array($bpmnEvent->getEvnMarker(), $arrayEventMarker)) {
@@ -706,7 +703,7 @@ class BpmnWorkflow extends Project\Bpmn
             }
 
             //Email-Event - Delete
-            $arrayEventType   = array("END", "INTERMEDIATE");
+            $arrayEventType = array("END", "INTERMEDIATE");
             $arrayEventMarker = array("EMAIL");
 
             if (in_array($bpmnEvent->getEvnType(), $arrayEventType) && in_array($bpmnEvent->getEvnMarker(), $arrayEventMarker)) {
@@ -728,7 +725,7 @@ class BpmnWorkflow extends Project\Bpmn
 
     public function addEvent($data)
     {
-        if (! array_key_exists("EVN_TYPE", $data)) {
+        if (!array_key_exists("EVN_TYPE", $data)) {
             throw new \RuntimeException("Required param \"EVN_TYPE\" is missing.");
         }
 
@@ -811,7 +808,7 @@ class BpmnWorkflow extends Project\Bpmn
                 $taskPosY = 0;
 
                 $flow = \BpmnFlow::findOneBy(array(
-                    \BpmnFlowPeer::FLO_ELEMENT_ORIGIN      => $elementUid,
+                    \BpmnFlowPeer::FLO_ELEMENT_ORIGIN => $elementUid,
                     \BpmnFlowPeer::FLO_ELEMENT_ORIGIN_TYPE => $elementType
                 ));
 
@@ -822,7 +819,7 @@ class BpmnWorkflow extends Project\Bpmn
                     $taskPosY = (int)($arrayFlowData["FLO_Y1"]);
                 } else {
                     $flow = \BpmnFlow::findOneBy(array(
-                        \BpmnFlowPeer::FLO_ELEMENT_DEST      => $elementUid,
+                        \BpmnFlowPeer::FLO_ELEMENT_DEST => $elementUid,
                         \BpmnFlowPeer::FLO_ELEMENT_DEST_TYPE => $elementType
                     ));
 
@@ -834,15 +831,15 @@ class BpmnWorkflow extends Project\Bpmn
                     }
                 }
 
-                $prefix   = $this->arrayTaskAttribute[$key]["prefix"];
+                $prefix = $this->arrayTaskAttribute[$key]["prefix"];
                 $taskType = $this->arrayTaskAttribute[$key]["type"];
 
                 $taskUid = $this->wp->addTask(array(
-                    "TAS_UID"   => $prefix . substr(Util\Common::generateUID(), (32 - strlen($prefix)) * -1),
-                    "TAS_TYPE"  => $taskType,
+                    "TAS_UID" => $prefix . substr(Util\Common::generateUID(), (32 - strlen($prefix)) * -1),
+                    "TAS_TYPE" => $taskType,
                     "TAS_TITLE" => $taskType,
-                    "TAS_POSX"  => $taskPosX,
-                    "TAS_POSY"  => $taskPosY
+                    "TAS_POSX" => $taskPosX,
+                    "TAS_POSY" => $taskPosY
                 ));
 
                 //Element-Task-Relation - Create
@@ -851,9 +848,9 @@ class BpmnWorkflow extends Project\Bpmn
                 $arrayResult = $elementTaskRelation->create(
                     $this->wp->getUid(),
                     [
-                        'ELEMENT_UID'  => $elementUid,
+                        'ELEMENT_UID' => $elementUid,
                         'ELEMENT_TYPE' => $elementType,
-                        'TAS_UID'      => $taskUid
+                        'TAS_UID' => $taskUid
                     ]
                 );
 
@@ -922,16 +919,16 @@ class BpmnWorkflow extends Project\Bpmn
 
             //Flows
             $arrayFlow = \BpmnFlow::findAllBy(array(
-                \BpmnFlowPeer::FLO_TYPE                => array("MESSAGE", \Criteria::NOT_EQUAL),
-                \BpmnFlowPeer::FLO_ELEMENT_ORIGIN      => $gatewayUid,
+                \BpmnFlowPeer::FLO_TYPE => array("MESSAGE", \Criteria::NOT_EQUAL),
+                \BpmnFlowPeer::FLO_ELEMENT_ORIGIN => $gatewayUid,
                 \BpmnFlowPeer::FLO_ELEMENT_ORIGIN_TYPE => "bpmnGateway"
             ));
 
             foreach ($arrayFlow as $value) {
                 $arrayFlowData = $value->toArray();
 
-                $routeDefault   = (array_key_exists("FLO_TYPE", $arrayFlowData) && $arrayFlowData["FLO_TYPE"] == "DEFAULT")? 1 : 0;
-                $routeCondition = (array_key_exists("FLO_CONDITION", $arrayFlowData))? $arrayFlowData["FLO_CONDITION"] : "";
+                $routeDefault = (array_key_exists("FLO_TYPE", $arrayFlowData) && $arrayFlowData["FLO_TYPE"] == "DEFAULT") ? 1 : 0;
+                $routeCondition = (array_key_exists("FLO_CONDITION", $arrayFlowData)) ? $arrayFlowData["FLO_CONDITION"] : "";
 
                 switch ($arrayFlowData["FLO_ELEMENT_DEST_TYPE"]) {
                     case "bpmnActivity":
@@ -1015,15 +1012,15 @@ class BpmnWorkflow extends Project\Bpmn
             $arrayEventData = \BpmnEvent::findOneBy(\BpmnEventPeer::EVN_UID, $eventUid)->toArray();
 
             if (!is_null($arrayEventData)) {
-                $arrayEventType   = array("INTERMEDIATE");
+                $arrayEventType = array("INTERMEDIATE");
                 $arrayEventMarker = array("MESSAGETHROW", "MESSAGECATCH", "TIMER", "EMAIL");
 
                 if (in_array($arrayEventData["EVN_TYPE"], $arrayEventType) && in_array($arrayEventData["EVN_MARKER"], $arrayEventMarker)) {
                     $arrayKey = array(
                         "MESSAGETHROW" => "intermediate-throw-message-event",
                         "MESSAGECATCH" => "intermediate-catch-message-event",
-                        "TIMER"        => "intermediate-catch-timer-event",
-                        "EMAIL"        => "intermediate-throw-email-event"
+                        "TIMER" => "intermediate-catch-timer-event",
+                        "EMAIL" => "intermediate-throw-email-event"
                     );
 
                     $taskUid = $this->__createTaskByElement(
@@ -1042,15 +1039,15 @@ class BpmnWorkflow extends Project\Bpmn
                     // The result value returns zero if the element is already mapped as a route
                     // we need to add this to fix cases of recursion if an already element has been mapped.
                     // like a loop for example.
-                    if ($result === 0 ) {
+                    if ($result === 0) {
                         return;
                     }
                 }
 
                 //Flows
                 $arrayFlow = \BpmnFlow::findAllBy(array(
-                    \BpmnFlowPeer::FLO_TYPE                => array("MESSAGE", \Criteria::NOT_EQUAL),
-                    \BpmnFlowPeer::FLO_ELEMENT_ORIGIN      => $eventUid,
+                    \BpmnFlowPeer::FLO_TYPE => array("MESSAGE", \Criteria::NOT_EQUAL),
+                    \BpmnFlowPeer::FLO_ELEMENT_ORIGIN => $eventUid,
                     \BpmnFlowPeer::FLO_ELEMENT_ORIGIN_TYPE => "bpmnEvent"
                 ));
 
@@ -1141,8 +1138,8 @@ class BpmnWorkflow extends Project\Bpmn
 
             //Flows
             $arrayFlow = \BpmnFlow::findAllBy(array(
-                \BpmnFlowPeer::FLO_TYPE                => array("MESSAGE", \Criteria::NOT_EQUAL),
-                \BpmnFlowPeer::FLO_ELEMENT_ORIGIN      => $activity["ACT_UID"],
+                \BpmnFlowPeer::FLO_TYPE => array("MESSAGE", \Criteria::NOT_EQUAL),
+                \BpmnFlowPeer::FLO_ELEMENT_ORIGIN => $activity["ACT_UID"],
                 \BpmnFlowPeer::FLO_ELEMENT_ORIGIN_TYPE => "bpmnActivity"
             ));
 
@@ -1266,13 +1263,13 @@ class BpmnWorkflow extends Project\Bpmn
         if (\Process::existsByProTitle($projectData["prj_name"])) {
             throw new \Exception("Project with name: {$projectData["prj_name"]}, already exists.");
         }
-        $activities = isset($projectData['diagrams']['0']['activities'])?$projectData['diagrams']['0']['activities']:array();
+        $activities = isset($projectData['diagrams']['0']['activities']) ? $projectData['diagrams']['0']['activities'] : array();
         foreach ($activities as $value) {
             if (empty($value['act_type'])) {
                 throw new \Exception("For activity: {$value['act_uid']} `act_type` is required but missing.");
             }
         }
-        $events = isset($projectData['diagrams']['0']['events'])?$projectData['diagrams']['0']['events']:array();
+        $events = isset($projectData['diagrams']['0']['events']) ? $projectData['diagrams']['0']['events'] : array();
         foreach ($events as $value) {
             if (empty($value['evn_type'])) {
                 throw new \Exception("For event: {$value['evn_uid']} `evn_type` is required but missing.");
@@ -1388,7 +1385,7 @@ class BpmnWorkflow extends Project\Bpmn
 
         $configList = array("changeCaseTo" => CASE_LOWER);
 
-        if (! is_null($diagram)) {
+        if (!is_null($diagram)) {
             $diagram = array_change_key_case($diagram, CASE_LOWER);
             $diagram["activities"] = $bwp->getActivities($configList);
             $diagram["events"] = $bwp->getEvents($configList);
@@ -1475,20 +1472,22 @@ class BpmnWorkflow extends Project\Bpmn
      * @return array
      */
     public static function updateFromStruct(
-        $prjUid, $projectData,
+        $prjUid,
+        $projectData,
         $generateUid = true,
         $forceInsert = false,
         $allData = null
-    ) {
+    )
+    {
         $diagram = isset($projectData["diagrams"]) && isset($projectData["diagrams"][0]) ? $projectData["diagrams"][0] : array();
-        $diagram["activities"] = isset($diagram["activities"])? $diagram["activities"]: array();
-        $diagram["artifacts"]  = isset($diagram["artifacts"])? $diagram["artifacts"]: array();
-        $diagram["gateways"] = isset($diagram["gateways"])? $diagram["gateways"]: array();
-        $diagram["events"] = isset($diagram["events"])? $diagram["events"]: array();
-        $diagram["data"] = isset($diagram["data"])? $diagram["data"]: array();
-        $diagram["participants"] = isset($diagram["participants"])? $diagram["participants"]: array();
-        $diagram["laneset"] = isset($diagram["laneset"])? $diagram["laneset"]: array();
-        $diagram["lanes"] = isset($diagram["lanes"])? $diagram["lanes"]: array();
+        $diagram["activities"] = isset($diagram["activities"]) ? $diagram["activities"] : array();
+        $diagram["artifacts"] = isset($diagram["artifacts"]) ? $diagram["artifacts"] : array();
+        $diagram["gateways"] = isset($diagram["gateways"]) ? $diagram["gateways"] : array();
+        $diagram["events"] = isset($diagram["events"]) ? $diagram["events"] : array();
+        $diagram["data"] = isset($diagram["data"]) ? $diagram["data"] : array();
+        $diagram["participants"] = isset($diagram["participants"]) ? $diagram["participants"] : array();
+        $diagram["laneset"] = isset($diagram["laneset"]) ? $diagram["laneset"] : array();
+        $diagram["lanes"] = isset($diagram["lanes"]) ? $diagram["lanes"] : array();
 
         $result = array();
 
@@ -1540,13 +1539,13 @@ class BpmnWorkflow extends Project\Bpmn
                     $diagram = self::refreshElementUid($diagram, $uidOld, $lanesetData["LNS_UID"]);
 
                     $result[] = array(
-                        "object"  => "laneset",
+                        "object" => "laneset",
                         "old_uid" => $uidOld,
                         "new_uid" => $lanesetData["LNS_UID"]
                     );
                 }
                 $bwp->addLaneset($lanesetData);
-            } elseif (! $bwp->isEquals($dataObject, $lanesetData)) {
+            } elseif (!$bwp->isEquals($dataObject, $lanesetData)) {
                 $bwp->updateLaneset($lanesetData["LNS_UID"], $lanesetData);
             } else {
                 Util\Logger::log("Update Laneset ({$lanesetData["LNS_UID"]}) Skipped - No changes required");
@@ -1560,7 +1559,7 @@ class BpmnWorkflow extends Project\Bpmn
 
         // looking for removed elements
         foreach ($dataCollection as $lanesetData) {
-            if (! in_array($lanesetData["LNS_UID"], $whiteList)) {
+            if (!in_array($lanesetData["LNS_UID"], $whiteList)) {
                 // If it is not in the white list, then remove them
                 $bwp->removeLaneset($lanesetData["LNS_UID"]);
             }
@@ -1585,13 +1584,13 @@ class BpmnWorkflow extends Project\Bpmn
                     $diagram = self::refreshElementUid($diagram, $uidOld, $laneData["LAN_UID"]);
 
                     $result[] = array(
-                        "object"  => "lane",
+                        "object" => "lane",
                         "old_uid" => $uidOld,
                         "new_uid" => $laneData["LAN_UID"]
                     );
                 }
                 $bwp->addLane($laneData);
-            } elseif (! $bwp->isEquals($dataObject, $laneData)) {
+            } elseif (!$bwp->isEquals($dataObject, $laneData)) {
                 $bwp->updateLane($laneData["LAN_UID"], $laneData);
             } else {
                 Util\Logger::log("Update Lane ({$laneData["LAN_UID"]}) Skipped - No changes required");
@@ -1605,7 +1604,7 @@ class BpmnWorkflow extends Project\Bpmn
 
         // looking for removed elements
         foreach ($dataCollection as $laneData) {
-            if (! in_array($laneData["LAN_UID"], $whiteList)) {
+            if (!in_array($laneData["LAN_UID"], $whiteList)) {
                 // If it is not in the white list, then remove them
                 $bwp->removeLane($laneData["LAN_UID"]);
             }
@@ -1630,7 +1629,7 @@ class BpmnWorkflow extends Project\Bpmn
                     $activityData["ACT_UID"] = Util\Common::generateUID();
 
                     $result[] = array(
-                        "object"  => "activity",
+                        "object" => "activity",
                         "old_uid" => $uidOld,
                         "new_uid" => $activityData["ACT_UID"]
                     );
@@ -1644,7 +1643,7 @@ class BpmnWorkflow extends Project\Bpmn
                 }
 
                 $bwp->addActivity($activityData);
-            } elseif (! $bwp->isEquals($activity, $activityData)) {
+            } elseif (!$bwp->isEquals($activity, $activityData)) {
                 $bwp->updateActivity($activityData["ACT_UID"], $activityData);
             } else {
                 Util\Logger::log("Update Activity ({$activityData["ACT_UID"]}) Skipped - No changes required");
@@ -1652,14 +1651,13 @@ class BpmnWorkflow extends Project\Bpmn
             $bwp->sincronizeActivityData($activityData["ACT_UID"], $activityData);
             $diagram["activities"][$i] = $activityData;
             $whiteList[] = $activityData["ACT_UID"];
-
         }
 
         $activities = $bwp->getActivities();
 
         // looking for removed elements
         foreach ($activities as $activityData) {
-            if (! in_array($activityData["ACT_UID"], $whiteList)) {
+            if (!in_array($activityData["ACT_UID"], $whiteList)) {
                 $bwp->removeActivity($activityData["ACT_UID"]);
             }
         }
@@ -1683,14 +1681,14 @@ class BpmnWorkflow extends Project\Bpmn
                     $artifactData["ART_UID"] = Util\Common::generateUID();
 
                     $result[] = array(
-                        "object"  => "artifact",
+                        "object" => "artifact",
                         "old_uid" => $uidOld,
                         "new_uid" => $artifactData["ART_UID"]
                     );
                 }
 
                 $bwp->addArtifact($artifactData);
-            } elseif (! $bwp->isEquals($artifact, $artifactData)) {
+            } elseif (!$bwp->isEquals($artifact, $artifactData)) {
                 $bwp->updateArtifact($artifactData["ART_UID"], $artifactData);
             } else {
                 Util\Logger::log("Update Artifact ({$artifactData["ART_UID"]}) Skipped - No changes required");
@@ -1703,7 +1701,7 @@ class BpmnWorkflow extends Project\Bpmn
         $artifacts = $bwp->getArtifacts();
         // looking for removed elements
         foreach ($artifacts as $artifactData) {
-            if (! in_array($artifactData["ART_UID"], $whiteList)) {
+            if (!in_array($artifactData["ART_UID"], $whiteList)) {
                 $bwp->removeArtifact($artifactData["ART_UID"]);
             }
         }
@@ -1734,7 +1732,7 @@ class BpmnWorkflow extends Project\Bpmn
                     $gatewayData["GAT_UID"] = Util\Common::generateUID();
 
                     $result[] = array(
-                        "object"  => "gateway",
+                        "object" => "gateway",
                         "old_uid" => $uidOld,
                         "new_uid" => $gatewayData["GAT_UID"]
                     );
@@ -1743,7 +1741,7 @@ class BpmnWorkflow extends Project\Bpmn
                 $bwp->addGateway($gatewayData);
 
                 $flagAddOrUpdate = true;
-            } elseif (! $bwp->isEquals($gateway, $gatewayData)) {
+            } elseif (!$bwp->isEquals($gateway, $gatewayData)) {
                 $bwp->updateGateway($gatewayData["GAT_UID"], $gatewayData);
 
                 $flagAddOrUpdate = true;
@@ -1775,7 +1773,7 @@ class BpmnWorkflow extends Project\Bpmn
 
         // looking for removed elements
         foreach ($gateways as $gatewayData) {
-            if (! in_array($gatewayData["GAT_UID"], $whiteList)) {
+            if (!in_array($gatewayData["GAT_UID"], $whiteList)) {
                 $bwp->removeGateway($gatewayData["GAT_UID"]);
             }
         }
@@ -1808,14 +1806,14 @@ class BpmnWorkflow extends Project\Bpmn
                     $eventData["EVN_UID"] = Util\Common::generateUID();
 
                     $result[] = array(
-                        "object"  => "event",
+                        "object" => "event",
                         "old_uid" => $uidOld,
                         "new_uid" => $eventData["EVN_UID"]
                     );
                 }
 
                 $bwp->addEvent($eventData);
-            } elseif (! $bwp->isEquals($event, $eventData)) {
+            } elseif (!$bwp->isEquals($event, $eventData)) {
                 $bwp->updateEvent($eventData["EVN_UID"], $eventData);
             } else {
                 Util\Logger::log("Update Event ({$eventData["EVN_UID"]}) Skipped - No changes required");
@@ -1829,7 +1827,7 @@ class BpmnWorkflow extends Project\Bpmn
 
         // looking for removed elements
         foreach ($events as $eventData) {
-            if (! in_array($eventData["EVN_UID"], $whiteList)) {
+            if (!in_array($eventData["EVN_UID"], $whiteList)) {
                 // If it is not in the white list, then remove them
                 $bwp->removeEvent($eventData["EVN_UID"]);
             }
@@ -1854,14 +1852,14 @@ class BpmnWorkflow extends Project\Bpmn
                     $dataObjectData["DAT_UID"] = Util\Common::generateUID();
 
                     $result[] = array(
-                        "object"  => "data",
+                        "object" => "data",
                         "old_uid" => $uidOld,
                         "new_uid" => $dataObjectData["DAT_UID"]
                     );
                 }
 
                 $bwp->addData($dataObjectData);
-            } elseif (! $bwp->isEquals($dataObject, $dataObjectData)) {
+            } elseif (!$bwp->isEquals($dataObject, $dataObjectData)) {
                 $bwp->updateData($dataObjectData["DAT_UID"], $dataObjectData);
             } else {
                 Util\Logger::log("Update Data ({$dataObjectData["DAT_UID"]}) Skipped - No changes required");
@@ -1875,7 +1873,7 @@ class BpmnWorkflow extends Project\Bpmn
 
         // looking for removed elements
         foreach ($dataCollection as $dataObjectData) {
-            if (! in_array($dataObjectData["DAT_UID"], $whiteList)) {
+            if (!in_array($dataObjectData["DAT_UID"], $whiteList)) {
                 // If it is not in the white list, then remove them
                 $bwp->removeData($dataObjectData["DAT_UID"]);
             }
@@ -1900,14 +1898,14 @@ class BpmnWorkflow extends Project\Bpmn
                     $participantData["PAR_UID"] = Util\Common::generateUID();
 
                     $result[] = array(
-                        "object"  => "participant",
+                        "object" => "participant",
                         "old_uid" => $uidOld,
                         "new_uid" => $participantData["PAR_UID"]
                     );
                 }
 
                 $bwp->addParticipant($participantData);
-            } elseif (! $bwp->isEquals($participant, $participantData)) {
+            } elseif (!$bwp->isEquals($participant, $participantData)) {
                 $bwp->updateParticipant($participantData["PAR_UID"], $participantData);
             } else {
                 Util\Logger::log("Update Participant ({$participantData["PAR_UID"]}) Skipped - No changes required");
@@ -1921,7 +1919,7 @@ class BpmnWorkflow extends Project\Bpmn
 
         // looking for removed elements
         foreach ($dataCollection as $participantData) {
-            if (! in_array($participantData["PAR_UID"], $whiteList)) {
+            if (!in_array($participantData["PAR_UID"], $whiteList)) {
                 // If it is not in the white list, then remove them
                 $bwp->removeParticipant($participantData["PAR_UID"]);
             }
@@ -1934,7 +1932,7 @@ class BpmnWorkflow extends Project\Bpmn
 
         $whiteList = array();
 
-        $diagramFlows = isset($diagram["flows"])?$diagram["flows"]:array();
+        $diagramFlows = isset($diagram["flows"]) ? $diagram["flows"] : array();
         foreach ($diagramFlows as $i => $flowData) {
             $flowData = array_change_key_case($flowData, CASE_UPPER);
 
@@ -1987,12 +1985,12 @@ class BpmnWorkflow extends Project\Bpmn
             $whiteList[] = $flowData["FLO_UID"];
         }
 
-        $diagramFlows = isset($diagram["flows"])?$diagram["flows"]:array();
+        $diagramFlows = isset($diagram["flows"]) ? $diagram["flows"] : array();
         foreach ($diagramFlows as $flowData) {
             $flow = $bwp->getFlow($flowData["FLO_UID"]);
             if ($forceInsert || is_null($flow)) {
                 $bwp->addFlow($flowData);
-            } elseif (! $bwp->isEquals($flow, $flowData)) {
+            } elseif (!$bwp->isEquals($flow, $flowData)) {
                 $bwp->updateFlow($flowData["FLO_UID"], $flowData, $diagram["flows"]);
             } else {
                 Util\Logger::log("Update Flow ({$flowData["FLO_UID"]}) Skipped - No changes required");
@@ -2003,7 +2001,7 @@ class BpmnWorkflow extends Project\Bpmn
 
         // looking for removed elements
         foreach ($flows as $flowData) {
-            if (! in_array($flowData["FLO_UID"], $whiteList)) {
+            if (!in_array($flowData["FLO_UID"], $whiteList)) {
                 $bwp->removeFlow($flowData["FLO_UID"]);
             }
         }
@@ -2014,15 +2012,15 @@ class BpmnWorkflow extends Project\Bpmn
 
             if (!is_null($arrayGatewayData)) {
                 $arrayFlow = \BpmnFlow::findAllBy([
-                    \BpmnFlowPeer::FLO_TYPE              => ['MESSAGE', \Criteria::NOT_EQUAL],
-                    \BpmnFlowPeer::FLO_ELEMENT_DEST      => $arrayGatewayData['GAT_UID'],
+                    \BpmnFlowPeer::FLO_TYPE => ['MESSAGE', \Criteria::NOT_EQUAL],
+                    \BpmnFlowPeer::FLO_ELEMENT_DEST => $arrayGatewayData['GAT_UID'],
                     \BpmnFlowPeer::FLO_ELEMENT_DEST_TYPE => 'bpmnGateway'
                 ]);
 
                 if (count($arrayFlow) > 1) {
                     $arrayFlow = \BpmnFlow::findAllBy([
-                        \BpmnFlowPeer::FLO_TYPE                => ['MESSAGE', \Criteria::NOT_EQUAL],
-                        \BpmnFlowPeer::FLO_ELEMENT_ORIGIN      => $arrayGatewayData['GAT_UID'],
+                        \BpmnFlowPeer::FLO_TYPE => ['MESSAGE', \Criteria::NOT_EQUAL],
+                        \BpmnFlowPeer::FLO_ELEMENT_ORIGIN => $arrayGatewayData['GAT_UID'],
                         \BpmnFlowPeer::FLO_ELEMENT_ORIGIN_TYPE => 'bpmnGateway'
                     ]);
 
@@ -2086,7 +2084,7 @@ class BpmnWorkflow extends Project\Bpmn
                     $arrayResult = $webEntryEvent->update(
                         $arrayWebEntryEventData['WEE_UID'],
                         $bpmnProject->getPrjAuthor(),
-                        (!is_null($arrayData))? $arrayData : $arrayWebEntryEventData,
+                        (!is_null($arrayData)) ? $arrayData : $arrayWebEntryEventData,
                         false
                     );
                 }
@@ -2129,10 +2127,9 @@ class BpmnWorkflow extends Project\Bpmn
     {
         array_walk_recursive(
             $diagram,
-            function (&$value, $key, $arrayData)
-            {
+            function (&$value, $key, $arrayData) {
                 try {
-                    if (strcmp($arrayData['oldUid'], $value) === 0){
+                    if (strcmp($arrayData['oldUid'], $value) === 0) {
                         $value = $arrayData['newUid'];
                     }
                 } catch (\Exception $e) {
@@ -2166,7 +2163,7 @@ class BpmnWorkflow extends Project\Bpmn
 
             $criteria->addSelectColumn(\TaskPeer::TAS_UID);
 
-            $criteria->addAlias('RT',  \RoutePeer::TABLE_NAME);
+            $criteria->addAlias('RT', \RoutePeer::TABLE_NAME);
             $criteria->addAlias('RNT', \RoutePeer::TABLE_NAME);
 
             $arrayCondition = [];
@@ -2182,7 +2179,8 @@ class BpmnWorkflow extends Project\Bpmn
 
             $criteria->add(
                 $criteria->getNewCriterion('RT.ROU_UID', null, \Criteria::ISNULL)->addAnd(
-                $criteria->getNewCriterion('RNT.ROU_UID', null, \Criteria::ISNULL))
+                    $criteria->getNewCriterion('RNT.ROU_UID', null, \Criteria::ISNULL)
+                )
             );
 
             $rsCriteria = \TaskPeer::doSelectRS($criteria);
@@ -2207,7 +2205,7 @@ class BpmnWorkflow extends Project\Bpmn
             //Update Process
             $process = \ProcessPeer::retrieveByPk($this->wp->getUid());
 
-            $arrayActionDone = (!is_null($process->getProActionDone()) && (string)($process->getProActionDone()) != '')? unserialize($process->getProActionDone()) : [];
+            $arrayActionDone = (!is_null($process->getProActionDone()) && (string)($process->getProActionDone()) != '') ? unserialize($process->getProActionDone()) : [];
             $arrayActionDone[] = $actionDone;
 
             $this->wp->update(['PRO_ACTION_DONE' => serialize($arrayActionDone)]);
diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php
index 1cee222b2..3971d6926 100644
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace ProcessMaker\Project\Adapter;
 
 use ProcessMaker\Project;
@@ -67,17 +68,16 @@ class WorkflowBpmn extends Project\Workflow
 
             //Add Audit Log
             $ogetProcess = new \Process();
-            $getprocess=$ogetProcess->load($this->getUid());
-            $nameProcess=$getprocess['PRO_TITLE'];
-            \G::auditLog("ImportProcess", 'BPMN Imported '.$nameProcess. ' ('.$this->getUid().')');
-
+            $getprocess = $ogetProcess->load($this->getUid());
+            $nameProcess = $getprocess['PRO_TITLE'];
+            \G::auditLog("ImportProcess", 'BPMN Imported ' . $nameProcess . ' (' . $this->getUid() . ')');
         } catch (\Exception $e) {
             $prjUid = $this->getUid();
             $this->remove();
 
             throw new \RuntimeException(sprintf(
-                "Can't create Project with prj_uid: %s, workflow creation fails." . PHP_EOL . $e->getMessage()
-                , $prjUid
+                "Can't create Project with prj_uid: %s, workflow creation fails." . PHP_EOL . $e->getMessage(),
+                $prjUid
             ));
         }
     }
@@ -103,12 +103,13 @@ class WorkflowBpmn extends Project\Workflow
         $eventName,
         $eventType,
         $condition = ""
-    ) {
+    )
+    {
         try {
-            $eventBouWidth  = 35;
+            $eventBouWidth = 35;
             $eventBouHeight = $eventBouWidth;
 
-            $eventBouWidth2  = (int)($eventBouWidth / 2);
+            $eventBouWidth2 = (int)($eventBouWidth / 2);
             $eventBouHeight2 = (int)($eventBouHeight / 2);
 
             $eventBouHeight12 = (int)($eventBouWidth / 12);
@@ -125,16 +126,16 @@ class WorkflowBpmn extends Project\Workflow
             } else {
                 //Activity
                 $eventBouX = $objectBouX + $objectBouWidth2 - $eventBouWidth2;
-                $eventBouY = ($eventType == "START")? $objectBouY - $eventBouHeight - $eventBouHeight2 : $objectBouY + $objectBouHeight + $eventBouHeight2 + $eventBouHeight12;
+                $eventBouY = ($eventType == "START") ? $objectBouY - $eventBouHeight - $eventBouHeight2 : $objectBouY + $objectBouHeight + $eventBouHeight2 + $eventBouHeight12;
             }
 
             $arrayData = array(
-                "EVN_NAME"   => $eventName,
-                "EVN_TYPE"   => $eventType,
+                "EVN_NAME" => $eventName,
+                "EVN_TYPE" => $eventType,
                 "EVN_MARKER" => "EMPTY",
-                "BOU_X"      => $eventBouX,
-                "BOU_Y"      => $eventBouY,
-                "BOU_WIDTH"  => $eventBouWidth,
+                "BOU_X" => $eventBouX,
+                "BOU_Y" => $eventBouY,
+                "BOU_WIDTH" => $eventBouWidth,
                 "BOU_HEIGHT" => $eventBouHeight
             );
 
@@ -150,24 +151,24 @@ class WorkflowBpmn extends Project\Workflow
             } else {
                 //Activity
                 $flowX1 = $objectBouX + $objectBouWidth2;
-                $flowY1 = ($eventType == "START")? $objectBouY - $eventBouHeight + $eventBouHeight2 : $objectBouY + $objectBouHeight;
+                $flowY1 = ($eventType == "START") ? $objectBouY - $eventBouHeight + $eventBouHeight2 : $objectBouY + $objectBouHeight;
                 $flowX2 = $flowX1;
-                $flowY2 = ($eventType == "START")? $objectBouY : $objectBouY + $objectBouHeight + $eventBouHeight2 + $eventBouHeight12;
+                $flowY2 = ($eventType == "START") ? $objectBouY : $objectBouY + $objectBouHeight + $eventBouHeight2 + $eventBouHeight12;
             }
 
             $arrayData = array(
-                "FLO_TYPE"                => "SEQUENCE",
-                "FLO_ELEMENT_ORIGIN"      => ($eventType == "START")? $eventUid : $objectUid,
-                "FLO_ELEMENT_ORIGIN_TYPE" => ($eventType == "START")? "bpmnEvent" : $objectBpmnType,
-                "FLO_ELEMENT_DEST"        => ($eventType == "START")? $objectUid : $eventUid,
-                "FLO_ELEMENT_DEST_TYPE"   => ($eventType == "START")? $objectBpmnType : "bpmnEvent",
-                "FLO_IS_INMEDIATE"        => 1,
-                "FLO_CONDITION"           => $condition,
-                "FLO_X1"                  => $flowX1,
-                "FLO_Y1"                  => $flowY1,
-                "FLO_X2"                  => $flowX2,
-                "FLO_Y2"                  => $flowY2,
-                "FLO_STATE"               => json_encode(
+                "FLO_TYPE" => "SEQUENCE",
+                "FLO_ELEMENT_ORIGIN" => ($eventType == "START") ? $eventUid : $objectUid,
+                "FLO_ELEMENT_ORIGIN_TYPE" => ($eventType == "START") ? "bpmnEvent" : $objectBpmnType,
+                "FLO_ELEMENT_DEST" => ($eventType == "START") ? $objectUid : $eventUid,
+                "FLO_ELEMENT_DEST_TYPE" => ($eventType == "START") ? $objectBpmnType : "bpmnEvent",
+                "FLO_IS_INMEDIATE" => 1,
+                "FLO_CONDITION" => $condition,
+                "FLO_X1" => $flowX1,
+                "FLO_Y1" => $flowY1,
+                "FLO_X2" => $flowX2,
+                "FLO_Y2" => $flowY2,
+                "FLO_STATE" => json_encode(
                     array(
                         array("x" => $flowX1, "y" => $flowY1),
                         array("x" => $flowX1, "y" => $flowY2 - 5),
@@ -195,23 +196,23 @@ class WorkflowBpmn extends Project\Workflow
             //BPMN
             //Activity
             $arrayActivityType = array(
-                "NORMAL"     => "TASK",
-                "ADHOC"      => "TASK",
+                "NORMAL" => "TASK",
+                "ADHOC" => "TASK",
                 "SUBPROCESS" => "SUB_PROCESS"
             );
 
             $activityBouX = (int)($arrayTaskData["TAS_POSX"]);
             $activityBouY = (int)($arrayTaskData["TAS_POSY"]);
-            $activityBouWidth  = (int)($arrayTaskData["TAS_WIDTH"]);
+            $activityBouWidth = (int)($arrayTaskData["TAS_WIDTH"]);
             $activityBouHeight = (int)($arrayTaskData["TAS_HEIGHT"]);
 
             $arrayData = array(
-                "ACT_UID"    => $taskUid,
-                "ACT_NAME"   => $arrayTaskData["TAS_TITLE"],
-                "ACT_TYPE"   => $arrayActivityType[$arrayTaskData["TAS_TYPE"]],
-                "BOU_X"      => $activityBouX,
-                "BOU_Y"      => $activityBouY,
-                "BOU_WIDTH"  => $activityBouWidth,
+                "ACT_UID" => $taskUid,
+                "ACT_NAME" => $arrayTaskData["TAS_TITLE"],
+                "ACT_TYPE" => $arrayActivityType[$arrayTaskData["TAS_TYPE"]],
+                "BOU_X" => $activityBouX,
+                "BOU_Y" => $activityBouY,
+                "BOU_WIDTH" => $activityBouWidth,
                 "BOU_HEIGHT" => $activityBouHeight
             );
 
@@ -247,12 +248,13 @@ class WorkflowBpmn extends Project\Workflow
         $gatewayName,
         $gatewayType,
         $gatewayDirection
-    ) {
+    )
+    {
         try {
-            $gatewayBouWidth  = 45;
+            $gatewayBouWidth = 45;
             $gatewayBouHeight = $gatewayBouWidth;
 
-            $gatewayBouWidth2  = (int)($gatewayBouWidth / 2);
+            $gatewayBouWidth2 = (int)($gatewayBouWidth / 2);
             $gatewayBouHeight2 = (int)($gatewayBouHeight / 2);
 
             //
@@ -261,17 +263,17 @@ class WorkflowBpmn extends Project\Workflow
 
             //Gateway
             $gatewayBouX = $objectBouX + $objectBouWidth2 - $gatewayBouWidth2;
-            $gatewayBouY = ($gatewayDirection == "DIVERGING")? $objectBouY + $objectBouHeight + $gatewayBouHeight2 : $objectBouY - $gatewayBouHeight - $gatewayBouHeight2;
+            $gatewayBouY = ($gatewayDirection == "DIVERGING") ? $objectBouY + $objectBouHeight + $gatewayBouHeight2 : $objectBouY - $gatewayBouHeight - $gatewayBouHeight2;
 
             $arrayData = array(
-                "GAT_NAME"         => $gatewayName,
-                "GAT_TYPE"         => $gatewayType,
-                "GAT_DIRECTION"    => $gatewayDirection,
+                "GAT_NAME" => $gatewayName,
+                "GAT_TYPE" => $gatewayType,
+                "GAT_DIRECTION" => $gatewayDirection,
                 "GAT_DEFAULT_FLOW" => "0",
-                "BOU_X"            => $gatewayBouX,
-                "BOU_Y"            => $gatewayBouY,
-                "BOU_WIDTH"        => $gatewayBouWidth,
-                "BOU_HEIGHT"       => $gatewayBouHeight
+                "BOU_X" => $gatewayBouX,
+                "BOU_Y" => $gatewayBouY,
+                "BOU_WIDTH" => $gatewayBouWidth,
+                "BOU_HEIGHT" => $gatewayBouHeight
             );
 
             $gatewayUid = $this->bp->addGateway($arrayData);
@@ -290,18 +292,18 @@ class WorkflowBpmn extends Project\Workflow
             }
 
             $arrayData = array(
-                "FLO_TYPE"                => "SEQUENCE",
-                "FLO_ELEMENT_ORIGIN"      => ($gatewayDirection == "DIVERGING")? $objectUid : $gatewayUid,
-                "FLO_ELEMENT_ORIGIN_TYPE" => ($gatewayDirection == "DIVERGING")? $objectBpmnType : "bpmnGateway",
-                "FLO_ELEMENT_DEST"        => ($gatewayDirection == "DIVERGING")? $gatewayUid : $objectUid,
-                "FLO_ELEMENT_DEST_TYPE"   => ($gatewayDirection == "DIVERGING")? "bpmnGateway" : $objectBpmnType,
-                "FLO_IS_INMEDIATE"        => 1,
-                "FLO_CONDITION"           => "",
-                "FLO_X1"                  => $flowX1,
-                "FLO_Y1"                  => $flowY1,
-                "FLO_X2"                  => $flowX2,
-                "FLO_Y2"                  => $flowY2,
-                "FLO_STATE"               => json_encode(
+                "FLO_TYPE" => "SEQUENCE",
+                "FLO_ELEMENT_ORIGIN" => ($gatewayDirection == "DIVERGING") ? $objectUid : $gatewayUid,
+                "FLO_ELEMENT_ORIGIN_TYPE" => ($gatewayDirection == "DIVERGING") ? $objectBpmnType : "bpmnGateway",
+                "FLO_ELEMENT_DEST" => ($gatewayDirection == "DIVERGING") ? $gatewayUid : $objectUid,
+                "FLO_ELEMENT_DEST_TYPE" => ($gatewayDirection == "DIVERGING") ? "bpmnGateway" : $objectBpmnType,
+                "FLO_IS_INMEDIATE" => 1,
+                "FLO_CONDITION" => "",
+                "FLO_X1" => $flowX1,
+                "FLO_Y1" => $flowY1,
+                "FLO_X2" => $flowX2,
+                "FLO_Y2" => $flowY2,
+                "FLO_STATE" => json_encode(
                     array(
                         array("x" => $flowX1, "y" => $flowY1),
                         array("x" => $flowX1, "y" => $flowY2 - 5),
@@ -334,10 +336,11 @@ class WorkflowBpmn extends Project\Workflow
         $objectDestBouWidth,
         $objectDestBouHeight,
         $condition = ""
-    ) {
+    )
+    {
         try {
-            $objectOriginBouWidth2  = (int)($objectOriginBouWidth / 2);
-            $objectDestBouWidth2  = (int)($objectDestBouWidth / 2);
+            $objectOriginBouWidth2 = (int)($objectOriginBouWidth / 2);
+            $objectDestBouWidth2 = (int)($objectDestBouWidth / 2);
 
             $flowX1 = $objectOriginBouX + $objectOriginBouWidth2;
             $flowY1 = $objectOriginBouY + $objectOriginBouHeight;
@@ -346,18 +349,18 @@ class WorkflowBpmn extends Project\Workflow
 
             //Flow
             $arrayData = array(
-                "FLO_TYPE"                => "SEQUENCE",
-                "FLO_ELEMENT_ORIGIN"      => $objectOriginUid,
+                "FLO_TYPE" => "SEQUENCE",
+                "FLO_ELEMENT_ORIGIN" => $objectOriginUid,
                 "FLO_ELEMENT_ORIGIN_TYPE" => $objectOriginBpmnType,
-                "FLO_ELEMENT_DEST"        => $objectDestUid,
-                "FLO_ELEMENT_DEST_TYPE"   => $objectDestBpmnType,
-                "FLO_IS_INMEDIATE"        => 1,
-                "FLO_CONDITION"           => $condition,
-                "FLO_X1"                  => $flowX1,
-                "FLO_Y1"                  => $flowY1,
-                "FLO_X2"                  => $flowX2,
-                "FLO_Y2"                  => $flowY2,
-                "FLO_STATE"               => json_encode(array())
+                "FLO_ELEMENT_DEST" => $objectDestUid,
+                "FLO_ELEMENT_DEST_TYPE" => $objectDestBpmnType,
+                "FLO_IS_INMEDIATE" => 1,
+                "FLO_CONDITION" => $condition,
+                "FLO_X1" => $flowX1,
+                "FLO_Y1" => $flowY1,
+                "FLO_X2" => $flowX2,
+                "FLO_Y2" => $flowY2,
+                "FLO_STATE" => json_encode(array())
             );
 
             $flowUid = $this->bp->addFlow($arrayData);
@@ -381,7 +384,7 @@ class WorkflowBpmn extends Project\Workflow
             $activityUid = $arrayTaskData["TAS_UID"];
             $activityBouX = (int)($arrayTaskData["TAS_POSX"]);
             $activityBouY = (int)($arrayTaskData["TAS_POSY"]);
-            $activityBouWidth  = (int)($arrayTaskData["TAS_WIDTH"]);
+            $activityBouWidth = (int)($arrayTaskData["TAS_WIDTH"]);
             $activityBouHeight = (int)($arrayTaskData["TAS_HEIGHT"]);
 
             $arrayTaskData = $this->getTask($nextTaskUid);
@@ -389,7 +392,7 @@ class WorkflowBpmn extends Project\Workflow
             $nextActivityUid = $arrayTaskData["TAS_UID"];
             $nextActivityBouX = (int)($arrayTaskData["TAS_POSX"]);
             $nextActivityBouY = (int)($arrayTaskData["TAS_POSY"]);
-            $nextActivityBouWidth  = (int)($arrayTaskData["TAS_WIDTH"]);
+            $nextActivityBouWidth = (int)($arrayTaskData["TAS_WIDTH"]);
             $nextActivityBouHeight = (int)($arrayTaskData["TAS_HEIGHT"]);
 
             $result = $this->bp->getGatewayByDirectionActivityAndFlow("CONVERGING", $nextActivityUid);
@@ -439,11 +442,11 @@ class WorkflowBpmn extends Project\Workflow
                 $arrayGatewayData = $result;
             }
 
-            $gatewayUid  = $arrayGatewayData["GAT_UID"];
+            $gatewayUid = $arrayGatewayData["GAT_UID"];
             $gatewayType = $arrayGatewayData["GAT_TYPE"];
             $gatewayBouX = $arrayGatewayData["BOU_X"];
             $gatewayBouY = $arrayGatewayData["BOU_Y"];
-            $gatewayBouWidth  = $arrayGatewayData["BOU_WIDTH"];
+            $gatewayBouWidth = $arrayGatewayData["BOU_WIDTH"];
             $gatewayBouHeight = $arrayGatewayData["BOU_HEIGHT"];
 
             $flowUid = $this->routeToBpmnFlow(
@@ -470,7 +473,7 @@ class WorkflowBpmn extends Project\Workflow
         }
     }
 
-    public function addRoute($taskUid, $nextTaskUid, $type, $condition = "")
+    public function addRoute($taskUid, $nextTaskUid, $type, $condition = "", $default = 0)
     {
         try {
             //Verify data
@@ -483,9 +486,9 @@ class WorkflowBpmn extends Project\Workflow
 
             //BPMN
             $arrayBpmnGatewayType = array(
-                "EVALUATE"               => "EXCLUSIVE",
-                "SELECT"                 => "COMPLEX",
-                "PARALLEL"               => "PARALLEL",
+                "EVALUATE" => "EXCLUSIVE",
+                "SELECT" => "COMPLEX",
+                "PARALLEL" => "PARALLEL",
                 "PARALLEL-BY-EVALUATION" => "INCLUSIVE"
             );
 
@@ -494,7 +497,7 @@ class WorkflowBpmn extends Project\Workflow
             $activityUid = $arrayTaskData["TAS_UID"];
             $activityBouX = (int)($arrayTaskData["TAS_POSX"]);
             $activityBouY = (int)($arrayTaskData["TAS_POSY"]);
-            $activityBouWidth  = (int)($arrayTaskData["TAS_WIDTH"]);
+            $activityBouWidth = (int)($arrayTaskData["TAS_WIDTH"]);
             $activityBouHeight = (int)($arrayTaskData["TAS_HEIGHT"]);
 
             switch ($type) {
@@ -522,11 +525,11 @@ class WorkflowBpmn extends Project\Workflow
                         $arrayGatewayData = $result;
                     }
 
-                    $gatewayUid  = $arrayGatewayData["GAT_UID"];
+                    $gatewayUid = $arrayGatewayData["GAT_UID"];
                     $gatewayType = $arrayGatewayData["GAT_TYPE"];
                     $gatewayBouX = $arrayGatewayData["BOU_X"];
                     $gatewayBouY = $arrayGatewayData["BOU_Y"];
-                    $gatewayBouWidth  = $arrayGatewayData["BOU_WIDTH"];
+                    $gatewayBouWidth = $arrayGatewayData["BOU_WIDTH"];
                     $gatewayBouHeight = $arrayGatewayData["BOU_HEIGHT"];
 
                     if ($nextTaskUid != "-1") {
@@ -610,12 +613,12 @@ class WorkflowBpmn extends Project\Workflow
             //BPMN
             //Artifact
             $arrayData = array(
-                "ART_UID"    => $swiUid,
-                "ART_TYPE"   => ($direction == "HORIZONTAL")? "HORIZONTAL_LINE" : "VERTICAL_LINE",
-                "ART_NAME"   => "",
-                "BOU_X"      => ($direction == "HORIZONTAL")? -6666 : $position,
-                "BOU_Y"      => ($direction == "HORIZONTAL")? $position : -6666,
-                "BOU_WIDTH"  => 0,
+                "ART_UID" => $swiUid,
+                "ART_TYPE" => ($direction == "HORIZONTAL") ? "HORIZONTAL_LINE" : "VERTICAL_LINE",
+                "ART_NAME" => "",
+                "BOU_X" => ($direction == "HORIZONTAL") ? -6666 : $position,
+                "BOU_Y" => ($direction == "HORIZONTAL") ? $position : -6666,
+                "BOU_WIDTH" => 0,
                 "BOU_HEIGHT" => 0
             );
 
@@ -637,12 +640,12 @@ class WorkflowBpmn extends Project\Workflow
             //BPMN
             //Artifact
             $arrayData = array(
-                "ART_UID"    => $swiUid,
-                "ART_TYPE"   => "TEXT_ANNOTATION",
-                "ART_NAME"   => $text,
-                "BOU_X"      => $x,
-                "BOU_Y"      => $y,
-                "BOU_WIDTH"  => 100,
+                "ART_UID" => $swiUid,
+                "ART_TYPE" => "TEXT_ANNOTATION",
+                "ART_NAME" => $text,
+                "BOU_X" => $x,
+                "BOU_Y" => $y,
+                "BOU_WIDTH" => 100,
                 "BOU_HEIGHT" => 30
             );
 
@@ -689,7 +692,7 @@ class WorkflowBpmn extends Project\Workflow
             $arrayWorkflowData["groupwfs"] = array();
 
             //Create WorkflowBpmn
-            $arrayUid  = array();
+            $arrayUid = array();
             $arrayUid2 = array();
 
             //Process
@@ -701,8 +704,8 @@ class WorkflowBpmn extends Project\Workflow
             );
 
             $arrayProcessData["PRO_PARENT"] = $processUidBk;
-            $arrayProcessData["PRO_TITLE"]  = $arrayProcessData["PRO_TITLE"] . " - New version - " . date("M d, H:i:s");
-            $arrayProcessData["PRO_CREATE_USER"] = ($userUid != "")? $userUid : "00000000000000000000000000000001";
+            $arrayProcessData["PRO_TITLE"] = $arrayProcessData["PRO_TITLE"] . " - New version - " . date("M d, H:i:s");
+            $arrayProcessData["PRO_CREATE_USER"] = ($userUid != "") ? $userUid : "00000000000000000000000000000001";
 
             $this->create($arrayProcessData);
 
@@ -739,7 +742,7 @@ class WorkflowBpmn extends Project\Workflow
                 $arrayRouteData = $value;
 
                 $arrayRouteData["TAS_UID"] = $arrayUid["task"][$arrayRouteData["TAS_UID"]];
-                $arrayRouteData["ROU_NEXT_TASK"] = ($arrayRouteData["ROU_NEXT_TASK"] != "-1")? $arrayUid["task"][$arrayRouteData["ROU_NEXT_TASK"]] : $arrayRouteData["ROU_NEXT_TASK"];
+                $arrayRouteData["ROU_NEXT_TASK"] = ($arrayRouteData["ROU_NEXT_TASK"] != "-1") ? $arrayUid["task"][$arrayRouteData["ROU_NEXT_TASK"]] : $arrayRouteData["ROU_NEXT_TASK"];
 
                 if ($arrayRouteData["ROU_TYPE"] != "SEC-JOIN") {
                     //Add
@@ -770,9 +773,9 @@ class WorkflowBpmn extends Project\Workflow
                         $swiUid = $this->addText($arrayLaneData["SWI_TEXT"], $swiX, $swiY);
                         break;
                     case "LINE":
-                        $direction = (($swiX == 0)? "HORIZONTAL" : "VERTICAL");
+                        $direction = (($swiX == 0) ? "HORIZONTAL" : "VERTICAL");
 
-                        $swiUid = $this->addLine(($direction == "HORIZONTAL")? $swiY : $swiX, $direction);
+                        $swiUid = $this->addLine(($direction == "HORIZONTAL") ? $swiY : $swiX, $direction);
                         break;
                 }
             }
@@ -808,4 +811,3 @@ class WorkflowBpmn extends Project\Workflow
         }
     }
 }
-
diff --git a/workflow/engine/src/ProcessMaker/Project/Bpmn.php b/workflow/engine/src/ProcessMaker/Project/Bpmn.php
index 977af64cf..26e4ba845 100644
--- a/workflow/engine/src/ProcessMaker/Project/Bpmn.php
+++ b/workflow/engine/src/ProcessMaker/Project/Bpmn.php
@@ -225,7 +225,7 @@ class Bpmn extends Handler
         $response = array();
         foreach ($data as $key => $val) {
             //Review if the type is "prj_uid"
-            if (isset($val['prj_uid']) && !empty($val['prj_uid']) ) {
+            if (isset($val['prj_uid']) && !empty($val['prj_uid'])) {
                 //The project exist?
                 if (!Bpmn::exists($val['prj_uid'])) {
                     $response[] = array(
@@ -514,7 +514,8 @@ class Bpmn extends Handler
         }
 
         // setting defaults
-        $data['PRO_UID'] = array_key_exists('PRO_UID', $data) ? $data['PRO_UID'] : Common::generateUID();;
+        $data['PRO_UID'] = array_key_exists('PRO_UID', $data) ? $data['PRO_UID'] : Common::generateUID();
+        ;
         $data['PRO_NAME'] = array_key_exists('PRO_NAME', $data) ? $data['PRO_NAME'] : $this->diagram->getDiaName();
 
         $this->process = new Process();
@@ -696,7 +697,7 @@ class Bpmn extends Handler
         );
     }
 
-    public function updateEvent($evnUid, $data)
+    public function updateEvent($evnUid, array $data)
     {
         /*if (array_key_exists("EVN_CANCEL_ACTIVITY", $data)) {
             $data["EVN_CANCEL_ACTIVITY"] = $data["EVN_CANCEL_ACTIVITY"] ? 1 : 0;
@@ -913,15 +914,22 @@ class Bpmn extends Handler
                 case "bpmnLaneset": $class = "BpmnLaneset"; break;
                 case "bpmnLane": $class = "BpmnLane"; break;
                 default:
-                    throw new \RuntimeException(sprintf("Invalid Object type, accepted types: [%s|%s|%s|%s], given %s.",
-                        "BpmnActivity", "BpmnBpmnGateway", "BpmnEvent", "bpmnArtifact", $data["FLO_ELEMENT_ORIGIN_TYPE"]
+                    throw new \RuntimeException(sprintf(
+                        "Invalid Object type, accepted types: [%s|%s|%s|%s], given %s.",
+                        "BpmnActivity",
+                        "BpmnBpmnGateway",
+                        "BpmnEvent",
+                        "bpmnArtifact",
+                        $data["FLO_ELEMENT_ORIGIN_TYPE"]
                     ));
             }
 
             // Validate origin object exists
             if (! $class::exists($data["FLO_ELEMENT_ORIGIN"])) {
-                throw new \RuntimeException(sprintf("Reference not found, the %s with UID: %s, does not exist!",
-                    ucfirst($data["FLO_ELEMENT_ORIGIN_TYPE"]), $data["FLO_ELEMENT_ORIGIN"]
+                throw new \RuntimeException(sprintf(
+                    "Reference not found, the %s with UID: %s, does not exist!",
+                    ucfirst($data["FLO_ELEMENT_ORIGIN_TYPE"]),
+                    $data["FLO_ELEMENT_ORIGIN"]
                 ));
             }
 
@@ -935,15 +943,22 @@ class Bpmn extends Handler
                 case "bpmnLaneset": $class = "BpmnLaneset"; break;
                 case "bpmnLane": $class = "BpmnLane"; break;
                 default:
-                    throw new \RuntimeException(sprintf("Invalid Object type, accepted types: [%s|%s|%s|%s], given %s.",
-                        "BpmnActivity", "BpmnBpmnGateway", "BpmnEvent", "bpmnArtifact", $data["FLO_ELEMENT_DEST_TYPE"]
+                    throw new \RuntimeException(sprintf(
+                        "Invalid Object type, accepted types: [%s|%s|%s|%s], given %s.",
+                        "BpmnActivity",
+                        "BpmnBpmnGateway",
+                        "BpmnEvent",
+                        "bpmnArtifact",
+                        $data["FLO_ELEMENT_DEST_TYPE"]
                     ));
             }
 
             // Validate origin object exists
             if (! $class::exists($data["FLO_ELEMENT_DEST"])) {
-                throw new \RuntimeException(sprintf("Reference not found, the %s with UID: %s, does not exist!",
-                    ucfirst($data["FLO_ELEMENT_DEST_TYPE"]), $data["FLO_ELEMENT_DEST"]
+                throw new \RuntimeException(sprintf(
+                    "Reference not found, the %s with UID: %s, does not exist!",
+                    ucfirst($data["FLO_ELEMENT_DEST_TYPE"]),
+                    $data["FLO_ELEMENT_DEST"]
                 ));
             }
 
@@ -1536,12 +1551,11 @@ class Bpmn extends Handler
         }
     }
 
-    public function getFlowNextPosition ($sFloUid, $sFloType, $sFloElementOrigin)
+    public function getFlowNextPosition($sFloUid, $sFloType, $sFloElementOrigin)
     {
         try {
-
             $oCriteria = new Criteria('workflow');
-            $oCriteria->addSelectColumn( '(COUNT(*) + 1) AS FLOW_POS' );
+            $oCriteria->addSelectColumn('(COUNT(*) + 1) AS FLOW_POS');
             $oCriteria->add(\BpmnFlowPeer::PRJ_UID, $this->getUid());
             $oCriteria->add(\BpmnFlowPeer::DIA_UID, $this->getDiagram("object")->getDiaUid());
             $oCriteria->add(\BpmnFlowPeer::FLO_UID, $sFloUid, \Criteria::NOT_EQUAL);
@@ -1552,26 +1566,25 @@ class Bpmn extends Handler
             $oDataset->next();
             $aRow = $oDataset->getRow();
             return (int)($aRow["FLOW_POS"]);
-
         } catch (Exception $oException) {
             throw $oException;
         }
     }
 
-    public function reOrderFlowPosition ($sFloOrigin, $iPosition)
+    public function reOrderFlowPosition($sFloOrigin, $iPosition)
     {
         try {
             $con = \Propel::getConnection('workflow');
-            $oCriteria = new Criteria( 'workflow' );
-            $oCriteria->add( \BpmnFlowPeer::FLO_ELEMENT_ORIGIN, $sFloOrigin );
-            $oCriteria->add( \BpmnFlowPeer::FLO_POSITION, $iPosition, '>' );
-            $oDataset = \BpmnFlowPeer::doSelectRS( $oCriteria );
-            $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+            $oCriteria = new Criteria('workflow');
+            $oCriteria->add(\BpmnFlowPeer::FLO_ELEMENT_ORIGIN, $sFloOrigin);
+            $oCriteria->add(\BpmnFlowPeer::FLO_POSITION, $iPosition, '>');
+            $oDataset = \BpmnFlowPeer::doSelectRS($oCriteria);
+            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             while ($oDataset->next()) {
                 $aRow = $oDataset->getRow();
                 $newPosition = ((int)$aRow['FLO_POSITION'])-1;
-                $oCriteriaTemp = new Criteria( 'workflow' );
-                $oCriteriaTemp->add( \BpmnFlowPeer::FLO_UID, $aRow['FLO_UID'] );
+                $oCriteriaTemp = new Criteria('workflow');
+                $oCriteriaTemp->add(\BpmnFlowPeer::FLO_UID, $aRow['FLO_UID']);
                 $oCriteria2 = new Criteria('workflow');
                 $oCriteria2->add(\BpmnFlowPeer::FLO_POSITION, $newPosition);
                 BasePeer::doUpdate($oCriteriaTemp, $oCriteria2, $con);
@@ -1680,8 +1693,7 @@ class Bpmn extends Handler
         $level,
         $message,
         $context = array()
-    )
-    {
+    ) {
         try {
             Bootstrap::registerMonolog($channel, $level, $message, $context, $context['workspace'], 'processmaker.log');
         } catch (Exception $e) {
@@ -1689,4 +1701,3 @@ class Bpmn extends Handler
         }
     }
 }
-
diff --git a/workflow/engine/src/ProcessMaker/Project/Workflow.php b/workflow/engine/src/ProcessMaker/Project/Workflow.php
index 1ac050db3..26775a4ad 100644
--- a/workflow/engine/src/ProcessMaker/Project/Workflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Workflow.php
@@ -15,6 +15,7 @@ use ProcessMaker\Util\Common;
 use ProcessMaker\Exception;
 use ProcessMaker\Util;
 use ReportTables;
+
 /**
  * Class Workflow
  *
@@ -68,7 +69,7 @@ class Workflow extends Handler
 
             $testTitle = htmlspecialchars($data['PRO_TITLE']);
 
-            if($testTitle != $data['PRO_TITLE']) {
+            if ($testTitle != $data['PRO_TITLE']) {
                 $data['PRO_TITLE'] = $testTitle;
             }
 
@@ -174,7 +175,7 @@ class Workflow extends Handler
      * Projects elements handlers
      */
 
-    public function addTask($taskData)
+    public function addTask(array $taskData)
     {
         // Setting defaults
         $taskData['TAS_UID'] = array_key_exists('TAS_UID', $taskData) ? $taskData['TAS_UID'] : Common::generateUID();
@@ -190,7 +191,6 @@ class Workflow extends Handler
             if ($task->getTasType() == "SUBPROCESS") {
                 $this->addSubProcess($this->proUid, $tasUid);
             }
-
         } catch (\Exception $e) {
             self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());
             throw $e;
@@ -242,7 +242,6 @@ class Workflow extends Handler
                     }
                 }
             }
-
         } catch (\Exception $e) {
             self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());
             throw $e;
@@ -254,7 +253,7 @@ class Workflow extends Handler
         try {
             $task = new ClassesTask();
             $taskData = $task->load($tasUid);
-        } catch (\Exception $e){
+        } catch (\Exception $e) {
             $taskData = null;
         }
 
@@ -320,7 +319,6 @@ class Workflow extends Handler
 
     public function updateSubProcess()
     {
-
     }
 
     /**
@@ -398,8 +396,8 @@ class Workflow extends Handler
             }
 
             //if ($type == 'SEQUENTIAL' || $type == 'SEC-JOIN' || $type == 'DISCRIMINATOR') {
-                //$oTasks = new Tasks();
-                //$oTasks->deleteAllRoutesOfTask($this->proUid, $fromTasUid);
+            //$oTasks = new Tasks();
+            //$oTasks->deleteAllRoutesOfTask($this->proUid, $fromTasUid);
             //}
 
             $route = \Route::findOneBy([
@@ -547,7 +545,7 @@ class Workflow extends Handler
             $aFields["ROU_TYPE"] = $sType;
             $aFields["ROU_DEFAULT"] = $default;
 
-            if(! empty($condition)) {
+            if (! empty($condition)) {
                 $aFields['ROU_CONDITION'] = $condition;
             }
 
@@ -894,7 +892,7 @@ class Workflow extends Handler
 
             while ($rsCriteria->next()) {
                 $row = $rsCriteria->getRow();
-                $emailEvent->delete($sProcessUID,$row["EMAIL_EVENT_UID"],false);
+                $emailEvent->delete($sProcessUID, $row["EMAIL_EVENT_UID"], false);
             }
 
             if (!$onlyDiagram) {
@@ -945,7 +943,7 @@ class Workflow extends Handler
                 'PRO_UID'=>$this->proUid,
                 'TAS_UID'=>'',
                 'SCH_TIME_NEXT_RUN'=>date('Y-m-d H:i:s'),
-                'SCH_LAST_RUN_TIME'=>NULL,
+                'SCH_LAST_RUN_TIME'=>null,
                 'SCH_STATE'=>'',
                 'SCH_LAST_STATE'=>'',
                 'USR_UID'=>'',
@@ -953,7 +951,7 @@ class Workflow extends Handler
                 'SCH_START_TIME'=>date('Y-m-d H:i:s'),
                 'SCH_START_DATE'=>date('Y-m-d H:i:s'),
                 'SCH_DAYS_PERFORM_TASK'=>'',
-                'SCH_EVERY_DAYS'=>NULL,
+                'SCH_EVERY_DAYS'=>null,
                 'SCH_WEEK_DAYS'=>'',
                 'SCH_START_DAY'=>'',
                 'SCH_START_DAY_OPT_1'=>'',
@@ -962,7 +960,7 @@ class Workflow extends Handler
                 'SCH_END_DATE'=>date('Y-m-d H:i:s'),
                 'SCH_REPEAT_EVERY'=>'',
                 'SCH_REPEAT_STOP_IF_RUNNING'=>'',
-                'CASE_SH_PLUGIN_UID'=>NULL,
+                'CASE_SH_PLUGIN_UID'=>null,
                 'SCH_DEL_USER_PASS'=>'',
                 'SCH_UID'=>$schUid,
                 'SCH_REPEAT_UNTIL'=>''
@@ -1047,7 +1045,6 @@ class Workflow extends Handler
             self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());
             throw $e;
         }
-
     }
 
     public function addLine($position, $direction = "HORIZONTAL")
@@ -1323,8 +1320,8 @@ class Workflow extends Handler
                         isset($arrayWorkflowData["uid"][$value["CTO_TYPE_OBJ"]]) &&
                         isset($arrayWorkflowData["uid"][$value["CTO_TYPE_OBJ"]][$value["CTO_UID_OBJ"]])) {
                     $arrayWorkflowData["caseTrackerObject"][$key]["CTO_UID_OBJ"] = $arrayWorkflowData["uid"][$value["CTO_TYPE_OBJ"]][$value["CTO_UID_OBJ"]];
-                        }
-                    }
+                }
+            }
 
             //Synchronize variables with process variables.
             foreach ($arrayWorkflowData["processVariables"] as $key => $value) {
@@ -1378,4 +1375,3 @@ class Workflow extends Handler
         }
     }
 }
-
diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
index 4e610f8ad..ed75e0f45 100644
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
@@ -2,27 +2,29 @@
 
 namespace ProcessMaker\Services\OAuth2;
 
+use PDO;
+
 /**
  * Simple PmPDO storage for all storage types
  * based on \OAuth2\Storage\Pdo
  *
  * @author Erik Amaru Ortiz <aortiz.erik at gmail dot com>
  */
-class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
+class PmPdo implements
+    \OAuth2\Storage\AuthorizationCodeInterface,
     \OAuth2\Storage\AccessTokenInterface,
     \OAuth2\Storage\ClientCredentialsInterface,
     \OAuth2\Storage\UserCredentialsInterface,
     \OAuth2\Storage\RefreshTokenInterface,
     \OAuth2\Storage\JwtBearerInterface
 {
-
     protected $db;
     protected $dbRBAC;
     protected $config;
 
     public function __construct($connection, $config = array(), $connectionRBAC = null)
     {
-        if (!$connection instanceof \PDO) {
+        if (!$connection instanceof PDO) {
             if (!is_array($connection)) {
                 throw new \InvalidArgumentException('First argument to OAuth2\Storage\Pdo must be an instance of PDO or a configuration array');
             }
@@ -34,12 +36,12 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
                 'username' => null,
                 'password' => null,
             ), $connection);
-            $connection = new \PDO($connection['dsn'], $connection['username'], $connection['password']);
+            $connection = new PDO($connection['dsn'], $connection['username'], $connection['password']);
         }
         $this->db = $connection;
 
         // it's for Pm < 3
-        if (!is_null($connectionRBAC) &&(!$connectionRBAC instanceof \PDO)) {
+        if (!is_null($connectionRBAC) &&(!$connectionRBAC instanceof PDO)) {
             if (!is_array($connectionRBAC)) {
                 throw new \InvalidArgumentException('First argument to OAuth2\Storage\Pdo must be an instance of PDO or a configuration array');
             }
@@ -51,12 +53,12 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
                 'username' => null,
                 'password' => null,
             ), $connectionRBAC);
-            $connectionRBAC = new \PDO($connectionRBAC['dsn'], $connectionRBAC['username'], $connectionRBAC['password']);
+            $connectionRBAC = new PDO($connectionRBAC['dsn'], $connectionRBAC['username'], $connectionRBAC['password']);
         }
         $this->dbRBAC = $connectionRBAC;
 
         // debugging
-        $connection->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+        $connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
         $this->config = array_merge(array(
             'client_table' => 'OAUTH_CLIENTS',
@@ -173,7 +175,7 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
     {
         $access_token = new \OauthAccessTokens();
         $access_token->load($token);
-        $stmt = $this->db->prepare(sprintf('UPDATE %s SET EXPIRES=%s WHERE ACCESS_TOKEN=:token', $this->config['access_token_table'], "'".Date('Y-m-d H:i:s',strtotime("-1 minute"))."'"));
+        $stmt = $this->db->prepare(sprintf('UPDATE %s SET EXPIRES=%s WHERE ACCESS_TOKEN=:token', $this->config['access_token_table'], "'".Date('Y-m-d H:i:s', strtotime("-1 minute"))."'"));
         return $stmt->execute(compact('token'));
     }
 
@@ -192,12 +194,12 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
     {
         $RBAC = \RBAC::getSingleton();
         $RBAC->initRBAC();
-        $uid = $RBAC->VerifyLogin($username , $password);
-        if($uid < 0){
-           return false;
+        $uid = $RBAC->VerifyLogin($username, $password);
+        if ($uid < 0) {
+            return false;
         }
-        if($uid != ''){
-           return true;
+        if ($uid != '') {
+            return true;
         }
         return false;
     }
@@ -295,6 +297,4 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
 
         return array_merge($a, array_change_key_case($a, $case));
     }
-
 }
-
diff --git a/workflow/engine/templates/cases/cases_ActionsTree.php b/workflow/engine/templates/cases/cases_ActionsTree.php
index dd64b5498..741eb015b 100644
--- a/workflow/engine/templates/cases/cases_ActionsTree.php
+++ b/workflow/engine/templates/cases/cases_ActionsTree.php
@@ -27,9 +27,9 @@ $APP_UID = $_SESSION['APPLICATION'];
 
 $c = new Criteria('workflow');
 $c->clearSelectColumns();
-$c->addSelectColumn( AppThreadPeer::APP_THREAD_PARENT );
-$c->add(AppThreadPeer::APP_UID, $APP_UID );
-$c->add(AppThreadPeer::APP_THREAD_STATUS , 'OPEN' );
+$c->addSelectColumn(AppThreadPeer::APP_THREAD_PARENT);
+$c->add(AppThreadPeer::APP_UID, $APP_UID);
+$c->add(AppThreadPeer::APP_THREAD_STATUS, 'OPEN');
 $cant = AppThreadPeer::doCount($c);
 
 $oTree = new PmTree();
@@ -38,7 +38,7 @@ $oTree->name = 'Actions';
 $oTree->showSign = false;
 
 $oCase = new Cases();
-$aFields = $oCase->loadCase( $_SESSION['APPLICATION'], $_SESSION['INDEX'] );
+$aFields = $oCase->loadCase($_SESSION['APPLICATION'], $_SESSION['INDEX']);
 
 $oCriteria = new Criteria('workflow');
 $oCriteria->add(AppDelayPeer::APP_UID, $_SESSION['APPLICATION']);
@@ -50,45 +50,42 @@ $oDataset = AppDelayPeer::doSelectRS($oCriteria);
 $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 $oDataset->next();
 $aRow = $oDataset->getRow();
-GLOBAL $RBAC;
-switch($aFields['APP_STATUS'])
-{
-	case 'DRAFT':
-			if(!$aRow) {
-				$oNode = &$oTree->addChild('1', '<a id="spause" class="linkInBlue" href="#" onclick="pauseCase();return false;">' . G::LoadTranslation('ID_PAUSED_CASE') . '</a></span><a id="scpause" class="linkInBlue" href="#" onclick="cancelPauseCase();return false;" style="display:none">' . G::LoadTranslation('ID_CANCEL') . ' ' . strtolower(G::LoadTranslation('ID_PAUSED_CASE')) . '</a><div id="pausediv" style="display:none"></div>', array('nodeType' => 'parentBlue'));
-			}
-			else {
-				$oNode = &$oTree->addChild('1', '<a class="linkInBlue" href="#" onclick="unpauseCase();return false;">' . G::LoadTranslation('ID_UNPAUSE') . '</a>', array('nodeType' => 'parentBlue'));
-			}
-			$oNode = &$oTree->addChild('2', '<a class="linkInBlue" href="#" onclick="deleteCase(\''.$APP_UID.'\');return false;">' . G::LoadTranslation('ID_DELETE') . '</a>', array('nodeType' => 'parentBlue'));
-			if($RBAC->userCanAccess('PM_REASSIGNCASE')==1) {
-			  $oNode = &$oTree->addChild('3', '<a class="linkInBlue" href="#" onclick="view_reassignCase(\''.$APP_UID.'\');return false;">' . G::LoadTranslation('ID_REASSIGN') . '</a>', array('nodeType' => 'parentBlue'));
-			}
-	break;
-	case 'TO_DO':
-			if(!$aRow) {
-				$oNode = &$oTree->addChild('1', '<a id="spause" class="linkInBlue" href="#" onclick="pauseCase();return false;">' . G::LoadTranslation('ID_PAUSED_CASE') . '</a></span><a id="scpause" class="linkInBlue" href="#" onclick="cancelPauseCase();return false;" style="display:none">' . G::LoadTranslation('ID_CANCEL') . ' ' . strtolower(G::LoadTranslation('ID_PAUSED_CASE')) . '</a><div id="pausediv" style="display:none"></div>', array('nodeType' => 'parentBlue'));
-				if ($cant == 1) {
-					$oNode = & $oTree->addChild('2', '<a class="linkInBlue" href="#" onclick="cancelCase();return false;">' . G::LoadTranslation('ID_CANCEL') . '</a>', array('nodeType'=>'parentBlue'));
-			    }
-			}
-			else {
-				$oNode = &$oTree->addChild('1', '<a class="linkInBlue" href="#" onclick="unpauseCase();return false;">' . G::LoadTranslation('ID_UNPAUSE') . '</a>', array('nodeType' => 'parentBlue'));
-			}
-			if($RBAC->userCanAccess('PM_REASSIGNCASE')==1) {
-			    $oNode = &$oTree->addChild('3', '<a class="linkInBlue" href="#" onclick="view_reassignCase(\''.$APP_UID.'\');return false;">' . G::LoadTranslation('ID_REASSIGN') . '</a>', array('nodeType' => 'parentBlue'));
-			}
-	break;
+global $RBAC;
+switch ($aFields['APP_STATUS']) {
+    case 'DRAFT':
+        if (!$aRow) {
+            $oNode = $oTree->addChild('1', '<a id="spause" class="linkInBlue" href="#" onclick="pauseCase();return false;">' . G::LoadTranslation('ID_PAUSED_CASE') . '</a></span><a id="scpause" class="linkInBlue" href="#" onclick="cancelPauseCase();return false;" style="display:none">' . G::LoadTranslation('ID_CANCEL') . ' ' . strtolower(G::LoadTranslation('ID_PAUSED_CASE')) . '</a><div id="pausediv" style="display:none"></div>', array('nodeType' => 'parentBlue'));
+        } else {
+            $oNode = $oTree->addChild('1', '<a class="linkInBlue" href="#" onclick="unpauseCase();return false;">' . G::LoadTranslation('ID_UNPAUSE') . '</a>', array('nodeType' => 'parentBlue'));
+        }
+        $oNode = $oTree->addChild('2', '<a class="linkInBlue" href="#" onclick="deleteCase(\'' . $APP_UID . '\');return false;">' . G::LoadTranslation('ID_DELETE') . '</a>', array('nodeType' => 'parentBlue'));
+        if ($RBAC->userCanAccess('PM_REASSIGNCASE') == 1) {
+            $oNode = $oTree->addChild('3', '<a class="linkInBlue" href="#" onclick="view_reassignCase(\'' . $APP_UID . '\');return false;">' . G::LoadTranslation('ID_REASSIGN') . '</a>', array('nodeType' => 'parentBlue'));
+        }
+        break;
+    case 'TO_DO':
+        if (!$aRow) {
+            $oNode = $oTree->addChild('1', '<a id="spause" class="linkInBlue" href="#" onclick="pauseCase();return false;">' . G::LoadTranslation('ID_PAUSED_CASE') . '</a></span><a id="scpause" class="linkInBlue" href="#" onclick="cancelPauseCase();return false;" style="display:none">' . G::LoadTranslation('ID_CANCEL') . ' ' . strtolower(G::LoadTranslation('ID_PAUSED_CASE')) . '</a><div id="pausediv" style="display:none"></div>', array('nodeType' => 'parentBlue'));
+            if ($cant == 1) {
+                $oNode = $oTree->addChild('2', '<a class="linkInBlue" href="#" onclick="cancelCase();return false;">' . G::LoadTranslation('ID_CANCEL') . '</a>', array('nodeType' => 'parentBlue'));
+            }
+        } else {
+            $oNode = $oTree->addChild('1', '<a class="linkInBlue" href="#" onclick="unpauseCase();return false;">' . G::LoadTranslation('ID_UNPAUSE') . '</a>', array('nodeType' => 'parentBlue'));
+        }
+        if ($RBAC->userCanAccess('PM_REASSIGNCASE') == 1) {
+            $oNode = $oTree->addChild('3', '<a class="linkInBlue" href="#" onclick="view_reassignCase(\'' . $APP_UID . '\');return false;">' . G::LoadTranslation('ID_REASSIGN') . '</a>', array('nodeType' => 'parentBlue'));
+        }
+        break;
 
-	case 'CANCELLED':
-		$oNode = &$oTree->addChild('1', '<a class="linkInBlue" href="#" onclick="reactivateCase();return false;">' . G::LoadTranslation('ID_REACTIVATE') . '</a>', array('nodeType' => 'parentBlue'));
-	break;
+    case 'CANCELLED':
+        $oNode = $oTree->addChild('1', '<a class="linkInBlue" href="#" onclick="reactivateCase();return false;">' . G::LoadTranslation('ID_REACTIVATE') . '</a>', array('nodeType' => 'parentBlue'));
+        break;
 }
 
 $oTask = new Task();
 $aTask = $oTask->load($_SESSION['TASK']);
 if ($aTask['TAS_TYPE'] == 'ADHOC') {
-	$oNode = &$oTree->addChild('4', '<a class="linkInBlue" href="#" onclick="adhocAssignmentUsers();return false;">' . G::LoadTranslation('ID_ADHOC_ASSIGNMENT') . '</a>', array('nodeType' => 'parentBlue'));
+    $oNode = $oTree->addChild('4', '<a class="linkInBlue" href="#" onclick="adhocAssignmentUsers();return false;">' . G::LoadTranslation('ID_ADHOC_ASSIGNMENT') . '</a>', array('nodeType' => 'parentBlue'));
 }
 
 $oNode->plus = '';
@@ -96,4 +93,3 @@ $oNode->minus = '';
 $oNode->point = '';
 
 echo $oTree->render();
-?>
diff --git a/workflow/engine/templates/cases/cases_InformationTree.php b/workflow/engine/templates/cases/cases_InformationTree.php
index de8b65f33..0c6c68545 100644
--- a/workflow/engine/templates/cases/cases_InformationTree.php
+++ b/workflow/engine/templates/cases/cases_InformationTree.php
@@ -28,49 +28,49 @@ $oTree->nodeType ="blank";
 $oTree->name     = 'Information';
 $oTree->showSign = false;
 
-$oNode        =& $oTree->addChild('1', '<a class="linkInBlue" href="#" onclick="showProcessMap();return false;">' . G::LoadTranslation('ID_PROCESS_MAP') . '</a>', array('nodeType'=>'parentBlue'));
+$oNode        = $oTree->addChild('1', '<a class="linkInBlue" href="#" onclick="showProcessMap();return false;">' . G::LoadTranslation('ID_PROCESS_MAP') . '</a>', array('nodeType'=>'parentBlue'));
 $oNode->plus  = '';
 $oNode->minus = '';
 $oNode->point = '';
 
-$oNode        =& $oTree->addChild('2', '<a class="linkInBlue" href="#" onclick="showProcessInformation();return false;">' . G::LoadTranslation('ID_PROCESS_INFORMATION') . '</a>', array('nodeType'=>'parentBlue'));
+$oNode        = $oTree->addChild('2', '<a class="linkInBlue" href="#" onclick="showProcessInformation();return false;">' . G::LoadTranslation('ID_PROCESS_INFORMATION') . '</a>', array('nodeType'=>'parentBlue'));
 $oNode->plus  = '';
 $oNode->minus = '';
 $oNode->point = '';
 
 if ($_SESSION['TASK'] != -1) {
-  $oNode        =& $oTree->addChild('3', '<a class="linkInBlue" href="#" onclick="showTaskInformation();return false;">' . G::LoadTranslation('ID_TASK_INFORMATION') . '</a>', array('nodeType'=>'parentBlue'));
-  $oNode->plus  = '';
-  $oNode->minus = '';
-  $oNode->point = '';
+    $oNode        = $oTree->addChild('3', '<a class="linkInBlue" href="#" onclick="showTaskInformation();return false;">' . G::LoadTranslation('ID_TASK_INFORMATION') . '</a>', array('nodeType'=>'parentBlue'));
+    $oNode->plus  = '';
+    $oNode->minus = '';
+    $oNode->point = '';
 }
 
-$oNode        =& $oTree->addChild('4', '<a class="linkInBlue" href="#" onclick="showTransferHistory();return false;">' . G::LoadTranslation('ID_CASE_HISTORY') . '</a>', array('nodeType'=>'parentBlue'));
+$oNode        = $oTree->addChild('4', '<a class="linkInBlue" href="#" onclick="showTransferHistory();return false;">' . G::LoadTranslation('ID_CASE_HISTORY') . '</a>', array('nodeType'=>'parentBlue'));
 $oNode->plus  = '';
 $oNode->minus = '';
 $oNode->point = '';
 
-$oNode        =& $oTree->addChild('6', '<a class="linkInBlue" href="#" onclick="showHistoryMessages();return false;">' . G::LoadTranslation('ID_HISTORY_MESSAGE_CASE') . '</a>', array('nodeType'=>'parentBlue'));
+$oNode        = $oTree->addChild('6', '<a class="linkInBlue" href="#" onclick="showHistoryMessages();return false;">' . G::LoadTranslation('ID_HISTORY_MESSAGE_CASE') . '</a>', array('nodeType'=>'parentBlue'));
 $oNode->plus  = '';
 $oNode->minus = '';
 $oNode->point = '';
 
-$oNode        =& $oTree->addChild('6', '<a class="linkInBlue" href="#" onclick="showDynaforms();return false;">' . G::LoadTranslation('ID_DYNAFORMS') . '</a>', array('nodeType'=>'parentBlue'));
+$oNode        = $oTree->addChild('6', '<a class="linkInBlue" href="#" onclick="showDynaforms();return false;">' . G::LoadTranslation('ID_DYNAFORMS') . '</a>', array('nodeType'=>'parentBlue'));
 $oNode->plus  = '';
 $oNode->minus = '';
 $oNode->point = '';
 
-$oNode        =& $oTree->addChild('5', '<a class="linkInBlue" href="#" onclick="showUploadedDocuments();return false;">' . G::LoadTranslation('ID_UPLOADED_DOCUMENTS') . '</a>', array('nodeType'=>'parentBlue'));
+$oNode        = $oTree->addChild('5', '<a class="linkInBlue" href="#" onclick="showUploadedDocuments();return false;">' . G::LoadTranslation('ID_UPLOADED_DOCUMENTS') . '</a>', array('nodeType'=>'parentBlue'));
 $oNode->plus  = '';
 $oNode->minus = '';
 $oNode->point = '';
 
-$oNode        =& $oTree->addChild('6', '<a class="linkInBlue" href="#" onclick="showGeneratedDocuments();return false;">' . G::LoadTranslation('ID_GENERATED_DOCUMENTS') . '</a>', array('nodeType'=>'parentBlue'));
+$oNode        = $oTree->addChild('6', '<a class="linkInBlue" href="#" onclick="showGeneratedDocuments();return false;">' . G::LoadTranslation('ID_GENERATED_DOCUMENTS') . '</a>', array('nodeType'=>'parentBlue'));
 $oNode->plus  = '';
 $oNode->minus = '';
 $oNode->point = '';
 /*
-$oNode        =& $oTree->addChild('6', '<a class="linkInBlue" href="#" onclick="stages();return false;">' . G::LoadTranslation('ID_STAGES') . '</a>', array('nodeType'=>'parentBlue'));
+$oNode        = $oTree->addChild('6', '<a class="linkInBlue" href="#" onclick="stages();return false;">' . G::LoadTranslation('ID_STAGES') . '</a>', array('nodeType'=>'parentBlue'));
 $oNode->plus  = '';
 $oNode->minus = '';
 $oNode->point = '';
@@ -81,11 +81,10 @@ $oProcess = new Process();
 $Fields = $oProcess->Load( $_SESSION['PROCESS'] );
 if($Fields['PRO_DEBUG']==1)
 {
-		$oNode        =& $oTree->addChild('7', '<a class="linkInBlue" href="../cases/casesDemo">' . G::LoadTranslation('ID_CASEDEMO') . '</a>', array('nodeType'=>'parentBlue'));
-		$oNode->plus  = '';
-		$oNode->minus = '';
-		$oNode->point = '';
-}		
+        $oNode        = $oTree->addChild('7', '<a class="linkInBlue" href="../cases/casesDemo">' . G::LoadTranslation('ID_CASEDEMO') . '</a>', array('nodeType'=>'parentBlue'));
+        $oNode->plus  = '';
+        $oNode->minus = '';
+        $oNode->point = '';
+}
 */
 echo $oTree->render();
-?>
diff --git a/workflow/engine/templates/cases/cases_KTTree.php b/workflow/engine/templates/cases/cases_KTTree.php
index 38dbc2275..21cf51b2e 100644
--- a/workflow/engine/templates/cases/cases_KTTree.php
+++ b/workflow/engine/templates/cases/cases_KTTree.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * cases_KTTree.php
- *  
+ *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
+ *
  * 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
@@ -14,23 +14,17 @@
  * 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., 
+ *
+ * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- * 
+ *
  */
 
 $oTree           = new PmTree();
 $oTree->name     = 'KT';
 $oTree->showSign = false;
 
-/*$oNode        =& $oTree->addChild('1', '<a href="#" onclick="showProcessInformation();return false;">' . G::LoadTranslation('ID_PROCESS_INFORMATION') . '</a>');
-$oNode->plus  = '';
-$oNode->minus = '';
-$oNode->point = '';*/
-
 echo $oTree->render();
-?>
\ No newline at end of file
diff --git a/workflow/engine/templates/cases/cases_StepsTree.php b/workflow/engine/templates/cases/cases_StepsTree.php
index 0bce771e7..d560cbea0 100644
--- a/workflow/engine/templates/cases/cases_StepsTree.php
+++ b/workflow/engine/templates/cases/cases_StepsTree.php
@@ -25,210 +25,196 @@
 
 use ProcessMaker\Plugins\PluginRegistry;
 
-  $c = new Criteria();
-  $c->add ( StepPeer::PRO_UID, $_SESSION['PROCESS'] );
-  $c->add ( StepPeer::TAS_UID, $_SESSION['TASK'] );
-  $c->addAscendingOrderByColumn ( StepPeer::STEP_POSITION );
+$c = new Criteria();
+$c->add(StepPeer::PRO_UID, $_SESSION['PROCESS']);
+$c->add(StepPeer::TAS_UID, $_SESSION['TASK']);
+$c->addAscendingOrderByColumn(StepPeer::STEP_POSITION);
 
-  $oPluginRegistry = PluginRegistry::loadSingleton();
-  $externalSteps   = $oPluginRegistry->getSteps();
+$oPluginRegistry = PluginRegistry::loadSingleton();
+$externalSteps = $oPluginRegistry->getSteps();
 
-  $oTree           = new PmTree();
-  $oTree->nodeType = "blank";
-  $oTree->name     = 'Steps';
-  $oTree->showSign = false;
+$oTree = new PmTree();
+$oTree->nodeType = "blank";
+$oTree->name = 'Steps';
+$oTree->showSign = false;
 
-  $tasUid = $_SESSION['TASK'];
-  $rs = StepPeer::doSelect( $c );
+$tasUid = $_SESSION['TASK'];
+$rs = StepPeer::doSelect($c);
 
-  $oCase = new Cases();
-  $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] );
-  $oPMScript = new PMScript();
-  $oPMScript->setFields($Fields['APP_DATA'] );
-	foreach ( $rs as $key => $aRow  )
-  {
+$oCase = new Cases();
+$Fields = $oCase->loadCase($_SESSION['APPLICATION']);
+$oPMScript = new PMScript();
+$oPMScript->setFields($Fields['APP_DATA']);
+foreach ($rs as $key => $aRow) {
     $bAccessStep = false;
     if (trim($aRow->getStepCondition()) != '') {
-      $oPMScript->setScript( $aRow->getStepCondition() );
-      $bAccessStep = $oPMScript->evaluate();
-    }
-    else {
-      $bAccessStep = true;
+        $oPMScript->setScript($aRow->getStepCondition());
+        $bAccessStep = $oPMScript->evaluate();
+    } else {
+        $bAccessStep = true;
     }
 
-   if ($bAccessStep)
-   {
-     switch( $aRow->getStepTypeObj() )
-     {
-      case 'DYNAFORM':
-        $oDocument = DynaformPeer::retrieveByPK($aRow->getStepUidObj());
-        $stepTitle = $oDocument->getDynTitle(); break;
-      case 'OUTPUT_DOCUMENT':
-        $oDocument = OutputDocumentPeer::retrieveByPK($aRow->getStepUidObj());
-        $stepTitle = $oDocument->getOutDocTitle(); break;
-      case 'INPUT_DOCUMENT':
-        $oDocument = InputDocumentPeer::retrieveByPK($aRow->getStepUidObj());
-        $stepTitle = $oDocument->getInpDocTitle();
-        $sType     = $oDocument->getInpDocFormNeeded(); break;
-      case 'EXTERNAL':
-        $stepTitle          = 'unknown ' . $aRow->getStepUidObj();
-        $oPluginRegistry = PluginRegistry::loadSingleton();
-        /** @var \ProcessMaker\Plugins\Interfaces\StepDetail $val */
-          foreach ( $externalSteps as $val ) {
-            if ($val->equalStepIdTo($aRow->getStepUidObj())) {
-            $stepTitle = $val->getStepTitle(); //default title
-            $sNamespace = $val->getNamespace();
-            $oPlugin =& $oPluginRegistry->getPlugin($sNamespace);
-            $classFile = PATH_PLUGINS . $oPlugin->sNamespace . PATH_SEP . 'class.' . $oPlugin->sNamespace .'.php';
-            if ( file_exists ( $classFile ) ) {
-              require_once ( $classFile );
-        			$sClassName = $sNamespace . 'class';
-              $obj = new $sClassName( );
-              if (method_exists($obj, 'getExternalStepTitle')) {  
-                $stepTitle = $obj->getExternalStepTitle( $aRow->getStepUidObj(), $tasUid, $aRow->getStepPosition());
-              }
-            }
-          }
-        }
-        break;
+    if ($bAccessStep) {
+        switch ($aRow->getStepTypeObj()) {
+            case 'DYNAFORM':
+                $oDocument = DynaformPeer::retrieveByPK($aRow->getStepUidObj());
+                $stepTitle = $oDocument->getDynTitle();
+                break;
+            case 'OUTPUT_DOCUMENT':
+                $oDocument = OutputDocumentPeer::retrieveByPK($aRow->getStepUidObj());
+                $stepTitle = $oDocument->getOutDocTitle();
+                break;
+            case 'INPUT_DOCUMENT':
+                $oDocument = InputDocumentPeer::retrieveByPK($aRow->getStepUidObj());
+                $stepTitle = $oDocument->getInpDocTitle();
+                $sType = $oDocument->getInpDocFormNeeded();
+                break;
+            case 'EXTERNAL':
+                $stepTitle = 'unknown ' . $aRow->getStepUidObj();
+                $oPluginRegistry = PluginRegistry::loadSingleton();
+                /** @var \ProcessMaker\Plugins\Interfaces\StepDetail $val */
+                foreach ($externalSteps as $val) {
+                    if ($val->equalStepIdTo($aRow->getStepUidObj())) {
+                        $stepTitle = $val->getStepTitle(); //default title
+                        $sNamespace = $val->getNamespace();
+                        $oPlugin = $oPluginRegistry->getPlugin($sNamespace);
+                        $classFile = PATH_PLUGINS . $oPlugin->sNamespace . PATH_SEP . 'class.' . $oPlugin->sNamespace . '.php';
+                        if (file_exists($classFile)) {
+                            require_once($classFile);
+                            $sClassName = $sNamespace . 'class';
+                            $obj = new $sClassName();
+                            if (method_exists($obj, 'getExternalStepTitle')) {
+                                $stepTitle = $obj->getExternalStepTitle($aRow->getStepUidObj(), $tasUid, $aRow->getStepPosition());
+                            }
+                        }
+                    }
+                }
+                break;
 
-      default:
-        $stepTitle = $aRow->getStepUid();
-     }
-
-     //$oNode        =& $oTree->addChild($aRow->getStepUid(), '&nbsp;' . $aRow->getStepNameObj(), array('nodeType'=>'parent') );
-     $oNode        =& $oTree->addChild($aRow->getStepUid(), '&nbsp;' . $stepTitle, array('nodeType'=>'parent') );
-     $oNode->plus  = '';
-     $oNode->minus = '';
-     switch( $aRow->getStepTypeObj() )
-     {
-        case 'DYNAFORM':
-        $sOptions  = '<table width="70%" cellpadding="0" cellspacing="0" border="0"><tr>';
-        $sOptions .= '<td width="100%" class="treeNode"><a style="' . (($_GET['TYPE'] == 'DYNAFORM') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'EDIT')) ?'background-color:orange;color:white;padding-left:5px;padding-right:5px; ' : '') . '" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=EDIT">' . G::LoadTranslation('ID_EDIT') . '</a></td>';
-        $sOptions .= '</tr></table>';
-        $oAux =& $oNode->addChild($aRow->getStepUid() . '_node', $sOptions, array('nodeType'=>'child'));
-        break;
-      case 'OUTPUT_DOCUMENT':
-        $sOptions  = '<table width="70%" cellpadding="0" cellspacing="0" border="0"><tr>';
-        $oCriteria = new Criteria('workflow');
-        $oCriteria->add(AppDocumentPeer::APP_UID,      $_SESSION['APPLICATION']);
-        $oCriteria->add(AppDocumentPeer::DEL_INDEX,    $_SESSION['INDEX']);
-        $oCriteria->add(AppDocumentPeer::DOC_UID,      $aRow->getStepUidObj());
-        $oCriteria->add(AppDocumentPeer::APP_DOC_TYPE, 'OUTPUT');
-        $oDataset = AppDocumentPeer::doSelectRS($oCriteria);
-        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $oDataset->next();
-        if ($aRow2 = $oDataset->getRow()) {
-          $sOptions .= '<td width="30%" class="treeNode"><a style="' . (($_GET['TYPE'] == 'OUTPUT_DOCUMENT') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'VIEW')) ? 'background-color:orange;color:white;padding-left:5px;padding-right:5px;' : '') . '" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=VIEW&DOC=' . $aRow2['APP_DOC_UID'] . '">' . G::LoadTranslation('ID_VIEW') . '</a></td>';
-          $sOptions .= '<td width="40%" class="treeNode"><a style="' . (($_GET['TYPE'] == 'OUTPUT_DOCUMENT') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'GENERATE')) ? 'background-color:orange;color:white;padding-left:5px;padding-right:5px;' : '') . '" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=GENERATE">' . G::LoadTranslation('ID_GENERATE') . '</a></td>';
-          $sOptions .= '<td width="30%" class="treeNode"><a style="' . (($_GET['TYPE'] == 'OUTPUT_DOCUMENT') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'DELETE')) ? 'background-color:orange;color:white;padding-left:5px;padding-right:5px;' : '') . '" href="../cases/cases_DeleteDocument?TYPE=OUTPUT&DOC=' . $aRow2['APP_DOC_UID'] . '" onclick="return confirm(\'' . G::LoadTranslation('ID_CONFIRM_DELETE_ELEMENT') . '\');">' . G::LoadTranslation('ID_DELETE') . '</a></td>';
-        }
-        else {
-          $sOptions .= '<td width="100%" class="treeNode"><a style="' . (($_GET['TYPE'] == 'OUTPUT_DOCUMENT') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'GENERATE')) ? 'background-color:orange;color:white;padding-left:5px;padding-right:5px;' : '') . '" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=GENERATE">' . G::LoadTranslation('ID_GENERATE') . '</a></td>';
-        }
-        $sOptions .= '</tr></table>';
-        $oAux =& $oNode->addChild($aRow->getStepUid() . '_node', $sOptions, array('nodeType'=>'child'));
-      break;
-      case 'INPUT_DOCUMENT':
-        $sOptions  = '<table width="100%" cellpadding="0" cellspacing="0" border="0"><tr>';
-        $sOptions .= '<td width="100%" class="treeNode"><a style="' . (($_GET['TYPE'] == 'INPUT_DOCUMENT') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'ATTACH')) ? 'background-color:orange;color:white;padding-left:5px;padding-right:5px;' : '') . '" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=ATTACH">' . ($sType == 'REAL' ? G::LoadTranslation('ID_NEW') : G::LoadTranslation('ID_ATTACH')) . '</a></td>';
-        $sOptions .= '</tr></table>';
-        $oCri = new Criteria;
-        $oCri->add( AppDocumentPeer::APP_UID , $_SESSION['APPLICATION'] );
-        $oCri->add( AppDocumentPeer::DEL_INDEX , $_SESSION['INDEX'] );
-        $oCri->add( AppDocumentPeer::DOC_UID , $aRow->getStepUidObj() );
-        $oCri->add( AppDocumentPeer::APP_DOC_TYPE , 'INPUT' );
-        $oCri->addAscendingOrderByColumn(AppDocumentPeer::APP_DOC_INDEX);
-        $aDocuments = AppDocumentPeer::doSelect($oCri);
-        if (sizeof($aDocuments) !== 0)
-        {
-          $i = 1;
-          $sOptions .= '<table width="90%" align="center" cellpadding="0" cellspacing="0" border="0">';
-          reset($aDocuments);
-          while ($oDocument = current($aDocuments))
-          {
-            $aRow2 = $oDocument->toArray(BasePeer::TYPE_FIELDNAME);
-            $oAux1 = new AppDocument();
-            $aAux  = $oAux1->load($aRow2['APP_DOC_UID']);
-            $sOptions .= '<tr>';
-            if ($aAux['APP_DOC_FILENAME'] != '') {
-              $sAux = $aAux['APP_DOC_FILENAME'];
-            }
-            else {
-              $sAux = $aAux['APP_DOC_COMMENT'];
-            }
-            $sOptions .= '<td width="5%">' . $i . '.</td><td width="55%" class="treeNodeAlternate"><input type="text" readonly="readonly" style="font:inherit;border:none;width:100%;" value="' . htmlentities( $sAux, ENT_QUOTES, "utf-8" ) . '" title="' . $sAux . '" /></td>';
-            global $oPluginRegistry;
-            if (!$oPluginRegistry->existsTrigger ( PM_CASE_DOCUMENT_LIST )) {
-              if (isset($_GET['DOC']))
-              {
-                $sOptions .= '<td width="20%" class="treeNode" align="center"><a style="' . (($_GET['TYPE'] == 'INPUT_DOCUMENT') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'VIEW') && ($_GET['DOC'] == $aRow2['APP_DOC_UID'])) ? 'background-color:orange;color:shite;padding-left:5px;padding-right:5px;' : '') . '" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=VIEW&DOC=' . $aRow2['APP_DOC_UID'] .'&VERSION=' . $aRow2['DOC_VERSION'] . '">' . G::LoadTranslation('ID_VIEW') . '</a></td>';
-              }
-              else
-              {
-                $sOptions .= '<td width="20%" class="treeNode" align="center"><a style="" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=VIEW&DOC=' . $aRow2['APP_DOC_UID'] . '&VERSION=' . $aRow2['DOC_VERSION']. '">' . G::LoadTranslation('ID_VIEW') . '</a></td>';
-              }
-              $sOptions .= '<td width="20%" class="treeNode" align="center"><a href="../cases/cases_DeleteDocument?TYPE=INPUT&DOC=' . $aRow2['APP_DOC_UID'] . '" onclick="return confirm(\'' . G::LoadTranslation('ID_CONFIRM_DELETE_ELEMENT') . '\');">' . G::LoadTranslation('ID_DELETE') . '</a></td>';
-            }
-            $sOptions .= '</tr>';
-            $i++;
-            next($aDocuments);
-          }
-          $sOptions .= '</table>';
-        }
-        $oAux =& $oNode->addChild($aRow->getStepUid() . '_node', $sOptions, array('nodeType'=>'child'));
-
-      break;
-      case 'MESSAGE':
-        $sOptions  = '<table width="70%" cellpadding="0" cellspacing="0" border="0"><tr>';
-        $sOptions .= '<td width="100%" class="treeNode"></td>';
-        $sOptions .= '</tr></table>';
-        $oAux =& $oNode->addChild($aRow['STEP_UID'] . '_node', $sOptions, array('nodeType'=>'child'));
-      break;
-      case 'EXTERNAL':
-        $aActions = array ('action' => 'label' );
-        $oPluginRegistry = PluginRegistry::loadSingleton();
-        /** @var \ProcessMaker\Plugins\Interfaces\StepDetail $val */
-        foreach ( $externalSteps as $key=>$val ) {
-          if ($val->equalStepIdTo($aRow->getStepUidObj())) {
-            $stepTitle = $val->getStepTitle(); //default title
-            $sNamespace = $val->getNamespace();
-            $oPlugin =& $oPluginRegistry->getPlugin($sNamespace);
-            $classFile = PATH_PLUGINS . $oPlugin->sNamespace . PATH_SEP . 'class.' . $oPlugin->sNamespace .'.php';
-            if ( file_exists ( $classFile ) ) {
-              require_once ( $classFile );
-        			$sClassName = $sNamespace . 'class';
-              $obj = new $sClassName( );
-              if (method_exists($obj, 'getExternalStepAction')) {  
-                $aActions = $obj->getExternalStepAction( $aRow->getStepUidObj(), $aRow->getStepPosition());
-              }
-            }
-          }
+            default:
+                $stepTitle = $aRow->getStepUid();
         }
 
-        $sOptions  = "<table width='70%' cellpadding='0' cellspacing='0' border='0'><tr>";
-        $sOptions .= "<td width='100%' class='treeNode'>";
-        foreach ( $aActions as $action => $label ) {
-          $styleAction = $_GET['UID'] == $aRow->getStepUidObj() && 
-                         $_GET['POSITION'] == $aRow->getStepPosition() && 
-                         $_GET['ACTION'] == $action ? 'background-color:orange;color:white;padding-left:5px;padding-right:5px; ' : ''; 
-          $sOptions .= " <a style='$styleAction' href='../cases/cases_Step?TYPE=" . 
-                       $aRow->getStepTypeObj() . "&UID=" . $aRow->getStepUidObj() . "&POSITION=" . $aRow->getStepPosition() . "&ACTION=$action'>" . $label . "</a>";
-        }   
-        $sOptions .= '</td></tr></table>';
-        
-        $oAux =& $oNode->addChild($aRow->getStepUid() . '_node', $sOptions, array('nodeType'=>'child'));
-     }
-     $oAux->point = '';
+        $oNode = $oTree->addChild($aRow->getStepUid(), '&nbsp;' . $stepTitle, array('nodeType' => 'parent'));
+        $oNode->plus = '';
+        $oNode->minus = '';
+        switch ($aRow->getStepTypeObj()) {
+            case 'DYNAFORM':
+                $sOptions = '<table width="70%" cellpadding="0" cellspacing="0" border="0"><tr>';
+                $sOptions .= '<td width="100%" class="treeNode"><a style="' . (($_GET['TYPE'] == 'DYNAFORM') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'EDIT')) ? 'background-color:orange;color:white;padding-left:5px;padding-right:5px; ' : '') . '" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=EDIT">' . G::LoadTranslation('ID_EDIT') . '</a></td>';
+                $sOptions .= '</tr></table>';
+                $oAux = $oNode->addChild($aRow->getStepUid() . '_node', $sOptions, array('nodeType' => 'child'));
+                break;
+            case 'OUTPUT_DOCUMENT':
+                $sOptions = '<table width="70%" cellpadding="0" cellspacing="0" border="0"><tr>';
+                $oCriteria = new Criteria('workflow');
+                $oCriteria->add(AppDocumentPeer::APP_UID, $_SESSION['APPLICATION']);
+                $oCriteria->add(AppDocumentPeer::DEL_INDEX, $_SESSION['INDEX']);
+                $oCriteria->add(AppDocumentPeer::DOC_UID, $aRow->getStepUidObj());
+                $oCriteria->add(AppDocumentPeer::APP_DOC_TYPE, 'OUTPUT');
+                $oDataset = AppDocumentPeer::doSelectRS($oCriteria);
+                $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                $oDataset->next();
+                if ($aRow2 = $oDataset->getRow()) {
+                    $sOptions .= '<td width="30%" class="treeNode"><a style="' . (($_GET['TYPE'] == 'OUTPUT_DOCUMENT') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'VIEW')) ? 'background-color:orange;color:white;padding-left:5px;padding-right:5px;' : '') . '" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=VIEW&DOC=' . $aRow2['APP_DOC_UID'] . '">' . G::LoadTranslation('ID_VIEW') . '</a></td>';
+                    $sOptions .= '<td width="40%" class="treeNode"><a style="' . (($_GET['TYPE'] == 'OUTPUT_DOCUMENT') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'GENERATE')) ? 'background-color:orange;color:white;padding-left:5px;padding-right:5px;' : '') . '" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=GENERATE">' . G::LoadTranslation('ID_GENERATE') . '</a></td>';
+                    $sOptions .= '<td width="30%" class="treeNode"><a style="' . (($_GET['TYPE'] == 'OUTPUT_DOCUMENT') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'DELETE')) ? 'background-color:orange;color:white;padding-left:5px;padding-right:5px;' : '') . '" href="../cases/cases_DeleteDocument?TYPE=OUTPUT&DOC=' . $aRow2['APP_DOC_UID'] . '" onclick="return confirm(\'' . G::LoadTranslation('ID_CONFIRM_DELETE_ELEMENT') . '\');">' . G::LoadTranslation('ID_DELETE') . '</a></td>';
+                } else {
+                    $sOptions .= '<td width="100%" class="treeNode"><a style="' . (($_GET['TYPE'] == 'OUTPUT_DOCUMENT') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'GENERATE')) ? 'background-color:orange;color:white;padding-left:5px;padding-right:5px;' : '') . '" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=GENERATE">' . G::LoadTranslation('ID_GENERATE') . '</a></td>';
+                }
+                $sOptions .= '</tr></table>';
+                $oAux = $oNode->addChild($aRow->getStepUid() . '_node', $sOptions, array('nodeType' => 'child'));
+                break;
+            case 'INPUT_DOCUMENT':
+                $sOptions = '<table width="100%" cellpadding="0" cellspacing="0" border="0"><tr>';
+                $sOptions .= '<td width="100%" class="treeNode"><a style="' . (($_GET['TYPE'] == 'INPUT_DOCUMENT') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'ATTACH')) ? 'background-color:orange;color:white;padding-left:5px;padding-right:5px;' : '') . '" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=ATTACH">' . ($sType == 'REAL' ? G::LoadTranslation('ID_NEW') : G::LoadTranslation('ID_ATTACH')) . '</a></td>';
+                $sOptions .= '</tr></table>';
+                $oCri = new Criteria;
+                $oCri->add(AppDocumentPeer::APP_UID, $_SESSION['APPLICATION']);
+                $oCri->add(AppDocumentPeer::DEL_INDEX, $_SESSION['INDEX']);
+                $oCri->add(AppDocumentPeer::DOC_UID, $aRow->getStepUidObj());
+                $oCri->add(AppDocumentPeer::APP_DOC_TYPE, 'INPUT');
+                $oCri->addAscendingOrderByColumn(AppDocumentPeer::APP_DOC_INDEX);
+                $aDocuments = AppDocumentPeer::doSelect($oCri);
+                if (sizeof($aDocuments) !== 0) {
+                    $i = 1;
+                    $sOptions .= '<table width="90%" align="center" cellpadding="0" cellspacing="0" border="0">';
+                    reset($aDocuments);
+                    while ($oDocument = current($aDocuments)) {
+                        $aRow2 = $oDocument->toArray(BasePeer::TYPE_FIELDNAME);
+                        $oAux1 = new AppDocument();
+                        $aAux = $oAux1->load($aRow2['APP_DOC_UID']);
+                        $sOptions .= '<tr>';
+                        if ($aAux['APP_DOC_FILENAME'] != '') {
+                            $sAux = $aAux['APP_DOC_FILENAME'];
+                        } else {
+                            $sAux = $aAux['APP_DOC_COMMENT'];
+                        }
+                        $sOptions .= '<td width="5%">' . $i . '.</td><td width="55%" class="treeNodeAlternate"><input type="text" readonly="readonly" style="font:inherit;border:none;width:100%;" value="' . htmlentities($sAux, ENT_QUOTES, "utf-8") . '" title="' . $sAux . '" /></td>';
+                        global $oPluginRegistry;
+                        if (!$oPluginRegistry->existsTrigger(PM_CASE_DOCUMENT_LIST)) {
+                            if (isset($_GET['DOC'])) {
+                                $sOptions .= '<td width="20%" class="treeNode" align="center"><a style="' . (($_GET['TYPE'] == 'INPUT_DOCUMENT') && ($_GET['UID'] == $aRow->getStepUidObj() && ($_GET['ACTION'] == 'VIEW') && ($_GET['DOC'] == $aRow2['APP_DOC_UID'])) ? 'background-color:orange;color:shite;padding-left:5px;padding-right:5px;' : '') . '" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=VIEW&DOC=' . $aRow2['APP_DOC_UID'] . '&VERSION=' . $aRow2['DOC_VERSION'] . '">' . G::LoadTranslation('ID_VIEW') . '</a></td>';
+                            } else {
+                                $sOptions .= '<td width="20%" class="treeNode" align="center"><a style="" href="../cases/cases_Step?TYPE=' . $aRow->getStepTypeObj() . '&UID=' . $aRow->getStepUidObj() . '&POSITION=' . $aRow->getStepPosition() . '&ACTION=VIEW&DOC=' . $aRow2['APP_DOC_UID'] . '&VERSION=' . $aRow2['DOC_VERSION'] . '">' . G::LoadTranslation('ID_VIEW') . '</a></td>';
+                            }
+                            $sOptions .= '<td width="20%" class="treeNode" align="center"><a href="../cases/cases_DeleteDocument?TYPE=INPUT&DOC=' . $aRow2['APP_DOC_UID'] . '" onclick="return confirm(\'' . G::LoadTranslation('ID_CONFIRM_DELETE_ELEMENT') . '\');">' . G::LoadTranslation('ID_DELETE') . '</a></td>';
+                        }
+                        $sOptions .= '</tr>';
+                        $i++;
+                        next($aDocuments);
+                    }
+                    $sOptions .= '</table>';
+                }
+                $oAux = $oNode->addChild($aRow->getStepUid() . '_node', $sOptions, array('nodeType' => 'child'));
+
+                break;
+            case 'MESSAGE':
+                $sOptions = '<table width="70%" cellpadding="0" cellspacing="0" border="0"><tr>';
+                $sOptions .= '<td width="100%" class="treeNode"></td>';
+                $sOptions .= '</tr></table>';
+                $oAux = $oNode->addChild($aRow['STEP_UID'] . '_node', $sOptions, array('nodeType' => 'child'));
+                break;
+            case 'EXTERNAL':
+                $aActions = array('action' => 'label');
+                $oPluginRegistry = PluginRegistry::loadSingleton();
+                /** @var \ProcessMaker\Plugins\Interfaces\StepDetail $val */
+                foreach ($externalSteps as $keyStep => $val) {
+                    if ($val->equalStepIdTo($aRow->getStepUidObj())) {
+                        $stepTitle = $val->getStepTitle(); //default title
+                        $sNamespace = $val->getNamespace();
+                        $oPlugin = $oPluginRegistry->getPlugin($sNamespace);
+                        $classFile = PATH_PLUGINS . $oPlugin->sNamespace . PATH_SEP . 'class.' . $oPlugin->sNamespace . '.php';
+                        if (file_exists($classFile)) {
+                            require_once($classFile);
+                            $sClassName = $sNamespace . 'class';
+                            $obj = new $sClassName();
+                            if (method_exists($obj, 'getExternalStepAction')) {
+                                $aActions = $obj->getExternalStepAction($aRow->getStepUidObj(), $aRow->getStepPosition());
+                            }
+                        }
+                    }
+                }
+
+                $sOptions = "<table width='70%' cellpadding='0' cellspacing='0' border='0'><tr>";
+                $sOptions .= "<td width='100%' class='treeNode'>";
+                foreach ($aActions as $action => $label) {
+                    $styleAction = $_GET['UID'] == $aRow->getStepUidObj() &&
+                    $_GET['POSITION'] == $aRow->getStepPosition() &&
+                    $_GET['ACTION'] == $action ? 'background-color:orange;color:white;padding-left:5px;padding-right:5px; ' : '';
+                    $sOptions .= " <a style='$styleAction' href='../cases/cases_Step?TYPE=" .
+                        $aRow->getStepTypeObj() . "&UID=" . $aRow->getStepUidObj() . "&POSITION=" . $aRow->getStepPosition() . "&ACTION=$action'>" . $label . "</a>";
+                }
+                $sOptions .= '</td></tr></table>';
+
+                $oAux = $oNode->addChild($aRow->getStepUid() . '_node', $sOptions, array('nodeType' => 'child'));
+        }
+        $oAux->point = '';
     }
-  }
+}
+
+$oNode = $oTree->addChild('-1', '<span class="treeNode"><a style="' . (($_GET['TYPE'] == 'ASSIGN_TASK') && ($_GET['UID'] == '-1' && ($_GET['ACTION'] == 'ASSIGN')) ? 'background-color:orange;padding-left:5px;padding-right:5px;color:white;' : '') . '" href="../cases/cases_Step?TYPE=ASSIGN_TASK&UID=-1&POSITION=10000&ACTION=ASSIGN">[ ' . G::LoadTranslation('ID_ASSIGN_TASK') . ' ]</a></span>', array('nodeType' => 'parent'));
+$oNode->plus = '';
+$oNode->minus = '';
 
-$oNode         =& $oTree->addChild('-1', '<span class="treeNode"><a style="' . (($_GET['TYPE'] == 'ASSIGN_TASK') && ($_GET['UID'] == '-1' && ($_GET['ACTION'] == 'ASSIGN')) ? 'background-color:orange;padding-left:5px;padding-right:5px;color:white;' : '') . '" href="../cases/cases_Step?TYPE=ASSIGN_TASK&UID=-1&POSITION=10000&ACTION=ASSIGN">[ ' . G::LoadTranslation('ID_ASSIGN_TASK') . ' ]</a></span>', array('nodeType'=>'parent'));
-$oNode->plus   =  '';
-$oNode->minus  =  '';
-/*$sOptions      =  '<table width="70%" cellpadding="0" cellspacing="0" border="0"><tr>';
-$sOptions     .=  '<td width="100%" class="treeNode"><a style="' . (($_GET['TYPE'] == 'ASSIGN_TASK') && ($_GET['UID'] == '-1' && ($_GET['ACTION'] == 'ASSIGN')) ? 'background-color:#006699;padding-left:5px;padding-right:5px;color:white;' : '') . '" href="../cases/cases_Step?TYPE=ASSIGN_TASK&UID=-1&POSITION=10000&ACTION=ASSIGN">' . G::LoadTranslation('ID_ASSIGN_SCREEN') . '</a></td>';
-$sOptions     .=  '</tr></table>';
-$oAux          =& $oNode->addChild('-1_node', $sOptions, array('nodeType'=>'child'));
-$oAux->point   =  '';*/
 echo $oTree->render();
diff --git a/workflow/engine/templates/cases/cases_toRevise.php b/workflow/engine/templates/cases/cases_toRevise.php
index f65e04bcc..77c00b2a8 100644
--- a/workflow/engine/templates/cases/cases_toRevise.php
+++ b/workflow/engine/templates/cases/cases_toRevise.php
@@ -55,22 +55,22 @@ $html = "
         </tr>
       </table>";
 
-        $ch = &$tree->addChild("", $html, array('nodeType' => 'child'));
+        $ch = $tree->addChild("", $html, array('nodeType' => 'child'));
         $ch->point = '</span><img src="/images/plus.gif" />';
         $i=1;
         $PRO_UID='';
         $DYN_UID='';
 foreach ($steps as $step) {
-        require_once 'classes/model/Dynaform.php';
-        $od = new Dynaform();
-        $dynaformF = $od->Load($step['STEP_UID_OBJ']);
+    require_once 'classes/model/Dynaform.php';
+    $od = new Dynaform();
+    $dynaformF = $od->Load($step['STEP_UID_OBJ']);
 
-        $n = $step['STEP_POSITION'];
-		$TITLE = " - ".$dynaformF['DYN_TITLE'];
-		$DYN_UID = $dynaformF['DYN_UID'];
-		$PRO_UID = $step['PRO_UID'];
+    $n = $step['STEP_POSITION'];
+    $TITLE = " - ".$dynaformF['DYN_TITLE'];
+    $DYN_UID = $dynaformF['DYN_UID'];
+    $PRO_UID = $step['PRO_UID'];
 
-        $html = "
+    $html = "
       <table cellspacing='0' cellpadding='0' border='1' style='border:0px;'>
         <tr>
         <td class='treeNode' style='border:0px;background-color:transparent;'><span id='focus$i'></td>
@@ -81,9 +81,9 @@ foreach ($steps as $step) {
         </tr>
       </table>";
 
-        $ch = &$tree->addChild("", $html, array('nodeType' => 'child'));
-        $ch->point = '<img src="/images/ftv2mnode.gif" />';
-		$i++;
+    $ch = $tree->addChild("", $html, array('nodeType' => 'child'));
+    $ch->point = '<img src="/images/ftv2mnode.gif" />';
+    $i++;
 }
 
 $html = "
@@ -95,23 +95,23 @@ $html = "
 		  </td>
         </tr>
       </table>";
-        $ch = &$tree->addChild("", $html, array('nodeType' => 'child'));
+        $ch = $tree->addChild("", $html, array('nodeType' => 'child'));
         $ch->point = '</span><img src="/images/plus.gif" />';
 
 $steps = $o->getAllInputsStepsToRevise($_GET['APP_UID']);
 //$i=1;
 
 foreach ($steps as $step) {
-        require_once 'classes/model/InputDocument.php';
-        $od = new InputDocument();
-        $IDF = $od->Load($step['STEP_UID_OBJ']);
+    require_once 'classes/model/InputDocument.php';
+    $od = new InputDocument();
+    $IDF = $od->Load($step['STEP_UID_OBJ']);
 
-        $n = $step['STEP_POSITION'];
-		$TITLE = " - ".$IDF['INP_DOC_TITLE'];
-		$INP_DOC_UID = $IDF['INP_DOC_UID'];
-		$PRO_UID = $step['PRO_UID'];
+    $n = $step['STEP_POSITION'];
+    $TITLE = " - ".$IDF['INP_DOC_TITLE'];
+    $INP_DOC_UID = $IDF['INP_DOC_UID'];
+    $PRO_UID = $step['PRO_UID'];
 
-        $html = "
+    $html = "
       <table cellspacing='0' cellpadding='0' border='1' style='border:0px;'>
         <tr>
         <td class='treeNode' style='border:0px;background-color:transparent;'><span id='focus$i'></td>
@@ -122,9 +122,9 @@ foreach ($steps as $step) {
         </tr>
       </table>";
 
-        $ch = &$tree->addChild("", $html, array('nodeType' => 'child'));
-        $ch->point = '<img src="/images/ftv2mnode.gif" />';
-		$i++;
+    $ch = $tree->addChild("", $html, array('nodeType' => 'child'));
+    $ch->point = '<img src="/images/ftv2mnode.gif" />';
+    $i++;
 }
 
 $i++;
@@ -138,8 +138,8 @@ $html = "
         </tr>
       </table>";
 
-        $ch = &$tree->addChild("", $html, array('nodeType' => 'child'));
+        $ch = $tree->addChild("", $html, array('nodeType' => 'child'));
         $ch->point = '</span><img src="/images/ftv2doc.gif" />';
 
-print ($tree->render());
+print($tree->render());
 //
diff --git a/workflow/engine/templates/dynaforms/fieldsHandler.php b/workflow/engine/templates/dynaforms/fieldsHandler.php
index 99fd5673f..5c0265813 100644
--- a/workflow/engine/templates/dynaforms/fieldsHandler.php
+++ b/workflow/engine/templates/dynaforms/fieldsHandler.php
@@ -1,39 +1,39 @@
-<?php
-/**
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- *
- */
-
- /*
-  * @Author Erik Amaru Ortiz <erik@colosa.com>
-  * @Date Aug 26th, 2009
-  */
-  if(!((isset( $_SESSION['USER_LOGGED'] ))&&(!(isset($_GET['sid']))))||!isset($_SESSION['Current_Dynafom'])) {
-    $oHeadPublisher =& headPublisher::getSingleton();
-    $oHeadPublisher->addScriptCode("
+<?php
+/**
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ *
+ */
+
+ /*
+  * @Author Erik Amaru Ortiz <erik@colosa.com>
+  * @Date Aug 26th, 2009
+  */
+  if (!((isset($_SESSION['USER_LOGGED']))&&(!(isset($_GET['sid']))))||!isset($_SESSION['Current_Dynafom'])) {
+      $oHeadPublisher = headPublisher::getSingleton();
+      $oHeadPublisher->addScriptCode("
     window.parent.location.href = '../processes/mainInit';
-    ");
-    G::RenderPage('publish');
-    exit();
-  }
-
+    ");
+      G::RenderPage('publish');
+      exit();
+  }
+
 ?>
 <html>
 	<head>
@@ -44,12 +44,12 @@
 		<script type="text/javascript" src="/js/jquery/jquery-ui-1.7.2.custom.min.js"></script>
 		<script type="text/javascript" src="/jscore/dynaforms/dynaforms_fieldsHandler.js"></script>
 	</head>
-<?php
-	$content = file_get_contents(PATH_DYNAFORM.$_SESSION['Current_Dynafom']['Parameters']['FILE'].".xml");
-	$oXxml = G::xmlParser($content);
-
-	if( !isset($oXxml->result['dynaForm']['__CONTENT__']) ){
-?>
+<?php
+    $content = file_get_contents(PATH_DYNAFORM.$_SESSION['Current_Dynafom']['Parameters']['FILE'].".xml");
+    $oXxml = G::xmlParser($content);
+
+    if (!isset($oXxml->result['dynaForm']['__CONTENT__'])) {
+        ?>
 	<br/>
 	<div class="ui-widget-header ui-corner-all" style="height:17px" align="center">
 		<?php echo G::loadTranslation('ID_NO_FIELD_FOUND')?>
@@ -58,30 +58,28 @@
         parent.document.getElementById('light').style.display='none';
         parent.document.getElementById('fade').style.display='none';
 	</script>
-<?php
-	  die();
-	}
-
-	$elements = $oXxml->result['dynaForm']['__CONTENT__'];
-	$dynaformAttributes = $oXxml->result['dynaForm']['__ATTRIBUTES__'];
-
-    $dynaformType = $dynaformAttributes['type'];
-
-	foreach($elements as $node_name=>$node){
-		if( $node_name == "___pm_boot_strap___"){
-      $boot_strap = $elements[$node_name];
-			$hidden_fields = G::decrypt($boot_strap['__ATTRIBUTES__']['meta'], 'dynafieldsHandler');
-			//echo $hidden_fields;
-			$hidden_fields_list = explode(',', $hidden_fields);
-			unset($elements[$node_name]);
-
-      ?>
+<?php
+      die();
+    }
+
+    $elements = $oXxml->result['dynaForm']['__CONTENT__'];
+    $dynaformAttributes = $oXxml->result['dynaForm']['__ATTRIBUTES__'];
+
+    $dynaformType = $dynaformAttributes['type'];
+
+    foreach ($elements as $node_name=>$node) {
+        if ($node_name == "___pm_boot_strap___") {
+            $boot_strap = $elements[$node_name];
+            $hidden_fields = G::decrypt($boot_strap['__ATTRIBUTES__']['meta'], 'dynafieldsHandler');
+            //echo $hidden_fields;
+            $hidden_fields_list = explode(',', $hidden_fields);
+            unset($elements[$node_name]); ?>
       <script>
         parent.jsMeta = "<?php echo $boot_strap['__ATTRIBUTES__']['meta'] ?>";
       </script>
-      <?php
-		}
-	}
+      <?php
+        }
+    }
 ?>
 	<body>
 	<table border="0" width="100%" cellpadding="0" cellspacing="0" class="fieldshandler_item">
@@ -106,74 +104,85 @@
 
 		<div id="dynafields">
 		  <ul id="sortable" style="margin:0; padding:0;">
-			<?php foreach($elements as $node_name=>$node){
-				    if( isset($hidden_fields_list) ){
-					   $checked = !(in_array($node_name, $hidden_fields_list))? 'checked="checked"': '';
-					} else {
-						$checked = 'checked="checked"';
-					}
-				?>
+			<?php foreach ($elements as $node_name=>$node) {
+    if (isset($hidden_fields_list)) {
+        $checked = !(in_array($node_name, $hidden_fields_list))? 'checked="checked"': '';
+    } else {
+        $checked = 'checked="checked"';
+    } ?>
 			<li style="list-style:none;" id="<?php echo $node_name?>" class="ui-state-default" onmouseover="setClass(this, 'ui-state-hover')" onmouseout="setClass(this, 'ui-state-default')">
 				<table class="dynalist" border="0" width="100%" cellpadding="0" cellspacing="0" id="fieldshandler_items_table">
 				<tr>
 					<td width="7%">
-						<?php if($node['__ATTRIBUTES__']['type'] != 'javascript' && $dynaformType != 'grid') {?>
+						<?php if ($node['__ATTRIBUTES__']['type'] != 'javascript' && $dynaformType != 'grid') {
+        ?>
 						<input id="chk@<?php echo $node_name?>" type="checkbox" onclick="parent.jsMeta = fieldsHandlerSaveHidden();" <?php echo $checked?> />
-						<?php } else {?>
+						<?php
+    } else {
+        ?>
 						&nbsp;
-						<?php }?>
+						<?php
+    } ?>
 					</td>
 					<td width="15%" >
-					<?php $type = $node['__ATTRIBUTES__']['type'];
-					switch($type){
-						case 'yesno':       	$type = 'yes_no';       		break;
-						case 'listbox':    		$type = 'list_box';     		break;
-						case 'checkgroup': $type = 'check_group';  	break;
-						case 'radiogroup': $type = 'radio_group';  	break;
-						case 'file':        		$type = 'upload_files'; 	break;
-					}?>
-          <?php if ( is_file(PATH_HTML.'images'.PATH_SEP.'dynamicForm'.PATH_SEP."$type.gif") ){?>
+					<?php $type = $node['__ATTRIBUTES__']['type'];
+    switch ($type) {
+                        case 'yesno':           $type = 'yes_no';               break;
+                        case 'listbox':            $type = 'list_box';             break;
+                        case 'checkgroup': $type = 'check_group';    break;
+                        case 'radiogroup': $type = 'radio_group';    break;
+                        case 'file':                $type = 'upload_files';    break;
+                    } ?>
+          <?php if (is_file(PATH_HTML.'images'.PATH_SEP.'dynamicForm'.PATH_SEP."$type.gif")) {
+                        ?>
 					<img src="/images/dynamicForm/<?php echo $type?>.gif"/>
-          <?php } else {?>
+          <?php
+                    } else {
+                        ?>
           <img src="/images/unknown_icon.gif" border="0" width="20" height="16"/>
-          <?php }?>
-          <span style="font-size:10px;">&nbsp;<?php echo "({$node['__ATTRIBUTES__']['type']})";?></span>
+          <?php
+                    } ?>
+          <span style="font-size:10px;">&nbsp;<?php echo "({$node['__ATTRIBUTES__']['type']})"; ?></span>
 					</td>
 
           <td width="28%"  style="font-size:12px;">
-              &nbsp;<?php echo "$node_name";?>
+              &nbsp;<?php echo "$node_name"; ?>
           </td>
 					<td><p style="font-size:12px; color:#1C3166; font-weight:bold">
-					<?php if (isset($node["__CONTENT__"][SYS_LANG]["__VALUE__"]) && $node["__CONTENT__"][SYS_LANG]["__VALUE__"] != "") {
-						  if( strlen($node['__CONTENT__'][SYS_LANG]['__VALUE__']) > 30 ){
-						  	$label = substr(trim(strip_tags(G::stripCDATA($node['__CONTENT__'][SYS_LANG]['__VALUE__']))), 0, 30 ) . '...';
-						  } else {
-						  	$label = $node['__CONTENT__'][SYS_LANG]['__VALUE__'];
-						  }
-					      print($label);
-					    } else {
-					      print("&nbsp;");
-					    }
-  					?></p>
+					<?php if (isset($node["__CONTENT__"][SYS_LANG]["__VALUE__"]) && $node["__CONTENT__"][SYS_LANG]["__VALUE__"] != "") {
+                        if (strlen($node['__CONTENT__'][SYS_LANG]['__VALUE__']) > 30) {
+                            $label = substr(trim(strip_tags(G::stripCDATA($node['__CONTENT__'][SYS_LANG]['__VALUE__']))), 0, 30) . '...';
+                        } else {
+                            $label = $node['__CONTENT__'][SYS_LANG]['__VALUE__'];
+                        }
+                        print($label);
+                    } else {
+                        print("&nbsp;");
+                    } ?></p>
 					</td>
 					<td width="40px" class="options" align="right">
-            <?php if( in_array($node['__ATTRIBUTES__']['type'], $_POST['fieldsList']) ){ ?>
+            <?php if (in_array($node['__ATTRIBUTES__']['type'], $_POST['fieldsList'])) {
+                        ?>
 						<!-- <div class="tool"><img src="/images/options.png" width="12" height="12" border="0"/> </div>-->
 						<div class="jq-checkpointSubhead" style="display:block">
 							<a title="<?php echo G::loadTranslation('ID_EDIT_FIELD')?>" href="#" onclick="__ActionEdit('<?php echo $node_name?>'); return false;"><img src="/images/e_Edit.png" width="15" height="15" border="0" onmouseout="backImage(this,'')" onmouseover="backImage(this,'url(/images/dynamicForm/hover.gif) no-repeat')"/></a>
-							<a title="<?php echo G::loadTranslation('ID_REMOVE_FIELD')?>" href="#" onclick="__ActionDelete('<?php echo $node_name?>', '<?php echo $node['__ATTRIBUTES__']['type'];?>');return false;"><img src="/images/e_Delete.png" width="15" height="15" border="0" onmouseout="backImage(this,'')" onmouseover="backImage(this,'url(/images/dynamicForm/hover.gif) no-repeat')"/></a>
+							<a title="<?php echo G::loadTranslation('ID_REMOVE_FIELD')?>" href="#" onclick="__ActionDelete('<?php echo $node_name?>', '<?php echo $node['__ATTRIBUTES__']['type']; ?>');return false;"><img src="/images/e_Delete.png" width="15" height="15" border="0" onmouseout="backImage(this,'')" onmouseover="backImage(this,'url(/images/dynamicForm/hover.gif) no-repeat')"/></a>
 						</div>
-            <?php } else {?>
+            <?php
+                    } else {
+                        ?>
                 <div class="tool"><img src="/images/options.png" width="12" height="12" border="0"/> </div>
                 <div class="jq-checkpointSubhead" style="display:none">
-                    <a title="<?php echo G::loadTranslation('ID_REMOVE_FIELD')?>" href="#" onclick="__ActionDelete('<?php echo $node_name?>', '<?php echo $node['__ATTRIBUTES__']['type'];?>');return false;"><img src="/images/e_Delete.png" width="15" height="15" border="0" onmouseout="backImage(this,'')" onmouseover="backImage(this,'url(/images/dynamicForm/hover.gif) no-repeat')"/></a>
+                    <a title="<?php echo G::loadTranslation('ID_REMOVE_FIELD')?>" href="#" onclick="__ActionDelete('<?php echo $node_name?>', '<?php echo $node['__ATTRIBUTES__']['type']; ?>');return false;"><img src="/images/e_Delete.png" width="15" height="15" border="0" onmouseout="backImage(this,'')" onmouseover="backImage(this,'url(/images/dynamicForm/hover.gif) no-repeat')"/></a>
                 </div>
-            <?php }?>
+            <?php
+                    } ?>
 					</td>
 				</tr>
 				</table>
 			</li>
-			<?php }?>
+			<?php
+}?>
 		  </ul>
 		</div>
 	 </center>
diff --git a/workflow/engine/templates/installer/installer_cards.js b/workflow/engine/templates/installer/installer_cards.js
index a754ce411..2307c9ed1 100644
--- a/workflow/engine/templates/installer/installer_cards.js
+++ b/workflow/engine/templates/installer/installer_cards.js
@@ -1,891 +1,916 @@
 var steps = [];
 
-Ext.onReady(function(){
-  PMExt.notify_time_out = 2;
+Ext.onReady(function () {
+    PMExt.notify_time_out = 2;
 
-  var storeDatabase = new Ext.data.Store({
-    proxy: new Ext.data.HttpProxy({url: 'getEngines', method:'POST'}),
-    reader: new Ext.data.JsonReader({
-      fields: [{name: 'id'},{name: 'label'}]
-    }),
-    listeners: {load: function() {
-      Ext.getCmp('db_engine').setValue(Ext.getCmp('db_engine').store.getAt(0).id);
-      if (Ext.getCmp('db_engine').store.getAt(0).id == 'mysql') {
-        Ext.getCmp('db_port').setValue('3306');
-        Ext.getCmp('db_username').setValue('root');
-      }
-      else {
-        Ext.getCmp('db_port').setValue('1433');
-        Ext.getCmp('db_username').setValue('sa');
-      }
-      testConnection();
-    }}
-  });
-
-  var store = new Ext.data.ArrayStore({
-      fields: ['id', 'label'],
-      data : [['en', 'English'],['es', 'Spanish']]
-  });
-
-  var cmbLanguages = new Ext.form.ComboBox({
-      fieldLabel: _('ID_LANGUAGES'),
-      store: store,
-      labelWidth: 200,
-      displayField:'label',
-      typeAhead: true,
-      mode: 'local',
-      forceSelection: true,
-      triggerAction: 'all',
-      emptyText:_('ID_EMPTY_LANGUAGE'),
-      selectOnFocus:true
-  });
-
-  // getting the system info
-  function getSystemInfo() {
-    wizard.showLoadMask(true);
-    Ext.Ajax.request({
-      url: 'getSystemInfo',
-      success: function(response){
-        var response = Ext.util.JSON.decode(response.responseText);
-        Ext.getCmp('php').setValue       (getFieldOutput(response.php.version,      response.php.result));
-        Ext.getCmp('mysql').setValue     (getFieldOutput(response.mysql.version,    response.mysql.result));
-        //Ext.getCmp('mssql').setValue     (getFieldOutput(response.mssql.version,    response.mssql.result));
-        Ext.getCmp('curl').setValue      (getFieldOutput(response.curl.version,     response.curl.result));
-        Ext.getCmp('openssl').setValue   (getFieldOutput(response.openssl.version,  response.openssl.result));
-        Ext.getCmp('dom').setValue       (getFieldOutput(response.dom.version,      response.dom.result));
-        Ext.getCmp('gd').setValue        (getFieldOutput(response.gd.version,       response.gd.result));
-        Ext.getCmp('multibyte').setValue (getFieldOutput(response.multibyte.version,response.multibyte.result));
-        Ext.getCmp('soap').setValue      (getFieldOutput(response.soap.version,     response.soap.result));
-        Ext.getCmp("mcrypt").setValue    (getFieldOutput(response.mcrypt.version,   response.mcrypt.result));
-        Ext.getCmp('ldap').setValue      (getFieldOutput(response.ldap.version,     response.ldap.result));
-        Ext.getCmp('memory').setValue    (getFieldOutput(response.memory.version,   response.memory.result));
-
-        dbReq  = response.mysql.result || response.mssql.result;
-        phpReq = response.php.result && response.curl.result && response.dom.result && response.gd.result && response.multibyte.result && response.soap.result && response.memory.result && response.mcrypt.result;
-        wizard.onClientValidation(0, dbReq && phpReq);
-        wizard.showLoadMask(false);
-      },
-      failure: function(){},
-      params: {'clientBrowser': PMExt.getBrowser().name}
-    });
-  }
-
-  // getting the system info
-  function getPermissionInfo() {
-    wizard.showLoadMask(true);
-
-    Ext.Ajax.request({
-      url: 'getPermissionInfo',
-      success: function(response) {
-        var okImage = '<img src="/images/dialog-ok-apply.png" width="12" height="12" />';
-        var badImage = '<img src="/images/delete.png" width="15" height="15" />';
-        var response = Ext.util.JSON.decode(response.responseText);
-        Ext.get('pathConfigSpan').dom.innerHTML    = (response.pathConfig.result ? okImage : badImage);
-        Ext.get('pathLanguagesSpan').dom.innerHTML = (response.pathLanguages.result ? okImage : badImage);
-        Ext.get('pathPluginsSpan').dom.innerHTML   = (response.pathPlugins.result ? okImage : badImage);
-        Ext.get('pathXmlformsSpan').dom.innerHTML  = (response.pathXmlforms.result ? okImage : badImage);
-        Ext.get('pathPublicSpan').dom.innerHTML    = (response.pathPublic.result ? okImage : badImage);
-        Ext.get('pathSharedSpan').dom.innerHTML    = (response.pathShared.result ? okImage : badImage);
-        Ext.get('pathLogFileSpan').dom.innerHTML   = (response.pathLogFile.result ? okImage : badImage);
-        Ext.get('pathTranslationsSpan').dom.innerHTML    = (response.pathTranslations.result ? okImage : badImage);
-        Ext.get('pathTranslationsMafeSpan').dom.innerHTML   = (response.pathTranslationsMafe.result ? okImage : badImage);
-
-        wizard.onClientValidation(1,
-          response.pathConfig.result &&
-          response.pathLanguages.result &&
-          response.pathPlugins.result &&
-          response.pathXmlforms.result &&
-          response.pathPublic.result &&
-          response.pathShared.result &&
-          response.pathLogFile.result &&          
-          response.pathTranslations.result &&
-          response.pathTranslationsMafe.result
-        );
-
-        wizard.showLoadMask(false);
-
-        permissionInfo.error1 = response.noWritableFiles
-
-        //type = response.success ? 'success' : _('ID_WARNING');
-        if (!response.success)
-          PMExt.error(_('ID_WARNING'), response.notify + ' <a href="#" onclick="showPermissionInfo(1); return false;">Show non-writable files.</a>');
-
-      },
-      failure: function(){},
-      params: {
-        'pathConfig': Ext.getCmp('pathConfig').getValue(),
-        'pathLanguages': Ext.getCmp('pathLanguages').getValue(),
-        'pathPlugins': Ext.getCmp('pathPlugins').getValue(),
-        'pathXmlforms': Ext.getCmp('pathXmlforms').getValue(),
-        'pathShared': Ext.getCmp('pathShared').getValue(),
-        'pathLogFile': Ext.getCmp('pathLogFile').getValue(),
-        'pathPublic': Ext.getCmp('pathPublic').getValue(),
-        'pathTranslations': Ext.getCmp('pathTranslations').getValue(),
-        'pathTranslationsMafe': Ext.getCmp('pathTranslationsMafe').getValue()
-      }
-    });
-  }
-
-  function checkLicenseAgree() {
-    //wizard.onClientValidation(2, Ext.getCmp('agreeCheckbox').checked);
-    wizard.onClientValidation(2, false);
-  }
-
-  function ckeckDBEnginesValuesLoaded() {
-    wizard.showLoadMask(true);
-    if (Ext.getCmp('db_engine').store.getCount() == 0) {
-      Ext.getCmp('db_engine').store.load();
-    }
-    else {
-      testConnection();
-    }
-  }
-
-  // test database Connection
-  function testConnection() {
-    wizard.showLoadMask(true);
-    if ((Ext.getCmp('db_engine').getValue() == '') || !Ext.getCmp('db_hostname').isValid() || !Ext.getCmp('db_username').isValid()) {
-      wizard.onClientValidation(3, false);
-      wizard.showLoadMask(false);
-      return false;
-    }
-    Ext.Ajax.request({
-      url: 'testConnection',
-      success: function(response){
-        var response = Ext.util.JSON.decode(response.responseText);
-        Ext.getCmp('db_message').setValue(getFieldOutput(response.message, response.result));
-
-        if (!response.result)
-          PMExt.notify(_('ID_WARNING'), response.message, _('ID_WARNING'));
-
-        wizard.onClientValidation(3, response.result);
-        wizard.showLoadMask(false);
-      },
-      failure: function(){},
-      params: {
-        'db_engine'  : Ext.getCmp('db_engine').getValue(),
-        'db_hostname': Ext.getCmp('db_hostname').getValue(),
-        'db_username': Ext.getCmp('db_username').getValue(),
-        'db_password': Ext.getCmp('db_password').getValue(),
-        'db_port'    : Ext.getCmp('db_port').getValue()
-      }
-    });
-  }
-
-  function checkWorkspaceConfiguration() {
-    var canInstall = false;
-    if (!Ext.getCmp('workspace').isValid()) {
-      Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_VALID_WORKSPACE'), false));
-      wizard.onClientValidation(4, false);
-      return;
-    }
-    if (!Ext.getCmp('adminUsername').isValid()) {
-      Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_VALID_ADMIN_NAME'), false));
-      wizard.onClientValidation(4, false);
-      return;
-    }
-    if (Ext.getCmp('adminPassword').getValue() == '') {
-      Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_VALID_ADMIN_PASSWORD'), false));
-      wizard.onClientValidation(4, false);
-      return;
-    }
-    if (Ext.getCmp('adminPassword').getValue() != Ext.getCmp('confirmPassword').getValue()) {
-      Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_PASSWORD_CONFIRMATION_INCORRECT'), false));
-      wizard.onClientValidation(4, false);
-      return;
-    }
-    if (!Ext.getCmp('wfDatabase').isValid()) {
-      Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_WORKFLOW_DATABASE_NAME'), false));
-      wizard.onClientValidation(4, false);
-      return;
-    }
-    checkDatabases();
-  }
-
-  function checkDatabases() {
-    wizard.showLoadMask(true);
-    Ext.Ajax.request({
-      url: 'checkDatabases',
-      success: function(response){
-        var existMsg = '<span style="color: red;">' + _('ID_NOT_AVAILABLE_DATABASE') + '</span>';
-        var noExistsMsg = '<span style="color: green;">' + _('ID_AVAILABLE_DATABASE') + '</span>';
-        var response = Ext.util.JSON.decode(response.responseText);
-        Ext.get('database_message').dom.innerHTML = (response.wfDatabaseExists ? existMsg : noExistsMsg);
-
-        var dbFlag = ((!response.wfDatabaseExists) || Ext.getCmp('deleteDB').getValue());
-        wizard.onClientValidation(4, dbFlag);
-
-        if (dbFlag) {
-          Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_DATA_CORRECT'), true));
+    var selectDbEngine = function (value) {
+        var port, username;
+        switch (value) {
+            case 'mysql':
+                port = 3306;
+                username = 'root';
+                break;
+            default:
+                port = 1433;
+                username = 'sa';
+                break;
         }
-        else {
-          Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_NOT_PASSED'), false));
-          PMExt.notify(_('ID_WARNING'), response.errMessage, _('ID_WARNING'), 4)
-        }
-        wizard.showLoadMask(false);
-      },
-      failure: function(){},
-      params: {
-        'db_engine'  : Ext.getCmp('db_engine').getValue(),
-        'db_hostname': Ext.getCmp('db_hostname').getValue(),
-        'db_username': Ext.getCmp('db_username').getValue(),
-        'db_password': Ext.getCmp('db_password').getValue(),
-        'db_port'    : Ext.getCmp('db_port').getValue(),
-        'wfDatabase' : Ext.getCmp('wfDatabase').getValue(),
+        Ext.getCmp('db_port').setValue(port);
+        Ext.getCmp('db_username').setValue(username);
+    };
+
+    var storeDatabase = new Ext.data.Store({
+        proxy: new Ext.data.HttpProxy({url: 'getEngines', method: 'POST'}),
+        reader: new Ext.data.JsonReader({
+            fields: [{name: 'id'}, {name: 'label'}]
+        }),
+        listeners: {
+            load: function () {
+                var value = Ext.getCmp('db_engine').store.getAt(0).id;
+                Ext.getCmp('db_engine').setValue(value);
+                selectDbEngine(value);
+                testConnection();
+            }
         }
     });
-  }
 
+    var store = new Ext.data.ArrayStore({
+        fields: ['id', 'label'],
+        data: [['en', 'English'], ['es', 'Spanish']]
+    });
 
-  var setIndex = 0;
+    var cmbLanguages = new Ext.form.ComboBox({
+        fieldLabel: _('ID_LANGUAGES'),
+        store: store,
+        labelWidth: 200,
+        displayField: 'label',
+        typeAhead: true,
+        mode: 'local',
+        forceSelection: true,
+        triggerAction: 'all',
+        emptyText: _('ID_EMPTY_LANGUAGE'),
+        selectOnFocus: true
+    });
 
-  steps[setIndex++] = new Ext.ux.Wiz.Card({
-    title : _('ID_PREINSTALLATION'),
-    monitorValid : false,
-    labelAlign: 'left',
-    labelWidth: 200,
-    defaults     : {
-    },
-    items : [
-      {
-        border    : false,
-        html      : _('ID_PREINSTALLATION'),
-        bodyStyle : 'background:none;padding-top:0px;padding-bottom:5px;font-weight:bold;font-size:1.3em;'
-      },
-      {
-        xtype:'panel',
-        layout:'border',
-        height: 380,
-        items:[
-          {
-            region: 'west',
-            width: 250,
-            bodyStyle : 'padding:10px;font-size:1.2em;',
-            html: _('ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION')
-          },
+    // getting the system info
+    function getSystemInfo() {
+        wizard.showLoadMask(true);
+        Ext.Ajax.request({
+            url: 'getSystemInfo',
+            success: function (response) {
+                var response = Ext.util.JSON.decode(response.responseText);
+                Ext.getCmp('php').setValue(getFieldOutput(response.php.version, response.php.result));
+                Ext.getCmp('mysql').setValue(getFieldOutput(response.mysql.version, response.mysql.result));
+                //Ext.getCmp('mssql').setValue     (getFieldOutput(response.mssql.version,    response.mssql.result));
+                Ext.getCmp('curl').setValue(getFieldOutput(response.curl.version, response.curl.result));
+                Ext.getCmp('openssl').setValue(getFieldOutput(response.openssl.version, response.openssl.result));
+                Ext.getCmp('dom').setValue(getFieldOutput(response.dom.version, response.dom.result));
+                Ext.getCmp('gd').setValue(getFieldOutput(response.gd.version, response.gd.result));
+                Ext.getCmp('multibyte').setValue(getFieldOutput(response.multibyte.version, response.multibyte.result));
+                Ext.getCmp('soap').setValue(getFieldOutput(response.soap.version, response.soap.result));
+                Ext.getCmp("mcrypt").setValue(getFieldOutput(response.mcrypt.version, response.mcrypt.result));
+                Ext.getCmp('ldap').setValue(getFieldOutput(response.ldap.version, response.ldap.result));
+                Ext.getCmp('memory').setValue(getFieldOutput(response.memory.version, response.memory.result));
 
-          {
-            region: 'center',
-            xtype : 'fieldset',
-            labelWidth: 200,
-            autoScroll: true,
-            items:[
-              {
-                xtype     : 'displayfield',
-                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_PHP'),
-                id  : 'php'
-              },
-              {
-                xtype     : 'displayfield',
-                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_MYSQL'),
-                id  : 'mysql'
-              }/*,
-              {
-                xtype     : 'displayfield',
-                fieldLabel: 'MSSQL Support (*)',
-                id  : 'mssql'
-              }*/,
-              {
-                xtype     : 'displayfield',
-                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_CURL'),
-                id  : 'curl'
-              },
-              {
-                xtype     : 'displayfield',
-                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_OPENSSL'),
-                id  : 'openssl'
-              },
-              {
-                xtype     : 'displayfield',
-                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_DOMXML'),
-                id  : 'dom'
-              },
-              {
-                xtype     : 'displayfield',
-                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_GD'),
-                id  : 'gd'
-              },
-              {
-                xtype     : 'displayfield',
-                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_MULTIBYTESTRING'),
-                id  : 'multibyte'
-              },
-              {
-                xtype     : 'displayfield',
-                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_SOAP'),
-                id  : 'soap'
-              },
-              {
-                   xtype: "displayfield",
-                   id: "mcrypt",
-                   fieldLabel: _("ID_MCRYPT_SUPPORT")
-              },
-              {
-                xtype     : 'displayfield',
-                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_LDAP'),
-                id  : 'ldap'
-              },
-              {
-                xtype     : 'displayfield',
-                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_MEMORYLIMIT'),
-                id: 'memory',
-                value: '5.0 or greater'
-              },
-              new Ext.Button({
-                text : _('ID_CHECK_AGAIN'),
-                handler  : getSystemInfo,
-                scope    : this
-              })
-            ]
-          }
-        ]
-      }
-    ],
-    listeners: {
-      show: getSystemInfo
-    }
-  });
-
-  // third card with Directory File Permission
-  steps[setIndex++] = new Ext.ux.Wiz.Card({
-    title:_('ID_DIRECTORY_FILE_PERMISSION'),
-    monitorValid : false,
-    labelAlign: 'left',
-    labelWidth: 200,
-    defaults     : {
-        //labelStyle : 'font-size:11px'
-    },
-    items : [
-      {
-        border    : false,
-        html: _('ID_DIRECTORY_FILE_PERMISSION'),
-        bodyStyle : 'background:none;padding-top:0px;padding-bottom:5px;font-weight:bold;font-size:1.3em;'
-      },
-      {
-        xtype:'panel',
-        layout:'border',
-        height: 380,
-        items:[
-          {
-            region: 'north',
-            height: 55,
-            bodyStyle : 'padding:10px;font-size:1.2em;',
-            html: _('ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP3_1')
-          },
-          {
-            region: 'center',
-            xtype : 'fieldset',
-            alignField : 'left',
-            bodyStyle : 'padding-left:40px;font-size:12;',
-            labelWidth: 180,
-            items:[
-              {
-                xtype: 'textfield',
-                fieldLabel: '<span id="pathConfigSpan"></span> '+_('ID_CONFIG_DIRECTORY'),
-                id: 'pathConfig',
-                width: 430,
-                value: path_config,
-                disabled: true
-              },
-              {
-                xtype: 'textfield',
-                fieldLabel: '<span id="pathLanguagesSpan"></span> '+ _('ID_LANGUAJE_DIRECTORY'),
-                id: 'pathLanguages',
-                width: 430,
-                value: path_languages,
-                disabled: true
-              },
-              {
-                xtype: 'textfield',
-                fieldLabel: '<span id="pathPluginsSpan"></span> ' + _('ID_PLUGINS_DIRECTORY'),
-                id: 'pathPlugins',
-                width: 430,
-                value: path_plugins,
-                disabled: true
-              },
-              {
-                xtype: 'textfield',
-                fieldLabel: '<span id="pathXmlformsSpan"></span> ' + _('ID_XMLFROM_DIRECTORY'),
-                id: 'pathXmlforms',
-                width: 430,
-                value: path_xmlforms,
-                disabled: true
-              },
-              {
-                xtype: 'textfield',
-                fieldLabel: '<span id="pathPublicSpan"></span> ' + _('ID_PUBLIC_INDEX_FILE'),
-                id: 'pathPublic',
-                width: 430,
-                value: path_public,
-                disabled: true
-              },
-              {
-                xtype: 'textfield',
-                fieldLabel: '<span id="pathTranslationsSpan"></span> ' + _('ID_TRANSLATIONS_DIRECTORY'),
-                id: 'pathTranslations',
-                width: 430,
-                value: path_translations,
-                disabled: true
-              },
-              {
-                xtype: 'textfield',
-                fieldLabel: '<span id="pathTranslationsMafeSpan"></span> ' + _('ID_MAFE_TRANSLATION_DIRECTORY'),
-                id: 'pathTranslationsMafe',
-                width: 430,
-                value: path_translationsMafe,
-                disabled: true
-              },
-              {
-                xtype: 'textfield',
-                fieldLabel: '<span id="pathSharedSpan"></span> ' + _('ID_WORFLOW_DATA_DIRECTORY'),
-                id: 'pathShared',
-                width: 430,
-                value: path_shared,
-                enableKeyEvents: true,
-                allowBlank: false,
-                blankText: _('ID_WORKFLOW_DATA_DIRECTORY_REQUIRED'),
-                selectOnFocus: true,
-                msgTarget: 'side',
-                listeners: {keyup: function() {
-                  wizard.onClientValidation(2, false);
-                  if (Ext.getCmp('pathShared').getValue().substr(-1, 1) != path_sep) {
-                    Ext.getCmp('pathLogFile').setValue(Ext.getCmp('pathShared').getValue() + path_sep + 'log' + path_sep + 'install.log');
-                  }
-                  else {
-                    Ext.getCmp('pathLogFile').setValue(Ext.getCmp('pathShared').getValue() + 'log' + path_sep + 'install.log');
-                  }
-                }}
-              },
-              {
-                xtype: 'textfield',
-                fieldLabel: '<span id="pathLogFileSpan"></span> ' + _('ID_INSTALLATION_FILE_LOG'),
-                id: 'pathLogFile',
-                width: 430,
-                value: path_shared + 'log' + path_sep + 'install.log',
-                disabled: true
-              },
-              new Ext.Button({
-                text : _('ID_CHECK_AGAIN'),
-                handler  : getPermissionInfo,
-                scope    : this
-              })
-            ]
-          }
-        ]
-      }
-    ],
-    listeners: {
-      show: getPermissionInfo
+                dbReq = response.mysql.result || response.mssql.result;
+                phpReq = response.php.result && response.curl.result && response.dom.result && response.gd.result && response.multibyte.result && response.soap.result && response.memory.result && response.mcrypt.result;
+                wizard.onClientValidation(0, dbReq && phpReq);
+                wizard.showLoadMask(false);
+            },
+            failure: function () {
+            },
+            params: {'clientBrowser': PMExt.getBrowser().name}
+        });
     }
 
-  } );
+    // getting the system info
+    function getPermissionInfo() {
+        wizard.showLoadMask(true);
 
+        Ext.Ajax.request({
+            url: 'getPermissionInfo',
+            success: function (response) {
+                var okImage = '<img src="/images/dialog-ok-apply.png" width="12" height="12" />';
+                var badImage = '<img src="/images/delete.png" width="15" height="15" />';
+                var response = Ext.util.JSON.decode(response.responseText);
+                Ext.get('pathConfigSpan').dom.innerHTML = (response.pathConfig.result ? okImage : badImage);
+                Ext.get('pathLanguagesSpan').dom.innerHTML = (response.pathLanguages.result ? okImage : badImage);
+                Ext.get('pathPluginsSpan').dom.innerHTML = (response.pathPlugins.result ? okImage : badImage);
+                Ext.get('pathXmlformsSpan').dom.innerHTML = (response.pathXmlforms.result ? okImage : badImage);
+                Ext.get('pathPublicSpan').dom.innerHTML = (response.pathPublic.result ? okImage : badImage);
+                Ext.get('pathSharedSpan').dom.innerHTML = (response.pathShared.result ? okImage : badImage);
+                Ext.get('pathLogFileSpan').dom.innerHTML = (response.pathLogFile.result ? okImage : badImage);
+                Ext.get('pathTranslationsSpan').dom.innerHTML = (response.pathTranslations.result ? okImage : badImage);
+                Ext.get('pathTranslationsMafeSpan').dom.innerHTML = (response.pathTranslationsMafe.result ? okImage : badImage);
 
-  // third card with input field email-address
-  steps[setIndex++] = new Ext.ux.Wiz.Card({
-    title:_('ID_PROCESSMAKER_LICENSE'),
-    //monitorValid : false,
-    defaults     : {
-      labelStyle : 'font-size:12px'
-    },
-    items : [
-      {
-        border    : false,
-        html:_('ID_PROCESSMAKER_LICENSE'),
-        bodyStyle : 'background:none;padding-top:0px;padding-bottom:5px;font-weight:bold;font-size:1.3em;'
-      },
-      {
-        xtype:'panel',
-        layout:'border',
-        height: 380,
-        items:[
-          {
-            region: 'center',
-            xtype : 'fieldset',
-            items:[
-              new Ext.form.TextArea({
-                name       : 'license',
-                readOnly   : true,
-                width      : 600,
-                height     : 330,
-                style      : 'font-size:13px',
-                value      : licenseTxt
-              }),
-              new Ext.form.Checkbox({
-                boxLabel   : 'I agree',
-                id : 'agreeCheckbox',
-                handler: function() {
-                  wizard.onClientValidation(2, this.getValue());
+                wizard.onClientValidation(1,
+                    response.pathConfig.result &&
+                    response.pathLanguages.result &&
+                    response.pathPlugins.result &&
+                    response.pathXmlforms.result &&
+                    response.pathPublic.result &&
+                    response.pathShared.result &&
+                    response.pathLogFile.result &&
+                    response.pathTranslations.result &&
+                    response.pathTranslationsMafe.result
+                );
+
+                wizard.showLoadMask(false);
+
+                permissionInfo.error1 = response.noWritableFiles
+
+                //type = response.success ? 'success' : _('ID_WARNING');
+                if (!response.success)
+                    PMExt.error(_('ID_WARNING'), response.notify + ' <a href="#" onclick="showPermissionInfo(1); return false;">Show non-writable files.</a>');
+
+            },
+            failure: function () {
+            },
+            params: {
+                'pathConfig': Ext.getCmp('pathConfig').getValue(),
+                'pathLanguages': Ext.getCmp('pathLanguages').getValue(),
+                'pathPlugins': Ext.getCmp('pathPlugins').getValue(),
+                'pathXmlforms': Ext.getCmp('pathXmlforms').getValue(),
+                'pathShared': Ext.getCmp('pathShared').getValue(),
+                'pathLogFile': Ext.getCmp('pathLogFile').getValue(),
+                'pathPublic': Ext.getCmp('pathPublic').getValue(),
+                'pathTranslations': Ext.getCmp('pathTranslations').getValue(),
+                'pathTranslationsMafe': Ext.getCmp('pathTranslationsMafe').getValue()
+            }
+        });
+    }
+
+    function checkLicenseAgree() {
+        //wizard.onClientValidation(2, Ext.getCmp('agreeCheckbox').checked);
+        wizard.onClientValidation(2, false);
+    }
+
+    function ckeckDBEnginesValuesLoaded() {
+        wizard.showLoadMask(true);
+        if (Ext.getCmp('db_engine').store.getCount() == 0) {
+            Ext.getCmp('db_engine').store.load();
+        } else {
+            testConnection();
+        }
+    }
+
+    // test database Connection
+    function testConnection() {
+        wizard.showLoadMask(true);
+        if ((Ext.getCmp('db_engine').getValue() == '') || !Ext.getCmp('db_hostname').isValid() || !Ext.getCmp('db_username').isValid()) {
+            wizard.onClientValidation(3, false);
+            wizard.showLoadMask(false);
+            return false;
+        }
+        Ext.Ajax.request({
+            url: 'testConnection',
+            success: function (response) {
+                var response = Ext.util.JSON.decode(response.responseText);
+                Ext.getCmp('db_message').setValue(getFieldOutput(response.message, response.result));
+
+                if (!response.result)
+                    PMExt.notify(_('ID_WARNING'), response.message, _('ID_WARNING'));
+
+                wizard.onClientValidation(3, response.result);
+                wizard.showLoadMask(false);
+            },
+            failure: function () {
+            },
+            params: {
+                'db_engine': Ext.getCmp('db_engine').getValue(),
+                'db_hostname': Ext.getCmp('db_hostname').getValue(),
+                'db_username': Ext.getCmp('db_username').getValue(),
+                'db_password': Ext.getCmp('db_password').getValue(),
+                'db_port': Ext.getCmp('db_port').getValue()
+            }
+        });
+    }
+
+    function checkWorkspaceConfiguration() {
+        var canInstall = false;
+        if (!Ext.getCmp('workspace').isValid()) {
+            Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_VALID_WORKSPACE'), false));
+            wizard.onClientValidation(4, false);
+            return;
+        }
+        if (!Ext.getCmp('adminUsername').isValid()) {
+            Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_VALID_ADMIN_NAME'), false));
+            wizard.onClientValidation(4, false);
+            return;
+        }
+        if (Ext.getCmp('adminPassword').getValue() == '') {
+            Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_VALID_ADMIN_PASSWORD'), false));
+            wizard.onClientValidation(4, false);
+            return;
+        }
+        if (Ext.getCmp('adminPassword').getValue() != Ext.getCmp('confirmPassword').getValue()) {
+            Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_PASSWORD_CONFIRMATION_INCORRECT'), false));
+            wizard.onClientValidation(4, false);
+            return;
+        }
+        if (!Ext.getCmp('wfDatabase').isValid()) {
+            Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_WORKFLOW_DATABASE_NAME'), false));
+            wizard.onClientValidation(4, false);
+            return;
+        }
+        checkDatabases();
+    }
+
+    function checkDatabases() {
+        wizard.showLoadMask(true);
+        Ext.Ajax.request({
+            url: 'checkDatabases',
+            success: function (response) {
+                var existMsg = '<span style="color: red;">' + _('ID_NOT_AVAILABLE_DATABASE') + '</span>';
+                var noExistsMsg = '<span style="color: green;">' + _('ID_AVAILABLE_DATABASE') + '</span>';
+                var response = Ext.util.JSON.decode(response.responseText);
+                Ext.get('database_message').dom.innerHTML = (response.wfDatabaseExists ? existMsg : noExistsMsg);
+
+                var dbFlag = ((!response.wfDatabaseExists) || Ext.getCmp('deleteDB').getValue());
+                wizard.onClientValidation(4, dbFlag);
+
+                if (dbFlag) {
+                    Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_DATA_CORRECT'), true));
                 }
-              })
-            ]
-          }
-        ]
-      }
-    ],
-    listeners: {
-      show: function() {
-        setTimeout(function(){
-          var iAgree = Ext.getCmp('agreeCheckbox').getValue();
-
-          wizard.onClientValidation(2, iAgree);
-        }, 100);
-      }
+                else {
+                    Ext.getCmp('finish_message').setValue(getFieldOutput(_('ID_NOT_PASSED'), false));
+                    PMExt.notify(_('ID_WARNING'), response.errMessage, _('ID_WARNING'), 4)
+                }
+                wizard.showLoadMask(false);
+            },
+            failure: function () {
+            },
+            params: {
+                'db_engine': Ext.getCmp('db_engine').getValue(),
+                'db_hostname': Ext.getCmp('db_hostname').getValue(),
+                'db_username': Ext.getCmp('db_username').getValue(),
+                'db_password': Ext.getCmp('db_password').getValue(),
+                'db_port': Ext.getCmp('db_port').getValue(),
+                'wfDatabase': Ext.getCmp('wfDatabase').getValue()
+            }
+        });
     }
 
-  });
+
+    var setIndex = 0;
+
+    steps[setIndex++] = new Ext.ux.Wiz.Card({
+        title: _('ID_PREINSTALLATION'),
+        monitorValid: false,
+        labelAlign: 'left',
+        labelWidth: 200,
+        defaults: {},
+        items: [
+            {
+                border: false,
+                html: _('ID_PREINSTALLATION'),
+                bodyStyle: 'background:none;padding-top:0px;padding-bottom:5px;font-weight:bold;font-size:1.3em;'
+            },
+            {
+                xtype: 'panel',
+                layout: 'border',
+                height: 380,
+                items: [
+                    {
+                        region: 'west',
+                        width: 250,
+                        bodyStyle: 'padding:10px;font-size:1.2em;',
+                        html: _('ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION')
+                    },
+
+                    {
+                        region: 'center',
+                        xtype: 'fieldset',
+                        labelWidth: 200,
+                        autoScroll: true,
+                        items: [
+                            {
+                                xtype: 'displayfield',
+                                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_PHP'),
+                                id: 'php'
+                            },
+                            {
+                                xtype: 'displayfield',
+                                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_MYSQL'),
+                                id: 'mysql'
+                            },
+                            {
+                                xtype: 'displayfield',
+                                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_CURL'),
+                                id: 'curl'
+                            },
+                            {
+                                xtype: 'displayfield',
+                                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_OPENSSL'),
+                                id: 'openssl'
+                            },
+                            {
+                                xtype: 'displayfield',
+                                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_DOMXML'),
+                                id: 'dom'
+                            },
+                            {
+                                xtype: 'displayfield',
+                                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_GD'),
+                                id: 'gd'
+                            },
+                            {
+                                xtype: 'displayfield',
+                                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_MULTIBYTESTRING'),
+                                id: 'multibyte'
+                            },
+                            {
+                                xtype: 'displayfield',
+                                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_SOAP'),
+                                id: 'soap'
+                            },
+                            {
+                                xtype: "displayfield",
+                                id: "mcrypt",
+                                fieldLabel: _("ID_MCRYPT_SUPPORT")
+                            },
+                            {
+                                xtype: 'displayfield',
+                                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_LDAP'),
+                                id: 'ldap'
+                            },
+                            {
+                                xtype: 'displayfield',
+                                fieldLabel: _('ID_PROCESSMAKER_REQUIREMENTS_MEMORYLIMIT'),
+                                id: 'memory',
+                                value: '5.0 or greater'
+                            },
+                            new Ext.Button({
+                                text: _('ID_CHECK_AGAIN'),
+                                handler: getSystemInfo,
+                                scope: this
+                            })
+                        ]
+                    }
+                ]
+            }
+        ],
+        listeners: {
+            show: getSystemInfo
+        }
+    });
+
+    // third card with Directory File Permission
+    steps[setIndex++] = new Ext.ux.Wiz.Card({
+        title: _('ID_DIRECTORY_FILE_PERMISSION'),
+        monitorValid: false,
+        labelAlign: 'left',
+        labelWidth: 200,
+        defaults: {
+            //labelStyle : 'font-size:11px'
+        },
+        items: [
+            {
+                border: false,
+                html: _('ID_DIRECTORY_FILE_PERMISSION'),
+                bodyStyle: 'background:none;padding-top:0px;padding-bottom:5px;font-weight:bold;font-size:1.3em;'
+            },
+            {
+                xtype: 'panel',
+                layout: 'border',
+                height: 380,
+                items: [
+                    {
+                        region: 'north',
+                        height: 55,
+                        bodyStyle: 'padding:10px;font-size:1.2em;',
+                        html: _('ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP3_1')
+                    },
+                    {
+                        region: 'center',
+                        xtype: 'fieldset',
+                        alignField: 'left',
+                        bodyStyle: 'padding-left:40px;font-size:12;',
+                        labelWidth: 180,
+                        items: [
+                            {
+                                xtype: 'textfield',
+                                fieldLabel: '<span id="pathConfigSpan"></span> ' + _('ID_CONFIG_DIRECTORY'),
+                                id: 'pathConfig',
+                                width: 430,
+                                value: path_config,
+                                disabled: true
+                            },
+                            {
+                                xtype: 'textfield',
+                                fieldLabel: '<span id="pathLanguagesSpan"></span> ' + _('ID_LANGUAJE_DIRECTORY'),
+                                id: 'pathLanguages',
+                                width: 430,
+                                value: path_languages,
+                                disabled: true
+                            },
+                            {
+                                xtype: 'textfield',
+                                fieldLabel: '<span id="pathPluginsSpan"></span> ' + _('ID_PLUGINS_DIRECTORY'),
+                                id: 'pathPlugins',
+                                width: 430,
+                                value: path_plugins,
+                                disabled: true
+                            },
+                            {
+                                xtype: 'textfield',
+                                fieldLabel: '<span id="pathXmlformsSpan"></span> ' + _('ID_XMLFROM_DIRECTORY'),
+                                id: 'pathXmlforms',
+                                width: 430,
+                                value: path_xmlforms,
+                                disabled: true
+                            },
+                            {
+                                xtype: 'textfield',
+                                fieldLabel: '<span id="pathPublicSpan"></span> ' + _('ID_PUBLIC_INDEX_FILE'),
+                                id: 'pathPublic',
+                                width: 430,
+                                value: path_public,
+                                disabled: true
+                            },
+                            {
+                                xtype: 'textfield',
+                                fieldLabel: '<span id="pathTranslationsSpan"></span> ' + _('ID_TRANSLATIONS_DIRECTORY'),
+                                id: 'pathTranslations',
+                                width: 430,
+                                value: path_translations,
+                                disabled: true
+                            },
+                            {
+                                xtype: 'textfield',
+                                fieldLabel: '<span id="pathTranslationsMafeSpan"></span> ' + _('ID_MAFE_TRANSLATION_DIRECTORY'),
+                                id: 'pathTranslationsMafe',
+                                width: 430,
+                                value: path_translationsMafe,
+                                disabled: true
+                            },
+                            {
+                                xtype: 'textfield',
+                                fieldLabel: '<span id="pathSharedSpan"></span> ' + _('ID_WORFLOW_DATA_DIRECTORY'),
+                                id: 'pathShared',
+                                width: 430,
+                                value: path_shared,
+                                enableKeyEvents: true,
+                                allowBlank: false,
+                                blankText: _('ID_WORKFLOW_DATA_DIRECTORY_REQUIRED'),
+                                selectOnFocus: true,
+                                msgTarget: 'side',
+                                listeners: {
+                                    keyup: function () {
+                                        wizard.onClientValidation(2, false);
+                                        if (Ext.getCmp('pathShared').getValue().substr(-1, 1) != path_sep) {
+                                            Ext.getCmp('pathLogFile').setValue(Ext.getCmp('pathShared').getValue() + path_sep + 'log' + path_sep + 'install.log');
+                                        }
+                                        else {
+                                            Ext.getCmp('pathLogFile').setValue(Ext.getCmp('pathShared').getValue() + 'log' + path_sep + 'install.log');
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                xtype: 'textfield',
+                                fieldLabel: '<span id="pathLogFileSpan"></span> ' + _('ID_INSTALLATION_FILE_LOG'),
+                                id: 'pathLogFile',
+                                width: 430,
+                                value: path_shared + 'log' + path_sep + 'install.log',
+                                disabled: true
+                            },
+                            new Ext.Button({
+                                text: _('ID_CHECK_AGAIN'),
+                                handler: getPermissionInfo,
+                                scope: this
+                            })
+                        ]
+                    }
+                ]
+            }
+        ],
+        listeners: {
+            show: getPermissionInfo
+        }
+
+    });
+
+
+    // third card with input field email-address
+    steps[setIndex++] = new Ext.ux.Wiz.Card({
+        title: _('ID_PROCESSMAKER_LICENSE'),
+        //monitorValid : false,
+        defaults: {
+            labelStyle: 'font-size:12px'
+        },
+        items: [
+            {
+                border: false,
+                html: _('ID_PROCESSMAKER_LICENSE'),
+                bodyStyle: 'background:none;padding-top:0px;padding-bottom:5px;font-weight:bold;font-size:1.3em;'
+            },
+            {
+                xtype: 'panel',
+                layout: 'border',
+                height: 380,
+                items: [
+                    {
+                        region: 'center',
+                        xtype: 'fieldset',
+                        items: [
+                            new Ext.form.TextArea({
+                                name: 'license',
+                                readOnly: true,
+                                width: 600,
+                                height: 330,
+                                style: 'font-size:13px',
+                                value: licenseTxt
+                            }),
+                            new Ext.form.Checkbox({
+                                boxLabel: 'I agree',
+                                id: 'agreeCheckbox',
+                                handler: function () {
+                                    wizard.onClientValidation(2, this.getValue());
+                                }
+                            })
+                        ]
+                    }
+                ]
+            }
+        ],
+        listeners: {
+            show: function () {
+                setTimeout(function () {
+                    var iAgree = Ext.getCmp('agreeCheckbox').getValue();
+
+                    wizard.onClientValidation(2, iAgree);
+                }, 100);
+            }
+        }
+
+    });
 
 // fourth card Database Configuration
-  steps[setIndex++] = new Ext.ux.Wiz.Card({
-    title        : _('ID_DATABASE_CONFIGURATION'),
-    monitorValid : false,
-    items : [
-      {
-        border    : false,
-        html      : _('ID_DATABASE_CONFIGURATION'),
-        bodyStyle : 'background:none;padding-top:0px;padding-bottom:5px;font-weight:bold;font-size:1.3em;'
-      },
-      {
-        xtype:'panel',
-        layout:'border',
-        height: 380,
-        items:[
-          {
-            region: 'west',
-            width: 200,
-            bodyStyle : 'padding:10px;font-size:1.2em;',
-            html: _('ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_1')
-          },
-          {
-            region: 'center',
-            xtype : 'panel',
-            bodyStyle : 'background:none;padding-left:20px;padding-right:20px;padding-top:20px;padding-bottom:20px;font-size:1.2em;',
-            items:[
-              {
-                xtype:'fieldset',
-                labelAlign: 'left',
-                labelWidth: 160,
-                items:[
-                  new Ext.form.ComboBox({
-                    fieldLabel: _('ID_DATABASE_ENGINE'),
-                    width : 200,
-                    store : storeDatabase,
-                    displayField : 'label',
-                    valueField   : 'id',
-                    mode         : 'local',
-                    editable : false,
-                    forceSelection: true,
-                    allowBlank: false,
-                    triggerAction: 'all',
-                    id: 'db_engine',
-                    selectOnFocus : true,
-                    listeners: {select: function() {
-                      if (this.value == 'mysql') {
-                        Ext.getCmp('db_port').setValue('3306');
-                        Ext.getCmp('db_username').setValue('root');
-                      }
-                      else {
-                        Ext.getCmp('db_port').setValue('1433');
-                        Ext.getCmp('db_username').setValue('sa');
-                      }
-                      wizard.onClientValidation(3, false);
-                    }}
-                  }),
-                  {
-                    xtype     : 'textfield',
-                    fieldLabel: _('ID_HOST_NAME_LABEL'),
-                    width : 180,
-                    id: 'db_hostname',
-                    value :'localhost',
-                    allowBlank : false,
-                    validator  : function(v){
-                        var t = /^[0-9\.a-zA-Z_\-]+$/;
-                        return t.test(v);
+    steps[setIndex++] = new Ext.ux.Wiz.Card({
+        title: _('ID_DATABASE_CONFIGURATION'),
+        monitorValid: false,
+        items: [
+            {
+                border: false,
+                html: _('ID_DATABASE_CONFIGURATION'),
+                bodyStyle: 'background:none;padding-top:0px;padding-bottom:5px;font-weight:bold;font-size:1.3em;'
+            },
+            {
+                xtype: 'panel',
+                layout: 'border',
+                height: 380,
+                items: [
+                    {
+                        region: 'west',
+                        width: 200,
+                        bodyStyle: 'padding:10px;font-size:1.2em;',
+                        html: _('ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_1')
                     },
-                    listeners: {change: function() {
-                      wizard.onClientValidation(3, false);
-                    }}
-                  },
-                  {
-                    xtype     : 'textfield',
-                    fieldLabel: _('ID_PORT'),
-                    width : 180,
-                    id: 'db_port',
-                    value :'',
-                    allowBlank : false,
-                    validator  : function(v){
-                        var t = /^[0-9]+$/;
-                        return t.test(v);
-                    },
-                    listeners: {change: function() {
-                      wizard.onClientValidation(3, false);
-                    }}
-                  },
-                  {
-                    xtype     : 'textfield',
-                    fieldLabel: _('ID_USERNAME'),
-                    width : 180,
-                    id: 'db_username',
-                    value :'root',
-                    allowBlank : false,
-                    validator  : function(v){
-                        var t = /^[.a-zA-Z_\-]+$/;
-                        return t.test(v);
-                    },
-                    listeners: {change: function() {
-                      wizard.onClientValidation(3, false);
-                    }}
-                  },
-                  {
-                    xtype     : 'textfield',
-                    fieldLabel: _('ID_PASSWORD'),
-                    inputType : 'password',
-                    value     : '',
-                    width : 180,
-                    id: 'db_password',
-                    allowBlank : true,
-                    listeners: {change: function() {
-                      wizard.onClientValidation(3, false);
-                    }}
-                  },
-                  {
-                    xtype     : 'displayfield',
-                    //fieldLabel: ',
-                    id  : 'db_message'
-                  },
-                  new Ext.Button({
-                    text : _('ID_TEST_CONNECTION'),
-                    handler  : testConnection,
-                    scope    : this
-                  })
-                ]
-              }
-            ]
-          }
-        ]
-      }
-    ],
-    listeners: {
-      show: ckeckDBEnginesValuesLoaded
-    }
-  });
+                    {
+                        region: 'center',
+                        xtype: 'panel',
+                        bodyStyle: 'background:none;padding-left:20px;padding-right:20px;padding-top:20px;padding-bottom:20px;font-size:1.2em;',
+                        items: [
+                            {
+                                xtype: 'fieldset',
+                                labelAlign: 'left',
+                                labelWidth: 160,
+                                items: [
+                                    new Ext.form.ComboBox({
+                                        fieldLabel: _('ID_DATABASE_ENGINE'),
+                                        width: 200,
+                                        store: storeDatabase,
+                                        displayField: 'label',
+                                        valueField: 'id',
+                                        mode: 'local',
+                                        editable: false,
+                                        forceSelection: true,
+                                        allowBlank: false,
+                                        triggerAction: 'all',
+                                        id: 'db_engine',
+                                        selectOnFocus: true,
+                                        listeners: {
+                                            select: function () {
+                                                selectDbEngine(this.value);
 
-
-  steps[setIndex++] = new Ext.ux.Wiz.Card({
-    title        : _('ID_WORKSPACE_CONFIGURATION'),
-    monitorValid : false,
-    defaults     : {
-      labelStyle : 'font-size:11px'
-    },
-    items : [
-      {
-        border    : false,
-        html      : _('ID_WORKSPACE_CONFIGURATION'),
-        bodyStyle : 'background:none;padding-top:0px;padding-bottom:5px;font-weight:bold;font-size:1.3em;'
-      },
-      {
-        xtype:'panel',
-        layout:'border',
-        height: 380,
-        items:[
-          {
-            region: 'west',
-            width: 200,
-            bodyStyle : 'padding:10px;font-size:1.2em;',
-            html: _('ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5')
-          },
-          {
-            region: 'center',
-            xtype : 'panel',
-            bodyStyle : 'background:none;padding-left:20px;padding-right:20px;padding-top:20px;padding-bottom:20px;font-size:1.2em;',
-            autoScroll: true,
-            items:[
-              {
-                xtype:'fieldset',
-                //labelAlign: 'right',
-                labelWidth: 210,
-                items:[
-                  {
-                    xtype     : 'textfield',
-                    fieldLabel: _('ID_WORKSPACE_NAME'),
-                    value  :'workflow',
-                    maxLength: 29,
-                    validator  : function(v){
-                        var t = /^[a-zA-Z_0-9]+$/;
-                        return t.test(v);
-                    },
-                    id : 'workspace',
-                    enableKeyEvents: true,
-                    listeners: {keyup: function() {
-                      wizard.onClientValidation(4, false);
-                      if (!Ext.getCmp('changeDBNames').getValue()) {
-                        Ext.getCmp('wfDatabase').setValue('wf_' + this.getValue());
-                      }
-                    }}
-                  },
-                  {
-                    xtype     : 'textfield',
-                    fieldLabel: _('ID_ADMIN_USERNAME'),
-                    value  :'admin',
-                    validator  : function(v){
-                        var t = /^[a-zA-Z_0-9.@-]+$/;
-                        return t.test(v);
-                    },
-                    id : 'adminUsername',
-                    enableKeyEvents: true,
-                    listeners: {keyup: function() {
-                      wizard.onClientValidation(4, false);
-                    }}
-                  },
-                  {
-                    xtype     : 'textfield',
-                    fieldLabel: _('ID_ADMIN_PASSWORD_LABEL'),
-                    inputType : 'password',
-                    id: 'adminPassword',
-                    enableKeyEvents: true,
-                    allowBlank: false,
-                    validator: function (v) {
-                        v = v.trim();
-                        return !/^\s+$/.test(v);
-                    },
-                    listeners: {keyup: function() {
-                      wizard.onClientValidation(4, false);
-                    }}
-                  },
-                  {
-                    xtype     : 'textfield',
-                    fieldLabel: _('ID_ADMIN_PASSWORD'),
-                    inputType : 'password',
-                    id : 'confirmPassword',
-                    enableKeyEvents: true,
-                    allowBlank: false,
-                    validator: function (v) {
-                        v = v.trim();
-                        return !/^\s+$/.test(v.trim());
-                    },
-                    listeners: {keyup: function() {
-                      wizard.onClientValidation(4, false);
-                    }}
-                  }
-                ]
-              },
-              {
-                xtype     : 'fieldset',
-                labelAlign: 'left',
-                labelWidth: 210,
-                //labelWidth: 200,
-                //title: 'ProcessMaker Databases',
-                items:[
-                 new Ext.form.Checkbox({
-                   boxLabel: _('ID_CHANGE_DATABASE_NAME'),
-                   id : 'changeDBNames',
-                   handler: function() {
-                     if (this.getValue()) {
-                       Ext.getCmp('wfDatabase').enable();
-                       Ext.getCmp('wfDatabase').validate();
-                    } else {
-                       Ext.getCmp('wfDatabase').setValue('wf_' + Ext.getCmp('workspace').getValue());
-                       Ext.getCmp('wfDatabase').disable();
-                     }
-                     wizard.onClientValidation(4, false);
-                   }
-                 }),
-                 {
-                    xtype     : 'textfield',
-                    fieldLabel: _('ID_WF_DATABASE_NAME'),
-                    id : 'wfDatabase',
-                    value  :'wf_workflow',
-                    allowBlank : false,
-                    maxLength: 32,
-                    validator  : function(v){
-                        var t = /^[a-zA-Z_0-9]+$/;
-                        return t.test(v);
-                    },
-                    disabled: true,
-                    enableKeyEvents: true,
-                    listeners: {keyup: function() {
-                      wizard.onClientValidation(4, false);
-                    }}
-                  },
-                  {
-                    xtype     : 'displayfield',
-                    id  : 'database_message'
-                  },
-                  new Ext.form.Checkbox({
-                    boxLabel   : _('ID_DELETE_DATABASES'),
-                    id : 'deleteDB',
-                    handler: function() {
-                      wizard.onClientValidation(4, false);
+                                                wizard.onClientValidation(3, false);
+                                            }
+                                        }
+                                    }),
+                                    {
+                                        xtype: 'textfield',
+                                        fieldLabel: _('ID_HOST_NAME_LABEL'),
+                                        width: 180,
+                                        id: 'db_hostname',
+                                        value: 'localhost',
+                                        allowBlank: false,
+                                        validator: function (v) {
+                                            var t = /^[0-9\.a-zA-Z_\-]+$/;
+                                            return t.test(v);
+                                        },
+                                        listeners: {
+                                            change: function () {
+                                                wizard.onClientValidation(3, false);
+                                            }
+                                        }
+                                    },
+                                    {
+                                        xtype: 'textfield',
+                                        fieldLabel: _('ID_PORT'),
+                                        width: 180,
+                                        id: 'db_port',
+                                        value: '',
+                                        allowBlank: false,
+                                        validator: function (v) {
+                                            var t = /^[0-9]+$/;
+                                            return t.test(v);
+                                        },
+                                        listeners: {
+                                            change: function () {
+                                                wizard.onClientValidation(3, false);
+                                            }
+                                        }
+                                    },
+                                    {
+                                        xtype: 'textfield',
+                                        fieldLabel: _('ID_USERNAME'),
+                                        width: 180,
+                                        id: 'db_username',
+                                        value: 'root',
+                                        allowBlank: false,
+                                        validator: function (v) {
+                                            var t = /^[.a-zA-Z_\-]+$/;
+                                            return t.test(v);
+                                        },
+                                        listeners: {
+                                            change: function () {
+                                                wizard.onClientValidation(3, false);
+                                            }
+                                        }
+                                    },
+                                    {
+                                        xtype: 'textfield',
+                                        fieldLabel: _('ID_PASSWORD'),
+                                        inputType: 'password',
+                                        value: '',
+                                        width: 180,
+                                        id: 'db_password',
+                                        allowBlank: true,
+                                        listeners: {
+                                            change: function () {
+                                                wizard.onClientValidation(3, false);
+                                            }
+                                        }
+                                    },
+                                    {
+                                        xtype: 'displayfield',
+                                        //fieldLabel: ',
+                                        id: 'db_message'
+                                    },
+                                    new Ext.Button({
+                                        text: _('ID_TEST_CONNECTION'),
+                                        handler: testConnection,
+                                        scope: this
+                                    })
+                                ]
+                            }
+                        ]
                     }
-                  }),
-                    new Ext.form.Checkbox({
-                        boxLabel: _('ID_INSTALL_USE_CURRENT_USER'),
-                        id : 'createUserLogged',
-                        handler: function() {
-                            wizard.onClientValidation(4, false);
-                        }
-                    }),
-                  {
-                    xtype     : 'displayfield',
-                    id  : 'finish_message'
-                  },
-                  new Ext.Button({
-                    id: 'checkWSConfiguration',
-                    text: _('ID_CHECK_WORKSPACE_CONFIGURATION'),
-                    handler: checkWorkspaceConfiguration,
-                    scope: this
-                  })
                 ]
-              }
-            ]
-          }
-        ]
-      }
-    ],
-    listeners: {
-      show: function () {
-        setTimeout(function () {
-          wizard.onClientValidation(4, false);
-          checkWorkspaceConfiguration();
-        }, 100);
-      }
-    }
-  });
+            }
+        ],
+        listeners: {
+            show: ckeckDBEnginesValuesLoaded
+        }
+    });
+
+
+    steps[setIndex++] = new Ext.ux.Wiz.Card({
+        title: _('ID_WORKSPACE_CONFIGURATION'),
+        monitorValid: false,
+        defaults: {
+            labelStyle: 'font-size:11px'
+        },
+        items: [
+            {
+                border: false,
+                html: _('ID_WORKSPACE_CONFIGURATION'),
+                bodyStyle: 'background:none;padding-top:0px;padding-bottom:5px;font-weight:bold;font-size:1.3em;'
+            },
+            {
+                xtype: 'panel',
+                layout: 'border',
+                height: 380,
+                items: [
+                    {
+                        region: 'west',
+                        width: 200,
+                        bodyStyle: 'padding:10px;font-size:1.2em;',
+                        html: _('ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5')
+                    },
+                    {
+                        region: 'center',
+                        xtype: 'panel',
+                        bodyStyle: 'background:none;padding-left:20px;padding-right:20px;padding-top:20px;padding-bottom:20px;font-size:1.2em;',
+                        autoScroll: true,
+                        items: [
+                            {
+                                xtype: 'fieldset',
+                                //labelAlign: 'right',
+                                labelWidth: 210,
+                                items: [
+                                    {
+                                        xtype: 'textfield',
+                                        fieldLabel: _('ID_WORKSPACE_NAME'),
+                                        value: 'workflow',
+                                        maxLength: 29,
+                                        validator: function (v) {
+                                            var t = /^[a-zA-Z_0-9]+$/;
+                                            return t.test(v);
+                                        },
+                                        id: 'workspace',
+                                        enableKeyEvents: true,
+                                        listeners: {
+                                            keyup: function () {
+                                                wizard.onClientValidation(4, false);
+                                                if (!Ext.getCmp('changeDBNames').getValue()) {
+                                                    Ext.getCmp('wfDatabase').setValue('wf_' + this.getValue());
+                                                }
+                                            }
+                                        }
+                                    },
+                                    {
+                                        xtype: 'textfield',
+                                        fieldLabel: _('ID_ADMIN_USERNAME'),
+                                        value: 'admin',
+                                        validator: function (v) {
+                                            var t = /^[a-zA-Z_0-9.@-]+$/;
+                                            return t.test(v);
+                                        },
+                                        id: 'adminUsername',
+                                        enableKeyEvents: true,
+                                        listeners: {
+                                            keyup: function () {
+                                                wizard.onClientValidation(4, false);
+                                            }
+                                        }
+                                    },
+                                    {
+                                        xtype: 'textfield',
+                                        fieldLabel: _('ID_ADMIN_PASSWORD_LABEL'),
+                                        inputType: 'password',
+                                        id: 'adminPassword',
+                                        enableKeyEvents: true,
+                                        allowBlank: false,
+                                        validator: function (v) {
+                                            v = v.trim();
+                                            return !/^\s+$/.test(v);
+                                        },
+                                        listeners: {
+                                            keyup: function () {
+                                                wizard.onClientValidation(4, false);
+                                            }
+                                        }
+                                    },
+                                    {
+                                        xtype: 'textfield',
+                                        fieldLabel: _('ID_ADMIN_PASSWORD'),
+                                        inputType: 'password',
+                                        id: 'confirmPassword',
+                                        enableKeyEvents: true,
+                                        allowBlank: false,
+                                        validator: function (v) {
+                                            v = v.trim();
+                                            return !/^\s+$/.test(v.trim());
+                                        },
+                                        listeners: {
+                                            keyup: function () {
+                                                wizard.onClientValidation(4, false);
+                                            }
+                                        }
+                                    }
+                                ]
+                            },
+                            {
+                                xtype: 'fieldset',
+                                labelAlign: 'left',
+                                labelWidth: 210,
+                                //labelWidth: 200,
+                                //title: 'ProcessMaker Databases',
+                                items: [
+                                    new Ext.form.Checkbox({
+                                        boxLabel: _('ID_CHANGE_DATABASE_NAME'),
+                                        id: 'changeDBNames',
+                                        handler: function () {
+                                            if (this.getValue()) {
+                                                Ext.getCmp('wfDatabase').enable();
+                                                Ext.getCmp('wfDatabase').validate();
+                                            } else {
+                                                Ext.getCmp('wfDatabase').setValue('wf_' + Ext.getCmp('workspace').getValue());
+                                                Ext.getCmp('wfDatabase').disable();
+                                            }
+                                            wizard.onClientValidation(4, false);
+                                        }
+                                    }),
+                                    {
+                                        xtype: 'textfield',
+                                        fieldLabel: _('ID_WF_DATABASE_NAME'),
+                                        id: 'wfDatabase',
+                                        value: 'wf_workflow',
+                                        allowBlank: false,
+                                        maxLength: 32,
+                                        validator: function (v) {
+                                            var t = /^[a-zA-Z_0-9]+$/;
+                                            return t.test(v);
+                                        },
+                                        disabled: true,
+                                        enableKeyEvents: true,
+                                        listeners: {
+                                            keyup: function () {
+                                                wizard.onClientValidation(4, false);
+                                            }
+                                        }
+                                    },
+                                    {
+                                        xtype: 'displayfield',
+                                        id: 'database_message'
+                                    },
+                                    new Ext.form.Checkbox({
+                                        boxLabel: _('ID_DELETE_DATABASES'),
+                                        id: 'deleteDB',
+                                        handler: function () {
+                                            wizard.onClientValidation(4, false);
+                                        }
+                                    }),
+                                    new Ext.form.Checkbox({
+                                        boxLabel: _('ID_INSTALL_USE_CURRENT_USER'),
+                                        id: 'createUserLogged',
+                                        handler: function () {
+                                            wizard.onClientValidation(4, false);
+                                        }
+                                    }),
+                                    {
+                                        xtype: 'displayfield',
+                                        id: 'finish_message'
+                                    },
+                                    new Ext.Button({
+                                        id: 'checkWSConfiguration',
+                                        text: _('ID_CHECK_WORKSPACE_CONFIGURATION'),
+                                        handler: checkWorkspaceConfiguration,
+                                        scope: this
+                                    })
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        ],
+        listeners: {
+            show: function () {
+                setTimeout(function () {
+                    wizard.onClientValidation(4, false);
+                    checkWorkspaceConfiguration();
+                }, 100);
+            }
+        }
+    });
 
 });
 
 permissionInfo = {};
-function showPermissionInfo()
-{
-  var text = '';
 
-  for (i=0; i < permissionInfo.error1.length; i++) {
-    text += (i+1)+'. '+permissionInfo.error1[i] + "\n";
-  }
+function showPermissionInfo() {
+    var text = '';
 
-  w = new Ext.Window({
-    layout: 'fit',
-    title: _('ID_NON_WRITABLE_FILES'),
-    width: 550,
-    height: 180,
-    closable: true,
-    resizable: true,
-    //html: text,
-    plain: true,
-    items: [{
-      xtype: 'textarea',
-      id        : 'permissionInfoText',
-      fieldLabel: '',
-      anchor: "100%",
-      value: text,
-      readOnly: true
-    }],
-    bbar: new Ext.ux.StatusBar({
-      defaultText: '',
-      id: 'login-statusbar2',
-      statusAlign: 'right'
-    })
-  });
+    for (i = 0; i < permissionInfo.error1.length; i++) {
+        text += (i + 1) + '. ' + permissionInfo.error1[i] + "\n";
+    }
 
-  w.show();
+    w = new Ext.Window({
+        layout: 'fit',
+        title: _('ID_NON_WRITABLE_FILES'),
+        width: 550,
+        height: 180,
+        closable: true,
+        resizable: true,
+        //html: text,
+        plain: true,
+        items: [{
+            xtype: 'textarea',
+            id: 'permissionInfoText',
+            fieldLabel: '',
+            anchor: "100%",
+            value: text,
+            readOnly: true
+        }],
+        bbar: new Ext.ux.StatusBar({
+            defaultText: '',
+            id: 'login-statusbar2',
+            statusAlign: 'right'
+        })
+    });
+
+    w.show();
 }
\ No newline at end of file
diff --git a/workflow/engine/templates/roles/roles_AssignPermissions.php b/workflow/engine/templates/roles/roles_AssignPermissions.php
index 2a8f9c6c0..9909de43c 100644
--- a/workflow/engine/templates/roles/roles_AssignPermissions.php
+++ b/workflow/engine/templates/roles/roles_AssignPermissions.php
@@ -1,47 +1,47 @@
-<?php
-
-$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 = '
-<div class="boxTopBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-<div class="boxContentBlue">
-    <table width="100%" style="margin:0px;" cellspacing="0" cellpadding="0">
-        <tr>
-            <td class="userGroupTitle">' . G::LoadTranslation('ID_ASSIGN_THE_ROLE') . ': '.$roleCode.'</td>
-        </tr>
-    </table>
-</div>
-<div class="boxBottomBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-<div class="userGroupLink"><a href="#" onclick="backPermissions(\''.$_GET['ROL_UID'].'\');return false;">' . G::LoadTranslation('ID_BACK_PERMISSIONS_LIST').'</a></div>';
-
-$tree->showSign = false;
-
-$oDataset->next();
-while ($aRow = $oDataset->getRow()) {
-    $ID_ASSIGN = G::LoadTranslation('ID_ASSIGN');
-
-    $CODE = $aRow['PER_CODE'];
-    $UID = $aRow['PER_UID'];
-
-    $html = "
-        <table cellspacing='0' cellpadding='0' border='1' style='border:0px;'>
-            <tr>
-                <td width='250px' class='treeNode' style='border:0px;background-color:transparent;'>{$CODE}</td>	
-                <td class='treeNode' style='border:0px;background-color:transparent;'>[<a href=\"javascript:assignPermissionToRole('{$ROL_UID}','{$UID}');\">{$ID_ASSIGN}</a>]</td>
-            </tr>
-        </table>";
-
-    $ch = &$tree->addChild('', $html, array('nodeType' => 'child'));
-    $ch->point = '<img src="/images/users.png" />';
-
-    $oDataset->next();
-}
-
-print($tree->render());
+<?php
+
+$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 = '
+<div class="boxTopBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+<div class="boxContentBlue">
+    <table width="100%" style="margin:0px;" cellspacing="0" cellpadding="0">
+        <tr>
+            <td class="userGroupTitle">' . G::LoadTranslation('ID_ASSIGN_THE_ROLE') . ': '.$roleCode.'</td>
+        </tr>
+    </table>
+</div>
+<div class="boxBottomBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+<div class="userGroupLink"><a href="#" onclick="backPermissions(\''.$_GET['ROL_UID'].'\');return false;">' . G::LoadTranslation('ID_BACK_PERMISSIONS_LIST').'</a></div>';
+
+$tree->showSign = false;
+
+$oDataset->next();
+while ($aRow = $oDataset->getRow()) {
+    $ID_ASSIGN = G::LoadTranslation('ID_ASSIGN');
+
+    $CODE = $aRow['PER_CODE'];
+    $UID = $aRow['PER_UID'];
+
+    $html = "
+        <table cellspacing='0' cellpadding='0' border='1' style='border:0px;'>
+            <tr>
+                <td width='250px' class='treeNode' style='border:0px;background-color:transparent;'>{$CODE}</td>	
+                <td class='treeNode' style='border:0px;background-color:transparent;'>[<a href=\"javascript:assignPermissionToRole('{$ROL_UID}','{$UID}');\">{$ID_ASSIGN}</a>]</td>
+            </tr>
+        </table>";
+
+    $ch = $tree->addChild('', $html, array('nodeType' => 'child'));
+    $ch->point = '<img src="/images/users.png" />';
+
+    $oDataset->next();
+}
+
+print($tree->render());
diff --git a/workflow/engine/templates/roles/roles_AssignRole.php b/workflow/engine/templates/roles/roles_AssignRole.php
index 506de82d8..759fe81c1 100644
--- a/workflow/engine/templates/roles/roles_AssignRole.php
+++ b/workflow/engine/templates/roles/roles_AssignRole.php
@@ -38,7 +38,7 @@ while ($aRow = $oDataset->getRow()) {
             </tr>
         </table>";
 
-    $ch = &$tree->addChild('', $html, array('nodeType' => 'child'));
+    $ch = $tree->addChild('', $html, array('nodeType' => 'child'));
     $ch->point = '<img src="/images/users.png" />';
 
     $oDataset->next();
diff --git a/workflow/engine/templates/roles/roles_Tree.php b/workflow/engine/templates/roles/roles_Tree.php
index 2d949ef86..7a922357e 100644
--- a/workflow/engine/templates/roles/roles_Tree.php
+++ b/workflow/engine/templates/roles/roles_Tree.php
@@ -44,7 +44,7 @@ while ($aRow = $oDataset->getRow()) {
             </tr>
         </table>";
 
-    $ch = &$tree->addChild('', $html, array('nodeType' => 'child'));
+    $ch = $tree->addChild('', $html, array('nodeType' => 'child'));
     $ch->point = '<img src="/images/users.png" />';
 
     $oDataset->next();
diff --git a/workflow/engine/templates/roles/roles_permissionsTree.php b/workflow/engine/templates/roles/roles_permissionsTree.php
index 6fd42eb4a..d31ab6067 100644
--- a/workflow/engine/templates/roles/roles_permissionsTree.php
+++ b/workflow/engine/templates/roles/roles_permissionsTree.php
@@ -1,84 +1,84 @@
-<?php
-/**
- * groups_Tree.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- *
- */
-
-	/**
-	 * @Description This is the View of all groups from a determinated user
-	 * @author Erik Amaru Ortiz <erik@colosa.com>
-	 * @Date 24/04/2008
-	 * @LastModification none
-	 */
-
-	$ROL_UID = $_GET['ROL_UID'];
-	global $RBAC;
-	$oDataset = $RBAC->getRolePermissions($ROL_UID);
-	$roleCode = $RBAC->getRoleCode($ROL_UID);
-
-
-	$tree = new PmTree();
-	$tree->name = 'Users';
-	$tree->nodeType = "base";
-	$tree->width = "350px";
-	$tree->value = '
-	<div class="boxTopBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-	<div class="boxContentBlue">
-  		<table width="100%" style="margin:0px;" cellspacing="0" cellpadding="0">
-  			<tr>
-	  			<td class="userGroupTitle">' . G::LoadTranslation('ID_PERMISSIONS_FOR_THE_ROL') . ': '.$roleCode.'</td>
-  			</tr>
-		</table>
-	</div>
-	<div class="boxBottomBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-	<div class="userGroupLink"><a href="#" onclick="showPermissions(\''.$_GET['ROL_UID'].'\');return false;">'.G::LoadTranslation('ID_ASSIGN').'</a></div>';
-
-	$tree->showSign = false;
-
-	$oDataset->next();
-	while ($aRow = $oDataset->getRow()) {
-	    $ID_REMOVE = G::LoadTranslation('ID_REMOVE');
-
-	    $CODE = $aRow['PER_CODE'];
-	    $UID = $aRow['PER_UID'];
-	    if($ROL_UID != "00000000000000000000000000000002") { #because the admin remove permitions it doesn't posible
-			$refer = "<a href=\"javascript:deletePermissionRole('{$ROL_UID}','{$UID}');\">{$ID_REMOVE}</a>";
-		} else {
-			$refer = "<font color='#CFCFCF'>{$ID_REMOVE}</font>";
-		}
-
-	    $html = "
-	      <table cellspacing='0' cellpadding='0' border='1' style='border:0px;'>
-	        <tr>
-	          <td width='250px' class='treeNode' style='border:0px;background-color:transparent;'>{$CODE}</td>
-	          <td class='treeNode' style='border:0px;background-color:transparent;'>[$refer]</td>
-	        </tr>
-	      </table>";
-
-	    $ch = &$tree->addChild('', $html, array('nodeType' => 'child'));
-	    $ch->point = '<img src="/images/users.png" />';
-
-	    $oDataset->next();
-	}
-
-
-	print ($tree->render());
+<?php
+/**
+ * groups_Tree.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ *
+ */
+
+    /**
+     * @Description This is the View of all groups from a determinated user
+     * @author Erik Amaru Ortiz <erik@colosa.com>
+     * @Date 24/04/2008
+     * @LastModification none
+     */
+
+    $ROL_UID = $_GET['ROL_UID'];
+    global $RBAC;
+    $oDataset = $RBAC->getRolePermissions($ROL_UID);
+    $roleCode = $RBAC->getRoleCode($ROL_UID);
+
+
+    $tree = new PmTree();
+    $tree->name = 'Users';
+    $tree->nodeType = "base";
+    $tree->width = "350px";
+    $tree->value = '
+	<div class="boxTopBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+	<div class="boxContentBlue">
+  		<table width="100%" style="margin:0px;" cellspacing="0" cellpadding="0">
+  			<tr>
+	  			<td class="userGroupTitle">' . G::LoadTranslation('ID_PERMISSIONS_FOR_THE_ROL') . ': '.$roleCode.'</td>
+  			</tr>
+		</table>
+	</div>
+	<div class="boxBottomBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+	<div class="userGroupLink"><a href="#" onclick="showPermissions(\''.$_GET['ROL_UID'].'\');return false;">'.G::LoadTranslation('ID_ASSIGN').'</a></div>';
+
+    $tree->showSign = false;
+
+    $oDataset->next();
+    while ($aRow = $oDataset->getRow()) {
+        $ID_REMOVE = G::LoadTranslation('ID_REMOVE');
+
+        $CODE = $aRow['PER_CODE'];
+        $UID = $aRow['PER_UID'];
+        if ($ROL_UID != "00000000000000000000000000000002") { #because the admin remove permitions it doesn't posible
+            $refer = "<a href=\"javascript:deletePermissionRole('{$ROL_UID}','{$UID}');\">{$ID_REMOVE}</a>";
+        } else {
+            $refer = "<font color='#CFCFCF'>{$ID_REMOVE}</font>";
+        }
+
+        $html = "
+	      <table cellspacing='0' cellpadding='0' border='1' style='border:0px;'>
+	        <tr>
+	          <td width='250px' class='treeNode' style='border:0px;background-color:transparent;'>{$CODE}</td>
+	          <td class='treeNode' style='border:0px;background-color:transparent;'>[$refer]</td>
+	        </tr>
+	      </table>";
+
+        $ch = $tree->addChild('', $html, array('nodeType' => 'child'));
+        $ch->point = '<img src="/images/users.png" />';
+
+        $oDataset->next();
+    }
+
+
+    print($tree->render());
diff --git a/workflow/engine/templates/setup/webServicesTree.php b/workflow/engine/templates/setup/webServicesTree.php
index 6f2c78d69..064e4b5da 100644
--- a/workflow/engine/templates/setup/webServicesTree.php
+++ b/workflow/engine/templates/setup/webServicesTree.php
@@ -1,134 +1,133 @@
-<?php
-/**
- * groups_Tree.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- *
- * 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.
- *
- * 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.
- *
- */
-
-$wsSessionId = '';
-if (isset ( $_SESSION ['WS_SESSION_ID'] )) {
-    $wsSessionId = $_SESSION ['WS_SESSION_ID'];
-}
-
-if (isset ( $_GET ['x'] )) {
-    if ($_GET ['x'] == 1) {
-        $wsdl = $_SESSION ['END_POINT'];
-        $workspace = $_SESSION ['WS_WORKSPACE'];
-    } else {
-        $wsdl = '<font color="red">' . G::LoadTranslation ( 'ID_WSDL' ) . '</font>';
-        $workspace = '';
-    }
-} else {
-	if (! isset ( $_SESSION ['END_POINT'] )) {
-		$wsdl = 'http://' . $_SERVER ['HTTP_HOST'];
-		$workspace = config("system.workspace");
-	} else {
-		$wsdl = $_SESSION ['END_POINT'];
-		$workspace = $_SESSION ['WS_WORKSPACE'];
-	}
-}
-
-$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . config("system.workspace") . '/en/classic/services/wsdl2';
-
-$wsdl = isset ( $_SESSION ['END_POINT'] ) ? $_SESSION ['END_POINT'] : $defaultEndpoint;
-
-$tree = new PmTree ( );
-$tree->name = 'WebServices';
-$tree->nodeType = "base";
-$tree->contentWidth = "310";
-$tree->width = "280px";
-$tree->value = '
-     <div class="boxTopBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-     <div class="boxContentBlue">
-
-      <table width="100%" style="margin:0px;" cellspacing="0" cellpadding="0">
-      <tr>
-          <td class="userGroupTitle">' . G::loadTranslation ( "ID_WEB_SERVICES" ) . '</td>
-      </tr>
-    </table>
-    </div>
-    <div class="boxBottomBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-
-      <div class="userGroupLink">
-          <a href="#" onclick="showDetails();return false;">' . G::LoadTranslation ( 'ID_DETAILS_WEBSERVICES' ) .
-          '</a> &nbsp;
-          <a href="#" onclick="webServicesSetup();return false;">' . G::LoadTranslation ( 'ID_SETUP_WEBSERVICES' ) .
-          '</a>
-      </div>
-
-    ';
-
-$tree->showSign = false;
-
-$allWebservices = array ();
-$allWebservices [] = 'Login';
-$allWebservices [] = 'CreateUser';
-$allWebservices [] = 'AssignUserToGroup';
-$allWebservices [] = 'NewCase';
-$allWebservices [] = 'NewCaseImpersonate';
-$allWebservices [] = 'RouteCase';
-$allWebservices [] = 'SendVariables';
-$allWebservices [] = 'SendMessage';
-$allWebservices [] = 'ProcessList';
-$allWebservices [] = 'CaseList';
-$allWebservices [] = 'UnassignedCaseList';
-$allWebservices [] = 'RoleList';
-$allWebservices [] = 'GroupList';
-$allWebservices [] = 'UserList';
-$allWebservices [] = 'TaskList';
-$allWebservices [] = 'TriggerList';
-$allWebservices [] = 'InputDocumentList';
-$allWebservices [] = 'InputDocumentProcessList';
-$allWebservices [] = 'OutputDocumentList';
-$allWebservices [] = 'RemoveDocument';
-$allWebservices [] = 'TaskCase';
-$allWebservices [] = 'ReassignCase';
-$allWebservices [] = 'removeUserFromGroup';
-
-foreach ($allWebservices as $ws) {
-    $ID_TEST = G::LoadTranslation ( 'ID_TEST' );
-    $UID = htmlentities ( $ws );
-    $WS_TITLE = strip_tags ( $ws );
-
-    $htmlGroup = '';
-    $htmlGroup .= "<table cellspacing='0' cellpadding='0' border='1' style='border:0px;'>";
-    $htmlGroup .= "<tr>";
-    $htmlGroup .= "<td width='250px' class='treeNode' style='border:0px;background-color:transparent;'>";
-    $htmlGroup .= "{$WS_TITLE}</td>";
-    $htmlGroup .= "<td class='treeNode' style='border:0px;background-color:transparent;'>";
-
-    if ($WS_TITLE !='SendFiles') {
-        if ($WS_TITLE == 'Login' || $wsSessionId != '') {
-            $htmlGroup .= "[<a href='#' onclick=\"showFormWS('{$UID}');return false;\">{$ID_TEST}</a>]";
-        }
-    } else {
-        if (isset($_SESSION ['WS_SESSION_ID'])&&$_SESSION ['WS_SESSION_ID']!='') {
-            $htmlGroup .= "[<a href='#' onclick=\"showUploadFilesForm();return false;\">{$ID_TEST}</a>]";
-        }
-    }
-
-    $htmlGroup .= "</td></tr></table>";
-
-    $ch = & $tree->addChild ( $ws, $htmlGroup, array ('nodeType' => 'child' ) );
-    $ch->point = '<img src="/images/trigger.gif" />';
-}
-print ($tree->render ()) ;
-
+<?php
+/**
+ * groups_Tree.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ *
+ */
+
+$wsSessionId = '';
+if (isset ($_SESSION ['WS_SESSION_ID'])) {
+    $wsSessionId = $_SESSION ['WS_SESSION_ID'];
+}
+
+if (isset ($_GET ['x'])) {
+    if ($_GET ['x'] == 1) {
+        $wsdl = $_SESSION ['END_POINT'];
+        $workspace = $_SESSION ['WS_WORKSPACE'];
+    } else {
+        $wsdl = '<font color="red">' . G::LoadTranslation('ID_WSDL') . '</font>';
+        $workspace = '';
+    }
+} else {
+    if (!isset ($_SESSION ['END_POINT'])) {
+        $wsdl = 'http://' . $_SERVER ['HTTP_HOST'];
+        $workspace = config("system.workspace");
+    } else {
+        $wsdl = $_SESSION ['END_POINT'];
+        $workspace = $_SESSION ['WS_WORKSPACE'];
+    }
+}
+
+$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . config("system.workspace") . '/en/classic/services/wsdl2';
+
+$wsdl = isset ($_SESSION ['END_POINT']) ? $_SESSION ['END_POINT'] : $defaultEndpoint;
+
+$tree = new PmTree ();
+$tree->name = 'WebServices';
+$tree->nodeType = "base";
+$tree->contentWidth = "310";
+$tree->width = "280px";
+$tree->value = '
+     <div class="boxTopBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+     <div class="boxContentBlue">
+
+      <table width="100%" style="margin:0px;" cellspacing="0" cellpadding="0">
+      <tr>
+          <td class="userGroupTitle">' . G::loadTranslation("ID_WEB_SERVICES") . '</td>
+      </tr>
+    </table>
+    </div>
+    <div class="boxBottomBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+
+      <div class="userGroupLink">
+          <a href="#" onclick="showDetails();return false;">' . G::LoadTranslation('ID_DETAILS_WEBSERVICES') .
+    '</a> &nbsp;
+          <a href="#" onclick="webServicesSetup();return false;">' . G::LoadTranslation('ID_SETUP_WEBSERVICES') .
+    '</a>
+      </div>
+
+    ';
+
+$tree->showSign = false;
+
+$allWebservices = array();
+$allWebservices [] = 'Login';
+$allWebservices [] = 'CreateUser';
+$allWebservices [] = 'AssignUserToGroup';
+$allWebservices [] = 'NewCase';
+$allWebservices [] = 'NewCaseImpersonate';
+$allWebservices [] = 'RouteCase';
+$allWebservices [] = 'SendVariables';
+$allWebservices [] = 'SendMessage';
+$allWebservices [] = 'ProcessList';
+$allWebservices [] = 'CaseList';
+$allWebservices [] = 'UnassignedCaseList';
+$allWebservices [] = 'RoleList';
+$allWebservices [] = 'GroupList';
+$allWebservices [] = 'UserList';
+$allWebservices [] = 'TaskList';
+$allWebservices [] = 'TriggerList';
+$allWebservices [] = 'InputDocumentList';
+$allWebservices [] = 'InputDocumentProcessList';
+$allWebservices [] = 'OutputDocumentList';
+$allWebservices [] = 'RemoveDocument';
+$allWebservices [] = 'TaskCase';
+$allWebservices [] = 'ReassignCase';
+$allWebservices [] = 'removeUserFromGroup';
+
+foreach ($allWebservices as $ws) {
+    $ID_TEST = G::LoadTranslation('ID_TEST');
+    $UID = htmlentities($ws);
+    $WS_TITLE = strip_tags($ws);
+
+    $htmlGroup = '';
+    $htmlGroup .= "<table cellspacing='0' cellpadding='0' border='1' style='border:0px;'>";
+    $htmlGroup .= "<tr>";
+    $htmlGroup .= "<td width='250px' class='treeNode' style='border:0px;background-color:transparent;'>";
+    $htmlGroup .= "{$WS_TITLE}</td>";
+    $htmlGroup .= "<td class='treeNode' style='border:0px;background-color:transparent;'>";
+
+    if ($WS_TITLE != 'SendFiles') {
+        if ($WS_TITLE == 'Login' || $wsSessionId != '') {
+            $htmlGroup .= "[<a href='#' onclick=\"showFormWS('{$UID}');return false;\">{$ID_TEST}</a>]";
+        }
+    } else {
+        if (isset($_SESSION ['WS_SESSION_ID']) && $_SESSION ['WS_SESSION_ID'] != '') {
+            $htmlGroup .= "[<a href='#' onclick=\"showUploadFilesForm();return false;\">{$ID_TEST}</a>]";
+        }
+    }
+
+    $htmlGroup .= "</td></tr></table>";
+
+    $ch = $tree->addChild($ws, $htmlGroup, array('nodeType' => 'child'));
+    $ch->point = '<img src="/images/trigger.gif" />';
+}
+print($tree->render());
diff --git a/workflow/engine/templates/steps/triggers_Tree.php b/workflow/engine/templates/steps/triggers_Tree.php
index edd758cbb..3359a2e80 100644
--- a/workflow/engine/templates/steps/triggers_Tree.php
+++ b/workflow/engine/templates/steps/triggers_Tree.php
@@ -28,90 +28,91 @@ use ProcessMaker\Plugins\PluginRegistry;
 try {
 
   //call plugin
-  $oPluginRegistry = PluginRegistry::loadSingleton();
-  $externalSteps   = $oPluginRegistry->getSteps();
+    $oPluginRegistry = PluginRegistry::loadSingleton();
+    $externalSteps   = $oPluginRegistry->getSteps();
 
-	$oProcessMap = new ProcessMap();
-  $oTree           = new PmTree();
-  $oTree->nodeType = 'blank';
-  $oTree->name     = 'Triggers';
-  $oTree->showSign = false;
-	$oCriteria = new Criteria('workflow');
-	$oCriteria->add(StepPeer::PRO_UID, $_SESSION['PROCESS']);
-  $oCriteria->add(StepPeer::TAS_UID, $_SESSION['TASK']);
-  $oCriteria->addAscendingOrderByColumn(StepPeer::STEP_POSITION);
-  $oDataset = StepPeer::doSelectRS($oCriteria);
-  $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-  $oDataset->next();
-  $i = 0;
-  while ($aRow = $oDataset->getRow()) {
-  	switch ($aRow['STEP_TYPE_OBJ']) {
-  		case 'DYNAFORM':
-  		  require_once 'classes/model/Dynaform.php';
-  		  $oObject           = new Dynaform();
-  		  $aFields           = $oObject->load($aRow['STEP_UID_OBJ']);
-  		  $aRow['STEP_NAME'] = $aFields['DYN_TITLE'];
-  		break;
-  		case 'INPUT_DOCUMENT':
-  		  require_once 'classes/model/InputDocument.php';
-  		  $oObject           = new InputDocument();
-  		  $aFields           = $oObject->load($aRow['STEP_UID_OBJ']);
-  		  $aRow['STEP_NAME'] = $aFields['INP_DOC_TITLE'];
-  		break;
-  		case 'OUTPUT_DOCUMENT':
-  		  require_once 'classes/model/OutputDocument.php';
-  		  $oObject           = new OutputDocument();
-  		  $aFields           = $oObject->load($aRow['STEP_UID_OBJ']);
-  		  $aRow['STEP_NAME'] = $aFields['OUT_DOC_TITLE'];
-  		break;
-   		case 'EXTERNAL':
+    $oProcessMap = new ProcessMap();
+    $oTree           = new PmTree();
+    $oTree->nodeType = 'blank';
+    $oTree->name     = 'Triggers';
+    $oTree->showSign = false;
+    $oCriteria = new Criteria('workflow');
+    $oCriteria->add(StepPeer::PRO_UID, $_SESSION['PROCESS']);
+    $oCriteria->add(StepPeer::TAS_UID, $_SESSION['TASK']);
+    $oCriteria->addAscendingOrderByColumn(StepPeer::STEP_POSITION);
+    $oDataset = StepPeer::doSelectRS($oCriteria);
+    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+    $oDataset->next();
+    $i = 0;
+    while ($aRow = $oDataset->getRow()) {
+        switch ($aRow['STEP_TYPE_OBJ']) {
+        case 'DYNAFORM':
+          require_once 'classes/model/Dynaform.php';
+          $oObject           = new Dynaform();
+          $aFields           = $oObject->load($aRow['STEP_UID_OBJ']);
+          $aRow['STEP_NAME'] = $aFields['DYN_TITLE'];
+        break;
+        case 'INPUT_DOCUMENT':
+          require_once 'classes/model/InputDocument.php';
+          $oObject           = new InputDocument();
+          $aFields           = $oObject->load($aRow['STEP_UID_OBJ']);
+          $aRow['STEP_NAME'] = $aFields['INP_DOC_TITLE'];
+        break;
+        case 'OUTPUT_DOCUMENT':
+          require_once 'classes/model/OutputDocument.php';
+          $oObject           = new OutputDocument();
+          $aFields           = $oObject->load($aRow['STEP_UID_OBJ']);
+          $aRow['STEP_NAME'] = $aFields['OUT_DOC_TITLE'];
+        break;
+        case 'EXTERNAL':
         $aRow['STEP_NAME'] = 'unknown ' . $aRow['STEP_UID'];
         /** @var \ProcessMaker\Plugins\Interfaces\StepDetail $val */
-            foreach ( $externalSteps as $val ) {
-   		  	if ( $val->equalStepIdTo($aRow['STEP_UID_OBJ']))
-   		  	  $aRow['STEP_NAME'] = $val->getStepTitle();
-    		  }
-    		break;
-  	}
-    $oCriteria  = $oProcessMap->getStepTriggersCriteria($aRow['STEP_UID'], $_SESSION['TASK'], 'BEFORE');
+            foreach ($externalSteps as $val) {
+                if ($val->equalStepIdTo($aRow['STEP_UID_OBJ'])) {
+                    $aRow['STEP_NAME'] = $val->getStepTitle();
+                }
+            }
+            break;
+    }
+        $oCriteria  = $oProcessMap->getStepTriggersCriteria($aRow['STEP_UID'], $_SESSION['TASK'], 'BEFORE');
+        $iCantidad1 = StepTriggerPeer::doCount($oCriteria);
+        $oCriteria  = $oProcessMap->getStepTriggersCriteria($aRow['STEP_UID'], $_SESSION['TASK'], 'AFTER');
+        $iCantidad2 = StepTriggerPeer::doCount($oCriteria);
+        $oNode             = $oTree->addChild($aRow['STEP_UID'], '&nbsp;&nbsp;<span onclick="tree.expand(this.parentNode);" style="cursor: pointer;">' . $aRow['STEP_NAME'] . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_'.$aRow['STEP_UID'] . '">' . ($iCantidad1 + $iCantidad2) . '</span>)' . '</span>', array('nodeType'=>'parent'));
+        $oNode->contracted = true;
+        $oAux1             = $oNode->addChild('before_node', '<span onclick="tree.expand(this.parentNode);showTriggers(\'' . $aRow['STEP_UID'] . '\', \'BEFORE\');" style="cursor: pointer;">' . G::LoadTranslation('ID_BEFORE') . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_'.$aRow['STEP_UID'].'_BEFORE">'. $iCantidad1 .'</span>) </span>', array('nodeType'=>'parent'));
+        $oAux1->plus       = "<span  style='cursor:pointer;display:block;width:15;height:10px;' onclick='tree.expand(this.parentNode);showTriggers(\"" . $aRow['STEP_UID'] . "\", \"BEFORE\");'></span>";
+        $oAux1->contracted = true;
+        $oAux2             = $oAux1->addChild($aRow['STEP_UID'] . '_before_node', '<span id="triggersSpan_' . $aRow['STEP_UID'] . '_BEFORE"></span>', array('nodeType'=>'parentBlue'));
+        $oAux1             = $oNode->addChild('after_node', '<span onclick="tree.expand(this.parentNode);showTriggers(\'' . $aRow['STEP_UID'] . '\', \'AFTER\');" style="cursor: pointer;">' . G::LoadTranslation('ID_AFTER') . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_'.$aRow['STEP_UID'].'_AFTER">'. $iCantidad2 .'</span>) </span>', array('nodeType'=>'parent'));
+        $oAux1->plus       = "<span  style='cursor:pointer;display:block;width:15;height:10px;' onclick='tree.expand(this.parentNode);showTriggers(\"" . $aRow['STEP_UID'] . "\", \"AFTER\");'></span>";
+        $oAux1->contracted = true;
+        $oAux2             = $oAux1->addChild($aRow['STEP_UID'] . '_after_node', '<span id="triggersSpan_' . $aRow['STEP_UID'] . '_AFTER"></span>', array('nodeType'=>'parentBlue'));
+        $oDataset->next();
+    }
+    $oCriteria  = $oProcessMap->getStepTriggersCriteria(-1, $_SESSION['TASK'], 'BEFORE');
     $iCantidad1 = StepTriggerPeer::doCount($oCriteria);
-    $oCriteria  = $oProcessMap->getStepTriggersCriteria($aRow['STEP_UID'], $_SESSION['TASK'], 'AFTER');
+    $oCriteria  = $oProcessMap->getStepTriggersCriteria(-2, $_SESSION['TASK'], 'BEFORE');
     $iCantidad2 = StepTriggerPeer::doCount($oCriteria);
-    $oNode             =& $oTree->addChild($aRow['STEP_UID'], '&nbsp;&nbsp;<span onclick="tree.expand(this.parentNode);" style="cursor: pointer;">' . $aRow['STEP_NAME'] . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_'.$aRow['STEP_UID'] . '">' . ($iCantidad1 + $iCantidad2) . '</span>)' . '</span>', array('nodeType'=>'parent'));
+    $oCriteria  = $oProcessMap->getStepTriggersCriteria(-2, $_SESSION['TASK'], 'AFTER');
+    $iCantidad3 = StepTriggerPeer::doCount($oCriteria);
+
+    $oNode             = $oTree->addChild('-1', '&nbsp;&nbsp;<span onclick="tree.expand(this.parentNode);" style="cursor: pointer;">[<b> ' . G::LoadTranslation('ID_ASSIGN_TASK') . ' </b>] ' . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_'.$aRow['STEP_UID'] . '">' . ($iCantidad1 + $iCantidad2 + $iCantidad3) . '</span>)' . '</span>', array('nodeType'=>'parent'));
     $oNode->contracted = true;
-    $oAux1             =& $oNode->addChild('before_node', '<span onclick="tree.expand(this.parentNode);showTriggers(\'' . $aRow['STEP_UID'] . '\', \'BEFORE\');" style="cursor: pointer;">' . G::LoadTranslation('ID_BEFORE') . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_'.$aRow['STEP_UID'].'_BEFORE">'. $iCantidad1 .'</span>) </span>', array('nodeType'=>'parent'));
-    $oAux1->plus       = "<span  style='cursor:pointer;display:block;width:15;height:10px;' onclick='tree.expand(this.parentNode);showTriggers(\"" . $aRow['STEP_UID'] . "\", \"BEFORE\");'></span>";
+    $oAux1             = $oNode->addChild('before_node', '<span onclick="tree.expand(this.parentNode);showTriggers(\'-1\', \'BEFORE\');" style="cursor: pointer;">' . G::LoadTranslation('ID_BEFORE_ASSIGNMENT') . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_-1_BEFORE">'. $iCantidad1 .'</span>) </span>', array('nodeType'=>'parent'));
+    $oAux1->plus       = "<span  style='cursor:pointer;display:block;width:15;height:10px;' onclick='tree.expand(this.parentNode);showTriggers(\"-1\", \"BEFORE\");'></span>";
     $oAux1->contracted = true;
-    $oAux2             =& $oAux1->addChild($aRow['STEP_UID'] . '_before_node', '<span id="triggersSpan_' . $aRow['STEP_UID'] . '_BEFORE"></span>', array('nodeType'=>'parentBlue'));
-    $oAux1             =& $oNode->addChild('after_node', '<span onclick="tree.expand(this.parentNode);showTriggers(\'' . $aRow['STEP_UID'] . '\', \'AFTER\');" style="cursor: pointer;">' . G::LoadTranslation('ID_AFTER') . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_'.$aRow['STEP_UID'].'_AFTER">'. $iCantidad2 .'</span>) </span>', array('nodeType'=>'parent'));
-    $oAux1->plus       = "<span  style='cursor:pointer;display:block;width:15;height:10px;' onclick='tree.expand(this.parentNode);showTriggers(\"" . $aRow['STEP_UID'] . "\", \"AFTER\");'></span>";
+    $oAux2             = $oAux1->addChild('-1_before_node', '<span id="triggersSpan_-1_BEFORE"></span>', array('nodeType'=>'parentBlue'));
+    $oAux1             = $oNode->addChild('before_node', '<span onclick="tree.expand(this.parentNode);showTriggers(\'-2\', \'BEFORE\');" style="cursor: pointer;">' . G::LoadTranslation('ID_BEFORE_DERIVATION') . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_-2_BEFORE">'. $iCantidad2 .'</span>) </span>', array('nodeType'=>'parent'));
+    $oAux1->plus       = "<span  style='cursor:pointer;display:block;width:15;height:10px;' onclick='tree.expand(this.parentNode);showTriggers(\"-2\", \"BEFORE\");'></span>";
     $oAux1->contracted = true;
-    $oAux2             =& $oAux1->addChild($aRow['STEP_UID'] . '_after_node', '<span id="triggersSpan_' . $aRow['STEP_UID'] . '_AFTER"></span>', array('nodeType'=>'parentBlue'));
-  	$oDataset->next();
-  }
-  $oCriteria  = $oProcessMap->getStepTriggersCriteria(-1, $_SESSION['TASK'], 'BEFORE');
-  $iCantidad1 = StepTriggerPeer::doCount($oCriteria);
-  $oCriteria  = $oProcessMap->getStepTriggersCriteria(-2, $_SESSION['TASK'], 'BEFORE');
-  $iCantidad2 = StepTriggerPeer::doCount($oCriteria);
-  $oCriteria  = $oProcessMap->getStepTriggersCriteria(-2, $_SESSION['TASK'], 'AFTER');
-  $iCantidad3 = StepTriggerPeer::doCount($oCriteria);
+    $oAux2             = $oAux1->addChild('-2_before_node', '<span id="triggersSpan_-2_BEFORE"></span>', array('nodeType'=>'parentBlue'));
+    $oAux1             = $oNode->addChild('after_node', '<span onclick="tree.expand(this.parentNode);showTriggers(\'-2\', \'AFTER\');" style="cursor: pointer;">' . G::LoadTranslation('ID_AFTER_DERIVATION') . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_-2_AFTER">'. $iCantidad3 .'</span>) </span>', array('nodeType'=>'parent'));
+    $oAux1->plus       = "<span  style='cursor:pointer;display:block;width:15;height:10px;' onclick='tree.expand(this.parentNode);showTriggers(\"-2\", \"AFTER\");'></span>";
+    $oAux1->contracted = true;
+    $oAux2             = $oAux1->addChild('-2_after_node', '<span id="triggersSpan_-2_AFTER"></span>', array('nodeType'=>'parentBlue'));
 
-  $oNode             =& $oTree->addChild('-1', '&nbsp;&nbsp;<span onclick="tree.expand(this.parentNode);" style="cursor: pointer;">[<b> ' . G::LoadTranslation('ID_ASSIGN_TASK') . ' </b>] ' . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_'.$aRow['STEP_UID'] . '">' . ($iCantidad1 + $iCantidad2 + $iCantidad3) . '</span>)' . '</span>', array('nodeType'=>'parent'));
-  $oNode->contracted = true;
-  $oAux1             =& $oNode->addChild('before_node', '<span onclick="tree.expand(this.parentNode);showTriggers(\'-1\', \'BEFORE\');" style="cursor: pointer;">' . G::LoadTranslation('ID_BEFORE_ASSIGNMENT') . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_-1_BEFORE">'. $iCantidad1 .'</span>) </span>', array('nodeType'=>'parent'));
-  $oAux1->plus       = "<span  style='cursor:pointer;display:block;width:15;height:10px;' onclick='tree.expand(this.parentNode);showTriggers(\"-1\", \"BEFORE\");'></span>";
-  $oAux1->contracted = true;
-  $oAux2             =& $oAux1->addChild('-1_before_node', '<span id="triggersSpan_-1_BEFORE"></span>', array('nodeType'=>'parentBlue'));
-  $oAux1             =& $oNode->addChild('before_node', '<span onclick="tree.expand(this.parentNode);showTriggers(\'-2\', \'BEFORE\');" style="cursor: pointer;">' . G::LoadTranslation('ID_BEFORE_DERIVATION') . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_-2_BEFORE">'. $iCantidad2 .'</span>) </span>', array('nodeType'=>'parent'));
-  $oAux1->plus       = "<span  style='cursor:pointer;display:block;width:15;height:10px;' onclick='tree.expand(this.parentNode);showTriggers(\"-2\", \"BEFORE\");'></span>";
-  $oAux1->contracted = true;
-  $oAux2             =& $oAux1->addChild('-2_before_node', '<span id="triggersSpan_-2_BEFORE"></span>', array('nodeType'=>'parentBlue'));
-  $oAux1             =& $oNode->addChild('after_node', '<span onclick="tree.expand(this.parentNode);showTriggers(\'-2\', \'AFTER\');" style="cursor: pointer;">' . G::LoadTranslation('ID_AFTER_DERIVATION') . ' - ' . G::LoadTranslation('ID_TRIGGERS'). ' (<span id="TRIG_-2_AFTER">'. $iCantidad3 .'</span>) </span>', array('nodeType'=>'parent'));
-  $oAux1->plus       = "<span  style='cursor:pointer;display:block;width:15;height:10px;' onclick='tree.expand(this.parentNode);showTriggers(\"-2\", \"AFTER\");'></span>";
-  $oAux1->contracted = true;
-  $oAux2             =& $oAux1->addChild('-2_after_node', '<span id="triggersSpan_-2_AFTER"></span>', array('nodeType'=>'parentBlue'));
-
-  $javascript = "
+    $javascript = "
   <script type=\"text/javascript\">
   //Add css Codemirror
   var head = document.getElementsByTagName(\"head\")[0];
@@ -130,13 +131,11 @@ try {
   </script>
   ";
 
-  echo $javascript . $oTree->render();
-}
-catch (Exception $oException) {
-	$token = strtotime("now");
+    echo $javascript . $oTree->render();
+} catch (Exception $oException) {
+    $token = strtotime("now");
     PMException::registerErrorLog($oException, $token);
-    G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
+    G::outRes(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)));
     die;
 }
 unset($_SESSION['PROCESS']);
-?>
\ No newline at end of file
diff --git a/workflow/engine/templates/toolbar.html b/workflow/engine/templates/toolbar.html
index 191e59a85..79beee5b3 100644
--- a/workflow/engine/templates/toolbar.html
+++ b/workflow/engine/templates/toolbar.html
@@ -21,7 +21,7 @@
 
 {php}
 //This will add registered HTML toolbar options from plugins
-$oPluginRegistry =& PMPluginRegistry::getSingleton();
+$oPluginRegistry = PMPluginRegistry::getSingleton();
 $oPluginRegistry->getToolbarOptions("NORMAL");
 {/php}
 </tr>
diff --git a/workflow/engine/templates/tools/methodsPermissions.php b/workflow/engine/templates/tools/methodsPermissions.php
index 4fb7dcbc6..41924c094 100644
--- a/workflow/engine/templates/tools/methodsPermissions.php
+++ b/workflow/engine/templates/tools/methodsPermissions.php
@@ -29,7 +29,7 @@
 $tree = new PmTree();
 
 reView(PATH_TRUNK, $tree);
-print( $tree->render());
+print($tree->render());
 
 function reView($path, &$tree)
 {
@@ -43,7 +43,9 @@ function reView($path, &$tree)
         if (is_dir($file)) {
             reView($file, $tree->addChild($file, $file));
         } elseif (substr($file, -4, 4) === '.php') {
-            $nodeFile = &$tree->addChild($file, $file . '&nbsp;' .
+            $nodeFile = $tree->addChild(
+                $file,
+                $file . '&nbsp;' .
                     selectPermissions('Set Permission', 'setPermission("' . $file . '",this);') .
                     selectPermissions('Remove Permission', 'removePermission("' . $file . '",this);')
             );
diff --git a/workflow/engine/templates/triggers/triggersTree.php b/workflow/engine/templates/triggers/triggersTree.php
index 7f88d9f2f..5c1aab825 100644
--- a/workflow/engine/templates/triggers/triggersTree.php
+++ b/workflow/engine/templates/triggers/triggersTree.php
@@ -24,7 +24,6 @@
  */
 
 try {
-
     $triggerLibrary = TriggerLibrary::getSingleton();
     $triggerLibraryO = $triggerLibrary->getRegisteredClasses();
 
@@ -33,16 +32,16 @@ try {
     $oTree->name = "Triggers";
     $oTree->showSign = false;
 
-    $div1Style = (strpos($_SERVER["HTTP_USER_AGENT"], "MSIE") !== false)? " style=\"margin-top: 0.65em;\"" : null;
+    $div1Style = (strpos($_SERVER["HTTP_USER_AGENT"], "MSIE") !== false) ? " style=\"margin-top: 0.65em;\"" : null;
 
-    $oNode = &$oTree->addChild("TRI_CUSTOM", "<div" . $div1Style . "><span onclick=\"currentPopupWindow.remove(); triggerNewCustom();\" style=\"cursor: pointer;\"><img src=\"/images/50px-Edit.png\" width=\"15px\" heigth=\"15px\" valing=\"middle\" alt=\"\" />&nbsp;&nbsp;<strong>" . G::LoadTranslation("ID_CUSTOM_TRIGGER") . "</strong></span><br /><span onclick=\"currentPopupWindow.remove(); triggerNewCustom();\" style=\"cursor: pointer;\"><small><em>" . G::LoadTranslation("ID_CUSTOM_TRIGGER_DESCRIPTION") . "</em></small></span></div>", array("nodeType" => "parent"));
-    $oNode = &$oTree->addChild("TRI_COPY",   "<div style=\"margin-top: 1.25em;\"><span onclick=\"currentPopupWindow.remove(); triggerCopy();\" style=\"cursor: pointer;\"><img src=\"/images/documents/_editcopy.png\" width=\"15px\" heigth=\"15px\" valing=\"middle\" alt=\"\" />&nbsp;&nbsp;<strong>" . G::LoadTranslation("ID_TRIGGER_COPY_OPTION") . "</strong></span><br /><span onclick=\"currentPopupWindow.remove(); triggerCopy();\" style=\"cursor: pointer;\"><small><em>" . G::LoadTranslation("ID_TRIGGER_COPY_OPTION_DESCRIPTION") . "</em></small></span></div>", array("nodeType" => "parent"));
+    $oNode = $oTree->addChild("TRI_CUSTOM", "<div" . $div1Style . "><span onclick=\"currentPopupWindow.remove(); triggerNewCustom();\" style=\"cursor: pointer;\"><img src=\"/images/50px-Edit.png\" width=\"15px\" heigth=\"15px\" valing=\"middle\" alt=\"\" />&nbsp;&nbsp;<strong>" . G::LoadTranslation("ID_CUSTOM_TRIGGER") . "</strong></span><br /><span onclick=\"currentPopupWindow.remove(); triggerNewCustom();\" style=\"cursor: pointer;\"><small><em>" . G::LoadTranslation("ID_CUSTOM_TRIGGER_DESCRIPTION") . "</em></small></span></div>", array("nodeType" => "parent"));
+    $oNode = $oTree->addChild("TRI_COPY", "<div style=\"margin-top: 1.25em;\"><span onclick=\"currentPopupWindow.remove(); triggerCopy();\" style=\"cursor: pointer;\"><img src=\"/images/documents/_editcopy.png\" width=\"15px\" heigth=\"15px\" valing=\"middle\" alt=\"\" />&nbsp;&nbsp;<strong>" . G::LoadTranslation("ID_TRIGGER_COPY_OPTION") . "</strong></span><br /><span onclick=\"currentPopupWindow.remove(); triggerCopy();\" style=\"cursor: pointer;\"><small><em>" . G::LoadTranslation("ID_TRIGGER_COPY_OPTION_DESCRIPTION") . "</em></small></span></div>", array("nodeType" => "parent"));
 
     $triggerLibraryOCount = count($triggerLibraryO);
 
     foreach ($triggerLibraryO as $keyLibrary => $libraryObj) {
         $libraryName = $libraryObj->info["name"];
-        $libraryIcon = (isset($libraryObj->info["icon"]) && ($libraryObj->info["icon"]!= ""))? $libraryObj->info["icon"] : "/images/browse.gif";
+        $libraryIcon = (isset($libraryObj->info["icon"]) && ($libraryObj->info["icon"] != "")) ? $libraryObj->info["icon"] : "/images/browse.gif";
         $libraryDescription = trim(str_replace("*", "", implode(" ", $libraryObj->info["description"])));
         $triggerCount = count($libraryObj->methods);
 
@@ -52,8 +51,8 @@ try {
 
             //Now the Triggers
             //Library Father (Name + Description)
-            $oNode = &$oTree->addChild($keyLibrary, "&nbsp;&nbsp;<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td nowrap=\"nowrap\" valign=\"top\"><span onclick=\"tree.expand(this.parentNode);\" style=\"cursor: pointer;\"><img src=\"" . $libraryIcon . "\" width=\"15px\" heigth=\"15px\" valing=\"middle\" alt=\"\" />&nbsp;&nbsp;<b>" . $libraryName . "&nbsp;($triggerCount)</b></td></tr><tr><td class=\"\"><span onclick=\"tree.expand(this.parentNode);\" style=\"cursor: pointer;\"><small><i>$libraryDescription</i></small></span></td></tr></table>", array("nodeType" => "parent"));
-            $oNode->contracted = ($triggerLibraryOCount == 1)? false : true;
+            $oNode = $oTree->addChild($keyLibrary, "&nbsp;&nbsp;<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td nowrap=\"nowrap\" valign=\"top\"><span onclick=\"tree.expand(this.parentNode);\" style=\"cursor: pointer;\"><img src=\"" . $libraryIcon . "\" width=\"15px\" heigth=\"15px\" valing=\"middle\" alt=\"\" />&nbsp;&nbsp;<b>" . $libraryName . "&nbsp;($triggerCount)</b></td></tr><tr><td class=\"\"><span onclick=\"tree.expand(this.parentNode);\" style=\"cursor: pointer;\"><small><i>$libraryDescription</i></small></span></td></tr></table>", array("nodeType" => "parent"));
+            $oNode->contracted = ($triggerLibraryOCount == 1) ? false : true;
 
             //Library Childs (available methods)
             foreach ($libraryObj->methods as $methodName => $methodObject) {
@@ -61,9 +60,7 @@ try {
                 $methodLabel = $methodObject->info["label"];
                 $methodDescription = trim(str_replace("*", "", implode(" ", $methodObject->info["description"])));
 
-                $oAux1 = &$oNode->addChild($keyLibrary . "-" . $methodName, "<table><tr><td nowrap=\"nowrap\"><span style=\"cursor: pointer;\"><a class=\"linkInBlue\" href=\"javascript:;\" onclick=\"currentPopupWindow.remove(); triggerNewWizard('$methodName' , '$keyLibrary'); return false;\">" . $methodLabel . " (" . $methodName . ")</a></span></td></tr><tr><td><i>" . $methodDescription . "</i><br></span></td></tr></table>", array("nodeType" => "child"));
-                //$oAux1->plus       = "<span  style='cursor:pointer;display:block;width:15;height:10px;' onclick='tree.expand(this.parentNode);'></span>";
-                //$oAux2             =& $oAux1->addChild($keyLibrary."-".$methodName."-desc", "$methodParameters", array('nodeType'=>'parent'));
+                $oAux1 = $oNode->addChild($keyLibrary . "-" . $methodName, "<table><tr><td nowrap=\"nowrap\"><span style=\"cursor: pointer;\"><a class=\"linkInBlue\" href=\"javascript:;\" onclick=\"currentPopupWindow.remove(); triggerNewWizard('$methodName' , '$keyLibrary'); return false;\">" . $methodLabel . " (" . $methodName . ")</a></span></td></tr><tr><td><i>" . $methodDescription . "</i><br></span></td></tr></table>", array("nodeType" => "child"));
             }
         }
     }
@@ -72,9 +69,8 @@ try {
 } catch (Exception $e) {
     $token = strtotime("now");
     PMException::registerErrorLog($e, $token);
-    G::outRes( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
+    G::outRes(G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)));
     die;
 }
 
 unset($_SESSION["PROCESS"]);
-
diff --git a/workflow/engine/templates/users/users_AssignGroup.php b/workflow/engine/templates/users/users_AssignGroup.php
index 0abc7d67d..6a3494021 100644
--- a/workflow/engine/templates/users/users_AssignGroup.php
+++ b/workflow/engine/templates/users/users_AssignGroup.php
@@ -1,83 +1,83 @@
-<?php
-/**
- * groups_Tree.php
- *  
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
- * 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.
- *
- * 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.
- * 
- */
- 
-	/**
-	 * @Description This is the View of all groups from a determinated user
-	 * @author Erik Amaru Ortiz <erik@colosa.com>
-	 * @Date 24/04/2008
-	 * @LastModification none 
-	 */
-	
-	require_once 'classes/model/Users.php';
-	
-	$oCriteria = new Criteria();
-	$oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
-	$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-	$oCriteria->add(UsersPeer::USR_UID, $_GET['sUserUID']);
-	$oDataset = UsersPeer::doSelectRS($oCriteria);
-	$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-	$oDataset->next();
-	$aRow = $oDataset->getRow();
-	
-	$groups = new Groups();
-	
-	$tree = new PmTree();
-	$tree->name = 'Users';
-	$tree->nodeType = "base";
-	$tree->width = "350px";
-	$tree->value = '
-	<div class="boxTopBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-	<div class="boxContentBlue">
-  		<table width="100%" style="margin:0px;" cellspacing="0" cellpadding="0">
-  			<tr>
-	  			<td class="userGroupTitle">' . G::loadTranslation("ID_ASSIGN_GROUP_TO") . ' ' . $aRow['USR_FIRSTNAME'] . ' ' . $aRow['USR_LASTNAME'] . '</td>
-  			</tr>
-		</table>
-	</div>
-	<div class="boxBottomBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-	<div class="userGroupLink"><a href="#" onclick="showUserGroups(\''.$_GET['sUserUID'].'\');return false;">'.G::LoadTranslation('ID_BACK_TO_GROUP_LIST').'</a></div>';
-	
-	$tree->showSign = false;
-	$allGroups = $groups->getAllGroups();
-	
-	foreach ($allGroups as $group) {
-	    $ID_ASSIGN = G::LoadTranslation('ID_ASSIGN');
-	    $groupUID = htmlentities($group->getGrpUid());
-	    $userUID = $_GET['sUserUID'];
-	    $GROUP_TITLE = strip_tags($group->getGrpTitle());
-	    $html = <<< innerHTML
-	      <table cellspacing='0' cellpadding='0' border='1' style='border:0px;'>
-	        <tr>
-	          <td width='250px' class='treeNode' style='border:0px;background-color:transparent;'>{$GROUP_TITLE}</td>	
-	          <td class='treeNode' style='border:0px;background-color:transparent;'>[<a href="#" onclick="saveUserGroup('{$groupUID}','{$userUID}');return false;">{$ID_ASSIGN}</a>]</td>
-	        </tr>
-	      </table>
-innerHTML;
-	    $ch = &$tree->addChild($group->getGrpUid(), $html, array('nodeType' => 'child'));
-	    $ch->point = '<img src="/images/users.png" />';
-	}
-	
-	
-	print ($tree->render());
+<?php
+/**
+ * groups_Tree.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ *
+ */
+ 
+    /**
+     * @Description This is the View of all groups from a determinated user
+     * @author Erik Amaru Ortiz <erik@colosa.com>
+     * @Date 24/04/2008
+     * @LastModification none
+     */
+    
+    require_once 'classes/model/Users.php';
+    
+    $oCriteria = new Criteria();
+    $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
+    $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
+    $oCriteria->add(UsersPeer::USR_UID, $_GET['sUserUID']);
+    $oDataset = UsersPeer::doSelectRS($oCriteria);
+    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+    $oDataset->next();
+    $aRow = $oDataset->getRow();
+    
+    $groups = new Groups();
+    
+    $tree = new PmTree();
+    $tree->name = 'Users';
+    $tree->nodeType = "base";
+    $tree->width = "350px";
+    $tree->value = '
+	<div class="boxTopBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+	<div class="boxContentBlue">
+  		<table width="100%" style="margin:0px;" cellspacing="0" cellpadding="0">
+  			<tr>
+	  			<td class="userGroupTitle">' . G::loadTranslation("ID_ASSIGN_GROUP_TO") . ' ' . $aRow['USR_FIRSTNAME'] . ' ' . $aRow['USR_LASTNAME'] . '</td>
+  			</tr>
+		</table>
+	</div>
+	<div class="boxBottomBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+	<div class="userGroupLink"><a href="#" onclick="showUserGroups(\''.$_GET['sUserUID'].'\');return false;">'.G::LoadTranslation('ID_BACK_TO_GROUP_LIST').'</a></div>';
+    
+    $tree->showSign = false;
+    $allGroups = $groups->getAllGroups();
+    
+    foreach ($allGroups as $group) {
+        $ID_ASSIGN = G::LoadTranslation('ID_ASSIGN');
+        $groupUID = htmlentities($group->getGrpUid());
+        $userUID = $_GET['sUserUID'];
+        $GROUP_TITLE = strip_tags($group->getGrpTitle());
+        $html = <<< innerHTML
+	      <table cellspacing='0' cellpadding='0' border='1' style='border:0px;'>
+	        <tr>
+	          <td width='250px' class='treeNode' style='border:0px;background-color:transparent;'>{$GROUP_TITLE}</td>	
+	          <td class='treeNode' style='border:0px;background-color:transparent;'>[<a href="#" onclick="saveUserGroup('{$groupUID}','{$userUID}');return false;">{$ID_ASSIGN}</a>]</td>
+	        </tr>
+	      </table>
+innerHTML;
+        $ch = $tree->addChild($group->getGrpUid(), $html, array('nodeType' => 'child'));
+        $ch->point = '<img src="/images/users.png" />';
+    }
+    
+    
+    print($tree->render());
diff --git a/workflow/engine/templates/users/users_Tree.php b/workflow/engine/templates/users/users_Tree.php
index 6de60afcf..9b5869bb8 100644
--- a/workflow/engine/templates/users/users_Tree.php
+++ b/workflow/engine/templates/users/users_Tree.php
@@ -1,85 +1,85 @@
-<?php
-/**
- * groups_Tree.php
- *  
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
- * 
- * 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.
- *
- * 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.
- * 
- */
- 
-	/**
-	 * @Description This is the View of all groups from a determinated user
-	 * @author Erik Amaru Ortiz <erik@colosa.com>
-	 * @Date 24/04/2008
-	 * @LastModification none 
-	 */
-	
-	require_once 'classes/model/Users.php';
-	
-	$oCriteria = new Criteria();
-	$oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
-	$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
-	$oCriteria->add(UsersPeer::USR_UID, $_GET['sUserUID']);
-	$oDataset = UsersPeer::doSelectRS($oCriteria);
-	$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-	$oDataset->next();
-	$aRow = $oDataset->getRow();
-	
-	$groups = new Groups();
-	
-	$tree = new PmTree();
-	$tree->name = 'Users';
-	$tree->nodeType = "base";
-	$tree->width = "350px";
-	$tree->value = '
-	<div class="boxTopBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-	<div class="boxContentBlue">
-  		<table width="100%" style="margin:0px;" cellspacing="0" cellpadding="0">
-  			<tr>
-	  			<td class="userGroupTitle">' . G::loadTranslation("ID_USER_GROUPS") . ' ' . $aRow['USR_FIRSTNAME'] . ' ' . $aRow['USR_LASTNAME'] . '</td>
-  			</tr>
-		</table>
-	</div>
-	<div class="boxBottomBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
-	<div class="userGroupLink"><a href="#" onclick="showUserGroupInterface(\''.$_GET['sUserUID'].'\');return false;">'.G::LoadTranslation('ID_ASSIGN_GROUP').'</a></div>';
-	
-	$tree->showSign = false;
-	$allGroups = $groups->getUserGroups($_GET['sUserUID']);
-	
-	foreach ($allGroups as $group) {
-	    $ID_DELETE = G::LoadTranslation('ID_DELETE');
-	    $groupUID = htmlentities($group->getGrpUid());
-	    $userUID = $_GET['sUserUID'];
-	    $GROUP_TITLE = strip_tags($group->getGrpTitle());
-	    $html = <<< innerHTML
-	      <table cellspacing='0' cellpadding='0' border='1' style='border:0px;'>
-	        <tr>
-	          <td width='250px' class='treeNode' style='border:0px;background-color:transparent;'>{$GROUP_TITLE}</td>	
-	          <td class='treeNode' style='border:0px;background-color:transparent;'>[<a href="#" onclick="deleteGroup('{$groupUID}','{$userUID}');return false;">{$ID_DELETE}</a>]</td>
-	        </tr>
-	      </table>
-innerHTML;
-	    $ch = &$tree->addChild($group->getGrpUid(), $html, array('nodeType' => 'child'));
-	    $ch->point = '<img src="/images/users.png" />';
-	}
-	if($groups->getNumberGroups($_GET['sUserUID']) == 0){
-		$ch = &$tree->addChild('', G::LoadTranslation('ID_MSG_NORESULTS_USERGROUP'), array('nodeType' => 'child'));
-	}
-	
-	print ($tree->render());
+<?php
+/**
+ * groups_Tree.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.23
+ *
+ * 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.
+ *
+ * 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.
+ *
+ */
+ 
+    /**
+     * @Description This is the View of all groups from a determinated user
+     * @author Erik Amaru Ortiz <erik@colosa.com>
+     * @Date 24/04/2008
+     * @LastModification none
+     */
+    
+    require_once 'classes/model/Users.php';
+    
+    $oCriteria = new Criteria();
+    $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
+    $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
+    $oCriteria->add(UsersPeer::USR_UID, $_GET['sUserUID']);
+    $oDataset = UsersPeer::doSelectRS($oCriteria);
+    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+    $oDataset->next();
+    $aRow = $oDataset->getRow();
+    
+    $groups = new Groups();
+    
+    $tree = new PmTree();
+    $tree->name = 'Users';
+    $tree->nodeType = "base";
+    $tree->width = "350px";
+    $tree->value = '
+	<div class="boxTopBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+	<div class="boxContentBlue">
+  		<table width="100%" style="margin:0px;" cellspacing="0" cellpadding="0">
+  			<tr>
+	  			<td class="userGroupTitle">' . G::loadTranslation("ID_USER_GROUPS") . ' ' . $aRow['USR_FIRSTNAME'] . ' ' . $aRow['USR_LASTNAME'] . '</td>
+  			</tr>
+		</table>
+	</div>
+	<div class="boxBottomBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
+	<div class="userGroupLink"><a href="#" onclick="showUserGroupInterface(\''.$_GET['sUserUID'].'\');return false;">'.G::LoadTranslation('ID_ASSIGN_GROUP').'</a></div>';
+    
+    $tree->showSign = false;
+    $allGroups = $groups->getUserGroups($_GET['sUserUID']);
+    
+    foreach ($allGroups as $group) {
+        $ID_DELETE = G::LoadTranslation('ID_DELETE');
+        $groupUID = htmlentities($group->getGrpUid());
+        $userUID = $_GET['sUserUID'];
+        $GROUP_TITLE = strip_tags($group->getGrpTitle());
+        $html = <<< innerHTML
+	      <table cellspacing='0' cellpadding='0' border='1' style='border:0px;'>
+	        <tr>
+	          <td width='250px' class='treeNode' style='border:0px;background-color:transparent;'>{$GROUP_TITLE}</td>	
+	          <td class='treeNode' style='border:0px;background-color:transparent;'>[<a href="#" onclick="deleteGroup('{$groupUID}','{$userUID}');return false;">{$ID_DELETE}</a>]</td>
+	        </tr>
+	      </table>
+innerHTML;
+        $ch = $tree->addChild($group->getGrpUid(), $html, array('nodeType' => 'child'));
+        $ch->point = '<img src="/images/users.png" />';
+    }
+    if ($groups->getNumberGroups($_GET['sUserUID']) == 0) {
+        $ch = $tree->addChild('', G::LoadTranslation('ID_MSG_NORESULTS_USERGROUP'), array('nodeType' => 'child'));
+    }
+    
+    print($tree->render());
diff --git a/workflow/public_html/bootstrap.php b/workflow/public_html/bootstrap.php
index b4f01fca5..a1086369c 100644
--- a/workflow/public_html/bootstrap.php
+++ b/workflow/public_html/bootstrap.php
@@ -30,257 +30,245 @@ use ProcessMaker\Plugins\PluginRegistry;
  * this file is used initialize main variables, redirect and dispatch all requests
  */
 
-  // Defining the PATH_SEP constant, he we are defining if the the path separator symbol will be '\\' or '/'
-  define('PATH_SEP', '/');
+// Defining the PATH_SEP constant, he we are defining if the the path separator symbol will be '\\' or '/'
+define('PATH_SEP', '/');
 
-  // Defining the Home Directory
-  $realdocuroot = str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']);
-  $docuroot = explode(PATH_SEP , $realdocuroot);
+// Defining the Home Directory
+$realdocuroot = str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']);
+$docuroot = explode(PATH_SEP, $realdocuroot);
 
-  array_pop($docuroot);
-  $pathhome = implode(PATH_SEP, $docuroot) . PATH_SEP;
+array_pop($docuroot);
+$pathhome = implode(PATH_SEP, $docuroot) . PATH_SEP;
 
-  // try to find automatically the trunk directory where are placed the RBAC and Gulliver directories
-  // in a normal installation you don't need to change it.
-  array_pop($docuroot);
-  $pathTrunk = implode(PATH_SEP, $docuroot) . PATH_SEP ;
+// try to find automatically the trunk directory where are placed the RBAC and Gulliver directories
+// in a normal installation you don't need to change it.
+array_pop($docuroot);
+$pathTrunk = implode(PATH_SEP, $docuroot) . PATH_SEP;
 
-  array_pop($docuroot);
-  $pathOutTrunk = implode(PATH_SEP, $docuroot) . PATH_SEP ;
+array_pop($docuroot);
+$pathOutTrunk = implode(PATH_SEP, $docuroot) . PATH_SEP;
 
-  define('PATH_HOME',     $pathhome);
-  define('PATH_TRUNK',    $pathTrunk);
-  define('PATH_OUTTRUNK', $pathOutTrunk);
-  // Including these files we get the PM paths and definitions (that should be just one file.
-  require_once $pathhome . PATH_SEP . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php';
-  require_once PATH_CORE . 'classes' . PATH_SEP . 'class.system.php';
+define('PATH_HOME', $pathhome);
+define('PATH_TRUNK', $pathTrunk);
+define('PATH_OUTTRUNK', $pathOutTrunk);
+// Including these files we get the PM paths and definitions (that should be just one file.
+require_once $pathhome . PATH_SEP . 'engine' . PATH_SEP . 'config' . PATH_SEP . 'paths.php';
+require_once PATH_CORE . 'classes' . PATH_SEP . 'class.system.php';
 
-  // starting session
-  $timelife = ini_get('session.gc_maxlifetime');
-  if (is_null($timelife)) {
-      $timelife = 1440;
-  }
-  ini_set('session.gc_maxlifetime', $timelife);
-  ini_set('session.cookie_lifetime', $timelife);
-  session_start();
+// starting session
+$timelife = ini_get('session.gc_maxlifetime');
+if (is_null($timelife)) {
+    $timelife = 1440;
+}
+ini_set('session.gc_maxlifetime', $timelife);
+ini_set('session.cookie_lifetime', $timelife);
+session_start();
 
-  $config = PmSystem::getSystemConfiguration();
+$config = PmSystem::getSystemConfiguration();
 
-  //$e_all  = defined('E_DEPRECATED') ? E_ALL  & ~E_DEPRECATED : E_ALL;
-  //$e_all  = defined('E_STRICT')     ? $e_all & ~E_STRICT     : $e_all;
-  //$e_all  = $config['debug']        ? $e_all                 : $e_all & ~E_NOTICE;
-  //$e_all = E_ALL & ~ E_DEPRECATED & ~ E_STRICT & ~ E_NOTICE  & ~E_WARNING;
+//$e_all  = defined('E_DEPRECATED') ? E_ALL  & ~E_DEPRECATED : E_ALL;
+//$e_all  = defined('E_STRICT')     ? $e_all & ~E_STRICT     : $e_all;
+//$e_all  = $config['debug']        ? $e_all                 : $e_all & ~E_NOTICE;
+//$e_all = E_ALL & ~ E_DEPRECATED & ~ E_STRICT & ~ E_NOTICE  & ~E_WARNING;
 
 
-  $filter = new InputFilter();
-  $config['display_errors'] = $filter->validateInput($config['display_errors']);
-  $config['error_reporting'] = $filter->validateInput($config['error_reporting']);
-  $config['memory_limit'] = $filter->validateInput($config['memory_limit']);
-  $config['wsdl_cache'] = $filter->validateInput($config['wsdl_cache'],'int');
-  $config['time_zone'] = $filter->validateInput($config['time_zone']);
-  // Do not change any of these settings directly, use env.ini instead
-  ini_set( 'display_errors', $filter->validateInput($config['display_errors']) );
-  ini_set( 'error_reporting', $filter->validateInput($config['error_reporting']) );
-  ini_set('short_open_tag', 'On');
-  ini_set('default_charset', "UTF-8");
-  ini_set('memory_limit', $filter->validateInput($config['memory_limit']) );
-  ini_set('soap.wsdl_cache_enabled', $config['wsdl_cache']);
-  ini_set('date.timezone', (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__'])? 'UTC' : $config['time_zone']); //Set Time Zone
+$filter = new InputFilter();
+$config['display_errors'] = $filter->validateInput($config['display_errors']);
+$config['error_reporting'] = $filter->validateInput($config['error_reporting']);
+$config['memory_limit'] = $filter->validateInput($config['memory_limit']);
+$config['wsdl_cache'] = $filter->validateInput($config['wsdl_cache'], 'int');
+$config['time_zone'] = $filter->validateInput($config['time_zone']);
+// Do not change any of these settings directly, use env.ini instead
+ini_set('display_errors', $filter->validateInput($config['display_errors']));
+ini_set('error_reporting', $filter->validateInput($config['error_reporting']));
+ini_set('short_open_tag', 'On');
+ini_set('default_charset', "UTF-8");
+ini_set('memory_limit', $filter->validateInput($config['memory_limit']));
+ini_set('soap.wsdl_cache_enabled', $config['wsdl_cache']);
+ini_set('date.timezone',
+    (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__']) ? 'UTC' : $config['time_zone']); //Set Time Zone
 
-  define ('DEBUG_SQL_LOG', $config['debug_sql']);
-  define ('DEBUG_TIME_LOG', $config['debug_time']);
-  define ('DEBUG_CALENDAR_LOG', $config['debug_calendar']);
-  define ('MEMCACHED_ENABLED',  $config['memcached']);
-  define ('MEMCACHED_SERVER',   $config['memcached_server']);
-  define ('TIME_ZONE', ini_get('date.timezone'));
+define('DEBUG_SQL_LOG', $config['debug_sql']);
+define('DEBUG_TIME_LOG', $config['debug_time']);
+define('DEBUG_CALENDAR_LOG', $config['debug_calendar']);
+define('MEMCACHED_ENABLED', $config['memcached']);
+define('MEMCACHED_SERVER', $config['memcached_server']);
+define('TIME_ZONE', ini_get('date.timezone'));
 
-  // IIS Compatibility, SERVER_ADDR doesn't exist on that env, so we need to define it.
-  $_SERVER['SERVER_ADDR'] = isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : $_SERVER['SERVER_NAME'];
+// IIS Compatibility, SERVER_ADDR doesn't exist on that env, so we need to define it.
+$_SERVER['SERVER_ADDR'] = isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : $_SERVER['SERVER_NAME'];
 
-  //to do: make different environments.  sys
+//to do: make different environments.  sys
 
-  define ('ERROR_SHOW_SOURCE_CODE', true);  // enable ERROR_SHOW_SOURCE_CODE to display the source code for any WARNING OR NOTICE
-  //define ( 'ERROR_LOG_NOTICE_ERROR', true );  //enable ERROR_LOG_NOTICE_ERROR to log Notices messages in default apache log
+define('ERROR_SHOW_SOURCE_CODE',
+    true);  // enable ERROR_SHOW_SOURCE_CODE to display the source code for any WARNING OR NOTICE
+//define ( 'ERROR_LOG_NOTICE_ERROR', true );  //enable ERROR_LOG_NOTICE_ERROR to log Notices messages in default apache log
 
-  //check if it is a installation instance
-  if(!defined('PATH_C')) {
+//check if it is a installation instance
+if (!defined('PATH_C')) {
     // is a intallation instance, so we need to define PATH_C and PATH_LANGUAGECONT constants temporarily
     define('PATH_C', (rtrim(G::sys_get_temp_dir(), PATH_SEP) . PATH_SEP));
-    define('PATH_LANGUAGECONT', PATH_HOME . 'engine/content/languages/' );
-  }
+    define('PATH_LANGUAGECONT', PATH_HOME . 'engine/content/languages/');
+}
 
-  // defining Virtual URLs
-  $virtualURITable = array();
-  $virtualURITable['/plugin/(*)']    = 'plugin';
-  $virtualURITable['/(sys*)/(*.js)'] = 'jsMethod';
-  $virtualURITable['/js/(*)']        = PATH_GULLIVER_HOME . 'js/';
-  $virtualURITable['/jscore/(*)']    = PATH_CORE . 'js/';
+// defining Virtual URLs
+$virtualURITable = [];
+$virtualURITable['/plugin/(*)'] = 'plugin';
+$virtualURITable['/(sys*)/(*.js)'] = 'jsMethod';
+$virtualURITable['/js/(*)'] = PATH_GULLIVER_HOME . 'js/';
+$virtualURITable['/jscore/(*)'] = PATH_CORE . 'js/';
 
-  if ( defined('PATH_C') ) {
+if (defined('PATH_C')) {
     $virtualURITable['/jsform/(*.js)'] = PATH_C . 'xmlform/';
-    $virtualURITable['/extjs/(*)']     = PATH_C . 'ExtJs/';
-  }
+    $virtualURITable['/extjs/(*)'] = PATH_C . 'ExtJs/';
+}
 
-  $virtualURITable['/htmlarea/(*)']                  = PATH_THIRDPARTY . 'htmlarea/';
-  $virtualURITable['/sys[a-zA-Z][a-zA-Z0-9]{0,}()/'] = 'sysNamed';
-  $virtualURITable['/(sys*)']                        = FALSE;
-  $virtualURITable['/errors/(*)']                    = PATH_GULLIVER_HOME . 'methods/errors/';
-  $virtualURITable['/gulliver/(*)']                  = PATH_GULLIVER_HOME . 'methods/';
-  $virtualURITable['/controls/(*)']                  = PATH_GULLIVER_HOME . 'methods/controls/';
-  $virtualURITable['/html2ps_pdf/(*)']               = PATH_THIRDPARTY . 'html2ps_pdf/';
-  $virtualURITable['/images/']                       = 'errorFile';
-  $virtualURITable['/skins/']                        = 'errorFile';
-  $virtualURITable['/files/']                        = 'errorFile';
-  $virtualURITable['/[a-zA-Z][a-zA-Z0-9]{0,}()']     = 'sysUnnamed';
-  $virtualURITable['/rest/(*)']                      = 'rest-service';
-  $virtualURITable['/update/(*)']                    = PATH_GULLIVER_HOME . 'methods/update/';
-  $virtualURITable['/(*)']                           = PATH_HTML;
+$virtualURITable['/htmlarea/(*)'] = PATH_THIRDPARTY . 'htmlarea/';
+$virtualURITable['/sys[a-zA-Z][a-zA-Z0-9]{0,}()/'] = 'sysNamed';
+$virtualURITable['/(sys*)'] = false;
+$virtualURITable['/errors/(*)'] = PATH_GULLIVER_HOME . 'methods/errors/';
+$virtualURITable['/gulliver/(*)'] = PATH_GULLIVER_HOME . 'methods/';
+$virtualURITable['/controls/(*)'] = PATH_GULLIVER_HOME . 'methods/controls/';
+$virtualURITable['/html2ps_pdf/(*)'] = PATH_THIRDPARTY . 'html2ps_pdf/';
+$virtualURITable['/images/'] = 'errorFile';
+$virtualURITable['/skins/'] = 'errorFile';
+$virtualURITable['/files/'] = 'errorFile';
+$virtualURITable['/[a-zA-Z][a-zA-Z0-9]{0,}()'] = 'sysUnnamed';
+$virtualURITable['/rest/(*)'] = 'rest-service';
+$virtualURITable['/update/(*)'] = PATH_GULLIVER_HOME . 'methods/update/';
+$virtualURITable['/(*)'] = PATH_HTML;
 
-  $isRestRequest = false;
+$isRestRequest = false;
 
-  // Verify if we need to redirect or stream the file, if G:VirtualURI returns true means we are going to redirect the page
-  if ( G::virtualURI($_SERVER['REQUEST_URI'], $virtualURITable , $realPath ))
-  {
+// Verify if we need to redirect or stream the file, if G:VirtualURI returns true means we are going to redirect the page
+if (G::virtualURI($_SERVER['REQUEST_URI'], $virtualURITable, $realPath)) {
     // review if the file requested belongs to public_html plugin
-    if ( substr ( $realPath, 0,6) == 'plugin' ) {
-      // Another way to get the path of Plugin public_html and stream the correspondent file, By JHL Jul 14, 08
-      // TODO: $pathsQuery will be used?
-      $pathsQuery = '';
-      // Get the query side
-      // Did we use this variable $pathsQuery for something??
-      $forQuery = explode("?",$realPath);
-      if (isset($forQuery[1])) {
-        $pathsQuery = $forQuery[1];
-      }
+    if (substr($realPath, 0, 6) == 'plugin') {
+        // Another way to get the path of Plugin public_html and stream the correspondent file, By JHL Jul 14, 08
+        // TODO: $pathsQuery will be used?
+        $pathsQuery = '';
+        // Get the query side
+        // Did we use this variable $pathsQuery for something??
+        $forQuery = explode("?", $realPath);
+        if (isset($forQuery[1])) {
+            $pathsQuery = $forQuery[1];
+        }
 
-      //Get that path in array
-      $paths          = explode ( PATH_SEP, $forQuery[0] );
-      //remove the "plugin" word from
-      $paths[0]       = substr ( $paths[0],6);
-      //Get the Plugin Folder, always the first element
-      $pluginFolder   = array_shift($paths);
-      //The other parts are the realpath into public_html (no matter how many elements)
-      $filePath       = implode(PATH_SEP,$paths);
-      $pluginFilename = PATH_PLUGINS . $pluginFolder . PATH_SEP . 'public_html'. PATH_SEP . $filePath;
+        //Get that path in array
+        $paths = explode(PATH_SEP, $forQuery[0]);
+        //remove the "plugin" word from
+        $paths[0] = substr($paths[0], 6);
+        //Get the Plugin Folder, always the first element
+        $pluginFolder = array_shift($paths);
+        //The other parts are the realpath into public_html (no matter how many elements)
+        $filePath = implode(PATH_SEP, $paths);
+        $pluginFilename = PATH_PLUGINS . $pluginFolder . PATH_SEP . 'public_html' . PATH_SEP . $filePath;
 
-      if ( file_exists ( $pluginFilename ) ) {
-        G::streamFile ( $pluginFilename );
-      }
-      die;
+        if (file_exists($pluginFilename)) {
+            G::streamFile($pluginFilename);
+        }
+        die;
     }
 
-    $requestUriArray = explode("/",$_SERVER['REQUEST_URI']);
+    $requestUriArray = explode("/", $_SERVER['REQUEST_URI']);
 
-    if((isset($requestUriArray[1]))&&($requestUriArray[1] == 'skin')) {
-      // This will allow to public images of Custom Skins, By JHL Feb 28, 11
-      $pathsQuery="";
-      // Get the query side
-      // This way we remove garbage
-      $forQuery = explode("?",$realPath);
-      if (isset($forQuery[1])) {
-        $pathsQuery = $forQuery[1];
-      }
+    if ((isset($requestUriArray[1])) && ($requestUriArray[1] == 'skin')) {
+        // This will allow to public images of Custom Skins, By JHL Feb 28, 11
+        $pathsQuery = "";
+        // Get the query side
+        // This way we remove garbage
+        $forQuery = explode("?", $realPath);
+        if (isset($forQuery[1])) {
+            $pathsQuery = $forQuery[1];
+        }
 
-      //Get that path in array
-      $paths = explode ( PATH_SEP, $forQuery[0] );
-      $fileToBeStreamed=str_replace("/skin/",PATH_CUSTOM_SKINS,$_SERVER['REQUEST_URI']);
+        //Get that path in array
+        $paths = explode(PATH_SEP, $forQuery[0]);
+        $fileToBeStreamed = str_replace("/skin/", PATH_CUSTOM_SKINS, $_SERVER['REQUEST_URI']);
 
-      if ( file_exists ( $fileToBeStreamed ) ) {
-        G::streamFile ( $fileToBeStreamed );
-      }
-      die;
+        if (file_exists($fileToBeStreamed)) {
+            G::streamFile($fileToBeStreamed);
+        }
+        die;
     }
     switch ($realPath) {
-      case 'sysUnnamed' :
-        require_once('sysUnnamed.php');
-        die;
-        break;
-      case 'sysNamed' :
-        header('location : ' . $_SERVER['REQUEST_URI'] . '/' .SYS_LANG. '/classic/login/login' );
-        die;
-        break;
-      case 'jsMethod' :
-        G::parseURI ( getenv( "REQUEST_URI" ) );
-        $filename = PATH_METHODS . SYS_COLLECTION . '/' . SYS_TARGET . '.js';
-        G::streamFile ( $filename );
-        die;
-        break;
-      case 'errorFile':
-        header ("location: /errors/error404.php?url=" . urlencode($_SERVER['REQUEST_URI']));
-        if ( DEBUG_TIME_LOG ) G::logTimeByPage(); //log this page
-        die;
-        break;
-      default :
-        if (substr($realPath, 0, 12) == 'rest-service') {
-          $isRestRequest = true;
-        } else {
-          $realPath = explode('?', $realPath);
-          $realPath[0] .= strpos(basename($realPath[0]), '.') === false ? '.php' : '';
-          G::streamFile ( $realPath[0] );
-          die;
-        }
-    }
-  }//virtual URI parser
-
-  // the request correspond to valid php page, now parse the URI
-  G::parseURI(getenv("REQUEST_URI"), $isRestRequest);
-
-    $arrayUpdating = G::isPMUnderUpdating();
-    if ($arrayUpdating['action']) {
-        if ($arrayUpdating['workspace'] == "true" || $arrayUpdating['workspace'] == SYS_TEMP) {
-            header("location: /update/updating.php");
-            if (DEBUG_TIME_LOG) G::logTimeByPage();
+        case 'sysUnnamed' :
+            require_once('sysUnnamed.php');
             die;
-        }
+            break;
+        case 'sysNamed' :
+            header('location : ' . $_SERVER['REQUEST_URI'] . '/' . SYS_LANG . '/classic/login/login');
+            die;
+            break;
+        case 'jsMethod' :
+            G::parseURI(getenv("REQUEST_URI"));
+            $filename = PATH_METHODS . SYS_COLLECTION . '/' . SYS_TARGET . '.js';
+            G::streamFile($filename);
+            die;
+            break;
+        case 'errorFile':
+            header("location: /errors/error404.php?url=" . urlencode($_SERVER['REQUEST_URI']));
+            if (DEBUG_TIME_LOG) {
+                G::logTimeByPage();
+            } //log this page
+            die;
+            break;
+        default :
+            if (substr($realPath, 0, 12) == 'rest-service') {
+                $isRestRequest = true;
+            } else {
+                $realPath = explode('?', $realPath);
+                $realPath[0] .= strpos(basename($realPath[0]), '.') === false ? '.php' : '';
+                G::streamFile($realPath[0]);
+                die;
+            }
     }
+}//virtual URI parser
 
-  // verify if index.html exists
-  if (!file_exists(PATH_HTML . 'index.html')) { // if not, create it from template
+// the request correspond to valid php page, now parse the URI
+G::parseURI(getenv("REQUEST_URI"), $isRestRequest);
+
+$arrayUpdating = G::isPMUnderUpdating();
+if ($arrayUpdating['action']) {
+    if ($arrayUpdating['workspace'] == "true" || $arrayUpdating['workspace'] == SYS_TEMP) {
+        header("location: /update/updating.php");
+        if (DEBUG_TIME_LOG) {
+            G::logTimeByPage();
+        }
+        die;
+    }
+}
+
+// verify if index.html exists
+if (!file_exists(PATH_HTML . 'index.html')) { // if not, create it from template
     file_put_contents(
-      PATH_HTML . 'index.html',
-      G::parseTemplate(PATH_TPL . "index.html", array("lang" => ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN))
+        PATH_HTML . 'index.html',
+        G::parseTemplate(PATH_TPL . "index.html",
+            array("lang" => ((defined("SYS_LANG") && SYS_LANG != "") ? SYS_LANG : "en"), "skin" => SYS_SKIN))
     );
-  }
+}
 
-  define('SYS_URI' , '/sys' .  SYS_TEMP . '/' . SYS_LANG . '/' . SYS_SKIN . '/');
+define('SYS_URI', '/sys' . SYS_TEMP . '/' . SYS_LANG . '/' . SYS_SKIN . '/');
 
-  // defining the serverConf singleton
-  if (defined('PATH_DATA') && file_exists(PATH_DATA)) {
+// defining the serverConf singleton
+if (defined('PATH_DATA') && file_exists(PATH_DATA)) {
     //Instance Server Configuration Singleton
-    $oServerConf =& ServerConf::getSingleton();
-  }
+    $oServerConf = ServerConf::getSingleton();
+}
 
-  // Call Gulliver Classes
+// Call Gulliver Classes
 
 
+// Create headPublisher singleton
 
+$oHeadPublisher = headPublisher::getSingleton();
 
+//Load filter class
 
+$filter = new InputFilter();
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  // Create headPublisher singleton
-
-  $oHeadPublisher =& headPublisher::getSingleton();
-
-  //Load filter class
-
-  $filter = new InputFilter();
-
-  // Installer, redirect to install if we don't have a valid shared data folder
-  if ( !defined('PATH_DATA') || !file_exists(PATH_DATA)) {
+// Installer, redirect to install if we don't have a valid shared data folder
+if (!defined('PATH_DATA') || !file_exists(PATH_DATA)) {
 
     // new installer, extjs based
     define('PATH_DATA', PATH_C);
@@ -289,13 +277,12 @@ use ProcessMaker\Plugins\PluginRegistry;
 
     // if the method name is empty set default to index method
     if (strpos(SYS_TARGET, '/') !== false) {
-      list($controller, $controllerAction) = explode('/', SYS_TARGET);
-    }
-    else {
-      $controllerAction = SYS_TARGET;
+        list($controller, $controllerAction) = explode('/', SYS_TARGET);
+    } else {
+        $controllerAction = SYS_TARGET;
     }
 
-    $controllerAction = ($controllerAction != '' && $controllerAction != 'login')? $controllerAction: 'index';
+    $controllerAction = ($controllerAction != '' && $controllerAction != 'login') ? $controllerAction : 'index';
 
     // create the installer controller and call its method
     if (is_callable([InstallerModule::class, $controllerAction])) {
@@ -308,134 +295,132 @@ use ProcessMaker\Plugins\PluginRegistry;
       header ("location: /errors/error404.php?url=" . urlencode($_SERVER['REQUEST_URI']));
     }
     die;
-  }
+}
 
-  // Load Language Translation
-  G::LoadTranslationObject(defined('SYS_LANG')?SYS_LANG:"en");
+// Load Language Translation
+G::LoadTranslationObject(defined('SYS_LANG') ? SYS_LANG : "en");
 
-  // look for a disabled workspace
-  if($oServerConf->isWSDisabled(SYS_TEMP)){
+// look for a disabled workspace
+if ($oServerConf->isWSDisabled(SYS_TEMP)) {
     $aMessage['MESSAGE'] = G::LoadTranslation('ID_DISB_WORKSPACE');
-    $G_PUBLISH           = new Publisher;
-    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-    G::RenderPage( 'publish' );
+    $G_PUBLISH = new Publisher;
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage);
+    G::RenderPage('publish');
     die;
-  }
+}
 
-  // database and workspace definition
-  // if SYS_TEMP exists, the URL has a workspace, now we need to verify if exists their db.php file
-  if ( defined('SYS_TEMP') && SYS_TEMP != '')  {
+// database and workspace definition
+// if SYS_TEMP exists, the URL has a workspace, now we need to verify if exists their db.php file
+if (defined('SYS_TEMP') && SYS_TEMP != '') {
     //this is the default, the workspace db.php file is in /shared/workflow/sites/SYS_SYS
-    if ( file_exists( PATH_DB .  SYS_TEMP . '/db.php' ) ) {
-      $pathFile = $filter->validateInput(PATH_DB .  SYS_TEMP . '/db.php','path');
-      require_once( $pathFile );
-      define ( 'SYS_SYS' , SYS_TEMP );
+    if (file_exists(PATH_DB . SYS_TEMP . '/db.php')) {
+        $pathFile = $filter->validateInput(PATH_DB . SYS_TEMP . '/db.php', 'path');
+        require_once($pathFile);
+        define('SYS_SYS', SYS_TEMP);
 
-      // defining constant for workspace shared directory
-      define ( 'PATH_WORKSPACE' , PATH_DB . config("system.workspace") . PATH_SEP );
-      // including workspace shared classes -> particularlly for pmTables
-      set_include_path(get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE);
+        // defining constant for workspace shared directory
+        define('PATH_WORKSPACE', PATH_DB . config("system.workspace") . PATH_SEP);
+        // including workspace shared classes -> particularlly for pmTables
+        set_include_path(get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE);
+    } else {
+        G::SendTemporalMessage('ID_NOT_WORKSPACE', "error");
+        G::header('location: /sys/' . SYS_LANG . '/' . SYS_SKIN . '/main/sysLogin?errno=2');
+        die;
     }
-    else {
-      G::SendTemporalMessage ('ID_NOT_WORKSPACE', "error");
-      G::header('location: /sys/' . SYS_LANG . '/' . SYS_SKIN . '/main/sysLogin?errno=2');
-      die;
-    }
-  }
-  else {  //when we are in global pages, outside any valid workspace
-    if (SYS_TARGET==='newSite') {
-      $phpFile = G::ExpandPath('methods') . SYS_COLLECTION . "/" . SYS_TARGET.'.php';
-      $phpFile = $filter->validateInput($phpFile,'path');
-      require_once($phpFile);
-      die();
-    }
-    else {
-      if(SYS_TARGET=="dbInfo"){ //Show dbInfo when no SYS_SYS
-          $pathFile = PATH_METHODS . 'login/dbInfo.php';
-          $pathFile = $filter->validateInput($pathFile,'path');
-          require_once($pathFile);
-      }
-      else{
+} else {  //when we are in global pages, outside any valid workspace
+    if (SYS_TARGET === 'newSite') {
+        $phpFile = G::ExpandPath('methods') . SYS_COLLECTION . "/" . SYS_TARGET . '.php';
+        $phpFile = $filter->validateInput($phpFile, 'path');
+        require_once($phpFile);
+        die();
+    } else {
+        if (SYS_TARGET == "dbInfo") { //Show dbInfo when no SYS_SYS
+            $pathFile = PATH_METHODS . 'login/dbInfo.php';
+            $pathFile = $filter->validateInput($pathFile, 'path');
+            require_once($pathFile);
+        } else {
 
-        if (substr(SYS_SKIN, 0, 2) === 'ux' && SYS_TARGET != 'sysLoginVerify') { // new ux sysLogin - extjs based form
-          $pathFile = $filter->validateInput(PATH_CONTROLLERS . 'main.php','path');
-          require_once $pathFile;
-          $controllerClass  = 'Main';
-          $controllerAction = SYS_TARGET == 'sysLoginVerify' ? SYS_TARGET : 'sysLogin';
-          //if the method exists
-          if( is_callable(Array($controllerClass, $controllerAction)) ) {
-            $controller = new $controllerClass();
-            $controller->setHttpRequestData($_REQUEST);
-            $controller->call($controllerAction);
-          }
+            if (substr(SYS_SKIN, 0,
+                    2) === 'ux' && SYS_TARGET != 'sysLoginVerify') { // new ux sysLogin - extjs based form
+                $pathFile = $filter->validateInput(PATH_CONTROLLERS . 'main.php', 'path');
+                require_once $pathFile;
+                $controllerClass = 'Main';
+                $controllerAction = SYS_TARGET == 'sysLoginVerify' ? SYS_TARGET : 'sysLogin';
+                //if the method exists
+                if (is_callable(Array($controllerClass, $controllerAction))) {
+                    $controller = new $controllerClass();
+                    $controller->setHttpRequestData($_REQUEST);
+                    $controller->call($controllerAction);
+                }
+            } else { // classic sysLogin interface
+                $pathFile = PATH_METHODS . 'login/sysLogin.php';
+                $pathFile = $filter->validateInput($pathFile, 'path');
+                require_once($pathFile);
+                die();
+            }
         }
-        else { // classic sysLogin interface
-          $pathFile = PATH_METHODS . 'login/sysLogin.php';
-          $pathFile = $filter->validateInput($pathFile,'path');
-          require_once($pathFile) ;
-          die();
-        }
-      }
-      if ( DEBUG_TIME_LOG ) G::logTimeByPage(); //log this page
-      die();
+        if (DEBUG_TIME_LOG) {
+            G::logTimeByPage();
+        } //log this page
+        die();
     }
-  }
+}
 
-  // PM Paths DATA
-  define('PATH_DATA_SITE',                 PATH_DATA      . 'sites/' . config("system.workspace") . '/');
-  define('PATH_DOCUMENT',                  PATH_DATA_SITE . 'files/');
-  define('PATH_DATA_MAILTEMPLATES',        PATH_DATA_SITE . 'mailTemplates/');
-  define('PATH_DATA_PUBLIC',               PATH_DATA_SITE . 'public/');
-  define('PATH_DATA_REPORTS',              PATH_DATA_SITE . 'reports/');
-  define('PATH_DYNAFORM',                  PATH_DATA_SITE . 'xmlForms/');
-  define('PATH_IMAGES_ENVIRONMENT_FILES',  PATH_DATA_SITE . 'usersFiles'.PATH_SEP);
-  define('PATH_IMAGES_ENVIRONMENT_USERS',  PATH_DATA_SITE . 'usersPhotographies'.PATH_SEP);
-  define('SERVER_NAME',  $_SERVER ['SERVER_NAME']);
-  define('SERVER_PORT',  $_SERVER ['SERVER_PORT']);
+// PM Paths DATA
+define('PATH_DATA_SITE', PATH_DATA . 'sites/' . config("system.workspace") . '/');
+define('PATH_DOCUMENT', PATH_DATA_SITE . 'files/');
+define('PATH_DATA_MAILTEMPLATES', PATH_DATA_SITE . 'mailTemplates/');
+define('PATH_DATA_PUBLIC', PATH_DATA_SITE . 'public/');
+define('PATH_DATA_REPORTS', PATH_DATA_SITE . 'reports/');
+define('PATH_DYNAFORM', PATH_DATA_SITE . 'xmlForms/');
+define('PATH_IMAGES_ENVIRONMENT_FILES', PATH_DATA_SITE . 'usersFiles' . PATH_SEP);
+define('PATH_IMAGES_ENVIRONMENT_USERS', PATH_DATA_SITE . 'usersPhotographies' . PATH_SEP);
+define('SERVER_NAME', $_SERVER ['SERVER_NAME']);
+define('SERVER_PORT', $_SERVER ['SERVER_PORT']);
 
-  // create memcached singleton
-  $memcache = & PMmemcached::getSingleton(config("system.workspace"));
+// create memcached singleton
+$memcache = PMmemcached::getSingleton(config("system.workspace"));
 
-  // verify configuration for rest service
-  if ($isRestRequest) {
-      // disable until confirm that rest is enabled & configured on rest-config.ini file
-      $isRestRequest = false;
-      $confFile = '';
-      $restApiClassPath = '';
+// verify configuration for rest service
+if ($isRestRequest) {
+    // disable until confirm that rest is enabled & configured on rest-config.ini file
+    $isRestRequest = false;
+    $confFile = '';
+    $restApiClassPath = '';
 
-      // try load and getting rest configuration
-      if (file_exists(PATH_DATA_SITE . 'rest-config.ini')) {
-          $confFile = PATH_DATA_SITE . 'rest-config.ini';
-          $restApiClassPath = PATH_DATA_SITE;
-      } elseif (file_exists(PATH_CONFIG . 'rest-config.ini')) {
-          $confFile = PATH_CONFIG . 'rest-config.ini';
-      }
-      if (! empty($confFile) && $restConfig = @parse_ini_file($confFile, true)) {
-          if (array_key_exists('enable_service', $restConfig)) {
-              if ($restConfig['enable_service'] == 'true' || $restConfig['enable_service'] == '1') {
-                  $isRestRequest = true; // rest service enabled
-              }
-          }
-      }
-  }
+    // try load and getting rest configuration
+    if (file_exists(PATH_DATA_SITE . 'rest-config.ini')) {
+        $confFile = PATH_DATA_SITE . 'rest-config.ini';
+        $restApiClassPath = PATH_DATA_SITE;
+    } elseif (file_exists(PATH_CONFIG . 'rest-config.ini')) {
+        $confFile = PATH_CONFIG . 'rest-config.ini';
+    }
+    if (!empty($confFile) && $restConfig = @parse_ini_file($confFile, true)) {
+        if (array_key_exists('enable_service', $restConfig)) {
+            if ($restConfig['enable_service'] == 'true' || $restConfig['enable_service'] == '1') {
+                $isRestRequest = true; // rest service enabled
+            }
+        }
+    }
+}
 
-  //here we are loading all plugins registered
-  //the singleton has a list of enabled plugins
-  $oPluginRegistry = PluginRegistry::loadSingleton();
+//here we are loading all plugins registered
+//the singleton has a list of enabled plugins
+$oPluginRegistry = PluginRegistry::loadSingleton();
 
-  // setup propel definitions and logging
-  require_once ( "propel/Propel.php" );
-  require_once ( "creole/Creole.php" );
+// setup propel definitions and logging
+require_once("propel/Propel.php");
+require_once("creole/Creole.php");
 
-  if (defined('DEBUG_SQL_LOG') && DEBUG_SQL_LOG) {
-    define('PM_PID', mt_rand(1,999999));
+if (defined('DEBUG_SQL_LOG') && DEBUG_SQL_LOG) {
+    define('PM_PID', mt_rand(1, 999999));
     require_once 'Log.php';
 
     // register debug connection decorator driver
     Creole::registerDriver('*', 'creole.contrib.DebugConnection');
 
     // initialize Propel with converted config file
-    Propel::init( PATH_CORE . "config/databases.php" );
+    Propel::init(PATH_CORE . "config/databases.php");
 
     // unified log file for all databases
     $logFile = PATH_DATA . 'log' . PATH_SEP . 'propel.log';
@@ -444,271 +429,333 @@ use ProcessMaker\Plugins\PluginRegistry;
     // log file for workflow database
     $con = Propel::getConnection('workflow');
     if ($con instanceof DebugConnection) {
-      $con->setLogger($logger);
+        $con->setLogger($logger);
     }
     // log file for rbac database
     $con = Propel::getConnection('rbac');
 
     if ($con instanceof DebugConnection) {
-      $con->setLogger($logger);
+        $con->setLogger($logger);
     }
 
     // log file for report database
     $con = Propel::getConnection('rp');
     if ($con instanceof DebugConnection) {
-      $con->setLogger($logger);
+        $con->setLogger($logger);
     }
-  }
-  else {
-    Propel::init( PATH_CORE . "config/databases.php" );
-  }
+} else {
+    Propel::init(PATH_CORE . "config/databases.php");
+}
 
-  Creole::registerDriver('dbarray', 'creole.contrib.DBArrayConnection');
+Creole::registerDriver('dbarray', 'creole.contrib.DBArrayConnection');
 
-  // Session Initializations
-  ini_set('session.auto_start', '1');
+// Session Initializations
+ini_set('session.auto_start', '1');
 
-  // The register_globals feature has been DEPRECATED as of PHP 5.3.0. default value Off.
-  // ini_set( 'register_globals', 'Off' );
-  //session_start();
-  ob_start();
+// The register_globals feature has been DEPRECATED as of PHP 5.3.0. default value Off.
+// ini_set( 'register_globals', 'Off' );
+//session_start();
+ob_start();
 
-  // Rebuild the base Workflow translations if not exists
-  if( ! is_file(PATH_LANGUAGECONT . 'translation.en') ){
-    require_once ( "classes/model/Translation.php" );
+// Rebuild the base Workflow translations if not exists
+if (!is_file(PATH_LANGUAGECONT . 'translation.en')) {
+    require_once("classes/model/Translation.php");
     $fields = Translation::generateFileTranslation('en');
-  }
+}
 
-  // TODO: Verify if the language set into url is defined in translations env.
-  if( SYS_LANG != 'en' && ! is_file(PATH_LANGUAGECONT . 'translation.' . SYS_LANG) ){
-    require_once ( "classes/model/Translation.php" );
+// TODO: Verify if the language set into url is defined in translations env.
+if (SYS_LANG != 'en' && !is_file(PATH_LANGUAGECONT . 'translation.' . SYS_LANG)) {
+    require_once("classes/model/Translation.php");
     $fields = Translation::generateFileTranslation(SYS_LANG);
-  }
+}
 
-  // Setup plugins
-  $oPluginRegistry->setupPlugins(); //get and setup enabled plugins
-  $avoidChangedWorkspaceValidation = false;
+// Setup plugins
+$oPluginRegistry->setupPlugins(); //get and setup enabled plugins
+$avoidChangedWorkspaceValidation = false;
 
-  // Load custom Classes and Model from Plugins.
-  G::LoadAllPluginModelClasses();
+// Load custom Classes and Model from Plugins.
+G::LoadAllPluginModelClasses();
 
-  // jump to php file in methods directory
-  $collectionPlugin = '';
-  if ($oPluginRegistry->isRegisteredFolder(SYS_COLLECTION)) {
-    $phpFile = PATH_PLUGINS . SYS_COLLECTION . PATH_SEP . SYS_TARGET.'.php';
-    $targetPlugin = explode( '/', SYS_TARGET );
+// jump to php file in methods directory
+$collectionPlugin = '';
+if ($oPluginRegistry->isRegisteredFolder(SYS_COLLECTION)) {
+    $phpFile = PATH_PLUGINS . SYS_COLLECTION . PATH_SEP . SYS_TARGET . '.php';
+    $targetPlugin = explode('/', SYS_TARGET);
     $collectionPlugin = $targetPlugin[0];
     $avoidChangedWorkspaceValidation = true;
-  }
-  else {
-    $phpFile = G::ExpandPath('methods') . SYS_COLLECTION . PATH_SEP . SYS_TARGET.'.php';
-  }
+} else {
+    $phpFile = G::ExpandPath('methods') . SYS_COLLECTION . PATH_SEP . SYS_TARGET . '.php';
+}
 
-  // services is a special folder,
-  if ( SYS_COLLECTION == 'services' ) {
+// services is a special folder,
+if (SYS_COLLECTION == 'services') {
     $avoidChangedWorkspaceValidation = true;
-    $targetPlugin = explode( '/', SYS_TARGET );
+    $targetPlugin = explode('/', SYS_TARGET);
 
-    if ( $targetPlugin[0] == 'webdav' ) {
-      $phpFile = G::ExpandPath('methods') . SYS_COLLECTION . PATH_SEP . 'webdav.php';
+    if ($targetPlugin[0] == 'webdav') {
+        $phpFile = G::ExpandPath('methods') . SYS_COLLECTION . PATH_SEP . 'webdav.php';
     }
-  }
+}
 
-  if (SYS_COLLECTION == 'login' && SYS_TARGET == 'login') {
+if (SYS_COLLECTION == 'login' && SYS_TARGET == 'login') {
     $avoidChangedWorkspaceValidation = true;
-  }
+}
 
-  //the index.php file, this new feature will allow automatically redirects to valid php file inside any methods folder
-  /* DEPRECATED
-  if ( SYS_TARGET == '' ) {
-    $phpFile = str_replace ( '.php', 'index.php', $phpFile );
-    $phpFile = include ( $phpFile );
-  }*/
-  $bWE = false;
-  $isControllerCall = false;
-  if ( substr(SYS_COLLECTION , 0,8) === 'gulliver' ) {
-    $phpFile = PATH_GULLIVER_HOME . 'methods/' . substr( SYS_COLLECTION , 8) . SYS_TARGET.'.php';
-  }
-  else {
+//the index.php file, this new feature will allow automatically redirects to valid php file inside any methods folder
+/* DEPRECATED
+if ( SYS_TARGET == '' ) {
+  $phpFile = str_replace ( '.php', 'index.php', $phpFile );
+  $phpFile = include ( $phpFile );
+}*/
+$bWE = false;
+$isControllerCall = false;
+if (substr(SYS_COLLECTION, 0, 8) === 'gulliver') {
+    $phpFile = PATH_GULLIVER_HOME . 'methods/' . substr(SYS_COLLECTION, 8) . SYS_TARGET . '.php';
+} else {
     //when the file is part of the public directory of any PROCESS, this a ProcessMaker feature
     if (preg_match('/^[0-9][[:alnum:]]+$/', SYS_COLLECTION) == 1) { //the pattern is /sysSYS/LANG/SKIN/PRO_UID/file
-      $auxPart = explode ( '/' ,  $_SERVER['REQUEST_URI']);
-      $aAux = explode('?', $auxPart[ count($auxPart)-1]);
-      //$extPart = explode ( '.' , $auxPart[ count($auxPart)-1] );
-      $extPart = explode ( '.' , $aAux[0] );
-      $queryPart = isset($aAux[1])?$aAux[1]:"";
-      $extension = $extPart[ count($extPart)-1 ];
-      $phpFile = PATH_DATA_SITE . 'public' . PATH_SEP .  SYS_COLLECTION . PATH_SEP . urldecode ($auxPart[ count($auxPart)-1]);
-      $aAux = explode('?', $phpFile);
-      $phpFile = $aAux[0];
+        $auxPart = explode('/', $_SERVER['REQUEST_URI']);
+        $aAux = explode('?', $auxPart[count($auxPart) - 1]);
+        //$extPart = explode ( '.' , $auxPart[ count($auxPart)-1] );
+        $extPart = explode('.', $aAux[0]);
+        $queryPart = isset($aAux[1]) ? $aAux[1] : "";
+        $extension = $extPart[count($extPart) - 1];
+        $phpFile = PATH_DATA_SITE . 'public' . PATH_SEP . SYS_COLLECTION . PATH_SEP . urldecode($auxPart[count($auxPart) - 1]);
+        $aAux = explode('?', $phpFile);
+        $phpFile = $aAux[0];
 
-      if ($extension != 'php') {
-        G::streamFile($phpFile);
-        die;
-      }
+        if ($extension != 'php') {
+            G::streamFile($phpFile);
+            die;
+        }
 
-      $avoidChangedWorkspaceValidation=true;
-      $bWE = true;
-      //$phpFile = PATH_DATA_SITE . 'public' . PATH_SEP .  SYS_COLLECTION . PATH_SEP . $auxPart[ count($auxPart)-1];
+        $avoidChangedWorkspaceValidation = true;
+        $bWE = true;
+        //$phpFile = PATH_DATA_SITE . 'public' . PATH_SEP .  SYS_COLLECTION . PATH_SEP . $auxPart[ count($auxPart)-1];
     }
 
     //erik: verify if it is a Controller Class or httpProxyController Class
     if (is_file(PATH_CONTROLLERS . SYS_COLLECTION . '.php')) {
-      $pathFile = $filter->validateInput(PATH_CONTROLLERS . SYS_COLLECTION . '.php','path');
-      require_once $pathFile;
-      $controllerClass  = SYS_COLLECTION;
-      //if the method name is empty set default to index method
-      $controllerAction = SYS_TARGET != '' ? SYS_TARGET : 'index';
-      //if the method exists
-      if (is_callable(Array($controllerClass, $controllerAction)) ) {
-        $isControllerCall = true;
-      }
+        $pathFile = $filter->validateInput(PATH_CONTROLLERS . SYS_COLLECTION . '.php', 'path');
+        require_once $pathFile;
+        $controllerClass = SYS_COLLECTION;
+        //if the method name is empty set default to index method
+        $controllerAction = SYS_TARGET != '' ? SYS_TARGET : 'index';
+        //if the method exists
+        if (is_callable(Array($controllerClass, $controllerAction))) {
+            $isControllerCall = true;
+        }
     }
 
-    if (!$isControllerCall && ! file_exists($phpFile) && ! $isRestRequest) {
-      $_SESSION['phpFileNotFound'] = $_SERVER['REQUEST_URI'];
-      header("location: /errors/error404.php?url=" . urlencode($_SERVER['REQUEST_URI']));
-      die;
+    if (!$isControllerCall && !file_exists($phpFile) && !$isRestRequest) {
+        $_SESSION['phpFileNotFound'] = $_SERVER['REQUEST_URI'];
+        header("location: /errors/error404.php?url=" . urlencode($_SERVER['REQUEST_URI']));
+        die;
     }
-  }
+}
 
-  //redirect to login, if user changed the workspace in the URL
-  if (! $avoidChangedWorkspaceValidation && isset($_SESSION['WORKSPACE']) && $_SESSION['WORKSPACE'] != config("system.workspace")) {
+//redirect to login, if user changed the workspace in the URL
+if (!$avoidChangedWorkspaceValidation && isset($_SESSION['WORKSPACE']) && $_SESSION['WORKSPACE'] != config("system.workspace")) {
     $_SESSION['WORKSPACE'] = config("system.workspace");
-    G::SendTemporalMessage ('ID_USER_HAVENT_RIGHTS_SYSTEM', "error");
+    G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', "error");
     // verify if the current skin is a 'ux' variant
     $urlPart = substr(SYS_SKIN, 0, 2) == 'ux' && SYS_SKIN != 'uxs' ? '/main/login' : '/login/login';
 
     header('Location: /sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN . $urlPart);
     die;
-  }
+}
 
-  // enable rbac
-  $RBAC = &RBAC::getSingleton( PATH_DATA, session_id() );
-  $RBAC->sSystem = 'PROCESSMAKER';
+// enable rbac
+$RBAC = RBAC::getSingleton(PATH_DATA, session_id());
+$RBAC->sSystem = 'PROCESSMAKER';
 
-  // define and send Headers for all pages
-  if (! defined('EXECUTE_BY_CRON')) {
-    header("Expires: " . gmdate("D, d M Y H:i:s", mktime( 0,0,0,date('m'),date('d')-1,date('Y') ) ) . " GMT");
+// define and send Headers for all pages
+if (!defined('EXECUTE_BY_CRON')) {
+    header("Expires: " . gmdate("D, d M Y H:i:s", mktime(0, 0, 0, date('m'), date('d') - 1, date('Y'))) . " GMT");
     header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
     header("Cache-Control: no-store, no-cache, must-revalidate");
     header("Cache-Control: post-check=0, pre-check=0", false);
     header("Pragma: no-cache");
 
     // get the language direction from ServerConf
-    define('SYS_LANG_DIRECTION', $oServerConf->getLanDirection() );
+    define('SYS_LANG_DIRECTION', $oServerConf->getLanDirection());
 
-    if((isset( $_SESSION['USER_LOGGED'] ))&&(!(isset($_GET['sid'])))) {
-      if (PHP_VERSION < 5.2) {
-        setcookie(session_name(), session_id(), time() + $timelife, '/', '; HttpOnly');
-      } else {
-        setcookie(session_name(), session_id(), time() + $timelife, '/', null, false, true);
-      }
-      $RBAC->initRBAC();
-      //using optimization with memcache, the user data will be in memcache 8 hours, or until session id goes invalid
-      $memKey = 'rbacSession' . session_id();
-      if ( ($RBAC->aUserInfo = $memcache->get($memKey)) === false ) {
-        $RBAC->loadUserRolePermission( $RBAC->sSystem, $_SESSION['USER_LOGGED'] );
-        $memcache->set( $memKey, $RBAC->aUserInfo, PMmemcached::EIGHT_HOURS );
-      }
-    }
-    else {
-      // this is the blank list to allow execute scripts with no login (without session started)
-      $noLoginFiles   = $noLoginFolders = array();
-      $noLoginFiles[] = 'login';
-      $noLoginFiles[] = 'authentication';
-      $noLoginFiles[] = 'login_Ajax';
-      $noLoginFiles[] = 'dbInfo';
-      $noLoginFiles[] = 'sysLoginVerify';
-      $noLoginFiles[] = 'processes_Ajax';
-      $noLoginFiles[] = 'showLogoFile';
-      $noLoginFiles[] = 'forgotPassword';
-      $noLoginFiles[] = 'retrivePassword';
-      $noLoginFiles[] = 'genericAjax';
-
-      $noLoginFolders[] = 'services';
-      $noLoginFolders[] = 'tracker';
-      $noLoginFolders[] = 'InstallerModule';
-
-      // This sentence is used when you lost the Session
-      if (! in_array(SYS_TARGET, $noLoginFiles)
-        && ! in_array(SYS_COLLECTION, $noLoginFolders)
-        && $bWE != true && $collectionPlugin != 'services'
-        && ! $isRestRequest
-      ) {
-        $bRedirect = true;
-
-        if (isset($_GET['sid'])) {
-          $oSessions = new Sessions();
-          if ($aSession = $oSessions->verifySession($_GET['sid'])) {
-            require_once 'classes/model/Users.php';
-            $oUser = new Users();
-            $aUser = $oUser->load($aSession['USR_UID']);
-            initUserSession($aUser['USR_UID'], $aUser['USR_USERNAME']);
-            $bRedirect = false;
-            if (PHP_VERSION < 5.2) {
-              setcookie(session_name(), session_id(), time() + $timelife, '/', '; HttpOnly');
-            } else {
-              setcookie(session_name(), session_id(), time() + $timelife, '/', null, false, true);
-            }
-            $RBAC->initRBAC();
-            $RBAC->loadUserRolePermission( $RBAC->sSystem, $_SESSION['USER_LOGGED'] );
-            $memKey = 'rbacSession' . session_id();
-            $memcache->set($memKey, $RBAC->aUserInfo, PMmemcached::EIGHT_HOURS );
-          }
+    if ((isset($_SESSION['USER_LOGGED'])) && (!(isset($_GET['sid'])))) {
+        if (PHP_VERSION < 5.2) {
+            setcookie(session_name(), session_id(), time() + $timelife, '/', '; HttpOnly');
+        } else {
+            setcookie(session_name(), session_id(), time() + $timelife, '/', null, false, true);
         }
-
-        if ($bRedirect) {
-          if (substr(SYS_SKIN, 0, 2) == 'ux' && SYS_SKIN != 'uxs') {  // verify if the current skin is a 'ux' variant
-            $loginUrl = 'main/login';
-          }
-          else if (strpos($_SERVER['REQUEST_URI'], '/home') !== false){ //verify is it is using the uxs skin for simplified interface
-            $loginUrl = 'home/login';
-          }
-          else {
-            $loginUrl = 'login/login'; // just set up the classic login
-          }
-
-          if (empty($_POST)) {
-            header('location: ' . SYS_URI . $loginUrl . '?u=' . urlencode($_SERVER['REQUEST_URI']));
-
-          }
-          else {
-            if ($isControllerCall) {
-      		    header("HTTP/1.0 302 session lost in controller");
-            }
-            else {
-              header('location: ' . SYS_URI . $loginUrl);
-            }
-          }
-          die();
+        $RBAC->initRBAC();
+        //using optimization with memcache, the user data will be in memcache 8 hours, or until session id goes invalid
+        $memKey = 'rbacSession' . session_id();
+        if (($RBAC->aUserInfo = $memcache->get($memKey)) === false) {
+            $RBAC->loadUserRolePermission($RBAC->sSystem, $_SESSION['USER_LOGGED']);
+            $memcache->set($memKey, $RBAC->aUserInfo, PMmemcached::EIGHT_HOURS);
         }
-      }
-    }
-    $_SESSION['phpLastFileFound'] = $_SERVER['REQUEST_URI'];
-
-    /**
-     * New feature for Gulliver framework to support Controllers & HttpProxyController classes handling
-     * @author Erik Amaru Ortiz <erik@colosa.com, aortiz.erik@gmail.com>
-     */
-    if ($isControllerCall) { //Instance the Controller object and call the request method
-      $controller = new $controllerClass();
-      $controller->setHttpRequestData($_REQUEST);
-      $controller->call($controllerAction);
-    } elseif ($isRestRequest) {
-      G::dispatchRestService(SYS_TARGET, $restConfig, $restApiClassPath);
     } else {
-      require_once $filter->validateInput($phpFile,'path');
-    }
+        // this is the blank list to allow execute scripts with no login (without session started)
+        $noLoginFiles = $noLoginFolders = [];
+        $noLoginFiles[] = 'login';
+        $noLoginFiles[] = 'authentication';
+        $noLoginFiles[] = 'login_Ajax';
+        $noLoginFiles[] = 'dbInfo';
+        $noLoginFiles[] = 'sysLoginVerify';
+        $noLoginFiles[] = 'processes_Ajax';
+        $noLoginFiles[] = 'showLogoFile';
+        $noLoginFiles[] = 'forgotPassword';
+        $noLoginFiles[] = 'retrivePassword';
+        $noLoginFiles[] = 'genericAjax';
 
-    if (defined('SKIP_HEADERS')){
-      header("Expires: " . gmdate("D, d M Y H:i:s", mktime(0, 0, 0, date('m'), date('d'), date('Y') + 1)) . " GMT");
-      header('Cache-Control: public');
-      header('Pragma: ');
-    }
+        $noLoginFolders[] = 'services';
+        $noLoginFolders[] = 'tracker';
+        $noLoginFolders[] = 'installer';
 
-    ob_end_flush();
-    if (DEBUG_TIME_LOG) {
-      G::logTimeByPage(); //log this page
+        // This sentence is used when you lost the Session
+        if (!in_array(SYS_TARGET, $noLoginFiles)
+            && !in_array(SYS_COLLECTION, $noLoginFolders)
+            && $bWE != true && $collectionPlugin != 'services'
+            && !$isRestRequest
+        ) {
+            $bRedirect = true;
+
+            if (isset($_GET['sid'])) {
+                $oSessions = new Sessions();
+                if ($aSession = $oSessions->verifySession($_GET['sid'])) {
+                    require_once 'classes/model/Users.php';
+                    $oUser = new Users();
+                    $aUser = $oUser->load($aSession['USR_UID']);
+                    initUserSession($aUser['USR_UID'], $aUser['USR_USERNAME']);
+                    $bRedirect = false;
+                    if (PHP_VERSION < 5.2) {
+                        setcookie(session_name(), session_id(), time() + $timelife, '/', '; HttpOnly');
+                    } else {
+                        setcookie(session_name(), session_id(), time() + $timelife, '/', null, false, true);
+                    }
+                    $RBAC->initRBAC();
+                    $RBAC->loadUserRolePermission($RBAC->sSystem, $_SESSION['USER_LOGGED']);
+                    $memKey = 'rbacSession' . session_id();
+                    $memcache->set($memKey, $RBAC->aUserInfo, PMmemcached::EIGHT_HOURS);
+                }
+            }
+
+            if ((isset($_SESSION['USER_LOGGED'])) && (!(isset($_GET['sid'])))) {
+                if (PHP_VERSION < 5.2) {
+                    setcookie(session_name(), session_id(), time() + $timelife, '/', '; HttpOnly');
+                } else {
+                    setcookie(session_name(), session_id(), time() + $timelife, '/', null, false, true);
+                }
+                $RBAC->initRBAC();
+                //using optimization with memcache, the user data will be in memcache 8 hours, or until session id goes invalid
+                $memKey = 'rbacSession' . session_id();
+                if (($RBAC->aUserInfo = $memcache->get($memKey)) === false) {
+                    $RBAC->loadUserRolePermission($RBAC->sSystem, $_SESSION['USER_LOGGED']);
+                    $memcache->set($memKey, $RBAC->aUserInfo, PMmemcached::EIGHT_HOURS);
+                }
+            } else {
+                // this is the blank list to allow execute scripts with no login (without session started)
+                $noLoginFiles = $noLoginFolders = [];
+                $noLoginFiles[] = 'login';
+                $noLoginFiles[] = 'authentication';
+                $noLoginFiles[] = 'login_Ajax';
+                $noLoginFiles[] = 'dbInfo';
+                $noLoginFiles[] = 'sysLoginVerify';
+                $noLoginFiles[] = 'processes_Ajax';
+                $noLoginFiles[] = 'showLogoFile';
+                $noLoginFiles[] = 'forgotPassword';
+                $noLoginFiles[] = 'retrivePassword';
+                $noLoginFiles[] = 'genericAjax';
+
+                $noLoginFolders[] = 'services';
+                $noLoginFolders[] = 'tracker';
+                $noLoginFolders[] = 'installer';
+
+                // This sentence is used when you lost the Session
+                if (!in_array(SYS_TARGET, $noLoginFiles)
+                    && !in_array(SYS_COLLECTION, $noLoginFolders)
+                    && $bWE != true && $collectionPlugin != 'services'
+                    && !$isRestRequest
+                ) {
+                    $bRedirect = true;
+
+                    if (isset($_GET['sid'])) {
+                        $oSessions = new Sessions();
+                        if ($aSession = $oSessions->verifySession($_GET['sid'])) {
+                            require_once 'classes/model/Users.php';
+                            $oUser = new Users();
+                            $aUser = $oUser->load($aSession['USR_UID']);
+                            $_SESSION['USER_LOGGED'] = $aUser['USR_UID'];
+                            $_SESSION['USR_USERNAME'] = $aUser['USR_USERNAME'];
+                            $bRedirect = false;
+                            if (PHP_VERSION < 5.2) {
+                                setcookie(session_name(), session_id(), time() + $timelife, '/', '; HttpOnly');
+                            } else {
+                                setcookie(session_name(), session_id(), time() + $timelife, '/', null, false, true);
+                            }
+                            $RBAC->initRBAC();
+                            $RBAC->loadUserRolePermission($RBAC->sSystem, $_SESSION['USER_LOGGED']);
+                            $memKey = 'rbacSession' . session_id();
+                            $memcache->set($memKey, $RBAC->aUserInfo, PMmemcached::EIGHT_HOURS);
+                        }
+                    }
+
+                    if ($bRedirect) {
+                        if (substr(SYS_SKIN, 0,
+                                2) == 'ux' && SYS_SKIN != 'uxs'
+                        ) {  // verify if the current skin is a 'ux' variant
+                            $loginUrl = 'main/login';
+                        } else {
+                            if (strpos($_SERVER['REQUEST_URI'],
+                                    '/home') !== false
+                            ) { //verify is it is using the uxs skin for simplified interface
+                                $loginUrl = 'home/login';
+                            } else {
+                                $loginUrl = 'login/login'; // just set up the classic login
+                            }
+                        }
+
+                        if (empty($_POST)) {
+                            header('location: ' . SYS_URI . $loginUrl . '?u=' . urlencode($_SERVER['REQUEST_URI']));
+
+                        } else {
+                            if ($isControllerCall) {
+                                header("HTTP/1.0 302 session lost in controller");
+                            } else {
+                                header('location: ' . SYS_URI . $loginUrl);
+                            }
+                        }
+                        die();
+                    }
+                }
+            }
+            $_SESSION['phpLastFileFound'] = $_SERVER['REQUEST_URI'];
+
+            /**
+             * New feature for Gulliver framework to support Controllers & HttpProxyController classes handling
+             *
+             * @author Erik Amaru Ortiz <erik@colosa.com, aortiz.erik@gmail.com>
+             */
+            if ($isControllerCall) { //Instance the Controller object and call the request method
+                $controller = new $controllerClass();
+                $controller->setHttpRequestData($_REQUEST);
+                $controller->call($controllerAction);
+            } elseif ($isRestRequest) {
+                G::dispatchRestService(SYS_TARGET, $restConfig, $restApiClassPath);
+            } else {
+                require_once $filter->validateInput($phpFile, 'path');
+            }
+
+            if (defined('SKIP_HEADERS')) {
+                header("Expires: " . gmdate("D, d M Y H:i:s",
+                        mktime(0, 0, 0, date('m'), date('d'), date('Y') + 1)) . " GMT");
+                header('Cache-Control: public');
+                header('Pragma: ');
+            }
+
+            ob_end_flush();
+            if (DEBUG_TIME_LOG) {
+                G::logTimeByPage(); //log this page
+            }
+        }
     }
-  }
+}
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 44582be96..1c9d476ed 100644
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -30,48 +30,49 @@ use ProcessMaker\Plugins\PluginRegistry;
  * this file is used initialize main variables, redirect and dispatch all requests
  */
 
-function transactionLog($transactionName){
+function transactionLog($transactionName)
+{
     if (extension_loaded('newrelic')) {
-        $baseName="ProcessMaker";
+        $baseName = "ProcessMaker";
 
         //Application base name
-        newrelic_set_appname ($baseName);
+        newrelic_set_appname($baseName);
 
 
         //Custom parameters
-        if(!empty(config("system.workspace"))){
-            newrelic_add_custom_parameter ("workspace", config("system.workspace"));
+        if (!empty(config("system.workspace"))) {
+            newrelic_add_custom_parameter("workspace", config("system.workspace"));
         }
-        if(defined("SYS_LANG")){
-            newrelic_add_custom_parameter ("lang", SYS_LANG);
+        if (defined("SYS_LANG")) {
+            newrelic_add_custom_parameter("lang", SYS_LANG);
         }
-        if(defined("SYS_SKIN")){
-            newrelic_add_custom_parameter ("skin", SYS_SKIN);
+        if (defined("SYS_SKIN")) {
+            newrelic_add_custom_parameter("skin", SYS_SKIN);
         }
-        if(defined("SYS_COLLECTION")){
-            newrelic_add_custom_parameter ("collection", SYS_COLLECTION);
+        if (defined("SYS_COLLECTION")) {
+            newrelic_add_custom_parameter("collection", SYS_COLLECTION);
         }
-        if(defined("SYS_TARGET")){
-            newrelic_add_custom_parameter ("target", SYS_TARGET);
+        if (defined("SYS_TARGET")) {
+            newrelic_add_custom_parameter("target", SYS_TARGET);
         }
-        if(defined("SYS_URI")){
-            newrelic_add_custom_parameter ("uri", SYS_URI);
+        if (defined("SYS_URI")) {
+            newrelic_add_custom_parameter("uri", SYS_URI);
         }
-        if(defined("PATH_CORE")){
-            newrelic_add_custom_parameter ("path_core", PATH_CORE);
+        if (defined("PATH_CORE")) {
+            newrelic_add_custom_parameter("path_core", PATH_CORE);
         }
-        if(defined("PATH_DATA_SITE")){
-            newrelic_add_custom_parameter ("path_site", PATH_DATA_SITE);
+        if (defined("PATH_DATA_SITE")) {
+            newrelic_add_custom_parameter("path_site", PATH_DATA_SITE);
         }
 
         //Show correct transaction name
-        if(!empty(config("system.workspace"))){
-            newrelic_set_appname ("PM-".config("system.workspace").";$baseName");
+        if (!empty(config("system.workspace"))) {
+            newrelic_set_appname("PM-" . config("system.workspace") . ";$baseName");
         }
-        if(defined("PATH_CORE")){
-            $transactionName=str_replace(PATH_CORE,"",$transactionName);
+        if (defined("PATH_CORE")) {
+            $transactionName = str_replace(PATH_CORE, "", $transactionName);
         }
-        newrelic_name_transaction ($transactionName);
+        newrelic_name_transaction($transactionName);
     }
 }
 
@@ -81,26 +82,26 @@ if (!isset($_SERVER['HTTP_USER_AGENT'])) {
 }
 
 // Defining the PATH_SEP constant, he we are defining if the the path separator symbol will be '\\' or '/'
-define( 'PATH_SEP', '/' );
+define('PATH_SEP', '/');
 
 // Defining the Home Directory
-$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
-$docuroot = explode( PATH_SEP, $realdocuroot );
+$realdocuroot = str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']);
+$docuroot = explode(PATH_SEP, $realdocuroot);
 
-array_pop( $docuroot );
-$pathhome = implode( PATH_SEP, $docuroot ) . PATH_SEP;
+array_pop($docuroot);
+$pathhome = implode(PATH_SEP, $docuroot) . PATH_SEP;
 
 // try to find automatically the trunk directory where are placed the RBAC and Gulliver directories
 // in a normal installation you don't need to change it.
-array_pop( $docuroot );
-$pathTrunk = implode( PATH_SEP, $docuroot ) . PATH_SEP;
+array_pop($docuroot);
+$pathTrunk = implode(PATH_SEP, $docuroot) . PATH_SEP;
 
-array_pop( $docuroot );
-$pathOutTrunk = implode( PATH_SEP, $docuroot ) . PATH_SEP;
+array_pop($docuroot);
+$pathOutTrunk = implode(PATH_SEP, $docuroot) . PATH_SEP;
 
-define( 'PATH_HOME', $pathhome );
-define( 'PATH_TRUNK', $pathTrunk );
-define( 'PATH_OUTTRUNK', $pathOutTrunk );
+define('PATH_HOME', $pathhome);
+define('PATH_TRUNK', $pathTrunk);
+define('PATH_OUTTRUNK', $pathOutTrunk);
 
 //we are focusing in have this behaivour
 //1. if the uri is a existing file return the file inmediately
@@ -108,7 +109,7 @@ define( 'PATH_OUTTRUNK', $pathOutTrunk );
 //3. process the uri,
 
 //here we are putting approved CONSTANTS, I mean constants be sure we need,
-define( 'PATH_HTML', PATH_HOME . 'public_html' . PATH_SEP );
+define('PATH_HTML', PATH_HOME . 'public_html' . PATH_SEP);
 
 //this is the first path, if the file exists...
 $request = substr($_SERVER['REQUEST_URI'], 1, strlen($_SERVER['REQUEST_URI'])); //removes the first '/'
@@ -117,7 +118,7 @@ $request = $fileWithoutParam[0];            // get the first element of the spli
 $requestFile = PATH_HTML . $request;        // temporary assemble a path for the file embedded in the URI
 if (file_exists($requestFile)) {
     if (!is_file($requestFile)) {
-        header( "location: /errors/error404.php?url=" . urlencode( $_SERVER['REQUEST_URI'] ) );
+        header("location: /errors/error404.php?url=" . urlencode($_SERVER['REQUEST_URI']));
         die;
     }
     if ($request === "app.php" || $request === "sysGeneric.php") {
@@ -126,16 +127,16 @@ if (file_exists($requestFile)) {
     }
     $pos = strripos($request, ".") + 1;
     $size = strlen($request);
-    if($pos < $size) {
+    if ($pos < $size) {
         //if this file got an extension then assign the content
         $ext_file = substr($request, $pos, $size);
         if ($ext_file == "gif" || $ext_file == "png") {
-            $ext_file = 'image/'.$ext_file ;
+            $ext_file = 'image/' . $ext_file;
         } elseif ($ext_file == "jpg" || $ext_file == "jpeg") {
             $ext_file = 'image/jpeg';
         } elseif ($ext_file == "swf") {
             $ext_file = "application/x-shockwave-flash";
-        } elseif ($ext_file == "json" || $ext_file == "htc" ) {
+        } elseif ($ext_file == "json" || $ext_file == "htc") {
             $ext_file = "text/plain";
         } elseif ($ext_file == "htm" || $ext_file == "html" || $ext_file == "txt") {
             $ext_file = "text/html";
@@ -147,33 +148,34 @@ if (file_exists($requestFile)) {
             $ext_file = "application/font-woff";
         } elseif ($ext_file == "js") {
             $ext_file = "text/javascript";
-        } elseif ($ext_file=="css") {
+        } elseif ($ext_file == "css") {
             //may this line be innecesary, all the .css are been generated at run time
             $ext_file = 'text/css';
         } else {
             $ext_file = "application/octet-stream";
         }
-        header ('Content-Type: ' . $ext_file);
+        header('Content-Type: ' . $ext_file);
     }
-    header ( 'Pragma: cache' );
-    $mtime = filemtime ( $requestFile );
-    $gmt_mtime = gmdate ( "D, d M Y H:i:s", $mtime ) . " GMT";
-    header ( 'ETag: "' . Bootstrap::encryptOld ( $mtime . $requestFile ) . '"' );
-    header ( "Last-Modified: " . $gmt_mtime );
-    header ( 'Cache-Control: public' );
-    $userAgent = strtolower ( $_SERVER ['HTTP_USER_AGENT'] );
-    if (preg_match ( "/msie/i", $userAgent )) {
-        header ( "Expires: " . gmdate ( "D, d M Y H:i:s", time () + 60 * 10 ) . " GMT" );
+    header('Pragma: cache');
+    $mtime = filemtime($requestFile);
+    $gmt_mtime = gmdate("D, d M Y H:i:s", $mtime) . " GMT";
+    header('ETag: "' . Bootstrap::encryptOld($mtime . $requestFile) . '"');
+    header("Last-Modified: " . $gmt_mtime);
+    header('Cache-Control: public');
+    $userAgent = strtolower($_SERVER ['HTTP_USER_AGENT']);
+    if (preg_match("/msie/i", $userAgent)) {
+        header("Expires: " . gmdate("D, d M Y H:i:s", time() + 60 * 10) . " GMT");
     } else {
-        header ( "Expires: " . gmdate ( "D, d M Y H:i:s", time () + 90 * 60 * 60 * 24 ) . " GMT" );
-        if (isset ( $_SERVER ['HTTP_IF_MODIFIED_SINCE'] )) {
+        header("Expires: " . gmdate("D, d M Y H:i:s", time() + 90 * 60 * 60 * 24) . " GMT");
+        if (isset($_SERVER ['HTTP_IF_MODIFIED_SINCE'])) {
             if ($_SERVER ['HTTP_IF_MODIFIED_SINCE'] == $gmt_mtime) {
-                header ( 'HTTP/1.1 304 Not Modified' );
+                header('HTTP/1.1 304 Not Modified');
             }
         }
-        if (isset ( $_SERVER ['HTTP_IF_NONE_MATCH'] )) {
-            if (str_replace ( '"', '', stripslashes ( $_SERVER ['HTTP_IF_NONE_MATCH'] ) ) == Bootstrap::encryptOld ( $mtime . $requestFile )) {
-                header ( "HTTP/1.1 304 Not Modified" );
+        if (isset($_SERVER ['HTTP_IF_NONE_MATCH'])) {
+            if (str_replace('"', '',
+                    stripslashes($_SERVER ['HTTP_IF_NONE_MATCH'])) == Bootstrap::encryptOld($mtime . $requestFile)) {
+                header("HTTP/1.1 304 Not Modified");
             }
         }
     }
@@ -183,71 +185,72 @@ if (file_exists($requestFile)) {
 
 
 // Defining RBAC Paths constants
-define( 'PATH_RBAC_HOME', PATH_TRUNK . 'rbac' . PATH_SEP );
+define('PATH_RBAC_HOME', PATH_TRUNK . 'rbac' . PATH_SEP);
 
 // Defining Gulliver framework paths constants
-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_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 );
+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_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);
 
 // Defining PMCore Path constants
-define( 'PATH_CORE', PATH_HOME . 'engine' . PATH_SEP );
-define( 'PATH_CLASSES', PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP );
-define( 'PATH_SKINS', PATH_CORE . 'skins' . PATH_SEP );
-define( 'PATH_SKIN_ENGINE', PATH_CORE . 'skinEngine' . PATH_SEP );
-define( 'PATH_METHODS', PATH_CORE . 'methods' . PATH_SEP );
-define( 'PATH_XMLFORM', PATH_CORE . 'xmlform' . PATH_SEP );
-define( 'PATH_CONFIG', PATH_CORE . 'config' . PATH_SEP );
-define( 'PATH_PLUGINS', PATH_CORE . 'plugins' . PATH_SEP );
-define( 'PATH_HTMLMAIL', PATH_CORE . 'html_templates' . PATH_SEP );
-define( 'PATH_TPL', PATH_CORE . 'templates' . PATH_SEP );
-define( 'PATH_TEST', PATH_CORE . 'test' . PATH_SEP );
-define( 'PATH_FIXTURES', PATH_TEST . 'fixtures' . PATH_SEP );
-define( 'PATH_RTFDOCS', PATH_CORE . 'rtf_templates' . PATH_SEP );
-define( 'PATH_DYNACONT', PATH_CORE . 'content' . PATH_SEP . 'dynaform' . PATH_SEP );
+define('PATH_CORE', PATH_HOME . 'engine' . PATH_SEP);
+define('PATH_CLASSES', PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP);
+define('PATH_SKINS', PATH_CORE . 'skins' . PATH_SEP);
+define('PATH_SKIN_ENGINE', PATH_CORE . 'skinEngine' . PATH_SEP);
+define('PATH_METHODS', PATH_CORE . 'methods' . PATH_SEP);
+define('PATH_XMLFORM', PATH_CORE . 'xmlform' . PATH_SEP);
+define('PATH_CONFIG', PATH_CORE . 'config' . PATH_SEP);
+define('PATH_PLUGINS', PATH_CORE . 'plugins' . PATH_SEP);
+define('PATH_HTMLMAIL', PATH_CORE . 'html_templates' . PATH_SEP);
+define('PATH_TPL', PATH_CORE . 'templates' . PATH_SEP);
+define('PATH_TEST', PATH_CORE . 'test' . PATH_SEP);
+define('PATH_FIXTURES', PATH_TEST . 'fixtures' . PATH_SEP);
+define('PATH_RTFDOCS', PATH_CORE . 'rtf_templates' . PATH_SEP);
+define('PATH_DYNACONT', PATH_CORE . 'content' . PATH_SEP . 'dynaform' . PATH_SEP);
 //define( 'PATH_LANGUAGECONT',PATH_CORE . 'content' . PATH_SEP . 'languages' . PATH_SEP );
-define( 'SYS_UPLOAD_PATH', PATH_HOME . "public_html/files/" );
-define( 'PATH_UPLOAD', PATH_HTML . 'files' . PATH_SEP );
+define('SYS_UPLOAD_PATH', PATH_HOME . "public_html/files/");
+define('PATH_UPLOAD', PATH_HTML . 'files' . PATH_SEP);
 
-define( 'PATH_WORKFLOW_MYSQL_DATA', PATH_CORE . 'data' . PATH_SEP . 'mysql' . PATH_SEP );
-define( 'PATH_RBAC_MYSQL_DATA', PATH_RBAC_CORE . 'data' . PATH_SEP . 'mysql' . PATH_SEP );
-define( 'FILE_PATHS_INSTALLED', PATH_CORE . 'config' . PATH_SEP . 'paths_installed.php' );
-define( 'PATH_WORKFLOW_MSSQL_DATA', PATH_CORE . 'data' . PATH_SEP . 'mssql' . PATH_SEP );
-define( 'PATH_RBAC_MSSQL_DATA', PATH_RBAC_CORE . 'data' . PATH_SEP . 'mssql' . PATH_SEP );
-define( 'PATH_CONTROLLERS', PATH_CORE . 'controllers' . PATH_SEP );
+define('PATH_WORKFLOW_MYSQL_DATA', PATH_CORE . 'data' . PATH_SEP . 'mysql' . PATH_SEP);
+define('PATH_RBAC_MYSQL_DATA', PATH_RBAC_CORE . 'data' . PATH_SEP . 'mysql' . PATH_SEP);
+define('FILE_PATHS_INSTALLED', PATH_CORE . 'config' . PATH_SEP . 'paths_installed.php');
+define('PATH_WORKFLOW_MSSQL_DATA', PATH_CORE . 'data' . PATH_SEP . 'mssql' . PATH_SEP);
+define('PATH_RBAC_MSSQL_DATA', PATH_RBAC_CORE . 'data' . PATH_SEP . 'mssql' . PATH_SEP);
+define('PATH_CONTROLLERS', PATH_CORE . 'controllers' . PATH_SEP);
 
 // include Gulliver Class
 
-if (file_exists( FILE_PATHS_INSTALLED )) {
+if (file_exists(FILE_PATHS_INSTALLED)) {
 
     // include the server installed configuration
     require_once FILE_PATHS_INSTALLED;
 
     // defining system constant when a valid server environment exists
-    define( 'PATH_LANGUAGECONT', PATH_DATA . "META-INF" . PATH_SEP );
-    define( 'PATH_CUSTOM_SKINS', PATH_DATA . 'skins' . PATH_SEP );
-    define( 'PATH_TEMPORAL', PATH_C . 'dynEditor/' );
-    define( 'PATH_DB', PATH_DATA . 'sites' . PATH_SEP );
+    define('PATH_LANGUAGECONT', PATH_DATA . "META-INF" . PATH_SEP);
+    define('PATH_CUSTOM_SKINS', PATH_DATA . 'skins' . PATH_SEP);
+    define('PATH_TEMPORAL', PATH_C . 'dynEditor/');
+    define('PATH_DB', PATH_DATA . 'sites' . PATH_SEP);
 
     // smarty constants
-    define( 'PATH_SMARTY_C', PATH_C . 'smarty' . PATH_SEP . 'c' );
-    define( 'PATH_SMARTY_CACHE', PATH_C . 'smarty' . PATH_SEP . 'cache' );
+    define('PATH_SMARTY_C', PATH_C . 'smarty' . PATH_SEP . 'c');
+    define('PATH_SMARTY_CACHE', PATH_C . 'smarty' . PATH_SEP . 'cache');
 
     /* TO DO: put these line in other part of code*/
-    Bootstrap::verifyPath ( PATH_SMARTY_C,     true );
-    Bootstrap::verifyPath ( PATH_SMARTY_CACHE, true );
+    Bootstrap::verifyPath(PATH_SMARTY_C, true);
+    Bootstrap::verifyPath(PATH_SMARTY_CACHE, true);
 }
 
 // set include path
-set_include_path( PATH_CORE . PATH_SEPARATOR .
-                  PATH_THIRDPARTY . PATH_SEPARATOR .
-                  PATH_THIRDPARTY . 'pear' . PATH_SEPARATOR .
-                  PATH_RBAC_CORE . PATH_SEPARATOR .
-                  get_include_path()
+set_include_path(
+    PATH_CORE . PATH_SEPARATOR .
+    PATH_THIRDPARTY . PATH_SEPARATOR .
+    PATH_THIRDPARTY . 'pear' . PATH_SEPARATOR .
+    PATH_RBAC_CORE . PATH_SEPARATOR .
+    get_include_path()
 );
 
 /**
@@ -255,33 +258,33 @@ set_include_path( PATH_CORE . PATH_SEPARATOR .
  */
 
 // URL Key
-define( "URL_KEY", 'c0l0s40pt1mu59r1m3' );
+define("URL_KEY", 'c0l0s40pt1mu59r1m3');
 
 // Other definitions
-define( 'TIMEOUT_RESPONSE', 100 ); //web service timeout
-define( 'APPLICATION_CODE', 'ProcessMaker' ); //to login like workflow system
-define( 'MAIN_POFILE', 'processmaker' );
-define( 'PO_SYSTEM_VERSION', 'PM 4.0.1' );
+define('TIMEOUT_RESPONSE', 100); //web service timeout
+define('APPLICATION_CODE', 'ProcessMaker'); //to login like workflow system
+define('MAIN_POFILE', 'processmaker');
+define('PO_SYSTEM_VERSION', 'PM 4.0.1');
 
-$G_CONTENT = NULL;
+$G_CONTENT = null;
 $G_MESSAGE = "";
 $G_MESSAGE_TYPE = "info";
-$G_MENU_SELECTED = - 1;
+$G_MENU_SELECTED = -1;
 $G_MAIN_MENU = "default";
 
 // Environment definitions
-define( 'G_PRO_ENV', 'PRODUCTION' );
-define( 'G_DEV_ENV', 'DEVELOPMENT' );
-define( 'G_TEST_ENV', 'TEST' );
+define('G_PRO_ENV', 'PRODUCTION');
+define('G_DEV_ENV', 'DEVELOPMENT');
+define('G_TEST_ENV', 'TEST');
 
 // Number of files per folder at PATH_UPLOAD (cases documents)
-define( 'APPLICATION_DOCUMENTS_PER_FOLDER', 1000 );
+define('APPLICATION_DOCUMENTS_PER_FOLDER', 1000);
 
 // Server of ProcessMaker Library
-define( 'PML_SERVER', 'http://library.processmaker.com' );
-define( 'PML_WSDL_URL', PML_SERVER . '/syspmLibrary/en/green/services/wsdl' );
-define( 'PML_UPLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/uploadProcess' );
-define( 'PML_DOWNLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/download' );
+define('PML_SERVER', 'http://library.processmaker.com');
+define('PML_WSDL_URL', PML_SERVER . '/syspmLibrary/en/green/services/wsdl');
+define('PML_UPLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/uploadProcess');
+define('PML_DOWNLOAD_URL', PML_SERVER . '/syspmLibrary/en/green/services/download');
 
 G::defineConstants();
 
@@ -298,9 +301,10 @@ if (is_null($timelife)) {
 }
 ini_set('session.gc_maxlifetime', $timelife);
 if ((preg_match("/msie/i", $_SERVER ['HTTP_USER_AGENT']) != 1 ||
-   $config['ie_cookie_lifetime'] == 1) &&
-   (!(preg_match("/safari/i", $_SERVER ['HTTP_USER_AGENT']) == 1 && preg_match("/chrome/i", $_SERVER ['HTTP_USER_AGENT']) == 0) ||
-   $config['safari_cookie_lifetime'] == 1)) {
+        $config['ie_cookie_lifetime'] == 1) &&
+    (!(preg_match("/safari/i", $_SERVER ['HTTP_USER_AGENT']) == 1 && preg_match("/chrome/i",
+                $_SERVER ['HTTP_USER_AGENT']) == 0) ||
+        $config['safari_cookie_lifetime'] == 1)) {
     ini_set('session.cookie_lifetime', $timelife);
 }
 session_start();
@@ -315,22 +319,22 @@ if (!(array_key_exists('REMOTE_USER', $_SERVER) && (string)($_SERVER['REMOTE_USE
 //$e_all = E_ALL & ~ E_DEPRECATED & ~ E_STRICT & ~ E_NOTICE  & ~E_WARNING;
 
 // Do not change any of these settings directly, use env.ini instead
-ini_set( 'display_errors', $config['display_errors']);
-ini_set( 'error_reporting', $config['error_reporting']);
-ini_set( 'short_open_tag', 'On' );
-ini_set( 'default_charset', "UTF-8" );
-ini_set( 'memory_limit', $config['memory_limit'] );
-ini_set( 'soap.wsdl_cache_enabled', $config['wsdl_cache'] );
+ini_set('display_errors', $config['display_errors']);
+ini_set('error_reporting', $config['error_reporting']);
+ini_set('short_open_tag', 'On');
+ini_set('default_charset', "UTF-8");
+ini_set('memory_limit', $config['memory_limit']);
+ini_set('soap.wsdl_cache_enabled', $config['wsdl_cache']);
 ini_set('date.timezone', $config['time_zone']); //Set Time Zone
 
-define( 'DEBUG_SQL_LOG', $config['debug_sql'] );
-define( 'DEBUG_SQL', $config['debug'] );
-define( 'DEBUG_TIME_LOG', $config['debug_time'] );
-define( 'DEBUG_CALENDAR_LOG', $config['debug_calendar'] );
-define( 'MEMCACHED_ENABLED', $config['memcached'] );
-define( 'MEMCACHED_SERVER', $config['memcached_server'] );
+define('DEBUG_SQL_LOG', $config['debug_sql']);
+define('DEBUG_SQL', $config['debug']);
+define('DEBUG_TIME_LOG', $config['debug_time']);
+define('DEBUG_CALENDAR_LOG', $config['debug_calendar']);
+define('MEMCACHED_ENABLED', $config['memcached']);
+define('MEMCACHED_SERVER', $config['memcached_server']);
 
-define ('WS_IN_LOGIN', isset($config['WS_IN_LOGIN']) ? $config['WS_IN_LOGIN'] : 'serverconf');
+define('WS_IN_LOGIN', isset($config['WS_IN_LOGIN']) ? $config['WS_IN_LOGIN'] : 'serverconf');
 
 define('LOAD_HEADERS_IE', $config['load_headers_ie']);
 define('LEAVE_CASE_WARNING', $config['leave_case_warning']);
@@ -339,15 +343,15 @@ define('DISABLE_PHP_UPLOAD_EXECUTION', $config['disable_php_upload_execution']);
 define('DISABLE_DOWNLOAD_DOCUMENTS_SESSION_VALIDATION', $config['disable_download_documents_session_validation']);
 
 // IIS Compatibility, SERVER_ADDR doesn't exist on that env, so we need to define it.
-$_SERVER['SERVER_ADDR'] = isset( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : $_SERVER['SERVER_NAME'];
+$_SERVER['SERVER_ADDR'] = isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : $_SERVER['SERVER_NAME'];
 
 //to do: make different environments.  sys
 
 //check if it is a installation instance
-if (! defined( 'PATH_C' )) {
-// is a intallation instance, so we need to define PATH_C and PATH_LANGUAGECONT constants temporarily
-define( 'PATH_C', (rtrim( Bootstrap::sys_get_temp_dir(), PATH_SEP ) . PATH_SEP) );
-define( 'PATH_LANGUAGECONT', PATH_HOME . 'engine/content/languages/' );
+if (!defined('PATH_C')) {
+    // is a intallation instance, so we need to define PATH_C and PATH_LANGUAGECONT constants temporarily
+    define('PATH_C', (rtrim(Bootstrap::sys_get_temp_dir(), PATH_SEP) . PATH_SEP));
+    define('PATH_LANGUAGECONT', PATH_HOME . 'engine/content/languages/');
 }
 
 //Load filter class
@@ -355,28 +359,28 @@ $skinPathErrors = G::skinGetPathToSrcByVirtualUri("errors", $config);
 $skinPathUpdate = G::skinGetPathToSrcByVirtualUri("update", $config);
 
 // defining Virtual URLs
-$virtualURITable = array ();
+$virtualURITable = [];
 $virtualURITable['/plugin/(*)'] = 'plugin';
 $virtualURITable['/(sys\w{0,})/(\w{0,}.js)'] = 'jsMethod';
 $virtualURITable['/js/(*)'] = PATH_GULLIVER_HOME . 'js/';
 $virtualURITable['/jscore/(*)'] = PATH_CORE . 'js/';
 
-if (defined( 'PATH_C' )) {
+if (defined('PATH_C')) {
     $virtualURITable['/jsform/(*.js)'] = PATH_C . 'xmlform/';
     $virtualURITable['/extjs/(*)'] = PATH_C . 'ExtJs/';
 }
 
 $virtualURITable['/htmlarea/(*)'] = PATH_THIRDPARTY . 'htmlarea/';
 //$virtualURITable['/sys[a-zA-Z][a-zA-Z0-9]{0,}()/'] = 'sysNamed';
-$virtualURITable['/(sys*)'] = FALSE;
-$virtualURITable["/errors/(*)"] = ($skinPathErrors != "")? $skinPathErrors : PATH_GULLIVER_HOME . "methods" . PATH_SEP . "errors" . PATH_SEP;
+$virtualURITable['/(sys*)'] = false;
+$virtualURITable["/errors/(*)"] = ($skinPathErrors != "") ? $skinPathErrors : PATH_GULLIVER_HOME . "methods" . PATH_SEP . "errors" . PATH_SEP;
 $virtualURITable['/gulliver/(*)'] = PATH_GULLIVER_HOME . 'methods/';
 $virtualURITable['/controls/(*)'] = PATH_GULLIVER_HOME . 'methods/controls/';
 $virtualURITable['/html2ps_pdf/(*)'] = PATH_THIRDPARTY . 'html2ps_pdf/';
 //$virtualURITable['/images/'] = 'errorFile';
 //$virtualURITable['/skins/'] = 'errorFile';
 //$virtualURITable['/files/'] = 'errorFile';
-$virtualURITable["/update/(*)"] = ($skinPathUpdate != "")? $skinPathUpdate : PATH_GULLIVER_HOME . "methods" . PATH_SEP . "update" . PATH_SEP;
+$virtualURITable["/update/(*)"] = ($skinPathUpdate != "") ? $skinPathUpdate : PATH_GULLIVER_HOME . "methods" . PATH_SEP . "update" . PATH_SEP;
 //$virtualURITable['/(*)'] = PATH_HTML;
 $virtualURITable['/css/(*)'] = PATH_HTML . 'css/'; //ugly
 $virtualURITable['/skin/(*)'] = PATH_HTML;
@@ -385,89 +389,91 @@ $virtualURITable['/images/(*)'] = PATH_HTML . 'images/'; //ugly
 $virtualURITable['/[a-zA-Z][a-zA-Z0-9]{0,}/'] = 'errorFile';
 
 // Verify if we need to redirect or stream the file, if G:VirtualURI returns true means we are going to redirect the page
-if (Bootstrap::virtualURI( $_SERVER['REQUEST_URI'], $virtualURITable, $realPath )) {
+if (Bootstrap::virtualURI($_SERVER['REQUEST_URI'], $virtualURITable, $realPath)) {
     // review if the file requested belongs to public_html plugin
-    if (substr( $realPath, 0, 6 ) == 'plugin') {
+    if (substr($realPath, 0, 6) == 'plugin') {
         // Another way to get the path of Plugin public_html and stream the correspondent file, By JHL Jul 14, 08
         // TODO: $pathsQuery will be used?
         $pathsQuery = '';
         // Get the query side
         // Did we use this variable $pathsQuery for something??
-        $forQuery = explode( "?", $realPath );
-        if (isset( $forQuery[1] )) {
+        $forQuery = explode("?", $realPath);
+        if (isset($forQuery[1])) {
             $pathsQuery = $forQuery[1];
         }
 
         //Get that path in array
-        $paths = explode( PATH_SEP, $forQuery[0] );
+        $paths = explode(PATH_SEP, $forQuery[0]);
         //remove the "plugin" word from
-        $paths[0] = substr( $paths[0], 6 );
+        $paths[0] = substr($paths[0], 6);
         //Get the Plugin Folder, always the first element
-        $pluginFolder = array_shift( $paths );
+        $pluginFolder = array_shift($paths);
         //The other parts are the realpath into public_html (no matter how many elements)
-        $filePath = implode( PATH_SEP, $paths );
+        $filePath = implode(PATH_SEP, $paths);
         $pluginFilename = PATH_PLUGINS . $pluginFolder . PATH_SEP . 'public_html' . PATH_SEP . $filePath;
 
-        if (file_exists( $pluginFilename )) {
+        if (file_exists($pluginFilename)) {
             //NewRelic Snippet - By JHL
             transactionLog($pluginFilename);
 
-            Bootstrap::streamFile( $pluginFilename, false, '', true );
+            Bootstrap::streamFile($pluginFilename, false, '', true);
         }
         die();
     }
 
-    $requestUriArray = explode( "/", $_SERVER['REQUEST_URI'] );
+    $requestUriArray = explode("/", $_SERVER['REQUEST_URI']);
 
-    if ((isset( $requestUriArray[1] )) && ($requestUriArray[1] == 'skin')) {
+    if ((isset($requestUriArray[1])) && ($requestUriArray[1] == 'skin')) {
         // This will allow to public images of Custom Skins, By JHL Feb 28, 11
         $pathsQuery = "";
         // Get the query side
         // This way we remove garbage
-        $forQuery = explode( "?", $realPath );
-        if (isset( $forQuery[1] )) {
+        $forQuery = explode("?", $realPath);
+        if (isset($forQuery[1])) {
             $pathsQuery = $forQuery[1];
         }
 
         //Get that path in array
-        $paths = explode( PATH_SEP, $forQuery[0] );
-        $url = (preg_match("/^(.*)\?.*$/", $_SERVER["REQUEST_URI"], $arrayMatch))? $arrayMatch[1] : $_SERVER["REQUEST_URI"];
+        $paths = explode(PATH_SEP, $forQuery[0]);
+        $url = (preg_match("/^(.*)\?.*$/", $_SERVER["REQUEST_URI"],
+            $arrayMatch)) ? $arrayMatch[1] : $_SERVER["REQUEST_URI"];
 
         $fileToBeStreamed = str_replace("/skin/", PATH_CUSTOM_SKINS, $url);
 
-        if (file_exists( $fileToBeStreamed )) {
+        if (file_exists($fileToBeStreamed)) {
             //NewRelic Snippet - By JHL
             transactionLog($fileToBeStreamed);
 
-            Bootstrap::streamFile( $fileToBeStreamed );
+            Bootstrap::streamFile($fileToBeStreamed);
         }
         die();
     }
 
     switch ($realPath) {
         case 'jsMethod':
-            Bootstrap::parseURI( getenv( "REQUEST_URI" ) );
+            Bootstrap::parseURI(getenv("REQUEST_URI"));
             $filename = PATH_METHODS . SYS_COLLECTION . '/' . SYS_TARGET . '.js';
             //NewRelic Snippet - By JHL
             transactionLog($filename);
-            Bootstrap::streamFile( $filename );
+            Bootstrap::streamFile($filename);
             die();
             break;
         case 'errorFile':
             header('Status: 404');
-            header( "location: /errors/error404.php?url=" . urlencode( $_SERVER['REQUEST_URI'] ) );
-            if (DEBUG_TIME_LOG)
-                Bootstrap::logTimeByPage(); //log this page
+            header("location: /errors/error404.php?url=" . urlencode($_SERVER['REQUEST_URI']));
+            if (DEBUG_TIME_LOG) {
+                Bootstrap::logTimeByPage();
+            } //log this page
             die();
             break;
         default:
             //Process files loaded with tag head in HTML
-            $realPath = explode( '?', $realPath );
-            $realPath[0] .= strpos( basename( $realPath[0] ), '.' ) === false ? '.php' : '';
+            $realPath = explode('?', $realPath);
+            $realPath[0] .= strpos(basename($realPath[0]), '.') === false ? '.php' : '';
             //NewRelic Snippet - By JHL
             transactionLog($realPath[0]);
 
-            Bootstrap::streamFile( $realPath[0] );
+            Bootstrap::streamFile($realPath[0]);
             die();
     }
 } //virtual URI parser
@@ -489,34 +495,35 @@ $arrayUpdating = Bootstrap::isPMUnderUpdating();
 if ($arrayUpdating['action']) {
     if ($arrayUpdating['workspace'] == "true" || $arrayUpdating['workspace'] == SYS_TEMP) {
         header("location: /update/updating.php");
-        if (DEBUG_TIME_LOG)
+        if (DEBUG_TIME_LOG) {
             Bootstrap::logTimeByPage();
+        }
         die();
     }
 }
 
 // verify if index.html exists
-if (! file_exists( PATH_HTML . 'index.html' )) { // if not, create it from template
-    file_put_contents( PATH_HTML . "index.html", Bootstrap::parseTemplate( PATH_TPL . "index.html", array ("lang" => ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN
-    ) ) );
+if (!file_exists(PATH_HTML . 'index.html')) { // if not, create it from template
+    file_put_contents(PATH_HTML . 'index.html', Bootstrap::parseTemplate(PATH_TPL . 'index.html', array(
+        'lang' => ((defined('SYS_LANG') && SYS_LANG != '') ? SYS_LANG : 'en'),
+        'skin' => SYS_SKIN
+    )));
 }
 
-define( 'SYS_URI', '/sys' . SYS_TEMP . '/' . SYS_LANG . '/' . SYS_SKIN . '/' );
+define('SYS_URI', '/sys' . SYS_TEMP . '/' . SYS_LANG . '/' . SYS_SKIN . '/');
 
 // defining the serverConf singleton
-if (defined( 'PATH_DATA' ) && file_exists( PATH_DATA )) {
+if (defined('PATH_DATA') && file_exists(PATH_DATA)) {
     //Instance Server Configuration Singleton
-    $oServerConf = & ServerConf::getSingleton();
+    $oServerConf = ServerConf::getSingleton();
 }
 
-
-
 // Create headPublisher singleton
 
-$oHeadPublisher = & headPublisher::getSingleton();
+$oHeadPublisher = headPublisher::getSingleton();
 
 // Installer, redirect to install if we don't have a valid shared data folder
-if (! defined( 'PATH_DATA' ) || ! file_exists( PATH_DATA )) {
+if (!defined('PATH_DATA') || !file_exists(PATH_DATA)) {
     // new installer, extjs based
     define( 'PATH_DATA', PATH_C );
     
@@ -532,8 +539,8 @@ if (! defined( 'PATH_DATA' ) || ! file_exists( PATH_DATA )) {
     $controller = InstallerModule::class;
 
     // if the method name is empty set default to index method
-    if (strpos( SYS_TARGET, '/' ) !== false) {
-        list ($controller, $controllerAction) = explode( '/', SYS_TARGET );
+    if (strpos(SYS_TARGET, '/') !== false) {
+        list($controller, $controllerAction) = explode('/', SYS_TARGET);
     } else {
         $controllerAction = SYS_TARGET;
     }
@@ -543,15 +550,15 @@ if (! defined( 'PATH_DATA' ) || ! file_exists( PATH_DATA )) {
     // create the installer controller and call its method
     if (is_callable([InstallerModule::class, $controllerAction])) {
         $installer = new $controller();
-        $installer->setHttpRequestData( $_REQUEST );
+        $installer->setHttpRequestData($_REQUEST);
         //NewRelic Snippet - By JHL
         transactionLog($controllerAction);
 
-        $installer->call( $controllerAction );
+        $installer->call($controllerAction);
     } else {
         $_SESSION['phpFileNotFound'] = $_SERVER['REQUEST_URI'];
         header('Status: 404');
-        header( "location: /errors/error404.php?url=" . urlencode( $_SERVER['REQUEST_URI'] ) );
+        header("location: /errors/error404.php?url=" . urlencode($_SERVER['REQUEST_URI']));
     }
     die();
 }
@@ -561,44 +568,45 @@ app()->make(Kernel::class)->bootstrap();
 restore_error_handler();
 //Overwrite with the Processmaker env.ini configuration used in production environments
 //@todo: move env.ini configuration to .env
-ini_set( 'display_errors', $config['display_errors']);
-ini_set( 'error_reporting', $config['error_reporting']);
-ini_set( 'short_open_tag', 'On' );
-ini_set( 'default_charset', "UTF-8" );
-ini_set( 'memory_limit', $config['memory_limit'] );
-ini_set( 'soap.wsdl_cache_enabled', $config['wsdl_cache'] );
+ini_set('display_errors', $config['display_errors']);
+ini_set('error_reporting', $config['error_reporting']);
+ini_set('short_open_tag', 'On');
+ini_set('default_charset', "UTF-8");
+ini_set('memory_limit', $config['memory_limit']);
+ini_set('soap.wsdl_cache_enabled', $config['wsdl_cache']);
 ini_set('date.timezone', $config['time_zone']); //Set Time Zone
 
 // Load Language Translation
-Bootstrap::LoadTranslationObject( defined( 'SYS_LANG' ) ? SYS_LANG : "en" );
+Bootstrap::LoadTranslationObject(defined('SYS_LANG') ? SYS_LANG : "en");
 
 // look for a disabled workspace
-if ($oServerConf->isWSDisabled( SYS_TEMP )) {
-    $aMessage['MESSAGE'] = Bootstrap::LoadTranslation( 'ID_DISB_WORKSPACE' );
+if ($oServerConf->isWSDisabled(SYS_TEMP)) {
+    $aMessage['MESSAGE'] = Bootstrap::LoadTranslation('ID_DISB_WORKSPACE');
     $G_PUBLISH = new Publisher();
-    $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
-    Bootstrap::RenderPage( 'publish' );
+    $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage);
+    Bootstrap::RenderPage('publish');
     die();
 }
 
 // database and workspace definition
 // if SYS_TEMP exists, the URL has a workspace, now we need to verify if exists their db.php file
-if (defined( 'SYS_TEMP' ) && SYS_TEMP != '') {
+if (defined('SYS_TEMP') && SYS_TEMP != '') {
     //this is the default, the workspace db.php file is in /shared/workflow/sites/SYS_SYS
     $pathFile = PATH_DB . SYS_TEMP . '/db.php';
-    if (file_exists( $pathFile )) {
-        require_once ($pathFile);
-        define( 'SYS_SYS', SYS_TEMP );
+    if (file_exists($pathFile)) {
+        require_once($pathFile);
+        define('SYS_SYS', SYS_TEMP);
         config(["system.workspace" => SYS_TEMP]);
 
         // defining constant for workspace shared directory
-        define( 'PATH_WORKSPACE', PATH_DB . config("system.workspace") . PATH_SEP );
+        define('PATH_WORKSPACE', PATH_DB . config("system.workspace") . PATH_SEP);
+
         // including workspace shared classes -> particularlly for pmTables
-        set_include_path( get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE );
+        set_include_path(get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE);
     } else {
         if (SYS_LANG != '' && SYS_SKIN != '') {
-            Bootstrap::SendTemporalMessage( 'ID_NOT_WORKSPACE', "error" );
-            Bootstrap::header( 'location: /sys/' . SYS_LANG . '/' . SYS_SKIN . '/main/sysLogin?errno=2' );
+            Bootstrap::SendTemporalMessage('ID_NOT_WORKSPACE', "error");
+            Bootstrap::header('location: /sys/' . SYS_LANG . '/' . SYS_SKIN . '/main/sysLogin?errno=2');
         } else {
             header('Status: 404');
             header('location: /errors/error404.php?url=' . urlencode($_SERVER['REQUEST_URI']));
@@ -607,96 +615,97 @@ if (defined( 'SYS_TEMP' ) && SYS_TEMP != '') {
     }
 } else { //when we are in global pages, outside any valid workspace
     if (SYS_TARGET === 'newSite') {
-        $phpFile = G::ExpandPath( 'methods' ) . SYS_COLLECTION . "/" . SYS_TARGET . '.php';
+        $phpFile = G::ExpandPath('methods') . SYS_COLLECTION . "/" . SYS_TARGET . '.php';
         //NewRelic Snippet - By JHL
         transactionLog($phpFile);
-        require_once ($phpFile);
+        require_once($phpFile);
         die();
     } else {
         if (SYS_TARGET == "dbInfo") { //Show dbInfo when no SYS_SYS
             $pathFile = PATH_METHODS . "login/dbInfo.php";
-            require_once ($pathFile);
+            require_once($pathFile);
         } else {
-
-            if (substr( SYS_SKIN, 0, 2 ) === 'ux' && SYS_TARGET != 'sysLoginVerify') { // new ux sysLogin - extjs based form
+            if (substr(SYS_SKIN, 0,
+                    2) === 'ux' && SYS_TARGET != 'sysLoginVerify') { // new ux sysLogin - extjs based form
                 $pathFile = PATH_CONTROLLERS . 'main.php';
                 require_once $pathFile;
                 $controllerClass = 'Main';
                 $controllerAction = SYS_TARGET == 'sysLoginVerify' ? SYS_TARGET : 'sysLogin';
                 //if the method exists
-                if (is_callable( Array ($controllerClass,$controllerAction
-                ) )) {
+                if (is_callable(array(
+                    $controllerClass,
+                    $controllerAction
+                ))) {
                     $controller = new $controllerClass();
-                    $controller->setHttpRequestData( $_REQUEST );
-                    $controller->call( $controllerAction );
+                    $controller->setHttpRequestData($_REQUEST);
+                    $controller->call($controllerAction);
                 }
             } else { // classic sysLogin interface
                 $pathFile = PATH_METHODS . "login/sysLogin.php";
-                require_once ($pathFile);
+                require_once($pathFile);
                 die();
             }
         }
-        if (DEBUG_TIME_LOG)
-            Bootstrap::logTimeByPage(); //log this page
+        if (DEBUG_TIME_LOG) {
+            Bootstrap::logTimeByPage();
+        } //log this page
         die();
     }
 }
 
 // PM Paths DATA
-define( 'PATH_DATA_SITE', PATH_DATA . 'sites/' . config("system.workspace") . '/' );
-define( 'PATH_DOCUMENT', PATH_DATA_SITE . 'files/' );
-define( 'PATH_DATA_MAILTEMPLATES', PATH_DATA_SITE . 'mailTemplates/' );
-define( 'PATH_DATA_PUBLIC', PATH_DATA_SITE . 'public/' );
-define( 'PATH_DATA_REPORTS', PATH_DATA_SITE . 'reports/' );
-define( 'PATH_DYNAFORM', PATH_DATA_SITE . 'xmlForms/' );
-define( 'PATH_IMAGES_ENVIRONMENT_FILES', PATH_DATA_SITE . 'usersFiles' . PATH_SEP );
-define( 'PATH_IMAGES_ENVIRONMENT_USERS', PATH_DATA_SITE . 'usersPhotographies' . PATH_SEP );
-define( 'SERVER_NAME', $_SERVER['SERVER_NAME'] );
-define( 'SERVER_PORT', $_SERVER['SERVER_PORT'] );
-
-
+define('PATH_DATA_SITE', PATH_DATA . 'sites/' . config("system.workspace") . '/');
+define('PATH_DOCUMENT', PATH_DATA_SITE . 'files/');
+define('PATH_DATA_MAILTEMPLATES', PATH_DATA_SITE . 'mailTemplates/');
+define('PATH_DATA_PUBLIC', PATH_DATA_SITE . 'public/');
+define('PATH_DATA_REPORTS', PATH_DATA_SITE . 'reports/');
+define('PATH_DYNAFORM', PATH_DATA_SITE . 'xmlForms/');
+define('PATH_IMAGES_ENVIRONMENT_FILES', PATH_DATA_SITE . 'usersFiles' . PATH_SEP);
+define('PATH_IMAGES_ENVIRONMENT_USERS', PATH_DATA_SITE . 'usersPhotographies' . PATH_SEP);
+define('SERVER_NAME', $_SERVER['SERVER_NAME']);
+define('SERVER_PORT', $_SERVER['SERVER_PORT']);
 
 // create memcached singleton
-$memcache = & PMmemcached::getSingleton( config("system.workspace") );
+$memcache = PMmemcached::getSingleton(config("system.workspace"));
 
 // load Plugins base class
 
 // setup propel definitions and logging
 //changed to autoloader
 
-if (defined( 'DEBUG_SQL_LOG' ) && DEBUG_SQL_LOG) {
-    define( 'PM_PID', mt_rand( 1, 999999 ) );
+if (defined('DEBUG_SQL_LOG') && DEBUG_SQL_LOG) {
+    define('PM_PID', mt_rand(1, 999999));
     require_once 'Log.php';
 
     // register debug connection decorator driver
-    Creole::registerDriver( '*', 'creole.contrib.DebugConnection' );
+    Creole::registerDriver('*', 'creole.contrib.DebugConnection');
 
     // initialize Propel with converted config file
-    Propel::init( PATH_CORE . "config/databases.php" );
+    Propel::init(PATH_CORE . "config/databases.php");
 
     // unified log file for all databases
     $logFile = PATH_DATA . 'log' . PATH_SEP . 'propel.log';
-    $logger = Log::singleton( 'file', $logFile, 'wf ' . config("system.workspace"), null, PEAR_LOG_INFO );
-    Propel::setLogger( $logger );
+    $logger = Log::singleton('file', $logFile, 'wf ' . config("system.workspace"), null, PEAR_LOG_INFO);
+    Propel::setLogger($logger);
     // log file for workflow database
-    $con = Propel::getConnection( 'workflow' );
+    $con = Propel::getConnection('workflow');
     if ($con instanceof DebugConnection) {
-        $con->setLogger( $logger );
+        $con->setLogger($logger);
     }
     // log file for rbac database
-    $con = Propel::getConnection( 'rbac' );
+    $con = Propel::getConnection('rbac');
 
     if ($con instanceof DebugConnection) {
-        $con->setLogger( $logger );
+        $con->setLogger($logger);
     }
 
     // log file for report database
-    $con = Propel::getConnection( 'rp' );
+    $con = Propel::getConnection('rp');
     if ($con instanceof DebugConnection) {
-        $con->setLogger( $logger );
+        $con->setLogger($logger);
     }
 } else {
-    Propel::init( PATH_CORE . "config/databases.php" );
+    Propel::init(PATH_CORE . "config/databases.php");
 }
 
 //here we are loading all plugins registered
@@ -712,7 +721,8 @@ $oPluginRegistry->init();
 $_SESSION['__SYSTEM_UTC_TIME_ZONE__'] = (int)($config['system_utc_time_zone']) == 1;
 /*----------------------------------********---------------------------------*/
 
-ini_set('date.timezone', (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__'])? 'UTC' : $config['time_zone']); //Set Time Zone
+ini_set('date.timezone',
+    (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__']) ? 'UTC' : $config['time_zone']); //Set Time Zone
 
 define('TIME_ZONE', ini_get('date.timezone'));
 
@@ -722,10 +732,10 @@ $_POST = \ProcessMaker\Util\DateTime::convertDataToUtc($_POST);
 $_REQUEST = \ProcessMaker\Util\DateTime::convertDataToUtc($_REQUEST);
 /*----------------------------------********---------------------------------*/
 
-Creole::registerDriver( 'dbarray', 'creole.contrib.DBArrayConnection' );
+Creole::registerDriver('dbarray', 'creole.contrib.DBArrayConnection');
 
 // Session Initializations
-ini_set( 'session.auto_start', '1' );
+ini_set('session.auto_start', '1');
 
 // The register_globals feature has been DEPRECATED as of PHP 5.3.0. default value Off.
 // ini_set( 'register_globals', 'Off' );
@@ -733,10 +743,10 @@ ini_set( 'session.auto_start', '1' );
 ob_start();
 
 // Rebuild the base Workflow translations if not exists
-if (! is_file( PATH_LANGUAGECONT . 'translation.en' )) {
+if (!is_file(PATH_LANGUAGECONT . 'translation.en')) {
     $pathFile = PATH_CLASSES . "model" . PATH_SEP . "Translation.php";
 
-    require_once ($pathFile);
+    require_once($pathFile);
 
     $pmTranslation = new Translation();
     $fields = $pmTranslation->generateFileTranslation("en");
@@ -746,10 +756,10 @@ if (! is_file( PATH_LANGUAGECONT . 'translation.en' )) {
 }
 
 // TODO: Verify if the language set into url is defined in translations env.
-if (SYS_LANG != 'en' && ! is_file( PATH_LANGUAGECONT . 'translation.' . SYS_LANG )) {
+if (SYS_LANG != 'en' && !is_file(PATH_LANGUAGECONT . 'translation.' . SYS_LANG)) {
     $pathFile = PATH_CLASSES . "model" . PATH_SEP . "Translation.php";
 
-    require_once ($pathFile);
+    require_once($pathFile);
 
     $pmTranslation = new Translation();
     $fields = $pmTranslation->generateFileTranslation(SYS_LANG);
@@ -767,22 +777,22 @@ Bootstrap::LoadAllPluginModelClasses();
 
 // jump to php file in methods directory
 $collectionPlugin = '';
-if ($oPluginRegistry->isRegisteredFolder( SYS_COLLECTION )) {
+if ($oPluginRegistry->isRegisteredFolder(SYS_COLLECTION)) {
     $phpFile = PATH_PLUGINS . SYS_COLLECTION . PATH_SEP . SYS_TARGET . '.php';
-    $targetPlugin = explode( '/', SYS_TARGET );
+    $targetPlugin = explode('/', SYS_TARGET);
     $collectionPlugin = $targetPlugin[0];
     $avoidChangedWorkspaceValidation = true;
 } else {
-    $phpFile = Bootstrap::ExpandPath( 'methods' ) . SYS_COLLECTION . PATH_SEP . SYS_TARGET . '.php';
+    $phpFile = Bootstrap::ExpandPath('methods') . SYS_COLLECTION . PATH_SEP . SYS_TARGET . '.php';
 }
 
 // services is a special folder,
 if (SYS_COLLECTION == 'services') {
     $avoidChangedWorkspaceValidation = true;
-    $targetPlugin = explode( '/', SYS_TARGET );
+    $targetPlugin = explode('/', SYS_TARGET);
 
     if ($targetPlugin[0] == 'webdav') {
-        $phpFile = Bootstrap::ExpandPath( 'methods' ) . SYS_COLLECTION . PATH_SEP . 'webdav.php';
+        $phpFile = Bootstrap::ExpandPath('methods') . SYS_COLLECTION . PATH_SEP . 'webdav.php';
     }
 }
 
@@ -794,19 +804,19 @@ $bWE = false;
 $isControllerCall = false;
 $isPluginController = false;
 
-if (substr( SYS_COLLECTION, 0, 8 ) === 'gulliver') {
-    $phpFile = PATH_GULLIVER_HOME . 'methods/' . substr( SYS_COLLECTION, 8 ) . SYS_TARGET . '.php';
+if (substr(SYS_COLLECTION, 0, 8) === 'gulliver') {
+    $phpFile = PATH_GULLIVER_HOME . 'methods/' . substr(SYS_COLLECTION, 8) . SYS_TARGET . '.php';
 } else {
     //when the file is part of the public directory of any PROCESS, this a ProcessMaker feature
-    if (preg_match( '/^[0-9][[:alnum:]]+$/', SYS_COLLECTION ) == 1) { //the pattern is /sysSYS/LANG/SKIN/PRO_UID/file
-        $auxPart = explode( '/', $_SERVER['REQUEST_URI'] );
-        $aAux = explode( '?', $auxPart[count( $auxPart ) - 1] );
+    if (preg_match('/^[0-9][[:alnum:]]+$/', SYS_COLLECTION) == 1) { //the pattern is /sysSYS/LANG/SKIN/PRO_UID/file
+        $auxPart = explode('/', $_SERVER['REQUEST_URI']);
+        $aAux = explode('?', $auxPart[count($auxPart) - 1]);
         //$extPart = explode ( '.' , $auxPart[ count($auxPart)-1] );
-        $extPart = explode( '.', $aAux[0] );
-        $queryPart = isset( $aAux[1] ) ? $aAux[1] : "";
-        $extension = $extPart[count( $extPart ) - 1];
-        $phpFile = PATH_DATA_SITE . 'public' . PATH_SEP . SYS_COLLECTION . PATH_SEP . urldecode( $auxPart[count( $auxPart ) - 1] );
-        $aAux = explode( '?', $phpFile );
+        $extPart = explode('.', $aAux[0]);
+        $queryPart = isset($aAux[1]) ? $aAux[1] : "";
+        $extension = $extPart[count($extPart) - 1];
+        $phpFile = PATH_DATA_SITE . 'public' . PATH_SEP . SYS_COLLECTION . PATH_SEP . urldecode($auxPart[count($auxPart) - 1]);
+        $aAux = explode('?', $phpFile);
         $phpFile = $aAux[0];
 
         if ($extension != 'php') {
@@ -834,15 +844,14 @@ if (substr( SYS_COLLECTION, 0, 8 ) === 'gulliver') {
     }
 
     //erik: verify if it is a Controller Class or httpProxyController Class
-    if (is_file( PATH_CONTROLLERS . SYS_COLLECTION . '.php' )) {
-
+    if (is_file(PATH_CONTROLLERS . SYS_COLLECTION . '.php')) {
         $pathFile = PATH_CONTROLLERS . SYS_COLLECTION . '.php';
         require_once $pathFile;
         $controllerClass = SYS_COLLECTION;
         //if the method name is empty set default to index method
         $controllerAction = SYS_TARGET != '' ? SYS_TARGET : 'index';
         //if the method exists
-        if (is_callable( Array ($controllerClass,$controllerAction ) )) {
+        if (is_callable(array($controllerClass, $controllerAction))) {
             $isControllerCall = true;
         }
 
@@ -868,13 +877,13 @@ if (substr( SYS_COLLECTION, 0, 8 ) === 'gulliver') {
 
         $pluginControllerPath = PATH_PLUGINS . $pluginName . PATH_SEP . 'controllers' . PATH_SEP;
 
-        $pathFile = $pluginControllerPath. $controllerClass . '.php';
+        $pathFile = $pluginControllerPath . $controllerClass . '.php';
         if (is_file($pathFile)) {
             require_once $pathFile;
-        } elseif (is_file($pluginControllerPath. ucfirst($controllerClass) . '.php')) {
+        } elseif (is_file($pluginControllerPath . ucfirst($controllerClass) . '.php')) {
             $controllerClass = ucfirst($controllerClass);
             require_once $pathFile;
-        } elseif (is_file($pluginControllerPath. ucfirst($controllerClass) . 'Controller.php')) {
+        } elseif (is_file($pluginControllerPath . ucfirst($controllerClass) . 'Controller.php')) {
             $controllerClass = ucfirst($controllerClass) . 'Controller';
             require_once $pathFile;
         }
@@ -885,46 +894,47 @@ if (substr( SYS_COLLECTION, 0, 8 ) === 'gulliver') {
         }
     }
 
-    if (! $isControllerCall && ! file_exists( $phpFile )) {
+    if (!$isControllerCall && !file_exists($phpFile)) {
         $_SESSION['phpFileNotFound'] = $_SERVER['REQUEST_URI'];
         header('Status: 404');
-        header( "location: /errors/error404.php?url=" . urlencode( $_SERVER['REQUEST_URI'] ) );
+        header("location: /errors/error404.php?url=" . urlencode($_SERVER['REQUEST_URI']));
         die();
     }
 }
 
 //redirect to login, if user changed the workspace in the URL
-if (! $avoidChangedWorkspaceValidation && isset( $_SESSION['WORKSPACE'] ) && $_SESSION['WORKSPACE'] != config("system.workspace")) {
+if (!$avoidChangedWorkspaceValidation && isset($_SESSION['WORKSPACE']) && $_SESSION['WORKSPACE'] != config("system.workspace")) {
     $_SESSION['WORKSPACE'] = config("system.workspace");
-    Bootstrap::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_SYSTEM', "error" );
+    Bootstrap::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_SYSTEM', "error");
     // verify if the current skin is a 'ux' variant
-    $urlPart = substr( SYS_SKIN, 0, 2 ) == 'ux' && SYS_SKIN != 'uxs' ? '/main/login' : '/login/login';
+    $urlPart = substr(SYS_SKIN, 0, 2) == 'ux' && SYS_SKIN != 'uxs' ? '/main/login' : '/login/login';
 
-    header( 'Location: /sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN . $urlPart );
+    header('Location: /sys' . config("system.workspace") . '/' . SYS_LANG . '/' . SYS_SKIN . $urlPart);
     die();
 }
 
 // enable rbac
 
-$RBAC = &RBAC::getSingleton( PATH_DATA, session_id() );
+$RBAC = RBAC::getSingleton(PATH_DATA, session_id());
 $RBAC->sSystem = 'PROCESSMAKER';
 
 // define and send Headers for all pages
-if (! defined( 'EXECUTE_BY_CRON' )) {
-    header( "Expires: " . gmdate( "D, d M Y H:i:s", mktime( 0, 0, 0, date( 'm' ), date( 'd' ) - 1, date( 'Y' ) ) ) . " GMT" );
-    header( "Last-Modified: " . gmdate( "D, d M Y H:i:s" ) . " GMT" );
-    header( "Cache-Control: no-store, no-cache, must-revalidate" );
-    header( "Cache-Control: post-check=0, pre-check=0", false );
-    header( "Pragma: no-cache" );
+if (!defined('EXECUTE_BY_CRON')) {
+    header("Expires: " . gmdate("D, d M Y H:i:s", mktime(0, 0, 0, date('m'), date('d') - 1, date('Y'))) . " GMT");
+    header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+    header("Cache-Control: no-store, no-cache, must-revalidate");
+    header("Cache-Control: post-check=0, pre-check=0", false);
+    header("Pragma: no-cache");
 
     // get the language direction from ServerConf
-    define( 'SYS_LANG_DIRECTION', $oServerConf->getLanDirection() );
+    define('SYS_LANG_DIRECTION', $oServerConf->getLanDirection());
 
-    if ((isset( $_SESSION['USER_LOGGED'] )) && (! (isset( $_GET['sid'] )))) {
+    if ((isset($_SESSION['USER_LOGGED'])) && (!(isset($_GET['sid'])))) {
         if ((preg_match("/msie/i", $_SERVER ['HTTP_USER_AGENT']) != 1 ||
-            $config['ie_cookie_lifetime'] == 1) &&
-            (!(preg_match("/safari/i", $_SERVER ['HTTP_USER_AGENT']) == 1 && preg_match("/chrome/i", $_SERVER ['HTTP_USER_AGENT']) == 0) ||
-            $config['safari_cookie_lifetime'] == 1)) {
+                $config['ie_cookie_lifetime'] == 1) &&
+            (!(preg_match("/safari/i", $_SERVER ['HTTP_USER_AGENT']) == 1 && preg_match("/chrome/i",
+                        $_SERVER ['HTTP_USER_AGENT']) == 0) ||
+                $config['safari_cookie_lifetime'] == 1)) {
             if (PHP_VERSION < 5.2) {
                 setcookie(session_name(), session_id(), time() + $timelife, '/', '; HttpOnly');
             } else {
@@ -934,13 +944,13 @@ if (! defined( 'EXECUTE_BY_CRON' )) {
         $RBAC->initRBAC();
         //using optimization with memcache, the user data will be in memcache 8 hours, or until session id goes invalid
         $memKey = 'rbacSession' . session_id();
-        if (($RBAC->aUserInfo = $memcache->get( $memKey )) === false) {
-            $RBAC->loadUserRolePermission( $RBAC->sSystem, $_SESSION['USER_LOGGED'] );
-            $memcache->set( $memKey, $RBAC->aUserInfo, PMmemcached::EIGHT_HOURS );
+        if (($RBAC->aUserInfo = $memcache->get($memKey)) === false) {
+            $RBAC->loadUserRolePermission($RBAC->sSystem, $_SESSION['USER_LOGGED']);
+            $memcache->set($memKey, $RBAC->aUserInfo, PMmemcached::EIGHT_HOURS);
         }
     } else {
         // this is the blank list to allow execute scripts with no login (without session started)
-        $noLoginFiles = $noLoginFolders = array ();
+        $noLoginFiles = $noLoginFolders = [];
         $noLoginFiles[] = 'login';
         $noLoginFiles[] = 'authentication';
         $noLoginFiles[] = 'authenticationSso';
@@ -979,23 +989,25 @@ if (! defined( 'EXECUTE_BY_CRON' )) {
         $noLoginFolders[] = 'InstallerModule';
 
         // This sentence is used when you lost the Session
-        if (! in_array( SYS_TARGET, $noLoginFiles ) && ! in_array( SYS_COLLECTION, $noLoginFolders ) && $bWE != true && $collectionPlugin != 'services') {
+        if (!in_array(SYS_TARGET, $noLoginFiles) && !in_array(SYS_COLLECTION,
+                $noLoginFolders) && $bWE != true && $collectionPlugin != 'services') {
             $bRedirect = true;
-            if (isset( $_GET['sid'] )) {
+            if (isset($_GET['sid'])) {
                 $oSessions = new Sessions();
-                if ($aSession = $oSessions->verifySession( $_GET['sid'] )) {
+                if ($aSession = $oSessions->verifySession($_GET['sid'])) {
                     require_once 'classes/model/Users.php';
                     $oUser = new Users();
-                    $aUser = $oUser->load( $aSession['USR_UID'] );
+                    $aUser = $oUser->load($aSession['USR_UID']);
                     initUserSession(
                         $aUser['USR_UID'],
                         $aUser['USR_USERNAME']
                     );
                     $bRedirect = false;
                     if ((preg_match("/msie/i", $_SERVER ['HTTP_USER_AGENT']) != 1 ||
-                        $config['ie_cookie_lifetime'] == 1) &&
-                        (!(preg_match("/safari/i", $_SERVER ['HTTP_USER_AGENT']) == 1 && preg_match("/chrome/i", $_SERVER ['HTTP_USER_AGENT']) == 0) ||
-                        $config['safari_cookie_lifetime'] == 1)) {
+                            $config['ie_cookie_lifetime'] == 1) &&
+                        (!(preg_match("/safari/i", $_SERVER ['HTTP_USER_AGENT']) == 1 && preg_match("/chrome/i",
+                                    $_SERVER ['HTTP_USER_AGENT']) == 0) ||
+                            $config['safari_cookie_lifetime'] == 1)) {
                         if (PHP_VERSION < 5.2) {
                             setcookie(session_name(), session_id(), time() + $timelife, '/', '; HttpOnly');
                         } else {
@@ -1003,9 +1015,9 @@ if (! defined( 'EXECUTE_BY_CRON' )) {
                         }
                     }
                     $RBAC->initRBAC();
-                    $RBAC->loadUserRolePermission( $RBAC->sSystem, $_SESSION['USER_LOGGED'] );
+                    $RBAC->loadUserRolePermission($RBAC->sSystem, $_SESSION['USER_LOGGED']);
                     $memKey = 'rbacSession' . session_id();
-                    $memcache->set( $memKey, $RBAC->aUserInfo, PMmemcached::EIGHT_HOURS );
+                    $memcache->set($memKey, $RBAC->aUserInfo, PMmemcached::EIGHT_HOURS);
                 }
             }
 
@@ -1024,7 +1036,6 @@ if (! defined( 'EXECUTE_BY_CRON' )) {
 
                 if (empty($_POST)) {
                     header('location: ' . SYS_URI . $loginUrl . '?u=' . urlencode($_SERVER['REQUEST_URI']));
-
                 } else {
                     if ($isControllerCall) {
                         header("HTTP/1.0 302 session lost in controller");
@@ -1062,10 +1073,10 @@ if (! defined( 'EXECUTE_BY_CRON' )) {
         require_once $phpFile;
     }
 
-    if (defined( 'SKIP_HEADERS' )) {
-        header( "Expires: " . gmdate( "D, d M Y H:i:s", mktime( 0, 0, 0, date( 'm' ), date( 'd' ), date( 'Y' ) + 1 ) ) . " GMT" );
-        header( 'Cache-Control: public' );
-        header( 'Pragma: ' );
+    if (defined('SKIP_HEADERS')) {
+        header("Expires: " . gmdate("D, d M Y H:i:s", mktime(0, 0, 0, date('m'), date('d'), date('Y') + 1)) . " GMT");
+        header('Cache-Control: public');
+        header('Pragma: ');
     }
 
     ob_end_flush();