@@ -90,7 +90,7 @@ |
||
90 | 90 | $data['query'] = new org_openpsa_reports_query_dba($args[0]); |
91 | 91 | $data['query']->require_do('midgard:update'); |
92 | 92 | } else { |
93 | - $data['query']= new org_openpsa_reports_query_dba(); |
|
93 | + $data['query'] = new org_openpsa_reports_query_dba(); |
|
94 | 94 | $data['query']->component = $this->_component; |
95 | 95 | } |
96 | 96 |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | $contacts = $importer->parse($input); |
152 | 152 | if (!empty($contacts)) { |
153 | 153 | $this->_request_data['import_status'] = $importer->import_subscribers($contacts, $this->_request_data['campaign']); |
154 | - if ( $this->_request_data['import_status']['subscribed_new'] > 0 |
|
154 | + if ($this->_request_data['import_status']['subscribed_new'] > 0 |
|
155 | 155 | || $this->_request_data['import_status']['already_subscribed'] > 0) { |
156 | 156 | $this->_import_success = true; |
157 | 157 | } |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | // Update the breadcrumb line |
190 | 190 | $this->_update_breadcrumb($handler_id, $guid); |
191 | 191 | |
192 | - if ( $request->request->has('org_openpsa_directmarketing_import') |
|
192 | + if ($request->request->has('org_openpsa_directmarketing_import') |
|
193 | 193 | && is_uploaded_file($_FILES['org_openpsa_directmarketing_import_upload']['tmp_name'])) { |
194 | 194 | $importer = new org_openpsa_directmarketing_importer_vcards($this->_schemadbs); |
195 | 195 | $this->_run_import($importer, $_FILES['org_openpsa_directmarketing_import_upload']['tmp_name']); |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | $read_rows = 0; |
245 | 245 | $handle = fopen($data['tmp_file'], 'r'); |
246 | 246 | $total_columns = 0; |
247 | - while ( $read_rows < 2 |
|
247 | + while ($read_rows < 2 |
|
248 | 248 | && $csv_line = fgetcsv($handle, 1000, $data['separator'])) { |
249 | 249 | if ($total_columns == 0) { |
250 | 250 | $total_columns = count($csv_line); |
@@ -59,7 +59,7 @@ |
||
59 | 59 | |
60 | 60 | public function __set($name, $value) |
61 | 61 | { |
62 | - if ( $name == 'homepage' |
|
62 | + if ($name == 'homepage' |
|
63 | 63 | && !empty($value) |
64 | 64 | && $value != $this->homepage) { |
65 | 65 | $this->_register_prober = true; |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | $this->content .= "{$this->abstract}\n"; |
135 | 135 | } |
136 | 136 | |
137 | - if (! $this->title) { |
|
137 | + if (!$this->title) { |
|
138 | 138 | $this->title = $this->document_url; |
139 | 139 | } |
140 | 140 | } |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | if (!empty($field->vars['value'])) { |
174 | 174 | //only index the first attachment for now |
175 | 175 | $attachment = array_shift($field->vars['value']); |
176 | - if ( !$attachment instanceof \midcom_db_attachment |
|
176 | + if (!$attachment instanceof \midcom_db_attachment |
|
177 | 177 | && !empty($attachment['object'])) { |
178 | 178 | //This is the form edit case |
179 | 179 | //@todo: In create case, nothing is found currently |
@@ -98,7 +98,7 @@ |
||
98 | 98 | |
99 | 99 | public function reverseTransform($array) |
100 | 100 | { |
101 | - if (!is_array($array) ) { |
|
101 | + if (!is_array($array)) { |
|
102 | 102 | throw new TransformationFailedException('Expected an array.'); |
103 | 103 | } |
104 | 104 |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | $password_length = mb_strlen($password); |
320 | 320 | |
321 | 321 | if ($password_length < $this->_config->get('min_password_length')) { |
322 | - if ($show_ui_message){ |
|
322 | + if ($show_ui_message) { |
|
323 | 323 | midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get('password too short'), 'error'); |
324 | 324 | } |
325 | 325 | return false; |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | } |
338 | 338 | |
339 | 339 | if ($score < $this->_config->get('min_password_score')) { |
340 | - if ($show_ui_message){ |
|
340 | + if ($show_ui_message) { |
|
341 | 341 | midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get('password weak'), 'error'); |
342 | 342 | } |
343 | 343 | return false; |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | $account = $this->get_account(); |
155 | 155 | if (!empty($new_password)) { |
156 | 156 | //check if the new encrypted password was already used |
157 | - if ( !$this->check_password_reuse($new_password, true) |
|
157 | + if (!$this->check_password_reuse($new_password, true) |
|
158 | 158 | || !$this->check_password_strength($new_password, true)) { |
159 | 159 | $this->errstr = "password strength too low"; |
160 | 160 | return false; |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | $password_length = mb_strlen($password); |
294 | 294 | |
295 | 295 | if ($password_length < $this->_config->get('min_password_length')) { |
296 | - if ($show_ui_message){ |
|
296 | + if ($show_ui_message) { |
|
297 | 297 | midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get('password too short'), 'error'); |
298 | 298 | } |
299 | 299 | return false; |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | } |
312 | 312 | |
313 | 313 | if ($score < $this->_config->get('min_password_score')) { |
314 | - if ($show_ui_message){ |
|
314 | + if ($show_ui_message) { |
|
315 | 315 | midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get('password weak'), 'error'); |
316 | 316 | } |
317 | 317 | return false; |
@@ -439,7 +439,7 @@ discard block |
||
439 | 439 | |
440 | 440 | public static function get_person_by_formdata(array $data) |
441 | 441 | { |
442 | - if ( empty($data['username']) |
|
442 | + if (empty($data['username']) |
|
443 | 443 | || empty($data['password'])) { |
444 | 444 | return false; |
445 | 445 | } |
@@ -471,7 +471,7 @@ discard block |
||
471 | 471 | $max_attempts = midcom_baseclasses_components_configuration::get($component, 'config')->get('max_password_attempts'); |
472 | 472 | $timeframe = midcom_baseclasses_components_configuration::get($component, 'config')->get('password_block_timeframe_min'); |
473 | 473 | |
474 | - if ( $max_attempts == 0 |
|
474 | + if ($max_attempts == 0 |
|
475 | 475 | || $timeframe == 0) { |
476 | 476 | return $stat; |
477 | 477 | } |
@@ -493,7 +493,7 @@ discard block |
||
493 | 493 | * If the maximum number of attempts is reached and the oldest attempt |
494 | 494 | * on the stack is within our defined timeframe, we block the account |
495 | 495 | */ |
496 | - if ( count($attempts) >= $max_attempts |
|
496 | + if (count($attempts) >= $max_attempts |
|
497 | 497 | && $attempts[$max_attempts - 1] >= (time() - ($timeframe * 60))) { |
498 | 498 | $this->disable_account(); |
499 | 499 | $stat = false; |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | |
240 | 240 | private function _convert_to_localdata() : string |
241 | 241 | { |
242 | - return "var " . $this->_grid->get_identifier() . '_entries = ' . json_encode($this->get_rows()) . ";\n"; |
|
242 | + return "var " . $this->_grid->get_identifier() . '_entries = ' . json_encode($this->get_rows()) . ";\n"; |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | private function _render_json() |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | $this->_sort_field = $query['sidx']; |
273 | 273 | $this->_sort_direction = strtoupper($query['sord']); |
274 | 274 | } |
275 | - if ( !empty($query['_search']) |
|
275 | + if (!empty($query['_search']) |
|
276 | 276 | && $query['_search'] === 'true') { |
277 | 277 | foreach ($query as $field => $value) { |
278 | 278 | if (in_array($field, ['_search', 'nd', 'page', 'rows', 'sidx', 'sord'])) { |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | |
298 | 298 | $this->_total_rows = $qb->count(); |
299 | 299 | |
300 | - if ( $this->_datatype == 'json' |
|
300 | + if ($this->_datatype == 'json' |
|
301 | 301 | && !empty($this->_results_per_page)) { |
302 | 302 | $qb->set_limit($this->_results_per_page); |
303 | 303 | if (!empty($this->_offset)) { |
@@ -143,7 +143,7 @@ |
||
143 | 143 | protected function save_attachment_list() : bool |
144 | 144 | { |
145 | 145 | if (!empty($this->config['widget_config']['sortable'])) { |
146 | - uasort($this->map, function ($a, $b) { |
|
146 | + uasort($this->map, function($a, $b) { |
|
147 | 147 | if ($a->metadata->score == $b->metadata->score) { |
148 | 148 | return strnatcasecmp($a->name, $b->name); |
149 | 149 | } |
@@ -40,7 +40,8 @@ discard block |
||
40 | 40 | foreach ($items as $identifier => $guid) { |
41 | 41 | try { |
42 | 42 | $results[$identifier] = new midcom_db_attachment($guid); |
43 | - } catch (midcom_error $e) { |
|
43 | + } |
|
44 | + catch (midcom_error $e) { |
|
44 | 45 | $e->log(); |
45 | 46 | } |
46 | 47 | } |
@@ -193,7 +194,8 @@ discard block |
||
193 | 194 | foreach (self::load_map($object, $field) as $identifier => $guid) { |
194 | 195 | try { |
195 | 196 | $attachments[$identifier] = midcom_db_attachment::get_cached($guid); |
196 | - } catch (midcom_error $e) { |
|
197 | + } |
|
198 | + catch (midcom_error $e) { |
|
197 | 199 | $e->log(); |
198 | 200 | } |
199 | 201 | } |
@@ -131,7 +131,8 @@ discard block |
||
131 | 131 | try { |
132 | 132 | $this->_backend->index($documents); |
133 | 133 | return true; |
134 | - } catch (Exception $e) { |
|
134 | + } |
|
135 | + catch (Exception $e) { |
|
135 | 136 | if ($batch) { |
136 | 137 | throw $e; |
137 | 138 | } |
@@ -160,7 +161,8 @@ discard block |
||
160 | 161 | try { |
161 | 162 | $this->_backend->delete($RIs); |
162 | 163 | return true; |
163 | - } catch (Exception $e) { |
|
164 | + } |
|
165 | + catch (Exception $e) { |
|
164 | 166 | debug_add("Deleting error: " . $e->getMessage(), MIDCOM_LOG_ERROR); |
165 | 167 | return false; |
166 | 168 | } |
@@ -182,7 +184,8 @@ discard block |
||
182 | 184 | try { |
183 | 185 | $this->_backend->delete_all($constraint); |
184 | 186 | return true; |
185 | - } catch (Exception $e) { |
|
187 | + } |
|
188 | + catch (Exception $e) { |
|
186 | 189 | debug_add("Deleting error: " . $e->getMessage(), MIDCOM_LOG_ERROR); |
187 | 190 | return false; |
188 | 191 | } |
@@ -216,7 +219,8 @@ discard block |
||
216 | 219 | |
217 | 220 | try { |
218 | 221 | $result_raw = $this->_backend->query($query, $filter, $options); |
219 | - } catch (Exception $e) { |
|
222 | + } |
|
223 | + catch (Exception $e) { |
|
220 | 224 | debug_add("Query error: " . $e->getMessage(), MIDCOM_LOG_ERROR); |
221 | 225 | return $result; |
222 | 226 | } |
@@ -237,7 +241,8 @@ discard block |
||
237 | 241 | if (!empty($document->topic_guid)) { |
238 | 242 | try { |
239 | 243 | midcom_db_topic::get_cached($document->topic_guid); |
240 | - } catch (midcom_error $e) { |
|
244 | + } |
|
245 | + catch (midcom_error $e) { |
|
241 | 246 | // Skip document, the object is hidden. |
242 | 247 | debug_add("Skipping the generic document {$document->title}, its topic seems to be invisible, we cannot proceed."); |
243 | 248 | continue; |
@@ -250,7 +255,8 @@ discard block |
||
250 | 255 | // Strip language code from end of RI if it looks like "<GUID>_<LANG>" |
251 | 256 | try { |
252 | 257 | midcom::get()->dbfactory->get_object_by_guid(preg_replace('/^([0-9a-f]{32,80})_[a-z]{2}$/', '\\1', $document->RI)); |
253 | - } catch (midcom_error $e) { |
|
258 | + } |
|
259 | + catch (midcom_error $e) { |
|
254 | 260 | // Skip document, the object is hidden, deleted or otherwise unavailable. |
255 | 261 | //@todo Maybe nonexistent objects should be removed from index? |
256 | 262 | continue; |