@@ -98,13 +98,13 @@ discard block |
||
98 | 98 | } |
99 | 99 | |
100 | 100 | $mimetype = $request->request->get('midgard_admin_asgard_mimetype'); |
101 | - if ( !empty($mimetype) |
|
101 | + if (!empty($mimetype) |
|
102 | 102 | && $local_file->mimetype != $mimetype) { |
103 | 103 | $local_file->mimetype = $mimetype; |
104 | 104 | $needs_update = true; |
105 | 105 | } |
106 | 106 | |
107 | - if ( $needs_update |
|
107 | + if ($needs_update |
|
108 | 108 | && !$local_file->update()) { |
109 | 109 | return null; |
110 | 110 | } |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | $this->bind_view_to_object($this->_file); |
235 | 235 | |
236 | 236 | $filename = $this->_process_form($request); |
237 | - if ( $filename |
|
237 | + if ($filename |
|
238 | 238 | && $filename != $data['filename']) { |
239 | 239 | return $this->relocate_to_file($filename); |
240 | 240 | } |
@@ -48,7 +48,8 @@ discard block |
||
48 | 48 | |
49 | 49 | try { |
50 | 50 | $folder = midcom_db_topic::get_cached($this->topic); |
51 | - } catch (midcom_error $e) { |
|
51 | + } |
|
52 | + catch (midcom_error $e) { |
|
52 | 53 | $e->log(); |
53 | 54 | } |
54 | 55 | $folder->delete_attachment(self::FOLDER_THUMBNAIL); |
@@ -58,7 +59,8 @@ discard block |
||
58 | 59 | { |
59 | 60 | try { |
60 | 61 | return new midcom_db_attachment($this->$type); |
61 | - } catch (midcom_error $e) { |
|
62 | + } |
|
63 | + catch (midcom_error $e) { |
|
62 | 64 | $e->log(); |
63 | 65 | return null; |
64 | 66 | } |
@@ -104,7 +104,8 @@ |
||
104 | 104 | { |
105 | 105 | $ret = ['org_openpsa_relatedto' => []]; |
106 | 106 | foreach ($array as $rel) { |
107 | - if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) { //Matches also 'org_openpsa_relatedto' |
|
107 | + if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) { |
|
108 | +//Matches also 'org_openpsa_relatedto' |
|
108 | 109 | //Wrong type of object found in array, cruelly abort the whole procedure |
109 | 110 | return null; |
110 | 111 | } |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | } |
189 | 189 | |
190 | 190 | // Override requested root object properties |
191 | - if ( !empty($this->target->guid) |
|
191 | + if (!empty($this->target->guid) |
|
192 | 192 | && $target->guid === $this->target->guid) { |
193 | 193 | foreach ($this->root_object_values as $name => $value) { |
194 | 194 | $target->$name = $value; |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | { |
242 | 242 | if ($this->$type) { |
243 | 243 | $method = 'copy_' . $type; |
244 | - if ( !$this->$method($source, $target) |
|
244 | + if (!$this->$method($source, $target) |
|
245 | 245 | && $this->halt_on_errors) { |
246 | 246 | $this->errors[] = $this->_l10n->get('failed to copy ' . $type); |
247 | 247 | return false; |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | return false; |
58 | 58 | } |
59 | 59 | |
60 | - if ( !$this->can_do('midgard:update') |
|
60 | + if (!$this->can_do('midgard:update') |
|
61 | 61 | || !$this->can_do('midgard:attachments')) { |
62 | 62 | debug_add("Failed to set parameters, midgard:update or midgard:attachments on the " . get_class($this) . " {$this->guid} not granted for the current user.", |
63 | 63 | MIDCOM_LOG_ERROR); |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | return null; |
78 | 78 | } |
79 | 79 | |
80 | - if ( !$this->can_do('midgard:update') |
|
80 | + if (!$this->can_do('midgard:update') |
|
81 | 81 | || !$this->can_do('midgard:attachments')) { |
82 | 82 | debug_add("Failed to set parameters, midgard:update or midgard:attachments on the " . get_class($this) . " {$this->guid} not granted for the current user.", |
83 | 83 | MIDCOM_LOG_ERROR); |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | $attachment->parentguid = $this->guid; |
92 | 92 | |
93 | 93 | if (!$attachment->create()) { |
94 | - debug_add("Could not create the attachment '{$name}' for " . get_class($this) . " {$this->guid}: " . midcom_connection::get_error_string(), |
|
94 | + debug_add("Could not create the attachment '{$name}' for " . get_class($this) . " {$this->guid}: " . midcom_connection::get_error_string(), |
|
95 | 95 | MIDCOM_LOG_INFO); |
96 | 96 | return null; |
97 | 97 | } |
@@ -115,7 +115,7 @@ |
||
115 | 115 | if ($counter <= $this->_offset) { |
116 | 116 | continue; |
117 | 117 | } |
118 | - if ( $this->_limit |
|
118 | + if ($this->_limit |
|
119 | 119 | && $counter > ($this->_offset + $this->_limit)) { |
120 | 120 | break; |
121 | 121 | } |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | $this->_user_id = midcom::get()->auth->acl->get_user_id(); |
141 | 141 | } |
142 | 142 | |
143 | - if ( $this->hide_invisible |
|
143 | + if ($this->hide_invisible |
|
144 | 144 | && !$this->_visibility_checks_added) { |
145 | 145 | if (!midcom::get()->config->get('show_hidden_objects')) { |
146 | 146 | $this->add_constraint('metadata.hidden', '=', false); |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | // Deal with empty arrays, which would produce invalid queries |
201 | 201 | // This is done here to avoid repetitive code in callers, and because |
202 | 202 | // it's easy enough to generalize: IN empty set => always false, NOT IN empty set => always true |
203 | - if ( is_array($value) |
|
203 | + if (is_array($value) |
|
204 | 204 | && empty($value)) { |
205 | 205 | if ($operator == 'NOT IN') { |
206 | 206 | return true; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | } |
95 | 95 | $this->set_object($id); |
96 | 96 | } else { |
97 | - if ( is_int($id) |
|
97 | + if (is_int($id) |
|
98 | 98 | && $id < 1) { |
99 | 99 | throw new midcom_error($id . ' is not a valid database ID'); |
100 | 100 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | } |
109 | 109 | |
110 | 110 | //Some useful information for performance tuning |
111 | - if ( midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG |
|
111 | + if (midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG |
|
112 | 112 | && $this->__object->guid) { |
113 | 113 | static $guids = []; |
114 | 114 | static $total = 0; |
@@ -102,7 +102,8 @@ |
||
102 | 102 | try { |
103 | 103 | $mgdschemaclass = $this->__mgdschema_class_name__; |
104 | 104 | $this->set_object(new $mgdschemaclass($id)); |
105 | - } catch (mgd_exception $e) { |
|
105 | + } |
|
106 | + catch (mgd_exception $e) { |
|
106 | 107 | debug_add('Constructing ' . $this->__mgdschema_class_name__ . ' object ' . $id . ' failed, reason: ' . $e->getMessage(), MIDCOM_LOG_WARN); |
107 | 108 | throw new midcom_error_midgard($e, $id); |
108 | 109 | } |
@@ -405,7 +405,7 @@ |
||
405 | 405 | { |
406 | 406 | // Complete fields |
407 | 407 | $this->indexed = time(); |
408 | - if ( $this->author == '' |
|
408 | + if ($this->author == '' |
|
409 | 409 | && isset($this->creator->name)) { |
410 | 410 | $this->author = $this->creator->name; |
411 | 411 | } |
@@ -579,7 +579,8 @@ |
||
579 | 579 | { |
580 | 580 | try { |
581 | 581 | return midcom_db_person::get_cached($guid); |
582 | - } catch (midcom_error $e) { |
|
582 | + } |
|
583 | + catch (midcom_error $e) { |
|
583 | 584 | return null; |
584 | 585 | } |
585 | 586 | } |