@@ -116,7 +116,8 @@ discard block |
||
| 116 | 116 | //TODO: check for duplicates ? |
| 117 | 117 | try { |
| 118 | 118 | $result = ['other_obj' => midcom::get()->dbfactory->get_object_by_guid($link[$other . 'Guid'])]; |
| 119 | - } catch (midcom_error $e) { |
|
| 119 | + } |
|
| 120 | + catch (midcom_error $e) { |
|
| 120 | 121 | continue; |
| 121 | 122 | } |
| 122 | 123 | $result['link'] = [ |
@@ -421,7 +422,8 @@ discard block |
||
| 421 | 422 | if (!($this->_object instanceof org_openpsa_relatedto_dba)) { |
| 422 | 423 | $response->status = "method requires guid of a link object as an argument"; |
| 423 | 424 | } |
| 424 | - } catch (midcom_error $e) { |
|
| 425 | + } |
|
| 426 | + catch (midcom_error $e) { |
|
| 425 | 427 | $response->status = "error: " . $e->getMessage(); |
| 426 | 428 | } |
| 427 | 429 | |
@@ -444,7 +446,8 @@ discard block |
||
| 444 | 446 | $relation = new org_openpsa_relatedto_dba($guid); |
| 445 | 447 | $response->result = $relation->delete(); |
| 446 | 448 | $response->status = 'Last message: ' . midcom_connection::get_error_string(); |
| 447 | - } catch (midcom_error $e) { |
|
| 449 | + } |
|
| 450 | + catch (midcom_error $e) { |
|
| 448 | 451 | $response->result = false; |
| 449 | 452 | $response->status = "Object '{$guid}' could not be loaded, error:" . $e->getMessage(); |
| 450 | 453 | } |
@@ -199,7 +199,7 @@ |
||
| 199 | 199 | private function _render_line(array $link, midcom_core_dbaobject &$other_obj) |
| 200 | 200 | { |
| 201 | 201 | $this->_request_data['link'] = $link; |
| 202 | - $this->_request_data['other_obj'] =& $other_obj; |
|
| 202 | + $this->_request_data['other_obj'] = & $other_obj; |
|
| 203 | 203 | $this->_request_data['icon'] = midcom_helper_reflector::get_object_icon($other_obj); |
| 204 | 204 | |
| 205 | 205 | if (get_class($other_obj) != $link['class']) { |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function read_login_data(Request $request) : ?array |
| 42 | 42 | { |
| 43 | - if ( !$request->request->has('midcom_services_auth_frontend_form_submit') |
|
| 43 | + if (!$request->request->has('midcom_services_auth_frontend_form_submit') |
|
| 44 | 44 | || !$request->request->has('username') |
| 45 | 45 | || !$request->request->has('password')) { |
| 46 | 46 | return null; |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | { |
| 77 | 77 | // Store the submitted form if the session expired, but user wants to save the data |
| 78 | 78 | if (!empty($_POST)) { |
| 79 | - $data =& midcom_core_context::get()->get_custom_key('request_data'); |
|
| 79 | + $data = & midcom_core_context::get()->get_custom_key('request_data'); |
|
| 80 | 80 | |
| 81 | 81 | $data['restored_form_data'] = []; |
| 82 | 82 | |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | |
| 41 | 41 | public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object) : ?string |
| 42 | 42 | { |
| 43 | - if ( $object instanceof org_openpsa_documents_document_dba |
|
| 43 | + if ($object instanceof org_openpsa_documents_document_dba |
|
| 44 | 44 | && $object->topic == $topic->id) { |
| 45 | 45 | return "document/{$object->guid}/"; |
| 46 | 46 | } |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | echo " <td>" . strftime('%x %X Z', $revision['date']) . "</td>\n"; |
| 37 | 37 | echo " <td>"; |
| 38 | 38 | |
| 39 | - if ( $revision['user'] |
|
| 39 | + if ($revision['user'] |
|
| 40 | 40 | && $user = midcom::get()->auth->get_user($revision['user'])) { |
| 41 | 41 | echo $user->get_storage()->name; |
| 42 | 42 | } elseif ($revision['ip']) { |
@@ -6,6 +6,6 @@ |
||
| 6 | 6 | &(view["content"]:h); |
| 7 | 7 | <?php |
| 8 | 8 | } else { |
| 9 | - echo "<p class=\"stub\">" . $data['l10n']->get('this page is stub')."</p>"; |
|
| 9 | + echo "<p class=\"stub\">" . $data['l10n']->get('this page is stub') . "</p>"; |
|
| 10 | 10 | } |
| 11 | 11 | ?> |
| 12 | 12 | \ No newline at end of file |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | <?php |
| 47 | 47 | //index is needed for sorting |
| 48 | 48 | echo "'index_name',"; |
| 49 | - echo "'" . $data['l10n']->get('entry title') ."',"; |
|
| 49 | + echo "'" . $data['l10n']->get('entry title') . "',"; |
|
| 50 | 50 | echo "'" . $data['l10n']->get('entry text') . "',"; |
| 51 | 51 | echo "'" . $data['l10n']->get('entry created') . "',"; |
| 52 | 52 | echo "'index_creator', '" . $data['l10n_midcom']->get('creator') . "',"; |
@@ -25,7 +25,8 @@ |
||
| 25 | 25 | $row['creator_index'] = $creator->rname; |
| 26 | 26 | $creator_card = org_openpsa_widgets_contact::get($entry->metadata->creator); |
| 27 | 27 | $row['creator'] = $creator_card->show_inline(); |
| 28 | - } catch (midcom_error $e) { |
|
| 28 | + } |
|
| 29 | + catch (midcom_error $e) { |
|
| 29 | 30 | $row['creator_index'] = ''; |
| 30 | 31 | $row['creator'] = ''; |
| 31 | 32 | } |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | { |
| 86 | 86 | ksort($constraints); |
| 87 | 87 | foreach ($constraints as $key => $data) { |
| 88 | - if ( !array_key_exists('value', $data) |
|
| 88 | + if (!array_key_exists('value', $data) |
|
| 89 | 89 | || empty($data['field']) |
| 90 | 90 | || empty($data['op'])) { |
| 91 | 91 | debug_add("Constraint #{$key} is not correctly defined, skipping", MIDCOM_LOG_WARN); |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | { |
| 147 | 147 | $query = $this->request["term"]; |
| 148 | 148 | $wildcard_query = $query; |
| 149 | - if ( isset($this->request['auto_wildcards']) |
|
| 149 | + if (isset($this->request['auto_wildcards']) |
|
| 150 | 150 | && !str_contains($query, '%')) { |
| 151 | 151 | switch ($this->request['auto_wildcards']) { |
| 152 | 152 | case 'start': |
@@ -253,9 +253,7 @@ discard block |
||
| 253 | 253 | return $label; |
| 254 | 254 | } |
| 255 | 255 | } |
| 256 | - return midcom_helper_reflector::get($object)->get_object_label($object) ?: |
|
| 257 | - self::build_label($object, array_column($result_headers, 'name')) ?: |
|
| 258 | - get_class($object) . ' #' . $object->id; |
|
| 256 | + return midcom_helper_reflector::get($object)->get_object_label($object) ?: self::build_label($object, array_column($result_headers, 'name')) ?: get_class($object) . ' #' . $object->id; |
|
| 259 | 257 | } |
| 260 | 258 | |
| 261 | 259 | private static function build_label($object, array $fields) : string |
@@ -289,7 +287,7 @@ discard block |
||
| 289 | 287 | } |
| 290 | 288 | return self::sanitize_label($value); |
| 291 | 289 | } |
| 292 | - if ( $field == 'username' |
|
| 290 | + if ($field == 'username' |
|
| 293 | 291 | && $object instanceof midcom_db_person) { |
| 294 | 292 | $account = new midcom_core_account($object); |
| 295 | 293 | return self::sanitize_label($account->get_username()); |
@@ -203,7 +203,8 @@ |
||
| 203 | 203 | if ($object instanceof mgdobject) { |
| 204 | 204 | try { |
| 205 | 205 | $obj = midcom::get()->dbfactory->convert_midgard_to_midcom($object); |
| 206 | - } catch (midcom_error $e) { |
|
| 206 | + } |
|
| 207 | + catch (midcom_error $e) { |
|
| 207 | 208 | return null; |
| 208 | 209 | } |
| 209 | 210 | } else { |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | |
| 305 | 305 | $label_prop = $this->get_label_property(); |
| 306 | 306 | |
| 307 | - if ( $label_prop != 'guid' |
|
| 307 | + if ($label_prop != 'guid' |
|
| 308 | 308 | && $this->property_exists($label_prop)) { |
| 309 | 309 | $search_properties[$label_prop] = true; |
| 310 | 310 | } |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | continue; |
| 355 | 355 | } |
| 356 | 356 | |
| 357 | - if ( !$this->is_link($property) |
|
| 357 | + if (!$this->is_link($property) |
|
| 358 | 358 | && $this->get_midgard_type($property) != MGD_TYPE_GUID) { |
| 359 | 359 | continue; |
| 360 | 360 | } |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | protected static function class_rewrite(string $schema_type) : string |
| 389 | 389 | { |
| 390 | 390 | $extends = midcom_baseclasses_components_configuration::get('midcom.helper.reflector', 'config')->get_array('class_extends'); |
| 391 | - if ( isset($extends[$schema_type]) |
|
| 391 | + if (isset($extends[$schema_type]) |
|
| 392 | 392 | && class_exists($extends[$schema_type])) { |
| 393 | 393 | return $extends[$schema_type]; |
| 394 | 394 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | $etag = trim($parser->data['headers']['etag']); |
| 88 | 88 | |
| 89 | 89 | $feed_etag = $this->_feed->get_parameter('net.nemein.rss', 'etag'); |
| 90 | - if ( !empty($feed_etag) |
|
| 90 | + if (!empty($feed_etag) |
|
| 91 | 91 | && $feed_etag == $etag) { |
| 92 | 92 | // Feed hasn't changed, skip updating |
| 93 | 93 | debug_add("Feed {$this->_feed->url} has not changed since " . date('c', $this->_feed->latestfetch), MIDCOM_LOG_WARN); |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | $guid = $item->get_id(); |
| 159 | 159 | $title = $item->get_title(); |
| 160 | 160 | |
| 161 | - if ( ( empty($title) |
|
| 161 | + if ((empty($title) |
|
| 162 | 162 | || trim($title) == '...') |
| 163 | 163 | && empty($guid)) { |
| 164 | 164 | // Something wrong with this entry, skip it |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | $meta_values['published'] = $article_date; |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | - if ( $this->apply_values($article, $values, $meta_values) |
|
| 226 | + if ($this->apply_values($article, $values, $meta_values) |
|
| 227 | 227 | && !$article->update()) { |
| 228 | 228 | return null; |
| 229 | 229 | } |
@@ -252,14 +252,14 @@ discard block |
||
| 252 | 252 | private function find_author(net_nemein_rss_parser_item $item) : midcom_db_person |
| 253 | 253 | { |
| 254 | 254 | // Try to figure out item author |
| 255 | - if ( $this->_feed->forceauthor |
|
| 255 | + if ($this->_feed->forceauthor |
|
| 256 | 256 | && $this->_feed->defaultauthor) { |
| 257 | 257 | // Feed has a "default author" set, use it |
| 258 | 258 | return new midcom_db_person($this->_feed->defaultauthor); |
| 259 | 259 | } |
| 260 | 260 | $author = $this->match_item_author($item); |
| 261 | 261 | $fallback_person_id = 1; |
| 262 | - if ( !$author |
|
| 262 | + if (!$author |
|
| 263 | 263 | || $author->id == $fallback_person_id) { |
| 264 | 264 | if ($this->_feed->defaultauthor) { |
| 265 | 265 | // Feed has a "default author" set, use it |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | } |
| 430 | 430 | } |
| 431 | 431 | |
| 432 | - if ( !empty($author_info['username']) |
|
| 432 | + if (!empty($author_info['username']) |
|
| 433 | 433 | && $person = midcom::get()->auth->get_user_by_name($author_info['username'])) { |
| 434 | 434 | return $person->get_storage(); |
| 435 | 435 | } |