Skip to content

Commit b93b17e

Browse files
agustinbussoagustinbusso
committed
Fix format
1 parent f1b6d9e commit b93b17e

36 files changed

Lines changed: 117 additions & 79 deletions

‎ProcessMaker/Filters/Filter.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private function operator()
103103
if ($this->operator === 'regex') {
104104
$this->operator = 'REGEXP';
105105
}
106-
106+
107107
return $this->operator;
108108
}
109109

@@ -212,6 +212,7 @@ private function convertUserIdsToUsernames($values)
212212
{
213213
return array_map(function ($value) {
214214
$username = User::find($value)?->username;
215+
215216
return isset($username) ? $username : $value;
216217
}, $values);
217218
}

‎ProcessMaker/Filters/SaveSession.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ class SaveSession
88
{
99
/**
1010
* Retrieve cached data; this is preserved for a week.
11-
* @param Array $json
12-
* @return Array
11+
* @param array $json
12+
* @return array
1313
*/
1414
private static function get($key, $json)
1515
{
16-
return Cache::remember($key, now()->addWeek(), function () use($json) {
16+
return Cache::remember($key, now()->addWeek(), function () use ($json) {
1717
return $json;
1818
});
1919
}
@@ -26,24 +26,25 @@ private static function get($key, $json)
2626
*/
2727
private static function getKey($user, $name)
2828
{
29-
return str_replace("-", "_", "user-{$user->id}-{$user->uuid}-{$name}");
29+
return str_replace('-', '_', "user-{$user->id}-{$user->uuid}-{$name}");
3030
}
3131

3232
/**
3333
* Get filter configuration.
34-
* @param String $name
34+
* @param string $name
3535
* @param User $user
3636
* @return type
3737
*/
3838
public static function getConfigFilter(String $name, Object $user)
3939
{
4040
$key = self::getKey($user, $name);
41+
4142
return self::get($key, []);
4243
}
4344

4445
/**
4546
* Store filter configuration.
46-
* @param String $name
47+
* @param string $name
4748
* @param User $user
4849
* @param array $array
4950
* @return type
@@ -52,6 +53,7 @@ public static function setConfigFilter(String $name, Object $user, array $array)
5253
{
5354
$key = self::getKey($user, $name);
5455
Cache::pull($key);
56+
5557
return self::get($key, $array);
5658
}
57-
}
59+
}

‎ProcessMaker/Http/Controllers/Api/BookmarkController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function store(Request $request, Process $process)
4646
try {
4747
$bookmark->updateOrCreate([
4848
'process_id' => $process->id,
49-
'user_id' => Auth::user()->id
49+
'user_id' => Auth::user()->id,
5050
]);
5151
} catch (\Exception $e) {
5252
return response()->json(['error' => $e->getMessage()], 400);

‎ProcessMaker/Http/Controllers/Api/ProcessController.php‎

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ class ProcessController extends Controller
5151
'bpmn',
5252
'svg',
5353
];
54+
5455
public $doNotSanitizeMustache = [
5556
'case_title',
5657
];
@@ -262,10 +263,10 @@ public function startEvents(Request $request, Process $process)
262263
$startEvents = [];
263264
$currentUser = Auth::user();
264265
foreach ($process->start_events as $event) {
265-
if (count($event["eventDefinitions"]) === 0) {
266-
if (array_key_exists("config", $event)) {
267-
$webEntry = json_decode($event["config"])->web_entry;
268-
$event["webEntry"] = $webEntry;
266+
if (count($event['eventDefinitions']) === 0) {
267+
if (array_key_exists('config', $event)) {
268+
$webEntry = json_decode($event['config'])->web_entry;
269+
$event['webEntry'] = $webEntry;
269270
}
270271
if (
271272
$this->checkUserCanStartProcess($event, $currentUser->id, $process, $request) ||
@@ -275,6 +276,7 @@ public function startEvents(Request $request, Process $process)
275276
}
276277
}
277278
}
279+
278280
return new ApiCollection($startEvents);
279281
}
280282

@@ -466,7 +468,7 @@ public function update(Request $request, Process $process)
466468
}
467469
}
468470

469-
$this->saveImagesIntoMedia($request, $process);
471+
$this->saveImagesIntoMedia($request, $process);
470472
// Catch errors to send more specific status
471473
try {
472474
$process->saveOrFail();
@@ -1497,6 +1499,7 @@ protected function getRequestFilterBy(Request $request, array $searchableColumns
14971499

14981500
return $where;
14991501
}
1502+
15001503
/**
15011504
* check if currentUser can start the request
15021505
*
@@ -1510,23 +1513,24 @@ protected function getRequestFilterBy(Request $request, array $searchableColumns
15101513
protected function checkUserCanStartProcess($event, $currentUser, $process, $request)
15111514
{
15121515
$response = false;
1513-
if (array_key_exists("assignment", $event)) {
1514-
switch ($event["assignment"]) {
1515-
case "user":
1516-
if (array_key_exists("assignedUsers", $event)) {
1517-
$response = $currentUser === (int)$event["assignedUsers"];
1516+
if (array_key_exists('assignment', $event)) {
1517+
switch ($event['assignment']) {
1518+
case 'user':
1519+
if (array_key_exists('assignedUsers', $event)) {
1520+
$response = $currentUser === (int) $event['assignedUsers'];
15181521
}
15191522
break;
1520-
case "group":
1521-
if (array_key_exists("assignedGroups", $event)) {
1522-
$response = $this->checkUsersGroup((int)$event["assignedGroups"], $request);
1523+
case 'group':
1524+
if (array_key_exists('assignedGroups', $event)) {
1525+
$response = $this->checkUsersGroup((int) $event['assignedGroups'], $request);
15231526
}
1524-
break;
1525-
case "process_manager":
1527+
break;
1528+
case 'process_manager':
15261529
$response = $currentUser === $process->manager_id;
1527-
break;
1530+
break;
15281531
}
15291532
}
1533+
15301534
return $response;
15311535
}
15321536

@@ -1543,24 +1547,24 @@ protected function checkUsersGroup(int $groupId, Request $request)
15431547
$currentUser = Auth::user()->id;
15441548
$group = Group::find($groupId);
15451549
$response = false;
1546-
if (isset($group)){
1550+
if (isset($group)) {
15471551
try {
15481552
$responseUsers = (new GroupController(new Group()))->users($group, $request);
15491553
$users = $responseUsers->all();
1550-
1554+
15511555
foreach ($users as $user) {
1552-
if($user->resource->member_id === $currentUser) {
1556+
if ($user->resource->member_id === $currentUser) {
15531557
$response = true;
15541558
}
15551559
}
15561560
} catch (\Exception $error) {
15571561
return ['error' => $error->getMessage()];
15581562
}
1559-
1563+
15601564
try {
15611565
$responseGroups = (new GroupController(new Group()))->groups($group, $request);
15621566
$groups = $responseGroups->all();
1563-
1567+
15641568
foreach ($groups as $group) {
15651569
if ($this->checkUsersGroup($group->resource->member_id, $request)) {
15661570
$response = true;
@@ -1570,6 +1574,7 @@ protected function checkUsersGroup(int $groupId, Request $request)
15701574
return ['error' => $error->getMessage()];
15711575
}
15721576
}
1577+
15731578
return $response;
15741579
}
15751580

@@ -1697,7 +1702,7 @@ public function duplicate(Process $process, Request $request)
16971702
}
16981703

16991704
public function saveImagesIntoMedia(Request $request, Process $process)
1700-
{
1705+
{
17011706
// Saving Carousel Images into Media table related to process_id
17021707
if (is_array($request->imagesCarousel) && !empty($request->imagesCarousel)) {
17031708
foreach ($request->imagesCarousel as $image) {
@@ -1706,19 +1711,22 @@ public function saveImagesIntoMedia(Request $request, Process $process)
17061711
->where('uuid', $image['uuid'])->exists()) {
17071712
$process->addMediaFromBase64($image['url'])->toMediaCollection('images_carousel');
17081713
}
1709-
}
1714+
}
17101715
}
17111716
}
17121717
}
17131718

1714-
public function getMediaImages(Request $request, Process $process) {
1719+
public function getMediaImages(Request $request, Process $process)
1720+
{
17151721
$media = Process::with(['media'])
17161722
->where('id', $process->id)
17171723
->get();
1724+
17181725
return new ProcessCollection($media);
17191726
}
17201727

1721-
public function deleteMediaImages(Request $request, Process $process) {
1728+
public function deleteMediaImages(Request $request, Process $process)
1729+
{
17221730
$process = Process::find($process->id);
17231731

17241732
// Get UUID image in media table

‎ProcessMaker/Http/Controllers/Api/UserController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ private function validateCellPhoneNumber(User $user, $number)
369369
],
370370
], 422);
371371
}
372+
372373
return false;
373374
}
374375

‎ProcessMaker/Http/Controllers/Auth/TwoFactorAuthController.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ class TwoFactorAuthController extends Controller
1717
private $twoFactorAuthentication;
1818

1919
const TFA_ERROR = '2fa-error';
20+
2021
const TFA_MESSAGE = '2fa-message';
22+
2123
const TFA_AUTH_APP = '2fa-auth-app';
24+
2225
const TFA_VALIDATED = '2fa-validated';
2326

2427
public function __construct()
@@ -173,6 +176,7 @@ private function testEmailServer()
173176
'message' => __('Unable to send email. Please check your email server settings.'),
174177
], 500);
175178
}
179+
176180
return true;
177181
}
178182

@@ -206,6 +210,7 @@ private function testSmsServer()
206210
'message' => __('Unable to send SMS. Please check your cell number and SMS server settings.'),
207211
], 500);
208212
}
213+
209214
return true;
210215
}
211216
}

‎ProcessMaker/Http/Controllers/RequestController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public function index($type = null)
5858
['type', 'title', 'currentUser']
5959
));
6060
}
61-
62-
$userFilter = SaveSession::getConfigFilter("requestFilter", Auth::user());
61+
62+
$userFilter = SaveSession::getConfigFilter('requestFilter', Auth::user());
6363

6464
return view('requests.index', compact(
6565
['type', 'title', 'currentUser', 'userFilter']

‎ProcessMaker/Http/Controllers/TaskController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public function index()
4040
if (isset($_SERVER['HTTP_USER_AGENT']) && MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])) {
4141
return view('tasks.mobile', compact('title'));
4242
}
43-
44-
$userFilter = SaveSession::getConfigFilter("taskFilter", Auth::user());
43+
44+
$userFilter = SaveSession::getConfigFilter('taskFilter', Auth::user());
4545

4646
return view('tasks.index', compact('title', 'userFilter'));
4747
}

‎ProcessMaker/Http/Middleware/SanitizeInput.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class SanitizeInput extends TransformsRequest
1818
public $except = [
1919
//
2020
];
21+
2122
public $allowExpressions = [];
2223

2324
/**

‎ProcessMaker/Http/Middleware/SessionControlBlock.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
class SessionControlBlock
1515
{
1616
const IP_RESTRICTION_KEY = 'session-control.ip_restriction';
17+
1718
const DEVICE_RESTRICTION_KEY = 'session-control.device_restriction';
1819

1920
/**
@@ -42,10 +43,10 @@ public function handle(Request $request, Closure $next): Response
4243

4344
private function getUser(Request $request): ?User
4445
{
45-
return User::with(['sessions' => function($query) {
46-
$query->where('is_active', true);
47-
}])
48-
->whereHas('sessions', function(Builder $query) {
46+
return User::with(['sessions' => function ($query) {
47+
$query->where('is_active', true);
48+
}])
49+
->whereHas('sessions', function (Builder $query) {
4950
$query->where('is_active', true);
5051
})->where('username', $request->input('username'))
5152
->first();

0 commit comments

Comments
 (0)