fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-4547

Browse Source
This commit is contained in:
Paula Quispe
2018-05-09 14:56:16 -04:00
parent 7384d2ef26
commit 565af9d8f6
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.g.php
View File

@@ -2832,7 +2832,7 @@ class G
* @param string $array_i
* @return array
*/
public function array_merge_2(&$array, &$array_i)
public static function array_merge_2(&$array, &$array_i)
{
foreach ($array_i as $k => $v) {
if (is_array($v)) {

4
workflow/engine/controllers/InstallerModule.php
View File

@@ -926,7 +926,7 @@ class InstallerModule extends Controller
->update([
'USR_USERNAME' => $adminUsername,
'USR_LASTNAME' => $adminUsername,
'USR_PASSWORD' => Bootstrap::hashPassword($adminPassword, Bootstrap::hashBcrypt)
'USR_PASSWORD' => G::encryptHash($adminPassword)
]);
DB::connection(self::CONNECTION_INSTALL)
@@ -935,7 +935,7 @@ class InstallerModule extends Controller
->update([
'USR_USERNAME' => $adminUsername,
'USR_LASTNAME' => $adminUsername,
'USR_PASSWORD' => Bootstrap::hashPassword($adminPassword, Bootstrap::hashBcrypt)
'USR_PASSWORD' => G::encryptHash($adminPassword)
]);
// Write the paths_installed.php file (contains all the information configured so far)
if (!file_exists(FILE_PATHS_INSTALLED)) {

3
workflow/engine/methods/groups/groups_Ajax.php
View File

@@ -160,7 +160,8 @@ switch ($_POST['action']) {
$start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
$limit = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $limit_size;
$filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : '';
$groupUid = $inputFilter->quoteSmart($_REQUEST['gUID'], Propel::getConnection("workflow")->getResource());
$connection = Propel::getConnection("workflow")->getResource();
$groupUid = $inputFilter->quoteSmart($_REQUEST['gUID'], $connection);
$groupUsers = new GroupUser();
$type = $_POST['action'] === 'assignedMembers' ? 'USERS' : 'AVAILABLE-USERS';

4
workflow/engine/src/ProcessMaker/Core/Installer.php
View File

@@ -513,7 +513,7 @@ class Installer
->where('USR_UID', '00000000000000000000000000000001')
->update([
'USR_USERNAME' => $this->options['admin']['username'],
'USR_PASSWORD' => Bootstrap::hashPassword($this->options['admin']['password'], Bootstrap::hashBcrypt)
'USR_PASSWORD' => G::encryptHash($this->options['admin']['password'])
]);
DB::connection(self::CONNECTION_INSTALL)
@@ -521,7 +521,7 @@ class Installer
->where('USR_UID', '00000000000000000000000000000001')
->update([
'USR_USERNAME' => $this->options['admin']['username'],
'USR_PASSWORD' => Bootstrap::hashPassword($this->options['admin']['password'], Bootstrap::hashBcrypt)
'USR_PASSWORD' => G::encryptHash($this->options['admin']['password'])
]);
}