@@ -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(); |
@@ -166,7 +166,7 @@ |
||
166 | 166 | $address = addslashes($address); |
167 | 167 | return preg_replace_callback( |
168 | 168 | '/href="(http:\/\/.*?)"/i', |
169 | - function ($match) use ($address) { |
|
169 | + function($match) use ($address) { |
|
170 | 170 | return 'href="' . str_replace("URL", rawurlencode($match[1]), $address) . '"'; |
171 | 171 | }, |
172 | 172 | $html); |
@@ -148,13 +148,13 @@ |
||
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
151 | - * Inserts a link detector to the given HTML source. All outgoing |
|
152 | - * HTTP links in the source HTML are replaced with the given |
|
153 | - * link detector address so that the token "URL" is replaced with |
|
154 | - * encoded form of the original link. It is expected that the link detector |
|
155 | - * address points to a script that records the passed link and |
|
156 | - * forwards the client to the real link target. |
|
157 | - */ |
|
151 | + * Inserts a link detector to the given HTML source. All outgoing |
|
152 | + * HTTP links in the source HTML are replaced with the given |
|
153 | + * link detector address so that the token "URL" is replaced with |
|
154 | + * encoded form of the original link. It is expected that the link detector |
|
155 | + * address points to a script that records the passed link and |
|
156 | + * forwards the client to the real link target. |
|
157 | + */ |
|
158 | 158 | private function _insert_link_detector(string $html, string $address) : string |
159 | 159 | { |
160 | 160 | $address = addslashes($address); |
@@ -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')); |
@@ -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 | } |
@@ -221,7 +221,7 @@ |
||
221 | 221 | return true; |
222 | 222 | } |
223 | 223 | if ($user === null) { |
224 | - $user =& $this->user; |
|
224 | + $user = & $this->user; |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | if ($user == 'EVERYONE') { |
@@ -87,7 +87,8 @@ |
||
87 | 87 | $param = $param->__object; |
88 | 88 | } |
89 | 89 | $this->_user_cache[$id] = new midcom_core_user($param); |
90 | - } catch (midcom_error $e) { |
|
90 | + } |
|
91 | + catch (midcom_error $e) { |
|
91 | 92 | // Keep it silent while missing user object can mess here |
92 | 93 | $this->_user_cache[$id] = null; |
93 | 94 | } |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | return null; |
101 | 101 | } |
102 | 102 | |
103 | - if ( midcom::get()->config->get('auth_check_client_ip') |
|
103 | + if (midcom::get()->config->get('auth_check_client_ip') |
|
104 | 104 | && $data['clientip'] != $request->getClientIp()) { |
105 | 105 | debug_add("The session had mismatching client IP.", MIDCOM_LOG_INFO); |
106 | 106 | debug_add("Expected {$data['clientip']}, got {$request->getClientIp()}."); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | return null; |
115 | 115 | } |
116 | 116 | |
117 | - if ( !$this->check_timestamp($data['timestamp'], $user) |
|
117 | + if (!$this->check_timestamp($data['timestamp'], $user) |
|
118 | 118 | || !$this->authenticate($user->username, '', true)) { |
119 | 119 | $this->logout($user); |
120 | 120 | return null; |