@@ -17,7 +17,7 @@ |
||
17 | 17 | } |
18 | 18 | |
19 | 19 | if (!$data['diff']) { |
20 | - echo "<dt>". $data['l10n']->get('no changes in content') ."</dt>\n"; |
|
20 | + echo "<dt>" . $data['l10n']->get('no changes in content') . "</dt>\n"; |
|
21 | 21 | } |
22 | 22 | ?> |
23 | 23 | </dl> |
24 | 24 | \ No newline at end of file |
@@ -45,7 +45,8 @@ discard block |
||
45 | 45 | $object = self::_load_backend($backend, $params); |
46 | 46 | debug_add('Using backend ' . $backend); |
47 | 47 | return $object; |
48 | - } catch (midcom_error $e) { |
|
48 | + } |
|
49 | + catch (midcom_error $e) { |
|
49 | 50 | debug_add('Failed to load backend ' . $backend . ', message:' . $e->getMessage()); |
50 | 51 | } |
51 | 52 | } |
@@ -80,7 +81,8 @@ discard block |
||
80 | 81 | $ret = $this->mail($message); |
81 | 82 | $this->error = null; |
82 | 83 | return $ret; |
83 | - } catch (Exception $e) { |
|
84 | + } |
|
85 | + catch (Exception $e) { |
|
84 | 86 | $this->error = $e->getMessage(); |
85 | 87 | return false; |
86 | 88 | } |
@@ -33,7 +33,8 @@ |
||
33 | 33 | { |
34 | 34 | try { |
35 | 35 | midcom::get()->cache->invalidate_all(); |
36 | - } catch (\Throwable $e) { |
|
36 | + } |
|
37 | + catch (\Throwable $e) { |
|
37 | 38 | $output->writeln($e->getMessage()); |
38 | 39 | } |
39 | 40 | $fs = new Filesystem; |
@@ -64,7 +64,8 @@ |
||
64 | 64 | try { |
65 | 65 | $this->__object = $this->__midcom_class_name__::get_cached($this->__identifier); |
66 | 66 | return true; |
67 | - } catch (midcom_error $e) { |
|
67 | + } |
|
68 | + catch (midcom_error $e) { |
|
68 | 69 | $e->log(); |
69 | 70 | } |
70 | 71 | return false; |
@@ -73,7 +73,8 @@ |
||
73 | 73 | if (is_a($stat, midcom_services_indexer_client::class)) { |
74 | 74 | try { |
75 | 75 | $stat->reindex(); |
76 | - } catch (RequestException $e) { |
|
76 | + } |
|
77 | + catch (RequestException $e) { |
|
77 | 78 | if ($e->hasResponse()) { |
78 | 79 | $crawler = new Crawler($e->getResponse()->getBody()->getContents()); |
79 | 80 | $body = $crawler->filterXPath('//body')->html(); |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | { |
82 | 82 | $this->calculate_price(false); |
83 | 83 | |
84 | - if ( $this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION |
|
84 | + if ($this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION |
|
85 | 85 | && $this->continuous) { |
86 | 86 | $this->end = 0; |
87 | 87 | } elseif ($this->end < $this->start) { |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | $calculator->run($this); |
170 | 170 | $cost = $calculator->get_cost(); |
171 | 171 | $price = $calculator->get_price(); |
172 | - if ( $price != $this->price |
|
172 | + if ($price != $this->price |
|
173 | 173 | || $cost != $this->cost) { |
174 | 174 | $this->price = $price; |
175 | 175 | $this->cost = $cost; |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | $units = $agreement_hours['invoiceable']; |
217 | 217 | $uninvoiceableUnits = $agreement_hours['reported'] - ($agreement_hours['invoiceable'] + $agreement_hours['invoiced']); |
218 | 218 | |
219 | - if ( $units != $this->units |
|
219 | + if ($units != $this->units |
|
220 | 220 | || $uninvoiceableUnits != $this->uninvoiceableUnits) { |
221 | 221 | debug_add("agreement values have changed, setting units to " . $units . ", uninvoiceable: " . $uninvoiceableUnits); |
222 | 222 | $this->units = $units; |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | |
271 | 271 | public function invoice() : bool |
272 | 272 | { |
273 | - if ( $this->state >= self::STATE_INVOICED |
|
273 | + if ($this->state >= self::STATE_INVOICED |
|
274 | 274 | || $this->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION) { |
275 | 275 | return false; |
276 | 276 | } |
@@ -122,7 +122,8 @@ discard block |
||
122 | 122 | try { |
123 | 123 | $creator = new midcom_db_person($view_metadata->get('creator')); |
124 | 124 | $creator_string = "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$creator->guid}/\">$creator->name</a>"; |
125 | - } catch (midcom_error $e) { |
|
125 | + } |
|
126 | + catch (midcom_error $e) { |
|
126 | 127 | $creator_string = $l10n->get('unknown person'); |
127 | 128 | } |
128 | 129 | $created = (int) $view_metadata->get('created'); |
@@ -135,7 +136,8 @@ discard block |
||
135 | 136 | try { |
136 | 137 | $editor = new midcom_db_person($view_metadata->get('revisor')); |
137 | 138 | $editor_string = "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$editor->guid}/\">$editor->name</a>"; |
138 | - } catch (midcom_error $e) { |
|
139 | + } |
|
140 | + catch (midcom_error $e) { |
|
139 | 141 | $editor_string = $l10n->get('unknown person'); |
140 | 142 | } |
141 | 143 |
@@ -16,7 +16,7 @@ |
||
16 | 16 | |
17 | 17 | $edited = (int) $view_metadata->get('revised'); |
18 | 18 | $revision = $view_metadata->get('revision'); |
19 | - if ( $revision > 1 |
|
19 | + if ($revision > 1 |
|
20 | 20 | && $edited != $created) { |
21 | 21 | try { |
22 | 22 | $editor = new midcom_db_person($view_metadata->get('revisor')); |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | return true; |
239 | 239 | } |
240 | 240 | if ($user === null) { |
241 | - $user =& $this->user; |
|
241 | + $user = & $this->user; |
|
242 | 242 | } |
243 | 243 | |
244 | 244 | if ($user == 'EVERYONE') { |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | public function require_admin_or_ip(string $domain) : bool |
436 | 436 | { |
437 | 437 | $ips = midcom::get()->config->get('indexer_reindex_allowed_ips'); |
438 | - if ( $ips |
|
438 | + if ($ips |
|
439 | 439 | && in_array($_SERVER['REMOTE_ADDR'], $ips)) { |
440 | 440 | if (!$this->request_sudo($domain)) { |
441 | 441 | throw new midcom_error('Failed to acquire SUDO rights. Aborting.'); |
@@ -575,7 +575,8 @@ |
||
575 | 575 | $param = $param->__object; |
576 | 576 | } |
577 | 577 | $this->_group_cache[$id] = new midcom_core_group($param); |
578 | - } catch (midcom_error $e) { |
|
578 | + } |
|
579 | + catch (midcom_error $e) { |
|
579 | 580 | debug_add("Group with identifier {$id} could not be loaded: " . $e->getMessage(), MIDCOM_LOG_WARN); |
580 | 581 | $this->_group_cache[$id] = null; |
581 | 582 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | parent::__construct(); |
44 | 44 | |
45 | 45 | $this->_object = $object; |
46 | - $this->_request_data =& $request_data; |
|
46 | + $this->_request_data = & $request_data; |
|
47 | 47 | |
48 | 48 | $this->root_types = midcom_helper_reflector_tree::get_root_classes(); |
49 | 49 | |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | // we go through the path bottom up and show the first root type we find |
60 | 60 | foreach (array_reverse($this->_object_path) as $node) { |
61 | 61 | foreach ($this->root_types as $root_type) { |
62 | - if ( is_a($node, $root_type) |
|
62 | + if (is_a($node, $root_type) |
|
63 | 63 | || midcom_helper_reflector::is_same_class($root_type, $node->__midcom_class_name__)) { |
64 | 64 | $this->expanded_root_types[] = $root_type; |
65 | 65 | break; |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | |
72 | 72 | protected function _is_collapsed(string $type, int $total) : bool |
73 | 73 | { |
74 | - return ( $total > $this->_config->get('max_navigation_entries') |
|
74 | + return ($total > $this->_config->get('max_navigation_entries') |
|
75 | 75 | && empty($_GET['show_all_' . $type])); |
76 | 76 | } |
77 | 77 | |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | foreach ($ref->get_child_classes() as $class) { |
88 | 88 | $qb = $ref->_child_objects_type_qb($class, $object, false); |
89 | 89 | |
90 | - if ( !$qb |
|
90 | + if (!$qb |
|
91 | 91 | || !($count = $qb->count_unchecked())) { |
92 | 92 | continue; |
93 | 93 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | { |
134 | 134 | $qb = $ref->_root_objects_qb(); |
135 | 135 | |
136 | - if ( !$qb |
|
136 | + if (!$qb |
|
137 | 137 | || !($total = $qb->count_unchecked())) { |
138 | 138 | return; |
139 | 139 | } |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | } |
212 | 212 | |
213 | 213 | 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"; |
214 | - if ( $selected |
|
214 | + if ($selected |
|
215 | 215 | || $autoexpand) { |
216 | 216 | $this->_list_child_elements($object, $level + 1); |
217 | 217 | } |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | continue; |
232 | 232 | } |
233 | 233 | |
234 | - if ( method_exists($class, 'navigation') |
|
234 | + if (method_exists($class, 'navigation') |
|
235 | 235 | && ($this->_request_data['plugin_name'] == "asgard_{$component}")) { |
236 | 236 | $this->_request_data['expanded'] = true; |
237 | 237 | midcom_show_style('midgard_admin_asgard_navigation_section_header'); |
@@ -265,13 +265,13 @@ discard block |
||
265 | 265 | if ($this->_is_selected($object)) { |
266 | 266 | $css_class .= ' selected'; |
267 | 267 | } |
268 | - if ( is_object($this->_object) |
|
269 | - && ( $object->guid == $this->_object->guid |
|
270 | - || ( is_a($this->_object, midcom_db_parameter::class) |
|
268 | + if (is_object($this->_object) |
|
269 | + && ($object->guid == $this->_object->guid |
|
270 | + || (is_a($this->_object, midcom_db_parameter::class) |
|
271 | 271 | && $object->guid == $this->_object->parentguid))) { |
272 | 272 | $css_class .= ' current'; |
273 | 273 | } |
274 | - if ( !$object->can_do('midgard:update')) { |
|
274 | + if (!$object->can_do('midgard:update')) { |
|
275 | 275 | $css_class .= ' readonly'; |
276 | 276 | } |
277 | 277 | return $css_class; |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | |
315 | 315 | // If the regular expression has been set, check which types should be shown |
316 | 316 | if ($regexp !== '//') { |
317 | - $label_mapping = array_filter($label_mapping, function ($root_type) use ($regexp, $exclude) { |
|
317 | + $label_mapping = array_filter($label_mapping, function($root_type) use ($regexp, $exclude) { |
|
318 | 318 | return preg_match($regexp, $root_type) == $exclude; |
319 | 319 | }, ARRAY_FILTER_USE_KEY); |
320 | 320 | } |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | * click if nothing is expanded |
345 | 345 | */ |
346 | 346 | $types_shown = false; |
347 | - if ( !empty($expanded_types) |
|
347 | + if (!empty($expanded_types) |
|
348 | 348 | && midgard_admin_asgard_plugin::get_preference('navigation_type') === 'dropdown') { |
349 | 349 | $this->_draw_select_navigation(); |
350 | 350 | $types_shown = true; |