@@ -59,7 +59,7 @@ |
||
59 | 59 | |
60 | 60 | public function __set($name, $value) |
61 | 61 | { |
62 | - if ( $name == 'homepage' |
|
62 | + if ($name == 'homepage' |
|
63 | 63 | && !empty($value) |
64 | 64 | && $value != $this->homepage) { |
65 | 65 | $this->_register_prober = true; |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | $password_length = mb_strlen($password); |
320 | 320 | |
321 | 321 | if ($password_length < $this->_config->get('min_password_length')) { |
322 | - if ($show_ui_message){ |
|
322 | + if ($show_ui_message) { |
|
323 | 323 | midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get('password too short'), 'error'); |
324 | 324 | } |
325 | 325 | return false; |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | } |
338 | 338 | |
339 | 339 | if ($score < $this->_config->get('min_password_score')) { |
340 | - if ($show_ui_message){ |
|
340 | + if ($show_ui_message) { |
|
341 | 341 | midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get('password weak'), 'error'); |
342 | 342 | } |
343 | 343 | return false; |
@@ -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, true) |
|
154 | + if (!$this->check_password_reuse($new_password, true) |
|
155 | 155 | || !$this->check_password_strength($new_password, true)) { |
156 | 156 | $this->errstr = "password strength too low"; |
157 | 157 | return false; |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | $password_length = mb_strlen($password); |
271 | 271 | |
272 | 272 | if ($password_length < $this->_config->get('min_password_length')) { |
273 | - if ($show_ui_message){ |
|
273 | + if ($show_ui_message) { |
|
274 | 274 | midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get('password too short'), 'error'); |
275 | 275 | } |
276 | 276 | return false; |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | } |
289 | 289 | |
290 | 290 | if ($score < $this->_config->get('min_password_score')) { |
291 | - if ($show_ui_message){ |
|
291 | + if ($show_ui_message) { |
|
292 | 292 | midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get('password weak'), 'error'); |
293 | 293 | } |
294 | 294 | return false; |
@@ -432,7 +432,7 @@ discard block |
||
432 | 432 | |
433 | 433 | public static function get_person_by_formdata(array $data) : ?midcom_db_person |
434 | 434 | { |
435 | - if ( empty($data['username']) |
|
435 | + if (empty($data['username']) |
|
436 | 436 | || empty($data['password'])) { |
437 | 437 | return null; |
438 | 438 | } |
@@ -463,7 +463,7 @@ discard block |
||
463 | 463 | $max_attempts = midcom_baseclasses_components_configuration::get($component, 'config')->get('max_password_attempts'); |
464 | 464 | $timeframe = midcom_baseclasses_components_configuration::get($component, 'config')->get('password_block_timeframe_min'); |
465 | 465 | |
466 | - if ( $max_attempts == 0 |
|
466 | + if ($max_attempts == 0 |
|
467 | 467 | || $timeframe == 0) { |
468 | 468 | return $stat; |
469 | 469 | } |
@@ -485,7 +485,7 @@ discard block |
||
485 | 485 | * If the maximum number of attempts is reached and the oldest attempt |
486 | 486 | * on the stack is within our defined timeframe, we block the account |
487 | 487 | */ |
488 | - if ( count($attempts) >= $max_attempts |
|
488 | + if (count($attempts) >= $max_attempts |
|
489 | 489 | && $attempts[$max_attempts - 1] >= (time() - ($timeframe * 60))) { |
490 | 490 | $this->disable_account(); |
491 | 491 | $stat = false; |
@@ -131,7 +131,8 @@ discard block |
||
131 | 131 | try { |
132 | 132 | $this->_backend->index($documents); |
133 | 133 | return true; |
134 | - } catch (Exception $e) { |
|
134 | + } |
|
135 | + catch (Exception $e) { |
|
135 | 136 | if ($batch) { |
136 | 137 | throw $e; |
137 | 138 | } |
@@ -160,7 +161,8 @@ discard block |
||
160 | 161 | try { |
161 | 162 | $this->_backend->delete($RIs); |
162 | 163 | return true; |
163 | - } catch (Exception $e) { |
|
164 | + } |
|
165 | + catch (Exception $e) { |
|
164 | 166 | debug_add("Deleting error: " . $e->getMessage(), MIDCOM_LOG_ERROR); |
165 | 167 | return false; |
166 | 168 | } |
@@ -182,7 +184,8 @@ discard block |
||
182 | 184 | try { |
183 | 185 | $this->_backend->delete_all($constraint); |
184 | 186 | return true; |
185 | - } catch (Exception $e) { |
|
187 | + } |
|
188 | + catch (Exception $e) { |
|
186 | 189 | debug_add("Deleting error: " . $e->getMessage(), MIDCOM_LOG_ERROR); |
187 | 190 | return false; |
188 | 191 | } |
@@ -216,7 +219,8 @@ discard block |
||
216 | 219 | |
217 | 220 | try { |
218 | 221 | $result_raw = $this->_backend->query($query, $filter, $options); |
219 | - } catch (Exception $e) { |
|
222 | + } |
|
223 | + catch (Exception $e) { |
|
220 | 224 | debug_add("Query error: " . $e->getMessage(), MIDCOM_LOG_ERROR); |
221 | 225 | return $result; |
222 | 226 | } |
@@ -237,7 +241,8 @@ discard block |
||
237 | 241 | if (!empty($document->topic_guid)) { |
238 | 242 | try { |
239 | 243 | midcom_db_topic::get_cached($document->topic_guid); |
240 | - } catch (midcom_error $e) { |
|
244 | + } |
|
245 | + catch (midcom_error $e) { |
|
241 | 246 | // Skip document, the object is hidden. |
242 | 247 | debug_add("Skipping the generic document {$document->title}, its topic seems to be invisible, we cannot proceed."); |
243 | 248 | continue; |
@@ -250,7 +255,8 @@ discard block |
||
250 | 255 | // Strip language code from end of RI if it looks like "<GUID>_<LANG>" |
251 | 256 | try { |
252 | 257 | midcom::get()->dbfactory->get_object_by_guid(preg_replace('/^([0-9a-f]{32,80})_[a-z]{2}$/', '\\1', $document->RI)); |
253 | - } catch (midcom_error $e) { |
|
258 | + } |
|
259 | + catch (midcom_error $e) { |
|
254 | 260 | // Skip document, the object is hidden, deleted or otherwise unavailable. |
255 | 261 | //@todo Maybe nonexistent objects should be removed from index? |
256 | 262 | continue; |
@@ -71,7 +71,7 @@ |
||
71 | 71 | * |
72 | 72 | * @return boolean Indicating success. |
73 | 73 | */ |
74 | - public function index(midcom_services_indexer_document|array $documents) : bool |
|
74 | + public function index(midcom_services_indexer_document | array $documents) : bool |
|
75 | 75 | { |
76 | 76 | if ($this->_disabled) { |
77 | 77 | return true; |
@@ -409,7 +409,8 @@ |
||
409 | 409 | //Get the parent object |
410 | 410 | try { |
411 | 411 | $parent = midcom::get()->dbfactory->get_object_by_guid($this->objectguid); |
412 | - } catch (midcom_error $e) { |
|
412 | + } |
|
413 | + catch (midcom_error $e) { |
|
413 | 414 | $e->log(); |
414 | 415 | return; |
415 | 416 | } |
@@ -218,8 +218,8 @@ discard block |
||
218 | 218 | { |
219 | 219 | $config = midcom_baseclasses_components_configuration::get('net.nehmer.comments', 'config'); |
220 | 220 | |
221 | - if ( $config->get('ratings_enable') |
|
222 | - && ( $config->get('ratings_cache_to_object') |
|
221 | + if ($config->get('ratings_enable') |
|
222 | + && ($config->get('ratings_cache_to_object') |
|
223 | 223 | || $config->get('comment_count_cache_to_object'))) { |
224 | 224 | // Handle ratings |
225 | 225 | $comments = self::list_by_objectguid($this->objectguid); |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | |
269 | 269 | private function _send_notifications() |
270 | 270 | { |
271 | - if ( empty($this->title) |
|
271 | + if (empty($this->title) |
|
272 | 272 | && empty($this->content)) { |
273 | 273 | // No need to send notifications about empty rating entries |
274 | 274 | return; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | net_nemein_rss_manage::add_toolbar_buttons($this->_node_toolbar, $this->_topic->can_do('midgard:create')); |
85 | 85 | } |
86 | 86 | |
87 | - if ( $this->_topic->can_do('midgard:update') |
|
87 | + if ($this->_topic->can_do('midgard:update') |
|
88 | 88 | && $this->_topic->can_do('midcom:component_config')) { |
89 | 89 | $buttons[] = $workflow->get_button('config/', [ |
90 | 90 | MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'), |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | $this->_request_data['categories'] = explode(',', $this->_config->get('categories')); |
115 | 115 | |
116 | 116 | foreach ($this->_request_data['schemadb']->all() as $schema) { |
117 | - if ( $schema->has_field('categories') |
|
117 | + if ($schema->has_field('categories') |
|
118 | 118 | && $schema->get_field('categories')['type'] == 'select') { |
119 | 119 | // TODO: Merge schema local and component config categories? |
120 | 120 | $options = array_combine($this->_request_data['categories'], $this->_request_data['categories']); |
@@ -61,7 +61,7 @@ |
||
61 | 61 | public static function get_by_object(org_openpsa_invoices_interfaces_customer $object) : self |
62 | 62 | { |
63 | 63 | if ( !($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer)) |
64 | - // check if the customerContact is set and has invoice_data |
|
64 | + // check if the customerContact is set and has invoice_data |
|
65 | 65 | && !($bd = self::get_billing_data(org_openpsa_contacts_person_dba::class, $object->customerContact))) { |
66 | 66 | $bd = new self(); |
67 | 67 | $due = midcom_baseclasses_components_configuration::get('org.openpsa.invoices', 'config')->get('default_due_days'); |
@@ -96,7 +96,8 @@ discard block |
||
96 | 96 | // if the property useContactAddress is set |
97 | 97 | $billing_data[0]->set_address(); |
98 | 98 | return $billing_data[0]; |
99 | - } catch (midcom_error $e) { |
|
99 | + } |
|
100 | + catch (midcom_error $e) { |
|
100 | 101 | $e->log(); |
101 | 102 | return null; |
102 | 103 | } |
@@ -141,10 +142,12 @@ discard block |
||
141 | 142 | { |
142 | 143 | try { |
143 | 144 | return new org_openpsa_contacts_person_dba($this->linkGuid); |
144 | - } catch (midcom_error $e) { |
|
145 | + } |
|
146 | + catch (midcom_error $e) { |
|
145 | 147 | try { |
146 | 148 | return new org_openpsa_contacts_group_dba($this->linkGuid); |
147 | - } catch (midcom_error $e) { |
|
149 | + } |
|
150 | + catch (midcom_error $e) { |
|
148 | 151 | debug_add("Failed to load contact with GUID: " . $this->linkGuid . " - last error:" . $e->getMessage(), MIDCOM_LOG_ERROR); |
149 | 152 | return false; |
150 | 153 | } |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public static function get_by_object(org_openpsa_invoices_interfaces_customer $object) : self |
54 | 54 | { |
55 | - if ( !($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer)) |
|
55 | + if (!($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer)) |
|
56 | 56 | // check if the customerContact is set and has invoice_data |
57 | 57 | && !($bd = self::get_billing_data(org_openpsa_contacts_person_dba::class, $object->customerContact))) { |
58 | 58 | $bd = new self(); |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | /** |
69 | 69 | * Get the billing data for given contact if any. |
70 | 70 | */ |
71 | - private static function get_billing_data(string $dba_class, string|int $contact_id) : ?self |
|
71 | + private static function get_billing_data(string $dba_class, string | int $contact_id) : ?self |
|
72 | 72 | { |
73 | 73 | if ($contact_id == 0) { |
74 | 74 | return null; |
@@ -26,7 +26,7 @@ |
||
26 | 26 | |
27 | 27 | private function load_controller() : controller |
28 | 28 | { |
29 | - if ( $this->_config->get('simple_name_handling') |
|
29 | + if ($this->_config->get('simple_name_handling') |
|
30 | 30 | && !midcom::get()->auth->admin) { |
31 | 31 | foreach ($this->_request_data['schemadb']->all() as $schema) { |
32 | 32 | $schema->get_field('name')['readonly'] = true; |
@@ -109,20 +109,20 @@ discard block |
||
109 | 109 | } |
110 | 110 | |
111 | 111 | // Approval attributes |
112 | - if ( midcom::get()->config->get('metadata_approval') |
|
112 | + if (midcom::get()->config->get('metadata_approval') |
|
113 | 113 | && !$object->metadata->is_approved()) { |
114 | 114 | $css_classes[] = 'unapproved'; |
115 | 115 | } |
116 | 116 | |
117 | 117 | // Hiding and scheduling attributes |
118 | - if ( ( !midcom::get()->config->get('show_hidden_objects') |
|
118 | + if ((!midcom::get()->config->get('show_hidden_objects') |
|
119 | 119 | || midcom::get()->config->get('metadata_scheduling')) |
120 | 120 | && !$object->metadata->is_visible()) { |
121 | 121 | $css_classes[] = 'hidden'; |
122 | 122 | } |
123 | 123 | |
124 | 124 | // Folder's class |
125 | - if ( $object instanceof midcom_db_topic |
|
125 | + if ($object instanceof midcom_db_topic |
|
126 | 126 | && $page_class = $object->get_parameter('midcom.services.metadata', 'page_class')) { |
127 | 127 | $css_classes[] = $page_class; |
128 | 128 | } |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | private function _add_opengraph_metadata(midcom_helper_metadata $view_metadata) |
194 | 194 | { |
195 | 195 | $opengraph_type = $view_metadata->object->get_parameter('midcom.helper.metadata', 'opengraph_type'); |
196 | - if ( $opengraph_type |
|
196 | + if ($opengraph_type |
|
197 | 197 | && $opengraph_type != 'none') { |
198 | 198 | $request_metadata = $this->get_request_metadata(); |
199 | 199 |
@@ -111,7 +111,7 @@ |
||
111 | 111 | */ |
112 | 112 | public function _handler_moderate_ajax(Request $request, string $status, array &$data) |
113 | 113 | { |
114 | - if ( !$request->request->has('action') |
|
114 | + if (!$request->request->has('action') |
|
115 | 115 | || !$request->request->has('guid')) { |
116 | 116 | throw new midcom_error_notfound('Incomplete POST data'); |
117 | 117 | } |