@@ -55,11 +55,11 @@ |
||
55 | 55 | foreach (array_filter($csv_line) as $field => $value) { |
56 | 56 | // Process the row accordingly |
57 | 57 | $field_matching = $this->_settings['fields'][$field]; |
58 | - if ( $field_matching |
|
58 | + if ($field_matching |
|
59 | 59 | && strstr($field_matching, ':')) { |
60 | 60 | [$schemadb, $schema_field] = explode(':', $field_matching); |
61 | 61 | |
62 | - if ( !array_key_exists($schemadb, $this->_schemadbs) |
|
62 | + if (!array_key_exists($schemadb, $this->_schemadbs) |
|
63 | 63 | || !$this->_schemadbs[$schemadb]->get('default')->has_field($schema_field)) { |
64 | 64 | // Invalid matching, skip |
65 | 65 | continue; |
@@ -386,7 +386,8 @@ |
||
386 | 386 | debug_add("EXIF information missing or without orientation tag. Skipping.", MIDCOM_LOG_INFO); |
387 | 387 | return; |
388 | 388 | } |
389 | - } catch (Exception $e) { |
|
389 | + } |
|
390 | + catch (Exception $e) { |
|
390 | 391 | debug_add("Could not read EXIF data: " . $e->getMessage() . ", skipping.", MIDCOM_LOG_WARN); |
391 | 392 | return; |
392 | 393 | } |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | $tmpfile = null; |
342 | 342 | $imagesize = getimagesize($this->_filename); |
343 | 343 | |
344 | - if ( $imagesize[2] == IMAGETYPE_JPEG |
|
344 | + if ($imagesize[2] == IMAGETYPE_JPEG |
|
345 | 345 | && $this->_jpegtran_available()) { |
346 | 346 | /* jpegtran */ |
347 | 347 | $operations = [ |
@@ -409,7 +409,7 @@ discard block |
||
409 | 409 | $imagesize = getimagesize($this->_filename); |
410 | 410 | |
411 | 411 | // Try lossless jpegtran rotation if possible |
412 | - if ( $imagesize[2] == IMAGETYPE_JPEG |
|
412 | + if ($imagesize[2] == IMAGETYPE_JPEG |
|
413 | 413 | && ($rotate % 90 == 0) |
414 | 414 | && $this->_jpegtran_available()) { |
415 | 415 | $tmpfile = $this->_get_tempfile(); |
@@ -539,7 +539,7 @@ discard block |
||
539 | 539 | */ |
540 | 540 | public function fill($x = null, $y = null, $color = null, string $gravity = 'center') |
541 | 541 | { |
542 | - if ( empty($x) |
|
542 | + if (empty($x) |
|
543 | 543 | || empty($y) |
544 | 544 | || empty($color)) { |
545 | 545 | //This is a bit silly, but here for backwards compatibility... |
@@ -64,7 +64,8 @@ |
||
64 | 64 | try { |
65 | 65 | $backend->update($message); |
66 | 66 | return true; |
67 | - } catch (midcom_error $e) { |
|
67 | + } |
|
68 | + catch (midcom_error $e) { |
|
68 | 69 | debug_add('RCS: Could not save file!'); |
69 | 70 | $e->log(); |
70 | 71 | return false; |
@@ -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 | } |
@@ -88,9 +88,9 @@ discard block |
||
88 | 88 | |
89 | 89 | while ($bt) { |
90 | 90 | $caller = array_shift($bt); |
91 | - if ( !array_key_exists('class', $caller) |
|
91 | + if (!array_key_exists('class', $caller) |
|
92 | 92 | || $caller['class'] != midcom_debug::class) { |
93 | - if ( !array_key_exists('function', $bt[0]) |
|
93 | + if (!array_key_exists('function', $bt[0]) |
|
94 | 94 | || $bt[0]['function'] != 'require') { |
95 | 95 | $caller = array_shift($bt); |
96 | 96 | } |
@@ -102,11 +102,11 @@ discard block |
||
102 | 102 | if (array_key_exists('class', $caller)) { |
103 | 103 | $record['extra']['caller'] .= $caller['class'] . '::'; |
104 | 104 | } |
105 | - if ( array_key_exists('function', $caller) |
|
105 | + if (array_key_exists('function', $caller) |
|
106 | 106 | && !str_starts_with($caller['function'], 'debug_')) { |
107 | 107 | $record['extra']['caller'] .= $caller['function']; |
108 | 108 | } else { |
109 | - $record['extra']['caller'] .= $caller['file'] . ' (' . $caller['line']. ')'; |
|
109 | + $record['extra']['caller'] .= $caller['file'] . ' (' . $caller['line'] . ')'; |
|
110 | 110 | } |
111 | 111 | return $record; |
112 | 112 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | */ |
28 | 28 | public function setTargetUrl($url) |
29 | 29 | { |
30 | - if ( !str_starts_with($url, "/") |
|
30 | + if (!str_starts_with($url, "/") |
|
31 | 31 | && !preg_match('|^https?://|', $url)) { |
32 | 32 | $prefix = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX); |
33 | 33 | if ($prefix == '') { |