@@ -201,7 +201,7 @@ |
||
| 201 | 201 | if ($part === '') { |
| 202 | 202 | continue; |
| 203 | 203 | } |
| 204 | - if ( midcom::get()->config->get('theme') |
|
| 204 | + if (midcom::get()->config->get('theme') |
|
| 205 | 205 | && !$args_started |
| 206 | 206 | && self::check_page_exists($part)) { |
| 207 | 207 | $page_style .= '/' . $part; |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | } |
| 72 | 72 | $this->__object = $id; |
| 73 | 73 | } else { |
| 74 | - if ( is_int($id) |
|
| 74 | + if (is_int($id) |
|
| 75 | 75 | && $id < 1) { |
| 76 | 76 | throw new midcom_error($id . ' is not a valid database ID'); |
| 77 | 77 | } |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | //Some useful information for performance tuning |
| 88 | - if ( midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG |
|
| 88 | + if (midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG |
|
| 89 | 89 | && $this->__object->guid) { |
| 90 | 90 | static $guids = []; |
| 91 | 91 | static $total = 0; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | return []; |
| 55 | 55 | } |
| 56 | 56 | $results = explode($this->multiple_separator, substr($input, 1, -1)); |
| 57 | - if ( !empty($this->config['widget_config']['id_field']) |
|
| 57 | + if (!empty($this->config['widget_config']['id_field']) |
|
| 58 | 58 | && $this->config['widget_config']['id_field'] == 'id') { |
| 59 | 59 | $results = array_map(intval(...), $results); |
| 60 | 60 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | public function reverseTransform(mixed $array) : mixed |
| 69 | 69 | { |
| 70 | - if (!is_array($array) ) { |
|
| 70 | + if (!is_array($array)) { |
|
| 71 | 71 | throw new TransformationFailedException('Expected an array.'); |
| 72 | 72 | } |
| 73 | 73 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | public function purify_content(FormEvent $event) |
| 36 | 36 | { |
| 37 | - if ( isset($this->config['Cache']['SerializerPath']) |
|
| 37 | + if (isset($this->config['Cache']['SerializerPath']) |
|
| 38 | 38 | && !file_exists($this->config['Cache']['SerializerPath'])) { |
| 39 | 39 | mkdir($this->config['Cache']['SerializerPath']); |
| 40 | 40 | } |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | // Load custom element/attribute definitions |
| 50 | 50 | $definitions = $this->get_from_global_config('html_purify_HTMLDefinition'); |
| 51 | - if ( !empty($definitions) |
|
| 51 | + if (!empty($definitions) |
|
| 52 | 52 | && $def = $purifier_config->maybeGetRawHTMLDefinition()) { |
| 53 | 53 | if (!empty($definitions['addAttribute'])) { |
| 54 | 54 | foreach (array_filter((array) $definitions['addAttribute'], is_array(...)) as $attrdef) { |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | * |
| 57 | 57 | * Any error will trigger midcom_error. |
| 58 | 58 | */ |
| 59 | - public function __construct(string|int|midgard_group $id) |
|
| 59 | + public function __construct(string | int | midgard_group $id) |
|
| 60 | 60 | { |
| 61 | 61 | if (is_object($id)) { |
| 62 | 62 | $this->_storage = $id; |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | */ |
| 67 | 67 | public function set_privilege($privilege, $assignee = null, int $value = MIDCOM_PRIVILEGE_ALLOW, string $classname = '') : bool |
| 68 | 68 | { |
| 69 | - if ( !$this->can_do('midgard:update') |
|
| 69 | + if (!$this->can_do('midgard:update') |
|
| 70 | 70 | || !$this->can_do('midgard:privileges')) { |
| 71 | 71 | debug_add("Failed to set a privilege, midgard:update or midgard:privileges on " . static::class . " {$this->guid} not granted for the current user.", |
| 72 | 72 | MIDCOM_LOG_ERROR); |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | */ |
| 97 | 97 | public function unset_privilege($privilege, $assignee = null, string $classname = '') : bool |
| 98 | 98 | { |
| 99 | - if ( !$this->can_do('midgard:update') |
|
| 99 | + if (!$this->can_do('midgard:update') |
|
| 100 | 100 | || !$this->can_do('midgard:privileges')) { |
| 101 | 101 | debug_add("Failed to unset a privilege, midgard:update or midgard:privileges on " . static::class . " {$this->guid} not granted for the current user.", |
| 102 | 102 | MIDCOM_LOG_ERROR); |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | * midcom_core_group object or subtype thereof. |
| 126 | 126 | * @param string $classname An optional class name to which a SELF privilege is restricted to. |
| 127 | 127 | */ |
| 128 | - public function get_privilege(string $privilege, midcom_core_user|midcom_core_group|string $assignee, string $classname = '') |
|
| 128 | + public function get_privilege(string $privilege, midcom_core_user | midcom_core_group | string $assignee, string $classname = '') |
|
| 129 | 129 | { |
| 130 | 130 | if (!$this->can_do('midgard:privileges')) { |
| 131 | 131 | debug_add("Failed to get a privilege, midgard:update or midgard:privileges on " . static::class . " {$this->guid} not granted for the current user.", |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | $tmpfile = null; |
| 324 | 324 | $imagesize = getimagesize($this->_filename); |
| 325 | 325 | |
| 326 | - if ( $imagesize[2] == IMAGETYPE_JPEG |
|
| 326 | + if ($imagesize[2] == IMAGETYPE_JPEG |
|
| 327 | 327 | && $this->_jpegtran_available()) { |
| 328 | 328 | /* jpegtran */ |
| 329 | 329 | $operations = [ |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | $imagesize = getimagesize($this->_filename); |
| 391 | 391 | |
| 392 | 392 | // Try lossless jpegtran rotation if possible |
| 393 | - if ( $imagesize[2] == IMAGETYPE_JPEG |
|
| 393 | + if ($imagesize[2] == IMAGETYPE_JPEG |
|
| 394 | 394 | && ($rotate % 90 == 0) |
| 395 | 395 | && $this->_jpegtran_available()) { |
| 396 | 396 | $tmpfile = $this->_get_tempfile(); |
@@ -502,7 +502,7 @@ discard block |
||
| 502 | 502 | */ |
| 503 | 503 | public function fill(?int $x = null, ?int $y = null, ?string $color = null, string $gravity = 'center') |
| 504 | 504 | { |
| 505 | - if ( empty($x) |
|
| 505 | + if (empty($x) |
|
| 506 | 506 | || empty($y) |
| 507 | 507 | || empty($color)) { |
| 508 | 508 | //This is a bit silly, but here for backwards compatibility... |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | $this->_component = 'midgard.admin.asgard'; |
| 35 | 35 | |
| 36 | 36 | $this->_object = $object; |
| 37 | - $this->_request_data =& $request_data; |
|
| 37 | + $this->_request_data = & $request_data; |
|
| 38 | 38 | |
| 39 | 39 | $root_types = midgard_admin_asgard_plugin::get_root_classes(); |
| 40 | 40 | |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | // we go through the path bottom up and show the first root type we find |
| 51 | 51 | foreach (array_reverse($this->_object_path) as $node) { |
| 52 | 52 | foreach (array_keys($root_types) as $root_type) { |
| 53 | - if ( $node instanceof $root_type |
|
| 53 | + if ($node instanceof $root_type |
|
| 54 | 54 | || midcom_helper_reflector::is_same_class($root_type, $node->__midcom_class_name__)) { |
| 55 | 55 | $this->expanded_root_types[] = $root_type; |
| 56 | 56 | break; |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | protected function _is_collapsed(string $type, int $total) : bool |
| 64 | 64 | { |
| 65 | - return ( $total > $this->_config->get('max_navigation_entries') |
|
| 65 | + return ($total > $this->_config->get('max_navigation_entries') |
|
| 66 | 66 | && empty($_GET['show_all_' . $type])); |
| 67 | 67 | } |
| 68 | 68 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | foreach ($ref->get_child_classes() as $class) { |
| 79 | 79 | $qb = $ref->_child_objects_type_qb($class, $object, false); |
| 80 | 80 | |
| 81 | - if ( !$qb |
|
| 81 | + if (!$qb |
|
| 82 | 82 | || !($count = $qb->count_unchecked())) { |
| 83 | 83 | continue; |
| 84 | 84 | } |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | { |
| 125 | 125 | $qb = $ref->_root_objects_qb(); |
| 126 | 126 | |
| 127 | - if ( !$qb |
|
| 127 | + if (!$qb |
|
| 128 | 128 | || !($total = $qb->count_unchecked())) { |
| 129 | 129 | return; |
| 130 | 130 | } |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | echo "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/{$mode}/{$object->guid}/\" title=\"GUID: {$object->guid}, ID: {$object->id}\">{$icon}{$label}</a>\n"; |
| 205 | - if ( $selected |
|
| 205 | + if ($selected |
|
| 206 | 206 | || $autoexpand) { |
| 207 | 207 | $this->_list_child_elements($object, $level + 1); |
| 208 | 208 | } |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | continue; |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | - if ( method_exists($class, 'navigation') |
|
| 225 | + if (method_exists($class, 'navigation') |
|
| 226 | 226 | && ($this->_request_data['plugin_name'] == "asgard_{$component}")) { |
| 227 | 227 | $this->_request_data['expanded'] = true; |
| 228 | 228 | midcom_show_style('midgard_admin_asgard_navigation_section_header'); |
@@ -256,13 +256,13 @@ discard block |
||
| 256 | 256 | if ($this->_is_selected($object)) { |
| 257 | 257 | $css_class .= ' selected'; |
| 258 | 258 | } |
| 259 | - if ( is_object($this->_object) |
|
| 260 | - && ( $object->guid == $this->_object->guid |
|
| 261 | - || ( $this->_object instanceof midcom_db_parameter |
|
| 259 | + if (is_object($this->_object) |
|
| 260 | + && ($object->guid == $this->_object->guid |
|
| 261 | + || ($this->_object instanceof midcom_db_parameter |
|
| 262 | 262 | && $object->guid == $this->_object->parentguid))) { |
| 263 | 263 | $css_class .= ' current'; |
| 264 | 264 | } |
| 265 | - if ( !$object->can_do('midgard:update')) { |
|
| 265 | + if (!$object->can_do('midgard:update')) { |
|
| 266 | 266 | $css_class .= ' readonly'; |
| 267 | 267 | } |
| 268 | 268 | return $css_class; |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | // Get the types that might have special display conditions |
| 284 | 284 | // @TODO: Should this just include to the configuration selection, although it would break the consistency |
| 285 | 285 | // of other similar preference sets, which simply override the global settings? |
| 286 | - if ( ($selected = midgard_admin_asgard_plugin::get_preference('midgard_types')) |
|
| 286 | + if (($selected = midgard_admin_asgard_plugin::get_preference('midgard_types')) |
|
| 287 | 287 | && preg_match_all('/\|([a-z0-9\.\-_]+)/', $selected, $regs)) { |
| 288 | 288 | $types = array_flip($regs[1]); |
| 289 | 289 | if ($exclude) { |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | // If the regular expression has been set, check which types should be shown |
| 304 | - $label_mapping = array_filter($label_mapping, function ($root_type) use ($regexp, $exclude) { |
|
| 304 | + $label_mapping = array_filter($label_mapping, function($root_type) use ($regexp, $exclude) { |
|
| 305 | 305 | return preg_match($regexp, $root_type) == $exclude; |
| 306 | 306 | }, ARRAY_FILTER_USE_KEY); |
| 307 | 307 | } |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | * click if nothing is expanded |
| 332 | 332 | */ |
| 333 | 333 | $types_shown = false; |
| 334 | - if ( !empty($expanded_types) |
|
| 334 | + if (!empty($expanded_types) |
|
| 335 | 335 | && midgard_admin_asgard_plugin::get_preference('navigation_type') === 'dropdown') { |
| 336 | 336 | $this->_draw_select_navigation(); |
| 337 | 337 | $types_shown = true; |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | $account = $this->get_account(); |
| 152 | 152 | if (!empty($new_password)) { |
| 153 | 153 | // check if the new encrypted password was already used |
| 154 | - if ( !$this->check_password_reuse($new_password) |
|
| 154 | + if (!$this->check_password_reuse($new_password) |
|
| 155 | 155 | || !$this->check_password_strength($new_password)) { |
| 156 | 156 | return false; |
| 157 | 157 | } |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | |
| 424 | 424 | public static function get_person_by_formdata(array $data) : ?midcom_db_person |
| 425 | 425 | { |
| 426 | - if ( empty($data['username']) |
|
| 426 | + if (empty($data['username']) |
|
| 427 | 427 | || empty($data['password'])) { |
| 428 | 428 | return null; |
| 429 | 429 | } |
@@ -472,7 +472,7 @@ discard block |
||
| 472 | 472 | * If the maximum number of attempts is reached and the oldest attempt |
| 473 | 473 | * on the stack is within our defined timeframe, we block the account |
| 474 | 474 | */ |
| 475 | - if ( count($attempts) >= $max_attempts |
|
| 475 | + if (count($attempts) >= $max_attempts |
|
| 476 | 476 | && $attempts[$max_attempts - 1] >= (time() - ($timeframe * 60))) { |
| 477 | 477 | $this->disable_account(); |
| 478 | 478 | $stat = false; |