@@ -169,7 +169,7 @@ |
||
| 169 | 169 | case 'proposed': |
| 170 | 170 | $html = $this->render_status($task->manager, "from %s"); |
| 171 | 171 | $task->get_members(); |
| 172 | - if ( $task->can_do('midgard:update') |
|
| 172 | + if ($task->can_do('midgard:update') |
|
| 173 | 173 | && isset($task->resources[midcom_connection::get_user()])) { |
| 174 | 174 | $html .= '<form method="post" action="' . $this->router->generate('workflow', ['guid' => $task->guid]) . '">'; |
| 175 | 175 | //TODO: If we need all resources to accept task hide tools when we have accepted and replace with "pending acceptance from..." |
@@ -255,7 +255,8 @@ discard block |
||
| 255 | 255 | $url = $this->router->generate('project', ['guid' => $project->guid]); |
| 256 | 256 | $ret['project'] = '<a href="' . $url . '">' . $project->title . '</a>'; |
| 257 | 257 | $ret['index_project'] = $project->title; |
| 258 | - } catch (midcom_error $e) { |
|
| 258 | + } |
|
| 259 | + catch (midcom_error $e) { |
|
| 259 | 260 | $e->log(); |
| 260 | 261 | } |
| 261 | 262 | |
@@ -267,7 +268,8 @@ discard block |
||
| 267 | 268 | $customer_url = "{$contacts_url}group/{$customer->guid}/"; |
| 268 | 269 | $ret['customer'] = "<a href='{$customer_url}' title='{$customer->official}'>{$customer->get_label()}</a>"; |
| 269 | 270 | $ret['index_customer'] = $customer->name; |
| 270 | - } catch (midcom_error) { |
|
| 271 | + } |
|
| 272 | + catch (midcom_error) { |
|
| 271 | 273 | $ret['customer'] = ''; |
| 272 | 274 | $ret['index_customer'] = ''; |
| 273 | 275 | } |
@@ -61,7 +61,8 @@ discard block |
||
| 61 | 61 | try { |
| 62 | 62 | $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($at_entry->arguments['deliverable']); |
| 63 | 63 | $salesproject = org_openpsa_sales_salesproject_dba::get_cached($deliverable->salesproject); |
| 64 | - } catch (midcom_error $e) { |
|
| 64 | + } |
|
| 65 | + catch (midcom_error $e) { |
|
| 65 | 66 | $e->log(); |
| 66 | 67 | return $invoice; |
| 67 | 68 | } |
@@ -103,7 +104,8 @@ discard block |
||
| 103 | 104 | $invoice[$fieldname] = '<a href="' . $sales_url . 'list/customer/' . $object->guid . '/">' . $invoice[$fieldname] . '</a>'; |
| 104 | 105 | } |
| 105 | 106 | $invoice['index_' . $fieldname] = $object->get_label(); |
| 106 | - } catch (midcom_error $e) { |
|
| 107 | + } |
|
| 108 | + catch (midcom_error $e) { |
|
| 107 | 109 | $e->log(); |
| 108 | 110 | } |
| 109 | 111 | } |
@@ -37,7 +37,6 @@ |
||
| 37 | 37 | - 1: MIDCOM_PRIVILEGE_ALLOW |
| 38 | 38 | - 2: MIDCOM_PRIVILEGE_DENY |
| 39 | 39 | - 3: MIDCOM_PRIVILEGE_INHERIT |
| 40 | - |
|
| 41 | 40 | * @property string $guid |
| 42 | 41 | * @package midcom |
| 43 | 42 | */ |
@@ -112,7 +112,8 @@ |
||
| 112 | 112 | if ($this->__cached_object === null) { |
| 113 | 113 | try { |
| 114 | 114 | $this->__cached_object = midcom::get()->dbfactory->get_object_by_guid($this->objectguid); |
| 115 | - } catch (midcom_error) { |
|
| 115 | + } |
|
| 116 | + catch (midcom_error) { |
|
| 116 | 117 | return null; |
| 117 | 118 | } |
| 118 | 119 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | * The Default constructor creates an empty privilege, if you specify |
| 76 | 76 | * another privilege object in the constructor, a copy is constructed. |
| 77 | 77 | */ |
| 78 | - public function __construct(midcom_core_privilege_db|array|string|null $src = null) |
|
| 78 | + public function __construct(midcom_core_privilege_db | array | string | null $src = null) |
|
| 79 | 79 | { |
| 80 | 80 | if (is_array($src)) { |
| 81 | 81 | // Store given values to our privilege array |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | * - Any midcom_core_user or midcom_core_group object or subtype thereof. |
| 211 | 211 | * - Any string identifier which can be resolved using midcom_services_auth::get_assignee(). |
| 212 | 212 | */ |
| 213 | - public function set_assignee(midcom_core_group|midcom_core_user|string $assignee) : bool |
|
| 213 | + public function set_assignee(midcom_core_group | midcom_core_user | string $assignee) : bool |
|
| 214 | 214 | { |
| 215 | 215 | if (is_string($assignee)) { |
| 216 | 216 | if ($this->is_magic_assignee($assignee)) { |
@@ -266,12 +266,12 @@ discard block |
||
| 266 | 266 | } |
| 267 | 267 | } |
| 268 | 268 | |
| 269 | - if ( !$this->is_magic_assignee() |
|
| 269 | + if (!$this->is_magic_assignee() |
|
| 270 | 270 | && !$this->get_assignee()) { |
| 271 | 271 | debug_add("The assignee identifier '{$this->assignee}' is invalid.", MIDCOM_LOG_INFO); |
| 272 | 272 | return false; |
| 273 | 273 | } |
| 274 | - if ( $this->assignee == 'OWNER' |
|
| 274 | + if ($this->assignee == 'OWNER' |
|
| 275 | 275 | && $this->privilegename == 'midgard:owner') { |
| 276 | 276 | debug_add("Tried to assign midgard:owner to the OWNER magic assignee, this is invalid.", MIDCOM_LOG_INFO); |
| 277 | 277 | return false; |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | MIDCOM_LOG_INFO); |
| 284 | 284 | return false; |
| 285 | 285 | } |
| 286 | - if ( !$object->can_do('midgard:update') |
|
| 286 | + if (!$object->can_do('midgard:update') |
|
| 287 | 287 | || !$object->can_do('midgard:privileges')) { |
| 288 | 288 | debug_add("Insufficient privileges on the content object with the GUID '{$this->__guid}', midgard:update and midgard:privileges required.", |
| 289 | 289 | MIDCOM_LOG_INFO); |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | return new midcom_core_privilege($result[0]); |
| 445 | 445 | } |
| 446 | 446 | |
| 447 | - private function _load(midcom_core_privilege_db|string|null $src = null) |
|
| 447 | + private function _load(midcom_core_privilege_db | string | null $src = null) |
|
| 448 | 448 | { |
| 449 | 449 | if ($src instanceof midcom_core_privilege_db) { |
| 450 | 450 | // Got a privilege object as argument, use that |
@@ -72,7 +72,8 @@ |
||
| 72 | 72 | $data = $event->getData(); |
| 73 | 73 | try { |
| 74 | 74 | $data = $purifier->purify($data); |
| 75 | - } catch (\Exception $e) { |
|
| 75 | + } |
|
| 76 | + catch (\Exception $e) { |
|
| 76 | 77 | debug_add("HTML Purifier failed: " . $e->getMessage(), MIDCOM_LOG_WARN); |
| 77 | 78 | } |
| 78 | 79 | $event->setData($data); |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | public function purify_content(FormEvent $event) |
| 36 | 36 | { |
| 37 | - if ( isset($this->config['Cache']['SerializerPath']) |
|
| 37 | + if (isset($this->config['Cache']['SerializerPath']) |
|
| 38 | 38 | && !file_exists($this->config['Cache']['SerializerPath'])) { |
| 39 | 39 | mkdir($this->config['Cache']['SerializerPath']); |
| 40 | 40 | } |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | // Load custom element/attribute definitions |
| 50 | 50 | $definitions = $this->get_from_global_config('html_purify_HTMLDefinition'); |
| 51 | - if ( !empty($definitions) |
|
| 51 | + if (!empty($definitions) |
|
| 52 | 52 | && $def = $purifier_config->maybeGetRawHTMLDefinition()) { |
| 53 | 53 | if (!empty($definitions['addAttribute'])) { |
| 54 | 54 | foreach (array_filter((array) $definitions['addAttribute'], is_array(...)) as $attrdef) { |
@@ -193,7 +193,8 @@ |
||
| 193 | 193 | |
| 194 | 194 | try { |
| 195 | 195 | $diff_fields = $rcs_handler->get_diff($prev_version, $this_version); |
| 196 | - } catch (midcom_error $e) { |
|
| 196 | + } |
|
| 197 | + catch (midcom_error $e) { |
|
| 197 | 198 | $e->log(); |
| 198 | 199 | return ''; |
| 199 | 200 | } |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | |
| 29 | 29 | public function _on_creating() : bool |
| 30 | 30 | { |
| 31 | - if ( $this->title == '' |
|
| 31 | + if ($this->title == '' |
|
| 32 | 32 | || !$this->topic) { |
| 33 | 33 | // We must have wikiword and topic at this stage |
| 34 | 34 | return false; |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | <th><?php echo $data['l10n']->get('type'); ?></th> |
| 24 | 24 | <?php |
| 25 | 25 | } ?> |
| 26 | -<?php if ( array_key_exists('invoiceable_filter', $query_data)) { |
|
| 26 | +<?php if (array_key_exists('invoiceable_filter', $query_data)) { |
|
| 27 | 27 | ?> |
| 28 | 28 | <th><?php echo midcom::get()->i18n->get_string('invoiceable', 'org.openpsa.projects'); ?></th> |
| 29 | 29 | <?php |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | return null; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - if (! $input instanceof midcom_db_attachment) { |
|
| 33 | + if (!$input instanceof midcom_db_attachment) { |
|
| 34 | 34 | throw new UnexpectedTypeException($input, midcom_db_attachment::class); |
| 35 | 35 | } |
| 36 | 36 | |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | 'customdata' => [] |
| 161 | 161 | ], $config)); |
| 162 | 162 | |
| 163 | - $normalize_widget = function (Options $options, $value) { |
|
| 163 | + $normalize_widget = function(Options $options, $value) { |
|
| 164 | 164 | if ($value == 'text') { |
| 165 | 165 | if (!empty($options['widget_config']['hideinput'])) { |
| 166 | 166 | return PasswordType::class; |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | return $value; |
| 186 | 186 | }; |
| 187 | 187 | |
| 188 | - $normalize_storage = function (Options $options, $value) use ($name) { |
|
| 188 | + $normalize_storage = function(Options $options, $value) use ($name) { |
|
| 189 | 189 | $default = [ |
| 190 | 190 | 'location' => 'parameter', |
| 191 | 191 | 'domain' => 'midcom.helper.datamanager2', |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | return $value; |
| 228 | 228 | }; |
| 229 | 229 | |
| 230 | - $normalize_validation = function (Options $options, $value) { |
|
| 230 | + $normalize_validation = function(Options $options, $value) { |
|
| 231 | 231 | $validation = []; |
| 232 | 232 | |
| 233 | 233 | foreach ((array) $value as $key => $rule) { |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $rule = ['type' => $rule]; |
| 240 | 240 | } elseif (!array_key_exists('type', $rule)) { |
| 241 | 241 | throw new midcom_error("Missing validation rule type for rule {$key} on field {$options['name']}, this is a required option."); |
| 242 | - } elseif ( $rule['type'] == 'compare' |
|
| 242 | + } elseif ($rule['type'] == 'compare' |
|
| 243 | 243 | && !array_key_exists('compare_with', $rule)) { |
| 244 | 244 | throw new midcom_error("Missing compare_with option for compare type rule {$key} on field {$options['name']}, this is a required option."); |
| 245 | 245 | } |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | 'later_than' => null |
| 49 | 49 | ] |
| 50 | 50 | ]); |
| 51 | - $resolver->setNormalizer('widget_config', function (Options $options, $value) { |
|
| 51 | + $resolver->setNormalizer('widget_config', function(Options $options, $value) { |
|
| 52 | 52 | $widget_defaults = [ |
| 53 | 53 | 'showOn' => 'both', |
| 54 | 54 | 'format' => '%Y-%m-%d %H:%M', |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | ]; |
| 60 | 60 | return helper::normalize($widget_defaults, $value); |
| 61 | 61 | }); |
| 62 | - $resolver->setNormalizer('constraints', function (Options $options, $value) { |
|
| 62 | + $resolver->setNormalizer('constraints', function(Options $options, $value) { |
|
| 63 | 63 | if ($options['type_config']['later_than']) { |
| 64 | 64 | $value[] = new laterthan($options['type_config']['later_than']); |
| 65 | 65 | } |