@@ -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 | } |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | </div> |
116 | 116 | <?php |
117 | 117 | $tabs = []; |
118 | - if ( $data['invoices_url'] |
|
118 | + if ($data['invoices_url'] |
|
119 | 119 | && $data['deliverable']->invoiced > 0) { |
120 | 120 | $tabs[] = [ |
121 | 121 | 'url' => $data['invoices_url'] . "list/deliverable/{$data['deliverable']->guid}/", |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | ]; |
124 | 124 | } |
125 | 125 | |
126 | - if ( $data['projects_url'] |
|
126 | + if ($data['projects_url'] |
|
127 | 127 | && $data['deliverable']->state >= org_openpsa_sales_salesproject_deliverable_dba::STATE_ORDERED |
128 | 128 | && $data['product'] |
129 | 129 | && $data['product']->orgOpenpsaObtype == org_openpsa_products_product_dba::TYPE_SERVICE) { |
@@ -65,17 +65,17 @@ |
||
65 | 65 | <tr> |
66 | 66 | <td class="title"><?php echo $data['l10n']->get('cost'); ?></td> |
67 | 67 | <?php |
68 | - if ($data['deliverable']->costType == '%') { ?> |
|
68 | + if ($data['deliverable']->costType == '%') { ?> |
|
69 | 69 | <td class="numeric"><?php echo $view['costPerUnit']; ?> %</td> |
70 | 70 | <td class="numeric"> </td> |
71 | 71 | <td class="numeric"> </td> |
72 | 72 | <?php |
73 | - } else { ?> |
|
73 | + } else { ?> |
|
74 | 74 | <td class="numeric"><?php echo $formatter->number($data['deliverable']->costPerUnit); ?></td> |
75 | 75 | <td class="numeric"><?php echo $view['plannedUnits']; ?></td> |
76 | 76 | <td class="numeric"><?php echo $view['units']; ?></td> |
77 | 77 | <?php |
78 | - } ?> |
|
78 | + } ?> |
|
79 | 79 | <td class="numeric"><?php echo $formatter->number($data['deliverable']->cost); ?></td> |
80 | 80 | </tr> |
81 | 81 | </tbody> |
@@ -5,29 +5,29 @@ |
||
5 | 5 | ?> |
6 | 6 | <div class="area org_openpsa_helper_box"><h3><?php echo $data['l10n']->get('offers'); ?></h3> |
7 | 7 | <ul><?php |
8 | - foreach ($data['offers'] as $offer) { |
|
9 | - echo '<li><span class="org_openpsa_helpers_fileinfo">'; |
|
10 | - $attachment = $offer->get_file(); |
|
11 | - $delete_link = $data['router']->generate('delete_offer', ['guid' => $offer->guid]); |
|
12 | - $edit_link = $data['router']->generate('edit_offer', ['guid' => $offer->guid]); |
|
8 | + foreach ($data['offers'] as $offer) { |
|
9 | + echo '<li><span class="org_openpsa_helpers_fileinfo">'; |
|
10 | + $attachment = $offer->get_file(); |
|
11 | + $delete_link = $data['router']->generate('delete_offer', ['guid' => $offer->guid]); |
|
12 | + $edit_link = $data['router']->generate('edit_offer', ['guid' => $offer->guid]); |
|
13 | 13 | |
14 | - if (!empty($attachment)) { |
|
15 | - $url = midcom_db_attachment::get_url($attachment); |
|
16 | - echo '<a href="' . $url . '" class="icon"><i class="fa fa-file-text-o"></i></a>'; |
|
17 | - } |
|
18 | - echo '<span class="info">'; |
|
19 | - echo '<span class="filename">' . $offer->get_label(); |
|
20 | - echo ' <a class="actions" href="' . $delete_link . '"><i class="fa fa-trash" title="' . $data['l10n_midcom']->get('delete') . '"></i></a>'; |
|
21 | - echo ' <a class="actions" ' . $wf->render_attributes() . ' href="' . $edit_link . '"><i class="fa fa-pencil" title="' . $data['l10n_midcom']->get('edit') . '"></i></a>'; |
|
22 | - echo "</span>\n"; |
|
23 | - if (!empty($attachment)) { |
|
24 | - echo ' <span class="date">' . $formatter->datetime($attachment->metadata->revised) . '</span> '; |
|
25 | - $person_card = org_openpsa_widgets_contact::get($attachment->metadata->revisor); |
|
26 | - echo $person_card->show_inline(); |
|
27 | - } |
|
28 | - echo "</span></span></li>\n"; |
|
29 | - } |
|
30 | - ?> |
|
14 | + if (!empty($attachment)) { |
|
15 | + $url = midcom_db_attachment::get_url($attachment); |
|
16 | + echo '<a href="' . $url . '" class="icon"><i class="fa fa-file-text-o"></i></a>'; |
|
17 | + } |
|
18 | + echo '<span class="info">'; |
|
19 | + echo '<span class="filename">' . $offer->get_label(); |
|
20 | + echo ' <a class="actions" href="' . $delete_link . '"><i class="fa fa-trash" title="' . $data['l10n_midcom']->get('delete') . '"></i></a>'; |
|
21 | + echo ' <a class="actions" ' . $wf->render_attributes() . ' href="' . $edit_link . '"><i class="fa fa-pencil" title="' . $data['l10n_midcom']->get('edit') . '"></i></a>'; |
|
22 | + echo "</span>\n"; |
|
23 | + if (!empty($attachment)) { |
|
24 | + echo ' <span class="date">' . $formatter->datetime($attachment->metadata->revised) . '</span> '; |
|
25 | + $person_card = org_openpsa_widgets_contact::get($attachment->metadata->revisor); |
|
26 | + echo $person_card->show_inline(); |
|
27 | + } |
|
28 | + echo "</span></span></li>\n"; |
|
29 | + } |
|
30 | + ?> |
|
31 | 31 | </ul> |
32 | 32 | </div> |
33 | 33 | <?php } ?> |
34 | 34 | \ No newline at end of file |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | $localpath = $path; |
159 | 159 | $matches['latest_parent'] = $folder_tree['/']; |
160 | 160 | $missing_levels = 0; |
161 | - while ( $localpath |
|
161 | + while ($localpath |
|
162 | 162 | && $localpath != '/') { |
163 | 163 | $localpath = dirname($localpath); |
164 | 164 | $missing_levels++; |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | |
186 | 186 | $root_folder = $folder; |
187 | 187 | $max = 100; |
188 | - while ( $folder[MIDCOM_NAV_COMPONENT] == 'net.nemein.wiki' |
|
188 | + while ($folder[MIDCOM_NAV_COMPONENT] == 'net.nemein.wiki' |
|
189 | 189 | && (($parent = $nap->get_node_uplink($folder[MIDCOM_NAV_ID])) != -1) |
190 | 190 | && $max > 0) { |
191 | 191 | $root_folder = $folder; |
@@ -249,7 +249,7 @@ |
||
249 | 249 | $new_status = $this->_find_status($this->_status_map[$this->status_type], $status_types); |
250 | 250 | } |
251 | 251 | |
252 | - if ( $new_status !== null |
|
252 | + if ($new_status !== null |
|
253 | 253 | && $this->status != $new_status) { |
254 | 254 | $this->status = $new_status; |
255 | 255 | $update_required = true; |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $invoices_url = $siteconfig->get_node_full_url('org.openpsa.invoices'); |
118 | 118 | $user_url = $siteconfig->get_node_full_url('org.openpsa.user'); |
119 | 119 | |
120 | - if ( $invoices_url |
|
120 | + if ($invoices_url |
|
121 | 121 | && midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_invoices_invoice_dba::class) |
122 | 122 | && $this->_contact->can_do('midgard:update')) { |
123 | 123 | $buttons[] = $workflow->get_button($invoices_url . "billingdata/" . $this->_contact->guid . '/', [ |
@@ -126,8 +126,8 @@ discard block |
||
126 | 126 | ]); |
127 | 127 | } |
128 | 128 | |
129 | - if ( $user_url |
|
130 | - && ( midcom_connection::get_user() == $this->_contact->id |
|
129 | + if ($user_url |
|
130 | + && (midcom_connection::get_user() == $this->_contact->id |
|
131 | 131 | || midcom::get()->auth->can_user_do('org.openpsa.user:access', null, org_openpsa_user_interface::class))) { |
132 | 132 | $buttons[] = [ |
133 | 133 | MIDCOM_TOOLBAR_URL => $user_url . "view/{$this->_contact->guid}/", |
@@ -192,7 +192,8 @@ |
||
192 | 192 | foreach ($this->$identifier as $member) { |
193 | 193 | try { |
194 | 194 | $this->_request_data['group'] = org_openpsa_contacts_group_dba::get_cached($member->gid); |
195 | - } catch (midcom_error $e) { |
|
195 | + } |
|
196 | + catch (midcom_error $e) { |
|
196 | 197 | $e->log(); |
197 | 198 | continue; |
198 | 199 | } |
@@ -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)) { |