@@ -34,7 +34,7 @@ |
||
34 | 34 | <div class="value"><?php echo $formatter->date($invoice->deliverydate); ?></div></div> |
35 | 35 | <?php } ?> |
36 | 36 | |
37 | - <div class="field"><div class="title"><?php echo $data['l10n_midcom']->get('description');?>: </div> |
|
37 | + <div class="field"><div class="title"><?php echo $data['l10n_midcom']->get('description'); ?>: </div> |
|
38 | 38 | <div class="description value">&(view['description']:h);</div></div> |
39 | 39 | |
40 | 40 | <?php |
@@ -46,7 +46,7 @@ |
||
46 | 46 | <?php |
47 | 47 | //index is needed for sorting |
48 | 48 | echo "'index_name',"; |
49 | - echo "'" . $data['l10n']->get('entry title') ."',"; |
|
49 | + echo "'" . $data['l10n']->get('entry title') . "',"; |
|
50 | 50 | echo "'" . $data['l10n']->get('entry text') . "',"; |
51 | 51 | echo "'" . $data['l10n']->get('entry created') . "',"; |
52 | 52 | echo "'index_creator', '" . $data['l10n_midcom']->get('creator') . "',"; |
@@ -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 | } |
@@ -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; |
@@ -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 | } |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | $dup = $this->check_duplicate($results, $result, $conf['duplicate_check']); |
89 | 89 | |
90 | 90 | if ($dup !== true) { |
91 | - if ( !is_object($dup) |
|
91 | + if (!is_object($dup) |
|
92 | 92 | || !array_key_exists($dup->id, $todelete)) { |
93 | 93 | $todelete[$result->id] = $result; |
94 | 94 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | } |
98 | 98 | } |
99 | 99 | } |
100 | - if ( $needs_update |
|
100 | + if ($needs_update |
|
101 | 101 | && !$result->update()) { |
102 | 102 | throw new midcom_error("Failed to update {$classname} #{$result->id}, errstr: " . midcom_connection::get_error_string()); |
103 | 103 | } |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | } |
146 | 146 | |
147 | 147 | foreach ($results as $result) { |
148 | - if ( $result->$field === $object->$field |
|
148 | + if ($result->$field === $object->$field |
|
149 | 149 | && $result->id !== $object->id) { |
150 | 150 | return $result; |
151 | 151 | } |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | $changed = false; |
164 | 164 | foreach ($person2 as $property => $value) { |
165 | 165 | // Copy only simple properties not marked to be skipped missing from person1 |
166 | - if ( !empty($person2->$property) |
|
166 | + if (!empty($person2->$property) |
|
167 | 167 | && empty($person1->$property) |
168 | 168 | && !isset($skip_properties[$property]) |
169 | 169 | && is_scalar($value)) { |
@@ -28,7 +28,7 @@ |
||
28 | 28 | |
29 | 29 | public function is_readable_by(string $user_id) : bool |
30 | 30 | { |
31 | - return ( empty($this->object) |
|
31 | + return (empty($this->object) |
|
32 | 32 | || !$this->guid |
33 | 33 | || !$user_id |
34 | 34 | || midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->guid, $this->object->__midcom_class_name__, $user_id)); |
@@ -28,7 +28,7 @@ |
||
28 | 28 | |
29 | 29 | public function is_readable_by(string $user_id) : bool |
30 | 30 | { |
31 | - return ( !$user_id |
|
31 | + return (!$user_id |
|
32 | 32 | || !$this->guid |
33 | 33 | || midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->guid, midcom_db_topic::class, $user_id)); |
34 | 34 | } |
@@ -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; |