@@ -48,7 +48,8 @@ discard block |
||
48 | 48 | if ($sales_url) { |
49 | 49 | $entry['deliverable'] = '<a href="' . $sales_url . 'deliverable/' . $deliverable->guid . '/">' . $entry['deliverable'] . '</a>'; |
50 | 50 | } |
51 | - } catch (midcom_error $e) { |
|
51 | + } |
|
52 | + catch (midcom_error $e) { |
|
52 | 53 | $entry['deliverable'] = ''; |
53 | 54 | } |
54 | 55 | try { |
@@ -57,7 +58,8 @@ discard block |
||
57 | 58 | if ($projects_url) { |
58 | 59 | $entry['task'] = '<a href="' . $projects_url . 'task/' . $task->guid . '/">' . $entry['task'] . '</a>'; |
59 | 60 | } |
60 | - } catch (midcom_error $e) { |
|
61 | + } |
|
62 | + catch (midcom_error $e) { |
|
61 | 63 | $entry['task'] = ''; |
62 | 64 | } |
63 | 65 |
@@ -195,7 +195,8 @@ discard block |
||
195 | 195 | try { |
196 | 196 | $event = new org_openpsa_calendar_event_dba($member->event); |
197 | 197 | $set_as_modified = true; |
198 | - } catch (midcom_error $e) { |
|
198 | + } |
|
199 | + catch (midcom_error $e) { |
|
199 | 200 | debug_add("event_resource #{$member->id} links to bogus event #{$member->event}, skipping and removing", MIDCOM_LOG_WARN); |
200 | 201 | $member->delete(); |
201 | 202 | return; |
@@ -223,7 +224,8 @@ discard block |
||
223 | 224 | |
224 | 225 | try { |
225 | 226 | $event = new org_openpsa_calendar_event_dba($member->eid); |
226 | - } catch (midcom_error $e) { |
|
227 | + } |
|
228 | + catch (midcom_error $e) { |
|
227 | 229 | debug_add("eventmember #{$member->id} links to bogus event #{$member->eid}, skipping and removing", MIDCOM_LOG_WARN); |
228 | 230 | $member->delete(); |
229 | 231 | return; |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | } |
126 | 126 | // TODO: Shared tasks need a separate check (different member object) |
127 | 127 | |
128 | - if ( !empty($this->busy_members) |
|
128 | + if (!empty($this->busy_members) |
|
129 | 129 | || !empty($this->busy_resources)) { |
130 | 130 | //Unresolved conflicts (note return value is for conflicts not lack of them) |
131 | 131 | midcom::get()->auth->drop_sudo(); |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | } |
189 | 189 | |
190 | 190 | if (array_key_exists($member->event, $modified_events)) { |
191 | - $event =& $modified_events[$member->event]; |
|
191 | + $event = & $modified_events[$member->event]; |
|
192 | 192 | $set_as_modified = false; |
193 | 193 | } else { |
194 | 194 | try { |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | } |
203 | 203 | debug_add("overlap found in event {$event->title} (#{$event->id})"); |
204 | 204 | |
205 | - if ( $event->tentative |
|
205 | + if ($event->tentative |
|
206 | 206 | && $rob_tentative) { |
207 | 207 | debug_add('event is tentative, robbing resources'); |
208 | 208 | $event->resources = array_diff_key($event->resources, $this->_event->resources); |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | } |
230 | 230 | debug_add("overlap found in event {$event->title} (#{$event->id})"); |
231 | 231 | |
232 | - if ( $event->tentative |
|
232 | + if ($event->tentative |
|
233 | 233 | && $rob_tentative) { |
234 | 234 | debug_add('event is tentative, robbing participants'); |
235 | 235 | $event->participants = array_diff_key($event->participants, $this->_event->participants); |
@@ -37,7 +37,6 @@ |
||
37 | 37 | - 1: MIDCOM_PRIVILEGE_ALLOW |
38 | 38 | - 2: MIDCOM_PRIVILEGE_DENY |
39 | 39 | - 3: MIDCOM_PRIVILEGE_INHERIT |
40 | - |
|
41 | 40 | * @property string $guid |
42 | 41 | * @package midcom |
43 | 42 | */ |
@@ -124,7 +124,8 @@ |
||
124 | 124 | if ($this->__cached_object === null) { |
125 | 125 | try { |
126 | 126 | $this->__cached_object = midcom::get()->dbfactory->get_object_by_guid($this->objectguid); |
127 | - } catch (midcom_error $e) { |
|
127 | + } |
|
128 | + catch (midcom_error $e) { |
|
128 | 129 | return null; |
129 | 130 | } |
130 | 131 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | * The Default constructor creates an empty privilege, if you specify |
76 | 76 | * another privilege object in the constructor, a copy is constructed. |
77 | 77 | */ |
78 | - public function __construct(midcom_core_privilege_db|array|string $src = null) |
|
78 | + public function __construct(midcom_core_privilege_db | array | string $src = null) |
|
79 | 79 | { |
80 | 80 | if (is_array($src)) { |
81 | 81 | // Store given values to our privilege array |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | * - Any midcom_core_user or midcom_core_group object or subtype thereof. |
211 | 211 | * - Any string identifier which can be resolved using midcom_services_auth::get_assignee(). |
212 | 212 | */ |
213 | - public function set_assignee(midcom_core_group|midcom_core_user|string $assignee) : bool |
|
213 | + public function set_assignee(midcom_core_group | midcom_core_user | string $assignee) : bool |
|
214 | 214 | { |
215 | 215 | if (is_string($assignee)) { |
216 | 216 | if ($this->is_magic_assignee($assignee)) { |
@@ -266,12 +266,12 @@ discard block |
||
266 | 266 | } |
267 | 267 | } |
268 | 268 | |
269 | - if ( !$this->is_magic_assignee() |
|
269 | + if (!$this->is_magic_assignee() |
|
270 | 270 | && !$this->get_assignee()) { |
271 | 271 | debug_add("The assignee identifier '{$this->assignee}' is invalid.", MIDCOM_LOG_INFO); |
272 | 272 | return false; |
273 | 273 | } |
274 | - if ( $this->assignee == 'OWNER' |
|
274 | + if ($this->assignee == 'OWNER' |
|
275 | 275 | && $this->privilegename == 'midgard:owner') { |
276 | 276 | debug_add("Tried to assign midgard:owner to the OWNER magic assignee, this is invalid.", MIDCOM_LOG_INFO); |
277 | 277 | return false; |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | MIDCOM_LOG_INFO); |
284 | 284 | return false; |
285 | 285 | } |
286 | - if ( !$object->can_do('midgard:update') |
|
286 | + if (!$object->can_do('midgard:update') |
|
287 | 287 | || !$object->can_do('midgard:privileges')) { |
288 | 288 | debug_add("Insufficient privileges on the content object with the GUID '{$this->__guid}', midgard:update and midgard:privileges required.", |
289 | 289 | MIDCOM_LOG_INFO); |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | |
41 | 41 | public function purify_content(FormEvent $event) |
42 | 42 | { |
43 | - if ( isset($this->config['Cache']['SerializerPath']) |
|
43 | + if (isset($this->config['Cache']['SerializerPath']) |
|
44 | 44 | && !file_exists($this->config['Cache']['SerializerPath'])) { |
45 | 45 | mkdir($this->config['Cache']['SerializerPath']); |
46 | 46 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | |
55 | 55 | // Load custom element/attribute definitions |
56 | 56 | $definitions = $this->get_from_global_config('html_purify_HTMLDefinition'); |
57 | - if ( !empty($definitions) |
|
57 | + if (!empty($definitions) |
|
58 | 58 | && $def = $purifier_config->maybeGetRawHTMLDefinition()) { |
59 | 59 | if (!empty($definitions['addAttribute'])) { |
60 | 60 | foreach (array_filter((array) $definitions['addAttribute'], 'is_array') as $attrdef) { |
@@ -72,7 +72,8 @@ |
||
72 | 72 | $data = $event->getData(); |
73 | 73 | try { |
74 | 74 | $data = $purifier->purify($data); |
75 | - } catch (\Exception $e) { |
|
75 | + } |
|
76 | + catch (\Exception $e) { |
|
76 | 77 | debug_add("HTML Purifier failed: " . $e->getMessage(), MIDCOM_LOG_WARN); |
77 | 78 | } |
78 | 79 | $event->setData($data); |
@@ -85,7 +85,8 @@ discard block |
||
85 | 85 | |
86 | 86 | $this->clearcache(); |
87 | 87 | |
88 | - if ($file && $file['name'] === $name) { // file exists and check filename for item ID based filesystem |
|
88 | + if ($file && $file['name'] === $name) { |
|
89 | +// file exists and check filename for item ID based filesystem |
|
89 | 90 | if ($this->uploadOverwrite) { |
90 | 91 | if (!$file['write']) { |
91 | 92 | return $this->setError(elFinder::ERROR_PERM_DENIED); |
@@ -142,11 +143,13 @@ discard block |
||
142 | 143 | { |
143 | 144 | try { |
144 | 145 | return org_openpsa_documents_document_dba::get_cached($path); |
145 | - } catch (midcom_error $e) { |
|
146 | + } |
|
147 | + catch (midcom_error $e) { |
|
146 | 148 | $e->log(); |
147 | 149 | try { |
148 | 150 | return org_openpsa_documents_directory::get_cached($path); |
149 | - } catch (midcom_error $e) { |
|
151 | + } |
|
152 | + catch (midcom_error $e) { |
|
150 | 153 | $e->log(); |
151 | 154 | } |
152 | 155 | } |
@@ -282,7 +285,8 @@ discard block |
||
282 | 285 | $object = midcom::get()->dbfactory->get_object_by_guid($path); |
283 | 286 | try { |
284 | 287 | $parentdir = org_openpsa_documents_directory::get_cached($parent); |
285 | - } catch (midcom_error $e) { |
|
288 | + } |
|
289 | + catch (midcom_error $e) { |
|
286 | 290 | $e->log(); |
287 | 291 | return false; |
288 | 292 | } |
@@ -579,7 +583,8 @@ discard block |
||
579 | 583 | try { |
580 | 584 | $doc = new org_openpsa_documents_document_dba($path); |
581 | 585 | return $doc->delete(); |
582 | - } catch (midcom_error $e) { |
|
586 | + } |
|
587 | + catch (midcom_error $e) { |
|
583 | 588 | return false; |
584 | 589 | } |
585 | 590 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | return $this->setError(elFinder::ERROR_UPLOAD_FILE_MIME, '(' . $mime . ')'); |
68 | 68 | } |
69 | 69 | |
70 | - $tmpsize = (int)sprintf('%u', filesize($tmpname)); |
|
70 | + $tmpsize = (int) sprintf('%u', filesize($tmpname)); |
|
71 | 71 | if ($this->uploadMaxSize > 0 && $tmpsize > $this->uploadMaxSize) { |
72 | 72 | return $this->setError(elFinder::ERROR_UPLOAD_FILE_SIZE); |
73 | 73 | } |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | $output = [$object->get_label()]; |
251 | 251 | |
252 | 252 | $parent = $object->get_parent(); |
253 | - while ( $parent |
|
253 | + while ($parent |
|
254 | 254 | && $parent->component == 'org.openpsa.documents') { |
255 | 255 | $output[] = $parent->extra; |
256 | 256 | $parent = $parent->get_parent(); |
@@ -347,12 +347,12 @@ discard block |
||
347 | 347 | $data['mime'] = 'directory'; |
348 | 348 | } |
349 | 349 | |
350 | - if ( $owner |
|
350 | + if ($owner |
|
351 | 351 | && $group = midcom::get()->auth->get_assignee($owner)) { |
352 | 352 | $data['group'] = $group->name; |
353 | 353 | } |
354 | 354 | |
355 | - if ( $this->root !== $path |
|
355 | + if ($this->root !== $path |
|
356 | 356 | && $parent = $object->get_parent()) { |
357 | 357 | $data['phash'] = $this->encode($parent->guid); |
358 | 358 | } |
@@ -411,7 +411,7 @@ discard block |
||
411 | 411 | * @param string $mode open mode |
412 | 412 | * @return resource|false |
413 | 413 | */ |
414 | - protected function _fopen($path, $mode="rb") |
|
414 | + protected function _fopen($path, $mode = "rb") |
|
415 | 415 | { |
416 | 416 | $document = org_openpsa_documents_document_dba::get_cached($path); |
417 | 417 | $attachments = blobs::get_attachments($document, 'document'); |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | * @param string $path file path |
430 | 430 | * @return bool |
431 | 431 | */ |
432 | - protected function _fclose($fp, $path='') |
|
432 | + protected function _fclose($fp, $path = '') |
|
433 | 433 | { |
434 | 434 | fclose($fp); |
435 | 435 | return true; |
@@ -611,7 +611,7 @@ discard block |
||
611 | 611 | { |
612 | 612 | $filename = midcom_db_attachment::safe_filename($name); |
613 | 613 | $att = $doc->create_attachment($filename, $name, $mimetype); |
614 | - if ( !$att |
|
614 | + if (!$att |
|
615 | 615 | || !$att->copy_from_handle($fp)) { |
616 | 616 | return false; |
617 | 617 | } |
@@ -193,7 +193,8 @@ |
||
193 | 193 | |
194 | 194 | try { |
195 | 195 | $diff_fields = $rcs_handler->get_diff($prev_version, $this_version); |
196 | - } catch (midcom_error $e) { |
|
196 | + } |
|
197 | + catch (midcom_error $e) { |
|
197 | 198 | $e->log(); |
198 | 199 | return ''; |
199 | 200 | } |
@@ -28,7 +28,7 @@ |
||
28 | 28 | |
29 | 29 | public function _on_creating() : bool |
30 | 30 | { |
31 | - if ( $this->title == '' |
|
31 | + if ($this->title == '' |
|
32 | 32 | || !$this->topic) { |
33 | 33 | // We must have wikiword and topic at this stage |
34 | 34 | return false; |
@@ -23,7 +23,7 @@ |
||
23 | 23 | <th><?php echo $data['l10n']->get('type'); ?></th> |
24 | 24 | <?php |
25 | 25 | } ?> |
26 | -<?php if ( array_key_exists('invoiceable_filter', $query_data)) { |
|
26 | +<?php if (array_key_exists('invoiceable_filter', $query_data)) { |
|
27 | 27 | ?> |
28 | 28 | <th><?php echo midcom::get()->i18n->get_string('invoiceable', 'org.openpsa.projects'); ?></th> |
29 | 29 | <?php |
@@ -40,7 +40,7 @@ |
||
40 | 40 | $at_entries = $mc->get_related_objects(); |
41 | 41 | |
42 | 42 | if (empty($at_entries)) { |
43 | - if ( ( $this->_deliverable->continuous |
|
43 | + if (($this->_deliverable->continuous |
|
44 | 44 | || $this->_deliverable->end > time()) |
45 | 45 | && $this->_deliverable->state == org_openpsa_sales_salesproject_deliverable_dba::STATE_STARTED) { |
46 | 46 | $schema->get_field('next_cycle')['hidden'] = false; |
@@ -30,7 +30,7 @@ |
||
30 | 30 | return null; |
31 | 31 | } |
32 | 32 | |
33 | - if (! $input instanceof midcom_db_attachment) { |
|
33 | + if (!$input instanceof midcom_db_attachment) { |
|
34 | 34 | throw new UnexpectedTypeException($input, midcom_db_attachment::class); |
35 | 35 | } |
36 | 36 |