@@ -23,7 +23,7 @@ |
||
23 | 23 | $temp = $request->files->get('file'); |
24 | 24 | |
25 | 25 | // Verify file extension |
26 | - if ( !$temp instanceof UploadedFile |
|
26 | + if (!$temp instanceof UploadedFile |
|
27 | 27 | || !in_array(strtolower($temp->getClientOriginalExtension()), ["gif", "jpg", "png"])) { |
28 | 28 | throw new midcom_error('Invalid extension.'); |
29 | 29 | } |
@@ -33,7 +33,8 @@ |
||
33 | 33 | $member->require_do('midgard:update'); |
34 | 34 | $member->extra = $request->request->get('title'); |
35 | 35 | $response['status'] = $member->update(); |
36 | - } catch (midcom_error $e) { |
|
36 | + } |
|
37 | + catch (midcom_error $e) { |
|
37 | 38 | $e->log(); |
38 | 39 | } |
39 | 40 | $response['message'] = midcom_connection::get_error_string(); |
@@ -116,7 +116,8 @@ discard block |
||
116 | 116 | //TODO: check for duplicates ? |
117 | 117 | try { |
118 | 118 | $result = ['other_obj' => midcom::get()->dbfactory->get_object_by_guid($link[$other . 'Guid'])]; |
119 | - } catch (midcom_error $e) { |
|
119 | + } |
|
120 | + catch (midcom_error $e) { |
|
120 | 121 | continue; |
121 | 122 | } |
122 | 123 | $result['link'] = [ |
@@ -403,7 +404,8 @@ discard block |
||
403 | 404 | if (!($this->_object instanceof org_openpsa_relatedto_dba)) { |
404 | 405 | $response['status'] = "method requires guid of a link object as an argument"; |
405 | 406 | } |
406 | - } catch (midcom_error $e) { |
|
407 | + } |
|
408 | + catch (midcom_error $e) { |
|
407 | 409 | $response['status'] = "error: " . $e->getMessage(); |
408 | 410 | } |
409 | 411 | |
@@ -424,7 +426,8 @@ discard block |
||
424 | 426 | $relation = new org_openpsa_relatedto_dba($guid); |
425 | 427 | $result = $relation->delete(); |
426 | 428 | $status = 'Last message: ' . midcom_connection::get_error_string(); |
427 | - } catch (midcom_error $e) { |
|
429 | + } |
|
430 | + catch (midcom_error $e) { |
|
428 | 431 | $result = false; |
429 | 432 | $status = "Object '{$guid}' could not be loaded, error:" . $e->getMessage(); |
430 | 433 | } |
@@ -196,10 +196,10 @@ |
||
196 | 196 | * |
197 | 197 | * @param array $link The necessary link information |
198 | 198 | */ |
199 | - private function _render_line(array $link, midcom_core_dbaobject &$other_obj) |
|
199 | + private function _render_line(array $link, midcom_core_dbaobject & $other_obj) |
|
200 | 200 | { |
201 | 201 | $this->_request_data['link'] = $link; |
202 | - $this->_request_data['other_obj'] =& $other_obj; |
|
202 | + $this->_request_data['other_obj'] = & $other_obj; |
|
203 | 203 | $this->_request_data['icon'] = midcom_helper_reflector::get_object_icon($other_obj); |
204 | 204 | |
205 | 205 | if (get_class($other_obj) != $link['class']) { |
@@ -27,7 +27,7 @@ |
||
27 | 27 | $prefix = $nap->get_node($this->_topic->id)[MIDCOM_NAV_ABSOLUTEURL]; |
28 | 28 | |
29 | 29 | $tree = new org_openpsa_widgets_tree(org_openpsa_contacts_group_dba::class, 'owner'); |
30 | - $tree->link_callback = function ($guid) use ($prefix) { |
|
30 | + $tree->link_callback = function($guid) use ($prefix) { |
|
31 | 31 | return $prefix . 'group/' . $guid . '/'; |
32 | 32 | }; |
33 | 33 | $tree->constraints[] = ['orgOpenpsaObtype', '<', org_openpsa_contacts_group_dba::ORGANIZATION]; |
@@ -171,7 +171,7 @@ |
||
171 | 171 | if (!empty($field->vars['value'])) { |
172 | 172 | //only index the first attachment for now |
173 | 173 | $attachment = array_shift($field->vars['value']); |
174 | - if ( !$attachment instanceof \midcom_db_attachment |
|
174 | + if (!$attachment instanceof \midcom_db_attachment |
|
175 | 175 | && !empty($attachment['object'])) { |
176 | 176 | //This is the form edit case |
177 | 177 | //@todo: In create case, nothing is found currently |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | |
341 | 341 | $item = array_replace($defaults, $item); |
342 | 342 | |
343 | - if ( !empty($item[MIDCOM_TOOLBAR_ACCESSKEY]) |
|
343 | + if (!empty($item[MIDCOM_TOOLBAR_ACCESSKEY]) |
|
344 | 344 | && !array_key_exists($item[MIDCOM_TOOLBAR_ACCESSKEY], $used_access_keys)) { |
345 | 345 | // We have valid access key, add it to help text |
346 | 346 | $prefix = 'Alt-'; |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | private function set_url(array &$item, string $url) |
366 | 366 | { |
367 | 367 | $item[MIDCOM_TOOLBAR__ORIGINAL_URL] = $url; |
368 | - if ( ( empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"]) |
|
368 | + if ((empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"]) |
|
369 | 369 | // Some items may want to keep their links unmutilated |
370 | 370 | || $item[MIDCOM_TOOLBAR_OPTIONS]["rel"] != "directlink") |
371 | 371 | && !str_starts_with($url, '/') |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | |
391 | 391 | if ($index == 0) { |
392 | 392 | array_shift($this->items); |
393 | - } elseif ($index == count($this->items) -1) { |
|
393 | + } elseif ($index == count($this->items) - 1) { |
|
394 | 394 | array_pop($this->items); |
395 | 395 | } else { |
396 | 396 | $this->items = array_merge(array_slice($this->items, 0, $index), |
@@ -513,7 +513,7 @@ discard block |
||
513 | 513 | */ |
514 | 514 | public function render() : string |
515 | 515 | { |
516 | - $visible_items = array_filter($this->items, function ($item) { |
|
516 | + $visible_items = array_filter($this->items, function($item) { |
|
517 | 517 | return !$item[MIDCOM_TOOLBAR_HIDDEN]; |
518 | 518 | }); |
519 | 519 | $this->rendered = true; |
@@ -576,7 +576,7 @@ discard block |
||
576 | 576 | // Try finding uppercase version of the accesskey first |
577 | 577 | $accesskey = strtoupper($item[MIDCOM_TOOLBAR_ACCESSKEY]); |
578 | 578 | $position = strpos($label, $accesskey); |
579 | - if ( $position === false |
|
579 | + if ($position === false |
|
580 | 580 | && midcom::get()->i18n->get_current_language() == 'en') { |
581 | 581 | // Try lowercase, too |
582 | 582 | $accesskey = strtolower($accesskey); |
@@ -636,7 +636,7 @@ discard block |
||
636 | 636 | $attributes['title'] = $item[MIDCOM_TOOLBAR_HELPTEXT]; |
637 | 637 | } |
638 | 638 | |
639 | - if ( $item[MIDCOM_TOOLBAR_ENABLED] |
|
639 | + if ($item[MIDCOM_TOOLBAR_ENABLED] |
|
640 | 640 | && $item[MIDCOM_TOOLBAR_ACCESSKEY] !== null) { |
641 | 641 | $attributes['class'] = 'accesskey'; |
642 | 642 | $attributes['accesskey'] = $item[MIDCOM_TOOLBAR_ACCESSKEY]; |
@@ -699,7 +699,7 @@ discard block |
||
699 | 699 | public function get_index_from_url(string $url) : ?int |
700 | 700 | { |
701 | 701 | foreach ($this->items as $i => $item) { |
702 | - if ( $item[MIDCOM_TOOLBAR_URL] == $url |
|
702 | + if ($item[MIDCOM_TOOLBAR_URL] == $url |
|
703 | 703 | || $item[MIDCOM_TOOLBAR__ORIGINAL_URL] == $url) { |
704 | 704 | return $i; |
705 | 705 | } |
@@ -717,7 +717,7 @@ discard block |
||
717 | 717 | * |
718 | 718 | * @param mixed $index The integer index or URL to check |
719 | 719 | */ |
720 | - protected function _check_index($index, bool $raise_error = true) :?int |
|
720 | + protected function _check_index($index, bool $raise_error = true) : ?int |
|
721 | 721 | { |
722 | 722 | if (is_string($index)) { |
723 | 723 | $url = $index; |
@@ -55,11 +55,11 @@ |
||
55 | 55 | foreach (array_filter($csv_line) as $field => $value) { |
56 | 56 | // Process the row accordingly |
57 | 57 | $field_matching = $this->_settings['fields'][$field]; |
58 | - if ( $field_matching |
|
58 | + if ($field_matching |
|
59 | 59 | && str_contains($field_matching, ':')) { |
60 | 60 | [$schemadb, $schema_field] = explode(':', $field_matching); |
61 | 61 | |
62 | - if ( !array_key_exists($schemadb, $this->_schemadbs) |
|
62 | + if (!array_key_exists($schemadb, $this->_schemadbs) |
|
63 | 63 | || !$this->_schemadbs[$schemadb]->get('default')->has_field($schema_field)) { |
64 | 64 | // Invalid matching, skip |
65 | 65 | continue; |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | private function apply_constraints(midcom_core_query $query, array $constraints) |
84 | 84 | { |
85 | 85 | foreach ($constraints as $key => $data) { |
86 | - if ( !array_key_exists('value', $data) |
|
86 | + if (!array_key_exists('value', $data) |
|
87 | 87 | || empty($data['field']) |
88 | 88 | || empty($data['op'])) { |
89 | 89 | debug_add("Constraint #{$key} is not correctly defined, skipping", MIDCOM_LOG_WARN); |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | { |
145 | 145 | $query = $this->request["term"]; |
146 | 146 | $wildcard_query = $query; |
147 | - if ( isset($this->request['auto_wildcards']) |
|
147 | + if (isset($this->request['auto_wildcards']) |
|
148 | 148 | && !str_contains($query, '%')) { |
149 | 149 | switch ($this->request['auto_wildcards']) { |
150 | 150 | case 'start': |
@@ -252,9 +252,7 @@ discard block |
||
252 | 252 | return $label; |
253 | 253 | } |
254 | 254 | } |
255 | - return midcom_helper_reflector::get($object)->get_object_label($object) ?: |
|
256 | - self::build_label($object, array_column($result_headers, 'name')) ?: |
|
257 | - get_class($object) . ' #' . $object->id; |
|
255 | + return midcom_helper_reflector::get($object)->get_object_label($object) ?: self::build_label($object, array_column($result_headers, 'name')) ?: get_class($object) . ' #' . $object->id; |
|
258 | 256 | } |
259 | 257 | |
260 | 258 | private static function build_label($object, array $fields) : string |
@@ -289,7 +287,7 @@ discard block |
||
289 | 287 | } |
290 | 288 | return self::sanitize_label($value); |
291 | 289 | } |
292 | - if ( $field == 'username' |
|
290 | + if ($field == 'username' |
|
293 | 291 | && $object instanceof midcom_db_person) { |
294 | 292 | $account = new midcom_core_account($object); |
295 | 293 | return self::sanitize_label($account->get_username()); |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | */ |
65 | 65 | public function set_privilege($privilege, $assignee = null, int $value = MIDCOM_PRIVILEGE_ALLOW, string $classname = '') : bool |
66 | 66 | { |
67 | - if ( !$this->can_do('midgard:update') |
|
67 | + if (!$this->can_do('midgard:update') |
|
68 | 68 | || !$this->can_do('midgard:privileges')) { |
69 | 69 | debug_add("Failed to set a privilege, midgard:update or midgard:privileges on " . static::class . " {$this->guid} not granted for the current user.", |
70 | 70 | MIDCOM_LOG_ERROR); |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | */ |
95 | 95 | public function unset_privilege($privilege, $assignee = null, string $classname = '') : bool |
96 | 96 | { |
97 | - if ( !$this->can_do('midgard:update') |
|
97 | + if (!$this->can_do('midgard:update') |
|
98 | 98 | || !$this->can_do('midgard:privileges')) { |
99 | 99 | debug_add("Failed to unset a privilege, midgard:update or midgard:privileges on " . static::class . " {$this->guid} not granted for the current user.", |
100 | 100 | MIDCOM_LOG_ERROR); |