@@ -100,7 +100,8 @@ |
||
100 | 100 | try { |
101 | 101 | $task = org_openpsa_projects_task_dba::get_cached($hour_report->task); |
102 | 102 | $options['success_url'] = $this->router->generate('list_hours_task', ['guid' => $task->guid]); |
103 | - } catch (midcom_error $e) { |
|
103 | + } |
|
104 | + catch (midcom_error $e) { |
|
104 | 105 | $e->log(); |
105 | 106 | } |
106 | 107 | return $this->get_workflow('delete', $options)->run($request); |
@@ -133,7 +133,7 @@ |
||
133 | 133 | return new midcom_response_relocate($relocate); |
134 | 134 | } |
135 | 135 | |
136 | - private function parse_input(ParameterBag $input, string $action) : int|bool |
|
136 | + private function parse_input(ParameterBag $input, string $action) : int | bool |
|
137 | 137 | { |
138 | 138 | if (!in_array($action, ['invoiceable', 'invoice', 'task'])) { |
139 | 139 | throw new midcom_error('passed action ' . $action . ' is unknown'); |
@@ -70,13 +70,13 @@ discard block |
||
70 | 70 | } |
71 | 71 | } elseif (!$this->form->isSubmitted()) { |
72 | 72 | $this->form->handleRequest($request); |
73 | - if ( $this->form->isSubmitted() |
|
73 | + if ($this->form->isSubmitted() |
|
74 | 74 | && $button = $this->form->getClickedButton()) { |
75 | 75 | $operation = $button->getConfig()->getOption('operation'); |
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
79 | - if ( in_array($operation, [self::SAVE, self::NEXT]) |
|
79 | + if (in_array($operation, [self::SAVE, self::NEXT]) |
|
80 | 80 | && !$this->form->isValid()) { |
81 | 81 | $operation = self::EDIT; |
82 | 82 | } |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | if ($storage->get_last_operation() === self::SAVE) { |
160 | 160 | // Get GUIDs and such for new-created dependent objects |
161 | 161 | $this->dm->set_storage($storage->get_value(), $this->dm->get_schema()->get_name()); |
162 | - } elseif ( !$this->form->isValid() |
|
162 | + } elseif (!$this->form->isValid() |
|
163 | 163 | && $storage->move_uploaded_files() > 0) { |
164 | 164 | $form = $this->dm->get_form($this->form->getName(), true); |
165 | 165 | $this->copy_errors($this->form, $form); |
@@ -68,7 +68,7 @@ |
||
68 | 68 | echo " <td class=\"numeric\"><span title=\"" . $data['l10n']->get('ongoing') . "\">{$task_count['ongoing']}</span></td>\n"; |
69 | 69 | echo " <td class=\"numeric\"><span title=\"" . $data['l10n']->get('on_hold') . "\">{$task_count['on_hold']}</span></td>\n"; |
70 | 70 | echo " <td class=\"numeric\"><span title=\"" . $data['l10n']->get('closed') . "\">{$task_count['closed']}</span></td>\n"; |
71 | - echo " <td class=\"numeric\"> " ; |
|
71 | + echo " <td class=\"numeric\"> "; |
|
72 | 72 | echo " <span title=\"" . $data['l10n']->get('reported') . "\">" . round($hours['reportedHours'], 2) . "</span>"; |
73 | 73 | if ($hours['plannedHours'] > 0) { |
74 | 74 | echo " / <span title=\"" . $data['l10n']->get('planned hours') . "\">" . round($hours['plannedHours'], 2) . "</span>"; |
@@ -21,7 +21,8 @@ |
||
21 | 21 | try { |
22 | 22 | $customer = new org_openpsa_contacts_group_dba($customer); |
23 | 23 | $customer_title = $customer->official; |
24 | - } catch (midcom_error) { |
|
24 | + } |
|
25 | + catch (midcom_error) { |
|
25 | 26 | $customer_title = $data['l10n']->get('no customer'); |
26 | 27 | } |
27 | 28 |
@@ -50,7 +50,7 @@ |
||
50 | 50 | } |
51 | 51 | |
52 | 52 | // Skip components beginning with midcom or midgard |
53 | - if ( preg_match('/^(midcom|midgard)\./', $manifest->name) |
|
53 | + if (preg_match('/^(midcom|midgard)\./', $manifest->name) |
|
54 | 54 | && $manifest->name != 'midcom.helper.search') { |
55 | 55 | continue; |
56 | 56 | } |
@@ -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 |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | } |
126 | 126 | // TODO: Shared tasks need a separate check (different member object) |
127 | 127 | |
128 | - if ( !empty($this->busy_members) |
|
128 | + if (!empty($this->busy_members) |
|
129 | 129 | || !empty($this->busy_resources)) { |
130 | 130 | //Unresolved conflicts (note return value is for conflicts not lack of them) |
131 | 131 | midcom::get()->auth->drop_sudo(); |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | } |
189 | 189 | |
190 | 190 | if (array_key_exists($member->event, $modified_events)) { |
191 | - $event =& $modified_events[$member->event]; |
|
191 | + $event = & $modified_events[$member->event]; |
|
192 | 192 | $set_as_modified = false; |
193 | 193 | } else { |
194 | 194 | try { |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | } |
203 | 203 | debug_add("overlap found in event {$event->title} (#{$event->id})"); |
204 | 204 | |
205 | - if ( $event->tentative |
|
205 | + if ($event->tentative |
|
206 | 206 | && $rob_tentative) { |
207 | 207 | debug_add('event is tentative, robbing resources'); |
208 | 208 | $event->resources = array_diff_key($event->resources, $this->_event->resources); |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | } |
230 | 230 | debug_add("overlap found in event {$event->title} (#{$event->id})"); |
231 | 231 | |
232 | - if ( $event->tentative |
|
232 | + if ($event->tentative |
|
233 | 233 | && $rob_tentative) { |
234 | 234 | debug_add('event is tentative, robbing participants'); |
235 | 235 | $event->participants = array_diff_key($event->participants, $this->_event->participants); |
@@ -142,7 +142,8 @@ discard block |
||
142 | 142 | try { |
143 | 143 | $event = new org_openpsa_calendar_event_dba($member->event); |
144 | 144 | $set_as_modified = true; |
145 | - } catch (midcom_error) { |
|
145 | + } |
|
146 | + catch (midcom_error) { |
|
146 | 147 | debug_add("event_resource #{$member->id} links to bogus event #{$member->event}, skipping and removing", MIDCOM_LOG_WARN); |
147 | 148 | $member->delete(); |
148 | 149 | return; |
@@ -170,7 +171,8 @@ discard block |
||
170 | 171 | |
171 | 172 | try { |
172 | 173 | $event = new org_openpsa_calendar_event_dba($member->eid); |
173 | - } catch (midcom_error) { |
|
174 | + } |
|
175 | + catch (midcom_error) { |
|
174 | 176 | debug_add("eventmember #{$member->id} links to bogus event #{$member->eid}, skipping and removing", MIDCOM_LOG_WARN); |
175 | 177 | $member->delete(); |
176 | 178 | return; |
@@ -102,7 +102,7 @@ |
||
102 | 102 | |
103 | 103 | // If user has preference for this message, we use that |
104 | 104 | $personal_preferences = $recipient->list_parameters('org.openpsa.notifications'); |
105 | - if ( !empty($personal_preferences) |
|
105 | + if (!empty($personal_preferences) |
|
106 | 106 | && array_key_exists("{$component}:{$action}", $personal_preferences)) { |
107 | 107 | return $personal_preferences[$action]; |
108 | 108 | } |
@@ -58,7 +58,8 @@ |
||
58 | 58 | // TODO: Should we sudo here to ensure getting correct prefs regardless of ACLs? |
59 | 59 | try { |
60 | 60 | $recipient = midcom_db_person::get_cached($recipient); |
61 | - } catch (midcom_error) { |
|
61 | + } |
|
62 | + catch (midcom_error) { |
|
62 | 63 | return false; |
63 | 64 | } |
64 | 65 |
@@ -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; |