Merge branch 'develop' of bitbucket.org:colosa/processmaker into bugfix/PMCORE-1335

composer.json

@@ -60,7 +60,8 @@
         "league/oauth2-google": "^3.0",
         "tecnickcom/tcpdf": "6.3.*",
         "fzaninotto/faker": "^1.7",
-        "predis/predis": "1.1.1"
+        "predis/predis": "1.1.1",
+        "phpmyadmin/sql-parser": "^5.3"
     },
     "require-dev": {
         "guzzlehttp/guzzle": "^6.3",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "da3512db89554c0bf1626fe310fd8254",
+    "content-hash": "c2797ee5f1a7edd412479d5495731149",
     "packages": [
         {
             "name": "bshaffer/oauth2-server-php",
@@ -2663,17 +2663,83 @@
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
             "time": "2018-11-15T22:32:31+00:00"
         },
+        {
+            "name": "phpmyadmin/sql-parser",
+            "version": "5.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpmyadmin/sql-parser.git",
+                "reference": "11457e9bbedc182b48c04db3a2621d17b58b0808"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/11457e9bbedc182b48c04db3a2621d17b58b0808",
+                "reference": "11457e9bbedc182b48c04db3a2621d17b58b0808",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1",
+                "symfony/polyfill-mbstring": "^1.3"
+            },
+            "conflict": {
+                "phpmyadmin/motranslator": "<3.0"
+            },
+            "require-dev": {
+                "phpmyadmin/coding-standard": "^1.0",
+                "phpmyadmin/motranslator": "^4.0 || ^5.0",
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^0.12.3",
+                "phpstan/phpstan-phpunit": "^0.12.1",
+                "phpunit/php-code-coverage": "*",
+                "phpunit/phpunit": "^7.4 || ^8 || ^9"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance",
+                "phpmyadmin/motranslator": "Translate messages to your favorite locale"
+            },
+            "bin": [
+                "bin/highlight-query",
+                "bin/lint-query",
+                "bin/tokenize-query"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PhpMyAdmin\\SqlParser\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "The phpMyAdmin Team",
+                    "email": "developers@phpmyadmin.net",
+                    "homepage": "https://www.phpmyadmin.net/team/"
+                }
+            ],
+            "description": "A validating SQL lexer and parser with a focus on MySQL dialect.",
+            "homepage": "https://github.com/phpmyadmin/sql-parser",
+            "keywords": [
+                "analysis",
+                "lexer",
+                "parser",
+                "sql"
+            ],
+            "time": "2020-03-21T00:25:34+00:00"
+        },
         {
             "name": "predis/predis",
             "version": "v1.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/nrk/predis.git",
+                "url": "https://github.com/predis/predis.git",
                 "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1",
+                "url": "https://api.github.com/repos/predis/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1",
                 "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1",
                 "shasum": ""
             },

gulliver/system/class.form.php

@@ -767,7 +767,7 @@ class Form extends XmlForm
      */
     public static function createXMLFileIfNotExists($filepath)
     {
-        if (file_exists($filepath)) {
+        if (file_exists($filepath) && filesize($filepath) > 0) {
             return;
         }
         $pathParts = pathinfo($filepath);

tests/unit/gulliver/system/FormTest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Tests\unit\gulliver\system;
+
+use Form;
+use G;
+use Tests\TestCase;
+
+class FormTest extends TestCase
+{
+    /**
+     * Test the creation of the XML file if not exists or has no content
+     *
+     * @covers Form::createXMLFileIfNotExists()
+     * @test
+     */
+    public function it_should_test_create_xml_file_if_not_exists()
+    {
+        // Build the file path
+        $xmlForm = PATH_DYNAFORM . G::generateUniqueID() . '/' . G::generateUniqueID() . '.xml';
+
+        // The file doesn't exists, so, should be created
+        Form::createXMLFileIfNotExists($xmlForm);
+
+        // File created?
+        $this->assertFileExists($xmlForm);
+
+        // File with content?
+        $this->assertNotEmpty(file_get_contents($xmlForm));
+
+        // Delete the file
+        unlink($xmlForm);
+
+        // Create another empty
+        touch($xmlForm);
+
+        // The file exists, but is empty, should be regenerated
+        Form::createXMLFileIfNotExists($xmlForm);
+
+        // File with content?
+        $this->assertNotEmpty(file_get_contents($xmlForm));
+    }
+}

tests/unit/workflow/engine/classes/CasesTest.php

@@ -7,6 +7,9 @@ use ProcessMaker\Model\Application;
 use ProcessMaker\Model\Delegation;
 use ProcessMaker\Model\Process;
 use ProcessMaker\Model\Step;
+use ProcessMaker\Model\Task;
+use ProcessMaker\Model\TaskUser;
+use ProcessMaker\Model\User;
 use Tests\TestCase;
 
 class CasesTest extends TestCase
@@ -360,6 +363,49 @@ class CasesTest extends TestCase
         $this->assertCount(4, $res);
     }
 
+    /**
+     * Test the getStartCases method
+     *
+     * @covers \Cases::getStartCases()
+     * @test
+     */
+    public function it_should_test_get_start_cases()
+    {
+        // Creating a process with initial tasks
+        $process = factory(Process::class)->create();
+        $user = factory(User::class)->create();
+        $normalTask = factory(Task::class)->create([
+            'PRO_UID' => $process->PRO_UID,
+            'PRO_ID' => $process->PRO_ID,
+            'TAS_START' => 'TRUE'
+        ]);
+        $webEntryTask = factory(Task::class)->create([
+            'PRO_UID' => $process->PRO_UID,
+            'PRO_ID' => $process->PRO_ID,
+            'TAS_START' => 'TRUE',
+            'TAS_TYPE' => 'WEBENTRYEVENT'
+        ]);
+        factory(TaskUser::class)->create([
+            'TAS_UID' => $normalTask->TAS_UID,
+            'USR_UID' => $user->USR_UID
+        ]);
+        factory(TaskUser::class)->create([
+            'TAS_UID' => $webEntryTask->TAS_UID,
+            'USR_UID' => $user->USR_UID
+        ]);
+
+        // Instance class Cases
+        $cases = new Cases();
+
+        // Get all initial tasks
+        $startingTasks = $cases->getStartCases($user->USR_UID);
+        $this->assertCount(3, $startingTasks);
+
+        // Get initial tasks without dummy tasks
+        $startingTasks = $cases->getStartCases($user->USR_UID, true);
+        $this->assertCount(2, $startingTasks);
+    }
+
     /**
      * Call the tearDown method
      */

tests/unit/workflow/engine/classes/DbConnectionsTest.php

@@ -0,0 +1,111 @@
+<?php
+
+namespace Tests\unit\workflow\engine\classes;
+
+use DbConnections;
+use G;
+use ProcessMaker\Model\DbSource;
+use ProcessMaker\Model\Process;
+use Propel;
+use Tests\TestCase;
+
+class DbConnectionsTest extends TestCase
+{
+    private $dbConnections;
+
+    /**
+     * Setup method.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+        $this->dbConnections = new DbConnections();
+    }
+
+    /**
+     * This test verify loadAdditionalConnections method.
+     * @test
+     * @covers DbConnections::loadAdditionalConnections
+     */
+    public function it_should_test_loadAdditionalConnections_method()
+    {
+        $process = factory(Process::class)->create();
+
+        $dbName = env('DB_DATABASE');
+        $dbSource = factory(DbSource::class)->create([
+            'PRO_UID' => $process->PRO_UID,
+            'DBS_TYPE' => 'mysql',
+            'DBS_SERVER' => env('DB_HOST'),
+            'DBS_DATABASE_NAME' => $dbName,
+            'DBS_USERNAME' => env('DB_USERNAME'),
+            'DBS_PASSWORD' => G::encrypt(env('DB_PASSWORD'), $dbName) . "_2NnV3ujj3w",
+            'DBS_PORT' => '3306',
+        ]);
+
+        $a = Propel::getConfiguration();
+
+
+        $_SESSION['PROCESS'] = $process->PRO_UID;
+        $this->dbConnections->loadAdditionalConnections();
+
+        $actual = Propel::getConfiguration();
+
+        $this->assertArrayHasKey($dbSource->DBS_UID, $actual['datasources']);
+    }
+
+    /**
+     * This test verify loadAdditionalConnections method with option true.
+     * @test
+     * @covers DbConnections::loadAdditionalConnections
+     */
+    public function it_should_test_loadAdditionalConnections_method_with_force_option_true()
+    {
+        $process = factory(Process::class)->create();
+
+        $dbName = env('DB_DATABASE');
+        $dbSource = factory(DbSource::class)->create([
+            'PRO_UID' => $process->PRO_UID,
+            'DBS_TYPE' => 'mysql',
+            'DBS_SERVER' => env('DB_HOST'),
+            'DBS_DATABASE_NAME' => $dbName,
+            'DBS_USERNAME' => env('DB_USERNAME'),
+            'DBS_PASSWORD' => G::encrypt(env('DB_PASSWORD'), $dbName) . "_2NnV3ujj3w",
+            'DBS_PORT' => '3306',
+        ]);
+
+        $_SESSION['PROCESS'] = $process->PRO_UID;
+        $this->dbConnections->loadAdditionalConnections(true);
+
+        $actual = Propel::getConfiguration();
+
+        $this->assertArrayHasKey($dbSource->DBS_UID, $actual['datasources']);
+    }
+
+    /**
+     * This test verify loadAdditionalConnections method with option false.
+     * @test
+     * @covers DbConnections::loadAdditionalConnections
+     */
+    public function it_should_test_loadAdditionalConnections_method_with_force_option_false()
+    {
+        $process = factory(Process::class)->create();
+
+        $dbName = env('DB_DATABASE');
+        $dbSource = factory(DbSource::class)->create([
+            'PRO_UID' => $process->PRO_UID,
+            'DBS_TYPE' => 'mysql',
+            'DBS_SERVER' => env('DB_HOST'),
+            'DBS_DATABASE_NAME' => $dbName,
+            'DBS_USERNAME' => env('DB_USERNAME'),
+            'DBS_PASSWORD' => G::encrypt(env('DB_PASSWORD'), $dbName) . "_2NnV3ujj3w",
+            'DBS_PORT' => '3306',
+        ]);
+
+        $_SESSION['PROCESS'] = $process->PRO_UID;
+        $this->dbConnections->loadAdditionalConnections(false);
+
+        $actual = Propel::getConfiguration();
+
+        $this->assertArrayHasKey($dbSource->DBS_UID, $actual['datasources']);
+    }
+}

tests/unit/workflow/engine/methods/groups/GroupsAjaxTest.php

@@ -68,9 +68,10 @@ class GroupsAjaxTest extends TestCase
         $content = ob_get_clean();
         $content = json_decode($content, JSON_OBJECT_AS_ARRAY);
 
-        $this->assertArrayHasKey("success", $content);
+        // @todo, review the issue in the circle CI 
-        $this->assertArrayHasKey("groups", $content);
+        //$this->assertArrayHasKey("success", $content);
-        $this->assertTrue($content["success"]);
+        //$this->assertArrayHasKey("groups", $content);
-        $this->assertTrue(is_array($content["groups"]));
+        //$this->assertTrue($content["success"]);
+        //$this->assertTrue(is_array($content["groups"]));
     }
 }

tests/unit/workflow/engine/methods/users/UsersAjaxTest.php

@@ -3,6 +3,7 @@
 namespace Tests\unit\workflow\engine\methods\users;
 
 use ProcessMaker\Model\Configuration;
+use ProcessMaker\Model\RbacUsersRoles;
 use ProcessMaker\Model\User;
 use RBAC;
 use Tests\TestCase;
@@ -58,15 +59,100 @@ class UsersAjaxTest extends TestCase
         //Clean the output buffer and turn off output buffering
         ob_end_clean();
 
+        //Removing the BOM (Byte Order Mark)
+        if (0 === strpos(bin2hex($outputBuffer), 'efbbbf')) {
+            //Decode the JSON string
+            $res = json_decode(substr($outputBuffer, 3));
+        } else {
             //Decode the JSON string
             $res = json_decode($outputBuffer);
+        }
 
         //Assert the call was success
         $this->assertTrue($res->success);
         //Assert the result corresponds to the user logged
         $this->assertEquals($usrUid, $res->user->USR_UID);
         //Assert the default menu is set
-        $this->assertEquals('PM_EDIT_USER_PROFILE_DEFAULT_MAIN_MENU_OPTIONS',
+        $this->assertEquals(
-            $res->permission->PREF_DEFAULT_MENUSELECTED);
+            'PM_EDIT_USER_PROFILE_DEFAULT_MAIN_MENU_OPTIONS',
+            $res->permission->PREF_DEFAULT_MENUSELECTED
+        );
+    }
+
+    /**
+     * Tests the user ajax file with the userData action
+     * @test
+     */
+    public function it_tests_the_user_ajax_file_with_save_personal_info_action()
+    {
+        //Declare the global variable
+        global $RBAC;
+        //Creates the user factory
+        $user2 = factory(User::class)->create(
+            [
+                'USR_ROLE' => 'PROCESSMAKER_ADMIN',
+                'USR_EMAIL' => 'test@processmaker.com'
+            ]
+        );
+        $usrUid = $user2['USR_UID'];
+        //Creates the configuration factory
+        factory(Configuration::class)->create([
+            'CFG_UID' => 'USER_PREFERENCES',
+            'OBJ_UID' => '',
+            'CFG_VALUE' => 'a:3:{s:12:"DEFAULT_LANG";s:0:"";s:12:"DEFAULT_MENU";s:8:"PM_SETUP";s:18:"DEFAULT_CASES_MENU";s:0:"";}',
+            'PRO_UID' => '',
+            'USR_UID' => $usrUid,
+            'APP_UID' => '',
+        ]);
+
+        //Creates the UsersRoles factory
+        factory(RbacUsersRoles::class)->create(
+            [
+                'USR_UID' => $usrUid,
+                'ROL_UID' => '00000000000000000000000000000002'
+            ]
+        );
+
+        //Sets the needed variables
+        $_SESSION['USER_LOGGED'] = $usrUid;
+        $_POST['action'] = 'savePersonalInfo';
+        $_POST['USR_UID'] = $usrUid;
+        $_POST['USR_EMAIL'] = "andrea.Adamczyk@processmaker.com";
+        $_POST['_token'] = 'b8sbHBMAcdwZ40W1Epf2A5leyJq3mArcnTjoToXU';
+        $_SESSION['USR_CSRF_TOKEN'] = 'b8sbHBMAcdwZ40W1Epf2A5leyJq3mArcnTjoToXU';
+        $_FILES['USR_PHOTO'] = ['name' => '', 'type' => '', 'tmp_name' => '', 'error' => 4, 'size' => 0];
+        $RBAC = RBAC::getSingleton(PATH_DATA, session_id());
+        $RBAC->initRBAC();
+        $RBAC->loadUserRolePermission('PROCESSMAKER', $_SESSION['USER_LOGGED']);
+
+        //Turn on output buffering
+        ob_start();
+
+        //Call the tested file
+        require PATH_TRUNK . 'workflow/engine/methods/users/usersAjax.php';
+
+        //Return the contents of the output buffer
+        $outputBuffer = ob_get_contents();
+
+        //Clean the output buffer and turn off output buffering
+        ob_end_clean();
+
+        //Removing the BOM (Byte Order Mark)
+        if (0 === strpos(bin2hex($outputBuffer), 'efbbbf')) {
+            //Decode the JSON string
+            $res = json_decode(substr($outputBuffer, 3));
+        } else {
+            //Decode the JSON string
+            $res = json_decode($outputBuffer);
+        }
+
+        //It asserts the result is success
+        $this->assertTrue($res->success);
+
+        //Get the edited user
+        $resUser = User::where('USR_UID', '=', $usrUid)->get();
+
+        //It asserts the user's email has been converted to lowercase
+        $this->assertEquals($resUser[0]->USR_EMAIL, strtolower($_POST['USR_EMAIL']));
     }
 }

workflow/engine/classes/Cases.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\Log;
+use ProcessMaker\BusinessModel\Task as BusinessModelTask;
 use ProcessMaker\BusinessModel\User as BusinessModelUser;
 use ProcessMaker\BusinessModel\WebEntryEvent;
 use ProcessMaker\Cases\CasesTrait;
@@ -110,14 +111,16 @@ class Cases
     }
 
     /**
-     * get user starting tasks
+     * Get user's starting tasks
-     * @param string $sUIDUser
+     *
-     * @return $rows
+     * @param string $uidUser
+     * @param bool $withoutDummyTasks
+     * @return array
      */
-    public function getStartCases($sUIDUser = '')
+    public function getStartCases($uidUser = '', $withoutDummyTasks = false)
     {
-        $rows[] = array('uid' => 'char', 'value' => 'char');
+        $rows = [['uid' => 'char', 'value' => 'char']];
-        $tasks = array();
+        $tasks = [];
 
         $c = new Criteria();
         $c->clearSelectColumns();
@@ -127,7 +130,7 @@ class Cases
         $c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
         $c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
         $c->add(TaskPeer::TAS_START, 'TRUE');
-        $c->add(TaskUserPeer::USR_UID, $sUIDUser);
+        $c->add(TaskUserPeer::USR_UID, $uidUser);
         $c->add(TaskUserPeer::TU_TYPE, 1);
         $rs = TaskPeer::doSelectRS($c);
         $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -142,7 +145,7 @@ class Cases
 
         //check groups
         $group = new Groups();
-        $aGroups = $group->getActiveGroupsForAnUser($sUIDUser);
+        $groups = $group->getActiveGroupsForAnUser($uidUser);
 
         $c = new Criteria();
         $c->clearSelectColumns();
@@ -152,7 +155,7 @@ class Cases
         $c->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
         $c->add(ProcessPeer::PRO_STATUS, 'ACTIVE');
         $c->add(TaskPeer::TAS_START, 'TRUE');
-        $c->add(TaskUserPeer::USR_UID, $aGroups, Criteria::IN);
+        $c->add(TaskUserPeer::USR_UID, $groups, Criteria::IN);
         $c->add(TaskUserPeer::TU_TYPE, 1);
         $rs = TaskPeer::doSelectRS($c);
         $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -172,17 +175,21 @@ class Cases
         $c->addSelectColumn(ProcessPeer::PRO_TITLE);
         $c->addJoin(TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN);
         $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN);
+        // Include or not the dummy tasks
+        if ($withoutDummyTasks) {
+            $c->add(TaskPeer::TAS_TYPE, BusinessModelTask::getDummyTypes(), Criteria::NOT_IN);
+        }
         $c->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE);
         $c->addAscendingOrderByColumn(TaskPeer::TAS_TITLE);
         $rs = TaskPeer::doSelectRS($c);
         $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
         $rs->next();
         while ($row = $rs->getRow()) {
-            $rows[] = array(
+            $rows[] = [
                 'uid' => $row['TAS_UID'],
                 'value' => $row['PRO_TITLE'] . ' (' . $row['TAS_TITLE'] . ')',
                 'pro_uid' => $row['PRO_UID']
-            );
+            ];
             $rs->next();
             $row = $rs->getRow();
         }

workflow/engine/classes/DbConnections.php

@@ -226,16 +226,11 @@ class DbConnections
                     // 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;
-                    }
+
                     $laravelConfig = [
                         'driver' => $externalDb->DBS_TYPE === 'mssql' ? 'sqlsrv' : $externalDb->DBS_TYPE, // MSSQL driver is not supported anymore, only SQLSRV
                         'host' => $externalDb->DBS_SERVER,

workflow/engine/classes/PmDynaform.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\Log;
+use PhpMyAdmin\SqlParser\Parser;
 use ProcessMaker\Core\System;
 use ProcessMaker\BusinessModel\DynaForm\SuggestTrait;
 use ProcessMaker\BusinessModel\Cases;
@@ -1043,6 +1044,16 @@ class PmDynaform
                         $dt[$key]["alias"] = "";
                     }
                     if ($key == 0) {
+                        //compatibility with table name alias when uses the sentence 'AS'
+                        if (strtoupper($dt[$key]["alias"]) === 'AS') {
+                            $parser = new Parser($sql);
+                            if (isset($parser->statements[$key]) && isset($parser->statements[$key]->from[$key])) {
+                                $obj1 = $parser->statements[$key]->from[$key];
+                                if (!empty($obj1->alias)) {
+                                    $dt[$key]["alias"] = $dt[$key]["alias"] . ' ' . $obj1->alias;
+                                }
+                            }
+                        }
                         $from .= $dt[$key]["table"]
                                 . ($dt[$key]["table"] == $dt[$key]["alias"] ? "" : " " . $dt[$key]["alias"]);
                     } else {

workflow/engine/classes/model/AppDelegation.php

@@ -270,7 +270,8 @@ class AppDelegation extends BaseAppDelegation
                     if ($resultAbe->next()) {
                         $dataAbe = $resultAbe->getRow();
                         $flagActionsByEmail = false;
-                        if ($dataAbe['ABE_TYPE']!='' && $data->USR_UID!='') {
+                        // These validations are important for the the action by email
+                        if (!empty($dataAbe['ABE_TYPE']) && !empty($data->USR_UID) && $data->DEL_INDEX > 1) {
                             $actionsByEmail = new ActionsByEmailCoreClass();
                             $actionsByEmail->sendActionsByEmail($data, $dataAbe);
                         }

workflow/engine/methods/login/retrivePassword.php

@@ -8,6 +8,7 @@ global $RBAC;
 $rbacUser = new RbacUsers();
 $user = new Users();
 $data['USR_USERNAME'] = strip_tags($data['USR_USERNAME']);
+$data['USR_EMAIL'] = strtolower($data['USR_EMAIL']);
 $userData = $rbacUser->getByUsername($data['USR_USERNAME']);
 $userExists = $userData === false ? false : true;
 
@@ -102,4 +103,3 @@ if ($userExists === true && $userData['USR_EMAIL'] != '' && $userData['USR_EMAIL
     G::SendTemporalMessage($msg, "warning", 'string');
     G::header('location: forgotPassword');
 }
-

workflow/engine/methods/users/usersAjax.php

@@ -5,6 +5,7 @@ use ProcessMaker\BusinessModel\User as BmUser;
 // Sanitizing the values sent in the global variables
 $filter = new InputFilter();
 $_POST = $filter->xssFilterHard($_POST);
+
 if (isset($_SESSION['USER_LOGGED'])) {
     $_SESSION['USER_LOGGED'] = $filter->xssFilterHard($_SESSION['USER_LOGGED']);
 }
@@ -145,6 +146,10 @@ try {
                 $permissionsToSaveData = $user->getPermissionsForEdit();
                 $form = $user->checkPermissionForEdit($_SESSION['USER_LOGGED'], $permissionsToSaveData, $form);
 
+                if (!empty($form["USR_EMAIL"])) {
+                    $form["USR_EMAIL"] = strtolower($form["USR_EMAIL"]);
+                }
+                    
                 switch ($_POST['action']) {
                     case 'saveUser':
                         if (!$user->checkPermission($_SESSION['USER_LOGGED'], 'PM_USERS')) {

workflow/engine/src/ProcessMaker/BusinessModel/ProjectUser.php

@@ -2,8 +2,15 @@
 
 namespace ProcessMaker\BusinessModel;
 
-use \G;
+use Cases;
+use Criteria;
+use Exception;
+use G;
+use GroupUserPeer;
 use ProcessMaker\Core\System;
+use ResultSet;
+use TaskPeer;
+use TaskUserPeer;
 
 class ProjectUser
 {
@@ -90,71 +97,75 @@ class ProjectUser
     }
 
     /**
-     * Return starting task
+     * Return starting tasks
      *
-     * @param string $sProcessUID {@min 32} {@max 32}
+     * @param string $processUid
      *
-     * return array
+     * @return array
+     *
+     * @throws Exception
      *
      * @access public
      */
-    public function getProjectStartingTasks($sProcessUID)
+    public function getProjectStartingTasks($processUid)
     {
         try {
-            Validator::proUid($sProcessUID, '$prj_uid');
+            Validator::proUid($processUid, '$prj_uid');
-            $aUsers = array();
+            $users = [];
-            $usersIds = array();
+            $usersIds = [];
 
-            $oCriteria = new \Criteria('workflow');
+            $criteria = new Criteria('workflow');
-            $oCriteria->addSelectColumn(\TaskUserPeer::USR_UID);
+            $criteria->addSelectColumn(TaskUserPeer::USR_UID);
-            $oCriteria->addJoin(\TaskPeer::TAS_UID, \TaskUserPeer::TAS_UID,  \Criteria::LEFT_JOIN);
+            $criteria->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID,  Criteria::LEFT_JOIN);
-            $oCriteria->add(\TaskPeer::PRO_UID, $sProcessUID);
+            $criteria->add(TaskPeer::PRO_UID, $processUid);
-            $oCriteria->add(\TaskUserPeer::TU_TYPE, 1);
+            $criteria->add(TaskUserPeer::TU_TYPE, 1);
-            $oCriteria->add(\TaskUserPeer::TU_RELATION, 1);
+            $criteria->add(TaskUserPeer::TU_RELATION, 1);
-            $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
+            $dataSet = TaskUserPeer::doSelectRS($criteria);
-            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $dataSet->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-            while ($oDataset->next()) {
+            while ($dataSet->next()) {
-                $aRow = $oDataset->getRow();
+                $row = $dataSet->getRow();
-                if (!in_array($aRow['USR_UID'], $usersIds)) {
+                if (!in_array($row['USR_UID'], $usersIds)) {
-                    $usersIds[] = $aRow['USR_UID'];
+                    $usersIds[] = $row['USR_UID'];
                 }
             }
 
-            $oCriteria = new \Criteria('workflow');
+            $criteria = new Criteria('workflow');
-            $oCriteria->addSelectColumn(\GroupUserPeer::USR_UID);
+            $criteria->addSelectColumn(GroupUserPeer::USR_UID);
-            $oCriteria->addJoin(\TaskPeer::TAS_UID, \TaskUserPeer::TAS_UID,  \Criteria::LEFT_JOIN);
+            $criteria->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID,  Criteria::LEFT_JOIN);
-            $oCriteria->addJoin(\TaskUserPeer::USR_UID, \GroupUserPeer::GRP_UID, \Criteria::LEFT_JOIN);
+            $criteria->addJoin(TaskUserPeer::USR_UID, GroupUserPeer::GRP_UID, Criteria::LEFT_JOIN);
-            $oCriteria->add(\TaskPeer::PRO_UID, $sProcessUID);
+            $criteria->add(TaskPeer::PRO_UID, $processUid);
-            $oCriteria->add(\TaskUserPeer::TU_TYPE, 1);
+            $criteria->add(TaskUserPeer::TU_TYPE, 1);
-            $oCriteria->add(\TaskUserPeer::TU_RELATION, 2);
+            $criteria->add(TaskUserPeer::TU_RELATION, 2);
-            $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
+            $dataSet = TaskUserPeer::doSelectRS($criteria);
-            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
+            $dataSet->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-            while ($oDataset->next()) {
+            while ($dataSet->next()) {
-                $aRow = $oDataset->getRow();
+                $row = $dataSet->getRow();
-                if (!in_array($aRow['USR_UID'], $usersIds)) {
+                if (!in_array($row['USR_UID'], $usersIds)) {
-                    $usersIds[] = $aRow['USR_UID'];
+                    $usersIds[] = $row['USR_UID'];
                 }
             }
 
             foreach($usersIds as $value) {
-                $oCase = new \Cases();
+                $cases = new Cases();
-                $startTasks = $oCase->getStartCases( $value );
+                $startTasks = $cases->getStartCases($value, true);
                 foreach ($startTasks as $task) {
-                    if ((isset( $task['pro_uid'] )) && ($task['pro_uid'] == $sProcessUID) ) {
+                    if ((isset($task['pro_uid'])) && ($task['pro_uid'] == $processUid)) {
-                        $taskValue = explode( '(', $task['value'] );
+                        $taskValue = explode('(', $task['value']);
-                        $tasksLastIndex = count( $taskValue ) - 1;
+                        $tasksLastIndex = count($taskValue) - 1;
-                        $taskValue = explode( ')', $taskValue[$tasksLastIndex] );
+                        $taskValue = explode(')', $taskValue[$tasksLastIndex]);
-                        $aUsers[] = array('act_name' => $taskValue[0],
+                        $users[] = [
-                                          'act_uid' => $task['uid']);
+                            'act_name' => $taskValue[0],
+                            'act_uid' => $task['uid']
+                        ];
                     }
                 }
             }
-            $new = array();
+            $new = [];
-            $exclude = array("");
+            $exclude = [""];
-            for ($i = 0; $i<=count($aUsers)-1; $i++) {
+            for ($i = 0; $i <= count($users) - 1; $i++) {
-                if (!in_array(trim($aUsers[$i]["act_uid"]) ,$exclude)) {
+                if (!in_array(trim($users[$i]["act_uid"]) ,$exclude)) {
-                     $new[] = $aUsers[$i];
+                     $new[] = $users[$i];
-                     $exclude[] = trim($aUsers[$i]["act_uid"]);
+                     $exclude[] = trim($users[$i]["act_uid"]);
                 }
             }
             return $new;

workflow/engine/templates/app/main.js

@@ -133,6 +133,9 @@ function openCaseNotesWindow(appUid1, delIndex, modalSw, appTitle, proUid, taskU
         prepareData: function(data){
           var i;
           data.user = _FNF(data.USR_EMAIL, data.USR_FIRSTNAME, data.USR_LASTNAME);
+          //the 'NOTE_CONTENT' is used directly in an HTML template, so reserved characters 
+          //must be converted to HTML entities.
+          data.NOTE_CONTENT = Ext.util.Format.htmlEncode(data.NOTE_CONTENT);
           data.NOTE_CONTENT = data.NOTE_CONTENT.replace(/\n/g,' <br/>');
           data.files = "";
           for (i = 0; i < data.attachments.length; i += 1) {

workflow/engine/templates/cases/main.js

@@ -21,6 +21,7 @@ setFlag = function (val) {
     flagRefresh = val;
 };
 
+Ext.BLANK_IMAGE_URL = "data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==";
 Ext.onReady(function(){
   new Ext.KeyMap(document, {
     key: Ext.EventObject.F5,

workflow/engine/templates/setup/environmentSettings.js

@@ -216,7 +216,7 @@ Ext.onReady(function() {
       maskRe: /^\d*$/,
       enableKeyEvents: true,
       
-      minValue: 90,
+      minValue: 30,
       maxValue: 14400,
 
       listeners: {