Passed
Push — master ( cf00ea...cda971 )
by Andreas
09:47
created
lib/midcom/admin/folder/management.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
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
             }
Please login to merge, or discard this patch.
lib/org/openpsa/sales/style/show-deliverable.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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) {
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -65,17 +65,17 @@
 block discarded – undo
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">&nbsp;</td>
71 71
                               <td class="numeric">&nbsp;</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>
Please login to merge, or discard this patch.
lib/org/openpsa/sales/style/show-offers.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -5,29 +5,29 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
lib/org/openpsa/calendar/conflictmanager.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -142,7 +142,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
lib/org/openpsa/notifications/main.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,8 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
lib/org/openpsa/projects/project.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -249,7 +249,7 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
lib/midcom/connection.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -261,7 +261,7 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,8 @@
 block discarded – undo
84 84
 
85 85
         try {
86 86
             $user = new midgard_user($login_tokens);
87
-        } catch (mgd_exception) {
87
+        }
88
+        catch (mgd_exception) {
88 89
             return null;
89 90
         }
90 91
         if (!$trusted && !self::verify_password($password, $user->password)) {
Please login to merge, or discard this patch.
lib/midcom/admin/help/style/midcom_admin_help_mgdschemas.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
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>";
Please login to merge, or discard this patch.
lib/org/openpsa/projects/task.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@
 block discarded – undo
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();
Please login to merge, or discard this patch.