@@ -50,9 +50,11 @@ |
||
50 | 50 | $filepath = $this->generate_filename(); |
51 | 51 | try { |
52 | 52 | $this->exec('co -q -f -r' . escapeshellarg(trim($revision)) . " {$filepath} 2>/dev/null"); |
53 | - } catch (midcom_error $e) { |
|
53 | + } |
|
54 | + catch (midcom_error $e) { |
|
54 | 55 | $e->log(); |
55 | - } finally { |
|
56 | + } |
|
57 | + finally { |
|
56 | 58 | if (!file_exists($filepath)) { |
57 | 59 | return []; |
58 | 60 | } |
@@ -91,7 +91,7 @@ |
||
91 | 91 | $revisions[$history['revision']] = $history; |
92 | 92 | |
93 | 93 | $i += 3; |
94 | - while ( $i < $total |
|
94 | + while ($i < $total |
|
95 | 95 | && !str_starts_with($lines[$i], '----') |
96 | 96 | && !str_starts_with($lines[$i], '=====')) { |
97 | 97 | $i++; |
@@ -55,7 +55,8 @@ |
||
55 | 55 | { |
56 | 56 | try { |
57 | 57 | return eval("return [{$data}\n];"); |
58 | - } catch (ParseError $e) { |
|
58 | + } |
|
59 | + catch (ParseError $e) { |
|
59 | 60 | throw new midcom_error('Failed to parse config data: ' . $e->getMessage() . ' in ' . $path . ' line ' . $e->getLine()); |
60 | 61 | } |
61 | 62 | } |
@@ -43,11 +43,11 @@ |
||
43 | 43 | public function buildForm(FormBuilderInterface $builder, array $options) |
44 | 44 | { |
45 | 45 | $session_key = md5($builder->getForm()->getName() . '_session_key'); |
46 | - $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($session_key) { |
|
46 | + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($session_key) { |
|
47 | 47 | $value = $event->getForm()->getData(); |
48 | 48 | $session = new midcom_services_session('midcom_datamanager_captcha'); |
49 | 49 | |
50 | - if ( !$session->exists($session_key) |
|
50 | + if (!$session->exists($session_key) |
|
51 | 51 | || $value != $session->get($session_key)) { |
52 | 52 | $event->getForm()->addError(new FormError($this->l10n->get('captcha validation failed'))); |
53 | 53 | } |
@@ -65,7 +65,7 @@ |
||
65 | 65 | $view->vars['readonly'] = $options['readonly']; |
66 | 66 | |
67 | 67 | if ($options['write_privilege'] !== null) { |
68 | - if ( array_key_exists('group', $options['write_privilege']) |
|
68 | + if (array_key_exists('group', $options['write_privilege']) |
|
69 | 69 | && !$this->auth->is_group_member($options['write_privilege']['group'])) { |
70 | 70 | $view->vars['readonly'] = true; |
71 | 71 | } |
@@ -82,7 +82,7 @@ |
||
82 | 82 | |
83 | 83 | // Handle automatic wildcards |
84 | 84 | $auto_wildcards = $this->_config->get('auto_wildcards'); |
85 | - if ( $auto_wildcards |
|
85 | + if ($auto_wildcards |
|
86 | 86 | && !str_contains($this->_query_string_processed, '%')) { |
87 | 87 | switch ($auto_wildcards) { |
88 | 88 | case 'both': |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | } |
46 | 46 | $recipient = $_ENV["RECIPIENT"]; |
47 | 47 | $token_length = strlen($recipient) - strlen($prefix) - strlen($suffix); |
48 | -if ( $token_length <= 0 |
|
48 | +if ($token_length <= 0 |
|
49 | 49 | || !str_starts_with($recipient, $prefix) |
50 | 50 | || !str_ends_with($recipient, $suffix)) { |
51 | 51 | error_log("Recipient address does not match address template: $recipient"); |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | fclose($fh); |
62 | 62 | exit(0); |
63 | 63 | } |
64 | -} elseif ( str_starts_with($BOUNCE_LOGGER, "http://") |
|
64 | +} elseif (str_starts_with($BOUNCE_LOGGER, "http://") |
|
65 | 65 | || str_starts_with($BOUNCE_LOGGER, "https://")) { |
66 | 66 | $client = new org_openpsa_httplib(); |
67 | 67 | $client->post($BOUNCE_LOGGER, ["token" => $token]); |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | $url = $this->context->get_key(MIDCOM_CONTEXT_URI); |
47 | 47 | |
48 | 48 | $prefix_length = strlen(midcom_connection::get_url('prefix')); |
49 | - if ( $prefix_length > 1 |
|
49 | + if ($prefix_length > 1 |
|
50 | 50 | && str_starts_with($url, midcom_connection::get_url('prefix'))) { |
51 | 51 | $url = substr($url, $prefix_length); |
52 | 52 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | */ |
72 | 72 | public function find_urlmethod() : ?string |
73 | 73 | { |
74 | - if ( empty($this->argv) |
|
74 | + if (empty($this->argv) |
|
75 | 75 | || !str_starts_with($this->argv[0], 'midcom-')) { |
76 | 76 | return null; |
77 | 77 | } |
@@ -47,7 +47,7 @@ |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | $result = []; |
50 | - if ( !empty($array['file']) |
|
50 | + if (!empty($array['file']) |
|
51 | 51 | || !empty($array['identifier']) && str_starts_with($array['identifier'], 'tmpfile-')) { |
52 | 52 | $result['file'] = parent::reverseTransform($array); |
53 | 53 | } elseif (!empty($array['objects'])) { |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $qb = new midcom_core_querybuilder($midcom_dba_classname); |
34 | 34 | $qb->add_constraint('metadata.revised', '>=', $since); |
35 | 35 | |
36 | - if ( $only_mine |
|
36 | + if ($only_mine |
|
37 | 37 | && midcom::get()->auth->user) { |
38 | 38 | $qb->add_constraint('metadata.authors', 'LIKE', '|' . midcom::get()->auth->user->guid . '|'); |
39 | 39 | } |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | continue; |
199 | 199 | } |
200 | 200 | |
201 | - if ( $object->can_do('midgard:update') |
|
201 | + if ($object->can_do('midgard:update') |
|
202 | 202 | && $object->can_do('midcom:approve')) { |
203 | 203 | $object->metadata->approve(); |
204 | 204 | midcom::get()->uimessages->add($this->_l10n->get('midgard.admin.asgard'), sprintf($this->_l10n->get('object %s approved'), $object->guid)); |
@@ -112,7 +112,8 @@ discard block |
||
112 | 112 | $row['approved'] = $object->is_approved() ? $object->metadata->approved : ''; |
113 | 113 | try { |
114 | 114 | $row['index_title'] = $reflector->get_object_label($object) ?: '[' . $this->_l10n->get('no title') . ']'; |
115 | - } catch (Exception $e) { |
|
115 | + } |
|
116 | + catch (Exception $e) { |
|
116 | 117 | $row['index_title'] = 'ERROR: ' . $e->getMessage(); |
117 | 118 | } |
118 | 119 | $link = $this->router->generate('object_' . $this->_request_data['default_mode'], ['guid' => $object->guid]); |
@@ -177,7 +178,8 @@ discard block |
||
177 | 178 | foreach ($guids as $guid) { |
178 | 179 | try { |
179 | 180 | $object = midcom::get()->dbfactory->get_object_by_guid($guid); |
180 | - } catch (midcom_error $e) { |
|
181 | + } |
|
182 | + catch (midcom_error $e) { |
|
181 | 183 | continue; |
182 | 184 | } |
183 | 185 | |
@@ -192,7 +194,8 @@ discard block |
||
192 | 194 | foreach ($guids as $guid) { |
193 | 195 | try { |
194 | 196 | $object = midcom::get()->dbfactory->get_object_by_guid($guid); |
195 | - } catch (midcom_error $e) { |
|
197 | + } |
|
198 | + catch (midcom_error $e) { |
|
196 | 199 | continue; |
197 | 200 | } |
198 | 201 |