@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | public function _on_creating() |
| 42 | 42 | { |
| 43 | - return ( $this->validate_tag($this->tag) |
|
| 43 | + return ($this->validate_tag($this->tag) |
|
| 44 | 44 | && $this->_check_duplicates() == 0); |
| 45 | 45 | } |
| 46 | 46 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | public function _on_updating() |
| 71 | 71 | { |
| 72 | - return ( $this->validate_tag($this->tag) |
|
| 72 | + return ($this->validate_tag($this->tag) |
|
| 73 | 73 | && $this->_check_duplicates() == 0); |
| 74 | 74 | } |
| 75 | 75 | |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | */ |
| 280 | 280 | private function add_misc_rule(array $rule, string $class, string $person_property) : bool |
| 281 | 281 | { |
| 282 | - $persons = [ 0 => -1]; |
|
| 282 | + $persons = [0 => -1]; |
|
| 283 | 283 | $match = $rule['match']; |
| 284 | 284 | $constraint_match = "IN"; |
| 285 | 285 | if ($rule['match'] == '<>') { |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | $ret = []; |
| 352 | 352 | |
| 353 | 353 | foreach ($object->get_properties() as $property) { |
| 354 | - if ( $property[0] == '_' |
|
| 354 | + if ($property[0] == '_' |
|
| 355 | 355 | || in_array($property, $skip_properties)) { |
| 356 | 356 | // Skip private or otherwise invalid properties |
| 357 | 357 | continue; |
@@ -50,12 +50,12 @@ |
||
| 50 | 50 | */ |
| 51 | 51 | public static function compile(string $content) : string |
| 52 | 52 | { |
| 53 | - return preg_replace_callback("%&\(([^)]*)\);%i", function ($variable) |
|
| 53 | + return preg_replace_callback("%&\(([^)]*)\);%i", function($variable) |
|
| 54 | 54 | { |
| 55 | 55 | $parts = explode(':', $variable[1]); |
| 56 | 56 | $variable = '$' . str_replace('.', '->', $parts[0]); |
| 57 | 57 | |
| 58 | - if ( isset($parts[1]) |
|
| 58 | + if (isset($parts[1]) |
|
| 59 | 59 | && array_key_exists($parts[1], self::$_filters)) { |
| 60 | 60 | if ($parts[1] == 'p') { |
| 61 | 61 | $command = 'eval(\'?>\' . ' . $variable . ')'; |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | $count = count($data['navigation_items']); |
| 5 | 5 | |
| 6 | 6 | foreach ($data['navigation_items'] as $i => $item) { |
| 7 | - if ( isset($item[MIDCOM_NAV_SORTABLE]) |
|
| 7 | + if (isset($item[MIDCOM_NAV_SORTABLE]) |
|
| 8 | 8 | && !$item[MIDCOM_NAV_SORTABLE]) { |
| 9 | 9 | continue; |
| 10 | 10 | } |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | $style = ''; |
| 16 | 16 | |
| 17 | 17 | // Skip all components that return the default icon |
| 18 | - if ( isset($item[MIDCOM_NAV_COMPONENT]) |
|
| 18 | + if (isset($item[MIDCOM_NAV_COMPONENT]) |
|
| 19 | 19 | && ($tmp = midcom::get()->componentloader->get_component_icon($item[MIDCOM_NAV_COMPONENT], false))) { |
| 20 | 20 | $icon = '<i class="fa fa-' . $tmp . '"></i>'; |
| 21 | 21 | } elseif (!$item[MIDCOM_NAV_GUID]) { |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | // User is or has been subscriber earlier, update status |
| 134 | 134 | $member = $members[0]; |
| 135 | 135 | |
| 136 | - if ( $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED |
|
| 136 | + if ($member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED |
|
| 137 | 137 | || $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::NORMAL) { |
| 138 | 138 | $this->_import_status['already_subscribed']++; |
| 139 | 139 | return; |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | |
| 174 | 174 | $qb = org_openpsa_contacts_group_dba::new_query_builder(); |
| 175 | 175 | $schema = $this->_schemadbs['organization']->get('default'); |
| 176 | - if ( $schema->has_field('company_id') |
|
| 176 | + if ($schema->has_field('company_id') |
|
| 177 | 177 | && !empty($subscriber['organization']['company_id'])) { |
| 178 | 178 | // Imported data has a company id, we use that instead of name |
| 179 | 179 | $qb->add_constraint($schema->get_field('company_id')['storage']['location'], '=', $subscriber['organization']['company_id']); |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | // Seek by official name |
| 182 | 182 | $qb->add_constraint('official', '=', $subscriber['organization']['official']); |
| 183 | 183 | |
| 184 | - if ( $schema->has_field('city') |
|
| 184 | + if ($schema->has_field('city') |
|
| 185 | 185 | && !empty($subscriber['organization']['city'])) { |
| 186 | 186 | // Imported data has a city, we use also that for matching |
| 187 | 187 | $qb->add_constraint($schema->get_field('city')['storage']['location'], '=', $subscriber['organization']['city']); |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | echo '<p>' . $data['l10n']->get('last login') . ': ' . $formatter->datetime($lastlogin) . "</p>\n"; |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | - if ( $data['person']->guid == midcom::get()->auth->user->guid |
|
| 14 | + if ($data['person']->guid == midcom::get()->auth->user->guid |
|
| 15 | 15 | || midcom::get()->auth->can_user_do('org.openpsa.user:manage', null, org_openpsa_user_interface::class)) { |
| 16 | 16 | $workflow = new midcom\workflow\datamanager; |
| 17 | 17 | echo '<ul class="area_toolbar">'; |
@@ -20,9 +20,9 @@ discard block |
||
| 20 | 20 | 'object' => $data['person'], |
| 21 | 21 | 'label' => $data['l10n']->get('account') |
| 22 | 22 | ]); |
| 23 | - echo '<li><a href="' . $data['router']->generate('account_delete', ['guid' => $data['person']->guid]). '" ' . $workflow->render_attributes() . '" class="button">'; |
|
| 23 | + echo '<li><a href="' . $data['router']->generate('account_delete', ['guid' => $data['person']->guid]) . '" ' . $workflow->render_attributes() . '" class="button">'; |
|
| 24 | 24 | echo '<span class="toolbar_label">' . $data['l10n_midcom']->get('delete') . '</span></a></li>'; |
| 25 | - if ( midcom::get()->config->get('auth_allow_trusted') === true |
|
| 25 | + if (midcom::get()->config->get('auth_allow_trusted') === true |
|
| 26 | 26 | && $data['person']->can_do('org.openpsa.user:su')) { |
| 27 | 27 | echo '<li><a class="button" href="' . $data['router']->generate('account_su', ['guid' => $data['person']->guid]) . '">' . $data['l10n']->get('switch to user') . "</a></li>\n"; |
| 28 | 28 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | } |
| 31 | 31 | } else { |
| 32 | 32 | echo '<p><span class="metadata">' . $data['l10n']->get("no account") . '</span></p>'; |
| 33 | - if ( $data['person']->guid == midcom::get()->auth->user->guid |
|
| 33 | + if ($data['person']->guid == midcom::get()->auth->user->guid |
|
| 34 | 34 | || midcom::get()->auth->can_user_do('org.openpsa.user:manage', null, org_openpsa_user_interface::class)) { |
| 35 | 35 | $workflow = new midcom\workflow\datamanager; |
| 36 | 36 | echo '<ul class="area_toolbar">'; |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | $this->add_breadcrumb('', $person->get_label()); |
| 25 | 25 | |
| 26 | 26 | $auth = midcom::get()->auth; |
| 27 | - if ( $person->guid == midcom::get()->auth->user->guid |
|
| 27 | + if ($person->guid == midcom::get()->auth->user->guid |
|
| 28 | 28 | || $auth->can_user_do('org.openpsa.user:manage', null, org_openpsa_user_interface::class)) { |
| 29 | 29 | $buttons = []; |
| 30 | 30 | $workflow = $this->get_workflow('datamanager'); |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | $delete_workflow = $this->get_workflow('delete', ['object' => $person]); |
| 38 | 38 | $buttons[] = $delete_workflow->get_button($this->router->generate('user_delete', ['guid' => $person->guid])); |
| 39 | 39 | } |
| 40 | - if ( midcom_connection::is_user($person) |
|
| 40 | + if (midcom_connection::is_user($person) |
|
| 41 | 41 | && $person->can_do('midgard:privileges')) { |
| 42 | 42 | $buttons[] = $workflow->get_button($this->router->generate('user_privileges', ['guid' => $person->guid]), [ |
| 43 | 43 | MIDCOM_TOOLBAR_LABEL => $this->_l10n->get("permissions"), |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | $invoices_url = $siteconfig->get_node_full_url('org.openpsa.invoices'); |
| 106 | 106 | $user_url = $siteconfig->get_node_full_url('org.openpsa.user'); |
| 107 | 107 | |
| 108 | - if ( $invoices_url |
|
| 108 | + if ($invoices_url |
|
| 109 | 109 | && midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_invoices_invoice_dba::class) |
| 110 | 110 | && $this->_contact->can_do('midgard:update')) { |
| 111 | 111 | $buttons[] = $workflow->get_button($invoices_url . "billingdata/" . $this->_contact->guid . '/', [ |
@@ -114,8 +114,8 @@ discard block |
||
| 114 | 114 | ]); |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - if ( $user_url |
|
| 118 | - && ( midcom::get()->auth->user->guid == $this->_contact->guid |
|
| 117 | + if ($user_url |
|
| 118 | + && (midcom::get()->auth->user->guid == $this->_contact->guid |
|
| 119 | 119 | || midcom::get()->auth->can_user_do('org.openpsa.user:access', null, org_openpsa_user_interface::class))) { |
| 120 | 120 | $buttons[] = [ |
| 121 | 121 | MIDCOM_TOOLBAR_URL => $user_url . "view/{$this->_contact->guid}/", |
@@ -171,8 +171,8 @@ discard block |
||
| 171 | 171 | $this->_uncached = $config->get('cache_module_content_uncached'); |
| 172 | 172 | $this->_headers_strategy = $this->get_strategy('cache_module_content_headers_strategy'); |
| 173 | 173 | $this->_headers_strategy_authenticated = $this->get_strategy('cache_module_content_headers_strategy_authenticated'); |
| 174 | - $this->_default_lifetime = (int)$config->get('cache_module_content_default_lifetime'); |
|
| 175 | - $this->_default_lifetime_authenticated = (int)$config->get('cache_module_content_default_lifetime_authenticated'); |
|
| 174 | + $this->_default_lifetime = (int) $config->get('cache_module_content_default_lifetime'); |
|
| 175 | + $this->_default_lifetime_authenticated = (int) $config->get('cache_module_content_default_lifetime_authenticated'); |
|
| 176 | 176 | |
| 177 | 177 | if ($this->_headers_strategy == 'no-cache') { |
| 178 | 178 | // we can't call no_cache() here, because it would try to call back to this class via the global getter |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | */ |
| 456 | 456 | public function expires(int $timestamp) |
| 457 | 457 | { |
| 458 | - if ( $this->_expires === null |
|
| 458 | + if ($this->_expires === null |
|
| 459 | 459 | || $this->_expires > $timestamp) { |
| 460 | 460 | $this->_expires = $timestamp; |
| 461 | 461 | } |
@@ -567,7 +567,7 @@ discard block |
||
| 567 | 567 | */ |
| 568 | 568 | public function write_meta_cache(string $content_id, Request $request, Response $response) |
| 569 | 569 | { |
| 570 | - if ( $this->_uncached |
|
| 570 | + if ($this->_uncached |
|
| 571 | 571 | || $this->_no_cache) { |
| 572 | 572 | return; |
| 573 | 573 | } |
@@ -636,7 +636,7 @@ discard block |
||
| 636 | 636 | |
| 637 | 637 | public function store_dl_content(int $context, string $dl_cache_data, Request $request) |
| 638 | 638 | { |
| 639 | - if ( $this->_no_cache |
|
| 639 | + if ($this->_no_cache |
|
| 640 | 640 | || $this->_uncached) { |
| 641 | 641 | return; |
| 642 | 642 | } |