@@ -83,7 +83,8 @@ |
||
| 83 | 83 | $productgroup = new org_openpsa_products_product_group_dba($this->_product->productGroup); |
| 84 | 84 | $replacements['<PRODUCTGROUP_TITLE>'] = $productgroup->title; |
| 85 | 85 | $replacements['<PRODUCTGROUP_CODE>'] = $productgroup->code; |
| 86 | - } catch (midcom_error $e) { |
|
| 86 | + } |
|
| 87 | + catch (midcom_error $e) { |
|
| 87 | 88 | $replacements['<PRODUCTGROUP_TITLE>'] = ''; |
| 88 | 89 | $replacements['<PRODUCTGROUP_CODE>'] = ''; |
| 89 | 90 | } |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | foreach ($this->_datamanagers as $type => $datamanager) { |
| 128 | 128 | foreach ($datamanager->get_schema($this->schemas[$type])->get('fields') as $name => $config) { |
| 129 | 129 | $title = $config['title']; |
| 130 | - if ( $this->include_totals |
|
| 130 | + if ($this->include_totals |
|
| 131 | 131 | && $config['type'] == 'number') { |
| 132 | 132 | $this->_totals[$type . '-' . $name] = 0; |
| 133 | 133 | } |
@@ -194,18 +194,18 @@ discard block |
||
| 194 | 194 | $data = array_pad($data, $target_size, ''); |
| 195 | 195 | continue; |
| 196 | 196 | } |
| 197 | - $object =& $row[$type]; |
|
| 197 | + $object = & $row[$type]; |
|
| 198 | 198 | |
| 199 | 199 | $datamanager->set_storage($object, $this->schemas[$type]); |
| 200 | 200 | |
| 201 | - if ( $this->include_guid |
|
| 201 | + if ($this->include_guid |
|
| 202 | 202 | && $type == $first_type) { |
| 203 | 203 | $data[] = $object->guid; |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | $csvdata = $datamanager->get_content_csv(); |
| 207 | 207 | foreach ($datamanager->get_schema()->get('fields') as $fieldname => $config) { |
| 208 | - if ( $this->include_totals |
|
| 208 | + if ($this->include_totals |
|
| 209 | 209 | && $config['type'] == 'number') { |
| 210 | 210 | $this->_totals[$type . '-' . $fieldname] += $csvdata[$fieldname]; |
| 211 | 211 | } |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | if (empty($this->csv['charset'])) { |
| 234 | 234 | // Default to ISO-LATIN-15 (Latin-1 with EURO sign etc) |
| 235 | 235 | $this->csv['charset'] = 'ISO-8859-15'; |
| 236 | - if ( isset($_SERVER['HTTP_USER_AGENT']) |
|
| 236 | + if (isset($_SERVER['HTTP_USER_AGENT']) |
|
| 237 | 237 | && !preg_match('/Windows/i', $_SERVER['HTTP_USER_AGENT'])) { |
| 238 | 238 | // Except when not on windows, then default to UTF-8 |
| 239 | 239 | $this->csv['charset'] = 'UTF-8'; |
@@ -100,7 +100,7 @@ |
||
| 100 | 100 | foreach ($arguments as $i => $argument) { |
| 101 | 101 | if ($argument === '__request_data__') { |
| 102 | 102 | $context = $event->getRequest()->attributes->get('context'); |
| 103 | - $arguments[$i] =& $context->get_custom_key('request_data'); |
|
| 103 | + $arguments[$i] = & $context->get_custom_key('request_data'); |
|
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | $event->setArguments($arguments); |
@@ -261,7 +261,7 @@ |
||
| 261 | 261 | if ($part === '') { |
| 262 | 262 | continue; |
| 263 | 263 | } |
| 264 | - if ( midcom::get()->config->get('theme') |
|
| 264 | + if (midcom::get()->config->get('theme') |
|
| 265 | 265 | && !$args_started |
| 266 | 266 | && self::check_page_exists($part)) { |
| 267 | 267 | $page_style .= '/' . $part; |
@@ -93,7 +93,8 @@ |
||
| 93 | 93 | |
| 94 | 94 | try { |
| 95 | 95 | $user = new midgard_user($login_tokens); |
| 96 | - } catch (mgd_exception $e) { |
|
| 96 | + } |
|
| 97 | + catch (mgd_exception $e) { |
|
| 97 | 98 | return null; |
| 98 | 99 | } |
| 99 | 100 | if (!$trusted && !self::verify_password($password, $user->password)) { |
@@ -162,7 +162,7 @@ |
||
| 162 | 162 | if (!$this->_message_stack) { |
| 163 | 163 | return; |
| 164 | 164 | } |
| 165 | - if ( $show_simple |
|
| 165 | + if ($show_simple |
|
| 166 | 166 | || !midcom::get()->auth->can_user_do('midcom:ajax', null, static::class)) { |
| 167 | 167 | $this->show_simple(); |
| 168 | 168 | return; |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | |
| 16 | 16 | foreach ($properties as $propname => $val) { |
| 17 | 17 | $description = preg_replace('/ *\n */', "\n", $val['value']); |
| 18 | - if ( $val['link'] |
|
| 18 | + if ($val['link'] |
|
| 19 | 19 | && $linked_component = midcom::get()->dbclassloader->get_component_for_class($val['link_name'])) { |
| 20 | 20 | $proplink = $data['router']->generate('help', ['component' => $linked_component, 'help_id' => 'mgdschemas']); |
| 21 | 21 | $proplink = "<a href='{$proplink}#{$val['link_name']}' title='{$linked_component}/{$val['link_name']}::{$val['link_target']}'>{$val['link_name']}:{$val['link_target']}</a>"; |
@@ -110,7 +110,7 @@ |
||
| 110 | 110 | public function _on_updated() |
| 111 | 111 | { |
| 112 | 112 | // Sync the object's ACL properties into MidCOM ACL system |
| 113 | - if ( !$this->_skip_acl_refresh) { |
|
| 113 | + if (!$this->_skip_acl_refresh) { |
|
| 114 | 114 | if ($this->orgOpenpsaAccesstype && $this->orgOpenpsaOwnerWg) { |
| 115 | 115 | debug_add("Synchronizing task ACLs to MidCOM"); |
| 116 | 116 | $sync = new org_openpsa_core_acl_synchronizer(); |
@@ -238,7 +238,8 @@ discard block |
||
| 238 | 238 | $salesproject = org_openpsa_sales_salesproject_dba::get_cached($agreement->salesproject); |
| 239 | 239 | $this->customer = $salesproject->customer; |
| 240 | 240 | } |
| 241 | - } catch (midcom_error $e) { |
|
| 241 | + } |
|
| 242 | + catch (midcom_error $e) { |
|
| 242 | 243 | } |
| 243 | 244 | } else { |
| 244 | 245 | // No agreement, we can't be invoiceable |
@@ -283,7 +284,8 @@ discard block |
||
| 283 | 284 | try { |
| 284 | 285 | $agreement = new org_openpsa_sales_salesproject_deliverable_dba($this->get_agreement()); |
| 285 | 286 | $agreement->update_units($this->id, $hours); |
| 286 | - } catch (midcom_error $e) { |
|
| 287 | + } |
|
| 288 | + catch (midcom_error $e) { |
|
| 287 | 289 | } |
| 288 | 290 | |
| 289 | 291 | if ($update) { |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | if ($this->_config->get('sales_pdfbuilder_class')) { |
| 94 | - if ( $this->_salesproject->can_do('midgard:update') |
|
| 94 | + if ($this->_salesproject->can_do('midgard:update') |
|
| 95 | 95 | && $this->is_pdf_creatable()) { |
| 96 | 96 | $workflow = $this->get_workflow('datamanager'); |
| 97 | 97 | $buttons[] = $workflow->get_button($this->router->generate('create_offer', ['guid' => $this->_salesproject->guid]), [ |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | case 'ordered': |
| 219 | 219 | if ($deliverable->orgOpenpsaObtype == org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION) { |
| 220 | 220 | $entries = $deliverable->get_at_entries(); |
| 221 | - if ( $entries |
|
| 221 | + if ($entries |
|
| 222 | 222 | && $entries[0]->status == midcom_services_at_entry_dba::SCHEDULED |
| 223 | 223 | && midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_invoices_invoice_dba::class)) { |
| 224 | 224 | return '<button class="run_cycle"><i class="fa fa-refresh"></i>' . $this->_l10n->get('generate now') . '</button>'; |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | } |
| 229 | 229 | break; |
| 230 | 230 | case 'delivered': |
| 231 | - if ( $deliverable->orgOpenpsaObtype != org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION |
|
| 231 | + if ($deliverable->orgOpenpsaObtype != org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION |
|
| 232 | 232 | && midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_invoices_invoice_dba::class)) { |
| 233 | 233 | $client_class = $this->_config->get('calculator'); |
| 234 | 234 | $client = new $client_class(); |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | $state = $data['deliverable']->get_state(); |
| 4 | 4 | $formatter = $data['l10n']->get_formatter(); |
| 5 | 5 | $per_unit = $data['l10n']->get('per unit'); |
| 6 | -if ( $data['product'] |
|
| 6 | +if ($data['product'] |
|
| 7 | 7 | && $unit_option = org_openpsa_sales_viewer::get_unit_option($data['product']->unit)) { |
| 8 | 8 | $per_unit = sprintf($data['l10n']->get('per %s'), $unit_option); |
| 9 | 9 | } |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | </div> |
| 125 | 125 | <?php |
| 126 | 126 | $tabs = []; |
| 127 | - if ( $data['invoices_url'] |
|
| 127 | + if ($data['invoices_url'] |
|
| 128 | 128 | && $data['deliverable']->invoiced > 0) { |
| 129 | 129 | $tabs[] = [ |
| 130 | 130 | 'url' => $data['invoices_url'] . "list/deliverable/{$data['deliverable']->guid}/", |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | ]; |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - if ( $data['projects_url'] |
|
| 135 | + if ($data['projects_url'] |
|
| 136 | 136 | && $data['deliverable']->state >= org_openpsa_sales_salesproject_deliverable_dba::STATE_ORDERED |
| 137 | 137 | && $data['product'] |
| 138 | 138 | && $data['product']->orgOpenpsaObtype == org_openpsa_products_product_dba::TYPE_SERVICE) { |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | } |
| 192 | 192 | echo " </tbody>\n"; |
| 193 | 193 | echo "</table>\n"; |
| 194 | - if ( $at_entries[0]->status == midcom_services_at_entry_dba::SCHEDULED |
|
| 194 | + if ($at_entries[0]->status == midcom_services_at_entry_dba::SCHEDULED |
|
| 195 | 195 | && midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_invoices_invoice_dba::class)) { |
| 196 | 196 | $label = $data['l10n']->get('generate now'); |
| 197 | 197 | $process_link = $data['router']->generate('deliverable_run_cycle', ['guid' => $data['deliverable']->guid]); |
@@ -74,12 +74,12 @@ |
||
| 74 | 74 | <tr> |
| 75 | 75 | <td class="title"><?php echo $data['l10n']->get('cost'); ?></td> |
| 76 | 76 | <?php |
| 77 | - if ($data['deliverable']->costType == '%') { ?> |
|
| 77 | + if ($data['deliverable']->costType == '%') { ?> |
|
| 78 | 78 | <td class="numeric"><?php echo $view['costPerUnit']; ?> %</td> |
| 79 | 79 | <td class="numeric"> </td> |
| 80 | 80 | <td class="numeric"> </td> |
| 81 | 81 | <?php |
| 82 | - } else { ?> |
|
| 82 | + } else { ?> |
|
| 83 | 83 | <td class="numeric"><?php echo $formatter->number($data['deliverable']->costPerUnit); ?></td> |
| 84 | 84 | <td class="numeric"><?php echo $view['plannedUnits']; ?></td> |
| 85 | 85 | <td class="numeric"><?php echo $view['units']; ?></td> |