@@ -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; |
@@ -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; |
@@ -409,7 +409,8 @@ |
||
| 409 | 409 | //Get the parent object |
| 410 | 410 | try { |
| 411 | 411 | $parent = midcom::get()->dbfactory->get_object_by_guid($this->objectguid); |
| 412 | - } catch (midcom_error $e) { |
|
| 412 | + } |
|
| 413 | + catch (midcom_error $e) { |
|
| 413 | 414 | $e->log(); |
| 414 | 415 | return; |
| 415 | 416 | } |
@@ -218,8 +218,8 @@ discard block |
||
| 218 | 218 | { |
| 219 | 219 | $config = midcom_baseclasses_components_configuration::get('net.nehmer.comments', 'config'); |
| 220 | 220 | |
| 221 | - if ( $config->get('ratings_enable') |
|
| 222 | - && ( $config->get('ratings_cache_to_object') |
|
| 221 | + if ($config->get('ratings_enable') |
|
| 222 | + && ($config->get('ratings_cache_to_object') |
|
| 223 | 223 | || $config->get('comment_count_cache_to_object'))) { |
| 224 | 224 | // Handle ratings |
| 225 | 225 | $comments = self::list_by_objectguid($this->objectguid); |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | |
| 269 | 269 | private function _send_notifications() |
| 270 | 270 | { |
| 271 | - if ( empty($this->title) |
|
| 271 | + if (empty($this->title) |
|
| 272 | 272 | && empty($this->content)) { |
| 273 | 273 | // No need to send notifications about empty rating entries |
| 274 | 274 | return; |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | net_nemein_rss_manage::add_toolbar_buttons($this->_node_toolbar, $this->_topic->can_do('midgard:create')); |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - if ( $this->_topic->can_do('midgard:update') |
|
| 87 | + if ($this->_topic->can_do('midgard:update') |
|
| 88 | 88 | && $this->_topic->can_do('midcom:component_config')) { |
| 89 | 89 | $buttons[] = $workflow->get_button('config/', [ |
| 90 | 90 | MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'), |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $this->_request_data['categories'] = explode(',', $this->_config->get('categories')); |
| 115 | 115 | |
| 116 | 116 | foreach ($this->_request_data['schemadb']->all() as $schema) { |
| 117 | - if ( $schema->has_field('categories') |
|
| 117 | + if ($schema->has_field('categories') |
|
| 118 | 118 | && $schema->get_field('categories')['type'] == 'select') { |
| 119 | 119 | // TODO: Merge schema local and component config categories? |
| 120 | 120 | $options = array_combine($this->_request_data['categories'], $this->_request_data['categories']); |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | public static function get_by_object(org_openpsa_invoices_interfaces_customer $object) : self |
| 62 | 62 | { |
| 63 | 63 | if ( !($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer)) |
| 64 | - // check if the customerContact is set and has invoice_data |
|
| 64 | + // check if the customerContact is set and has invoice_data |
|
| 65 | 65 | && !($bd = self::get_billing_data(org_openpsa_contacts_person_dba::class, $object->customerContact))) { |
| 66 | 66 | $bd = new self(); |
| 67 | 67 | $due = midcom_baseclasses_components_configuration::get('org.openpsa.invoices', 'config')->get('default_due_days'); |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | */ |
| 61 | 61 | public static function get_by_object(org_openpsa_invoices_interfaces_customer $object) : self |
| 62 | 62 | { |
| 63 | - if ( !($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer)) |
|
| 63 | + if (!($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer)) |
|
| 64 | 64 | // check if the customerContact is set and has invoice_data |
| 65 | 65 | && !($bd = self::get_billing_data(org_openpsa_contacts_person_dba::class, $object->customerContact))) { |
| 66 | 66 | $bd = new self(); |
@@ -96,7 +96,8 @@ discard block |
||
| 96 | 96 | // if the property useContactAddress is set |
| 97 | 97 | $billing_data[0]->set_address(); |
| 98 | 98 | return $billing_data[0]; |
| 99 | - } catch (midcom_error $e) { |
|
| 99 | + } |
|
| 100 | + catch (midcom_error $e) { |
|
| 100 | 101 | $e->log(); |
| 101 | 102 | return null; |
| 102 | 103 | } |
@@ -141,10 +142,12 @@ discard block |
||
| 141 | 142 | { |
| 142 | 143 | try { |
| 143 | 144 | return new org_openpsa_contacts_person_dba($this->linkGuid); |
| 144 | - } catch (midcom_error $e) { |
|
| 145 | + } |
|
| 146 | + catch (midcom_error $e) { |
|
| 145 | 147 | try { |
| 146 | 148 | return new org_openpsa_contacts_group_dba($this->linkGuid); |
| 147 | - } catch (midcom_error $e) { |
|
| 149 | + } |
|
| 150 | + catch (midcom_error $e) { |
|
| 148 | 151 | debug_add("Failed to load contact with GUID: " . $this->linkGuid . " - last error:" . $e->getMessage(), MIDCOM_LOG_ERROR); |
| 149 | 152 | return false; |
| 150 | 153 | } |
@@ -197,7 +197,8 @@ |
||
| 197 | 197 | if ($this->_response === null) { |
| 198 | 198 | $this->_stop('Could not handle request, unknown method', 405); |
| 199 | 199 | } |
| 200 | - } catch (midcom_error $e) { |
|
| 200 | + } |
|
| 201 | + catch (midcom_error $e) { |
|
| 201 | 202 | $this->_responseStatus = $e->getCode(); |
| 202 | 203 | return $this->_send_response($e->getMessage()); |
| 203 | 204 | } |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | |
| 27 | 27 | private function load_controller() : controller |
| 28 | 28 | { |
| 29 | - if ( $this->_config->get('simple_name_handling') |
|
| 29 | + if ($this->_config->get('simple_name_handling') |
|
| 30 | 30 | && !midcom::get()->auth->admin) { |
| 31 | 31 | foreach ($this->_request_data['schemadb']->all() as $schema) { |
| 32 | 32 | $schema->get_field('name')['readonly'] = true; |