@@ -351,11 +351,11 @@ discard block |
||
| 351 | 351 | |
| 352 | 352 | $item = array_replace($defaults, $item); |
| 353 | 353 | |
| 354 | - if ( !empty($item[MIDCOM_TOOLBAR_ACCESSKEY]) |
|
| 354 | + if (!empty($item[MIDCOM_TOOLBAR_ACCESSKEY]) |
|
| 355 | 355 | && !array_key_exists($item[MIDCOM_TOOLBAR_ACCESSKEY], $used_access_keys)) { |
| 356 | 356 | // We have valid access key, add it to help text |
| 357 | 357 | $prefix = 'Alt-'; |
| 358 | - if ( isset($_SERVER['HTTP_USER_AGENT']) |
|
| 358 | + if (isset($_SERVER['HTTP_USER_AGENT']) |
|
| 359 | 359 | && strstr($_SERVER['HTTP_USER_AGENT'], 'Macintosh')) { |
| 360 | 360 | // Mac users |
| 361 | 361 | $prefix = 'Ctrl-Alt-'; |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | private function set_url(array &$item, string $url) |
| 378 | 378 | { |
| 379 | 379 | $item[MIDCOM_TOOLBAR__ORIGINAL_URL] = $url; |
| 380 | - if ( ( empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"]) |
|
| 380 | + if ((empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"]) |
|
| 381 | 381 | // Some items may want to keep their links unmutilated |
| 382 | 382 | || $item[MIDCOM_TOOLBAR_OPTIONS]["rel"] != "directlink") |
| 383 | 383 | && !str_starts_with($url, '/') |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | |
| 403 | 403 | if ($index == 0) { |
| 404 | 404 | array_shift($this->items); |
| 405 | - } elseif ($index == count($this->items) -1) { |
|
| 405 | + } elseif ($index == count($this->items) - 1) { |
|
| 406 | 406 | array_pop($this->items); |
| 407 | 407 | } else { |
| 408 | 408 | $this->items = array_merge(array_slice($this->items, 0, $index - 1), |
@@ -525,7 +525,7 @@ discard block |
||
| 525 | 525 | */ |
| 526 | 526 | public function render() : string |
| 527 | 527 | { |
| 528 | - $visible_items = array_filter($this->items, function ($item) { |
|
| 528 | + $visible_items = array_filter($this->items, function($item) { |
|
| 529 | 529 | return !$item[MIDCOM_TOOLBAR_HIDDEN]; |
| 530 | 530 | }); |
| 531 | 531 | $this->rendered = true; |
@@ -588,7 +588,7 @@ discard block |
||
| 588 | 588 | // Try finding uppercase version of the accesskey first |
| 589 | 589 | $accesskey = strtoupper($item[MIDCOM_TOOLBAR_ACCESSKEY]); |
| 590 | 590 | $position = strpos($label, $accesskey); |
| 591 | - if ( $position === false |
|
| 591 | + if ($position === false |
|
| 592 | 592 | && midcom::get()->i18n->get_current_language() == 'en') { |
| 593 | 593 | // Try lowercase, too |
| 594 | 594 | $accesskey = strtolower($accesskey); |
@@ -649,7 +649,7 @@ discard block |
||
| 649 | 649 | $attributes['title'] = $item[MIDCOM_TOOLBAR_HELPTEXT]; |
| 650 | 650 | } |
| 651 | 651 | |
| 652 | - if ( $item[MIDCOM_TOOLBAR_ENABLED] |
|
| 652 | + if ($item[MIDCOM_TOOLBAR_ENABLED] |
|
| 653 | 653 | && $item[MIDCOM_TOOLBAR_ACCESSKEY] !== null) { |
| 654 | 654 | $attributes['class'] = 'accesskey'; |
| 655 | 655 | $attributes['accesskey'] = $item[MIDCOM_TOOLBAR_ACCESSKEY]; |
@@ -712,7 +712,7 @@ discard block |
||
| 712 | 712 | public function get_index_from_url(string $url) : ?int |
| 713 | 713 | { |
| 714 | 714 | foreach ($this->items as $i => $item) { |
| 715 | - if ( $item[MIDCOM_TOOLBAR_URL] == $url |
|
| 715 | + if ($item[MIDCOM_TOOLBAR_URL] == $url |
|
| 716 | 716 | || $item[MIDCOM_TOOLBAR__ORIGINAL_URL] == $url) { |
| 717 | 717 | return $i; |
| 718 | 718 | } |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | * |
| 731 | 731 | * @param mixed $index The integer index or URL to check |
| 732 | 732 | */ |
| 733 | - protected function _check_index($index, bool $raise_error = true) :?int |
|
| 733 | + protected function _check_index($index, bool $raise_error = true) : ?int |
|
| 734 | 734 | { |
| 735 | 735 | if (is_string($index)) { |
| 736 | 736 | $url = $index; |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | { |
| 138 | 138 | debug_add("task->start() called with user #" . midcom_connection::get_user()); |
| 139 | 139 | //PONDER: Check actual status objects for more accurate logic ? |
| 140 | - if ( $task->status >= org_openpsa_projects_task_status_dba::STARTED |
|
| 140 | + if ($task->status >= org_openpsa_projects_task_status_dba::STARTED |
|
| 141 | 141 | && $task->status <= org_openpsa_projects_task_status_dba::APPROVED) { |
| 142 | 142 | //We already have started status |
| 143 | 143 | debug_add('Task has already been started'); |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | |
| 319 | 319 | private static function is_manager(org_openpsa_projects_task_dba $task) : bool |
| 320 | 320 | { |
| 321 | - return ( $task->manager == 0 |
|
| 321 | + return ($task->manager == 0 |
|
| 322 | 322 | || midcom_connection::get_user() == $task->manager); |
| 323 | 323 | } |
| 324 | 324 | } |
@@ -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 the " . get_class($this) . " {$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 the " . get_class($this) . " {$this->guid} not granted for the current user.", |
| 100 | 100 | MIDCOM_LOG_ERROR); |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | { |
| 16 | 16 | public function write_acls(midcom_core_dbaobject $object, $owner_id, int $accesstype) : bool |
| 17 | 17 | { |
| 18 | - if ( empty($owner_id) |
|
| 18 | + if (empty($owner_id) |
|
| 19 | 19 | || empty($accesstype)) { |
| 20 | 20 | return false; |
| 21 | 21 | } |
@@ -63,14 +63,14 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | if ($privileges) { |
| 65 | 65 | foreach ($privileges as $privilege) { |
| 66 | - if ( !empty($needed_privileges[$privilege->privilegename]) |
|
| 66 | + if (!empty($needed_privileges[$privilege->privilegename]) |
|
| 67 | 67 | && $needed_privileges[$privilege->privilegename]['assignee'] == $privilege->assignee |
| 68 | 68 | && $needed_privileges[$privilege->privilegename]['value'] == $privilege->value) { |
| 69 | 69 | unset($needed_privileges[$privilege->privilegename]); |
| 70 | 70 | continue; |
| 71 | 71 | } |
| 72 | 72 | // Clear old ACLs applying to others than current user or selected owner group |
| 73 | - if ( $privilege->assignee != midcom::get()->auth->user->id |
|
| 73 | + if ($privilege->assignee != midcom::get()->auth->user->id |
|
| 74 | 74 | && $privilege->assignee != $owner_id) { |
| 75 | 75 | debug_add("Removing privilege {$privilege->privilegename} from {$privilege->assignee}"); |
| 76 | 76 | $object->unset_privilege($privilege->privilegename, $privilege->assignee); |
@@ -318,7 +318,7 @@ |
||
| 318 | 318 | public function update_cache() |
| 319 | 319 | { |
| 320 | 320 | // Check if the attachment can be read anonymously |
| 321 | - if ( midcom::get()->config->get('attachment_cache_enabled') |
|
| 321 | + if (midcom::get()->config->get('attachment_cache_enabled') |
|
| 322 | 322 | && !$this->can_do('midgard:read', 'EVERYONE')) { |
| 323 | 323 | // Not public file, ensure it is removed |
| 324 | 324 | $this->remove_from_cache(); |
@@ -246,7 +246,7 @@ |
||
| 246 | 246 | */ |
| 247 | 247 | public function prepare_handler(array &$parameters) |
| 248 | 248 | { |
| 249 | - $this->parameters =& $parameters; |
|
| 249 | + $this->parameters = & $parameters; |
|
| 250 | 250 | |
| 251 | 251 | $parameters['handler'] = explode('::', $parameters['_controller'], 2); |
| 252 | 252 | |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | if (file_exists(MIDCOM_STATIC_ROOT . $jqgrid_path . 'i18n/grid.locale-' . $language . '.js')) { |
| 110 | 110 | $lang = $language; |
| 111 | 111 | } |
| 112 | - $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'i18n/grid.locale-'. $lang . '.js'); |
|
| 112 | + $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'i18n/grid.locale-' . $lang . '.js'); |
|
| 113 | 113 | $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'jquery.jqgrid.min.js'); |
| 114 | 114 | |
| 115 | 115 | $head->add_jsfile(MIDCOM_STATIC_URL . '/midcom.grid/jqGrid.custom.js'); |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | public function set_option(string $key, $value, bool $autoquote_string = true) : self |
| 156 | 156 | { |
| 157 | 157 | $this->_raw_options[$key] = $value; |
| 158 | - if ( $autoquote_string |
|
| 158 | + if ($autoquote_string |
|
| 159 | 159 | && is_string($value)) { |
| 160 | 160 | $value = '"' . str_replace('"', '\\"', $value) . '"'; |
| 161 | 161 | } elseif ($value === true) { |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | public function set_select_column(string $name, string $label, string $options, array $selectdata) : self |
| 186 | 186 | { |
| 187 | 187 | $selectstring = implode(';', array_map( |
| 188 | - function ($key, $value) { |
|
| 188 | + function($key, $value) { |
|
| 189 | 189 | return $key . ':' . $value; |
| 190 | 190 | }, |
| 191 | 191 | array_keys($selectdata), |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | */ |
| 232 | 232 | public function remove_column(string $name) |
| 233 | 233 | { |
| 234 | - if ( empty($name) |
|
| 234 | + if (empty($name) |
|
| 235 | 235 | || !array_key_exists($name, $this->_columns)) { |
| 236 | 236 | throw new midcom_error('Invalid column name ' . $name); |
| 237 | 237 | } |
@@ -122,8 +122,8 @@ |
||
| 122 | 122 | return 'undefined'; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - if ( !str_starts_with($url, '/') |
|
| 126 | - && ! preg_match('|^https?://|', $url)) { |
|
| 125 | + if (!str_starts_with($url, '/') |
|
| 126 | + && !preg_match('|^https?://|', $url)) { |
|
| 127 | 127 | $url = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX) . $url; |
| 128 | 128 | } |
| 129 | 129 | return '"' . $url . '"'; |
@@ -34,11 +34,11 @@ discard block |
||
| 34 | 34 | $resolver |
| 35 | 35 | ->setRequired('schema') |
| 36 | 36 | ->setAllowedTypes('schema', schema::class) |
| 37 | - ->setDefault('action', function (Options $options, $value) { |
|
| 37 | + ->setDefault('action', function(Options $options, $value) { |
|
| 38 | 38 | return $options['schema']->get('action'); |
| 39 | 39 | }); |
| 40 | 40 | |
| 41 | - $resolver->setNormalizer('csrf_protection', function (Options $options, $value) { |
|
| 41 | + $resolver->setNormalizer('csrf_protection', function(Options $options, $value) { |
|
| 42 | 42 | foreach ($options['schema']->get('fields') as $config) { |
| 43 | 43 | if ($config['widget'] === 'csrf') { |
| 44 | 44 | return true; |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | } |
| 47 | 47 | return false; |
| 48 | 48 | }); |
| 49 | - $resolver->setNormalizer('constraints', function (Options $options, $value) { |
|
| 49 | + $resolver->setNormalizer('constraints', function(Options $options, $value) { |
|
| 50 | 50 | $validation = $options['schema']->get('validation'); |
| 51 | 51 | if (!empty($validation)) { |
| 52 | 52 | $cb_wrapper = new cb_wrapper($validation); |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | // this is mainly there to skip validation in case the user pressed cancel |
| 73 | 73 | $builder->addEventListener(FormEvents::POST_SUBMIT, function(PostSubmitEvent $event) { |
| 74 | 74 | $form = $event->getForm(); |
| 75 | - if ( $form instanceof Form |
|
| 75 | + if ($form instanceof Form |
|
| 76 | 76 | && $form->getClickedButton() |
| 77 | 77 | && $form->getClickedButton()->getConfig()->getOption('operation') == controller::CANCEL) { |
| 78 | 78 | $event->stopPropagation(); |