Completed
Pull Request — master (#198)
by
unknown
19:02
created
lib/org/openpsa/sales/style/show-salesproject.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
              <div class="value"><?php echo $formatter->number($salesproject->profit); ?></div>
41 41
             </div>
42 42
             <?php
43
-             $owner_card = org_openpsa_widgets_contact::get($salesproject->owner);
43
+                $owner_card = org_openpsa_widgets_contact::get($salesproject->owner);
44 44
             ?>
45 45
             <div class="field">
46 46
              <div class="title"><?php echo $data['l10n']->get('owner'); ?></div>
Please login to merge, or discard this patch.
lib/org/openpsa/expenses/hour/report.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
     {
91 91
         if ($this->invoiceable) {
92 92
             $task = new org_openpsa_projects_task_dba($this->task);
93
-            $time_slot = (float)$task->get_parameter('org.openpsa.projects.projectbroker', 'minimum_slot');
93
+            $time_slot = (float) $task->get_parameter('org.openpsa.projects.projectbroker', 'minimum_slot');
94 94
             if (empty($time_slot)) {
95 95
                 $time_slot = (float) midcom_baseclasses_components_configuration::get('org.openpsa.projects', 'config')->get('default_minimum_time_slot');
96 96
                 if (empty($time_slot)) {
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,8 @@
 block discarded – undo
100 100
                     $parent->add_members('resources', [$this->person]);
101 101
                 }
102 102
             }
103
-        } catch (midcom_error $e) {
103
+        }
104
+        catch (midcom_error $e) {
104 105
             $e->log();
105 106
         }
106 107
 
Please login to merge, or discard this patch.
lib/org/openpsa/invoices/style/admin-read.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,8 @@
 block discarded – undo
8 8
     if ($customer->orgOpenpsaObtype <= org_openpsa_contacts_group_dba::MYCONTACTS) {
9 9
         $customer = false;
10 10
     }
11
-} catch (midcom_error $e) {
11
+}
12
+catch (midcom_error $e) {
12 13
     $customer = false;
13 14
 }
14 15
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
     }
50 50
     ?>
51 51
 
52
-    <div class="field"><div class="title"><?php echo $data['l10n_midcom']->get('description');?>: </div>
52
+    <div class="field"><div class="title"><?php echo $data['l10n_midcom']->get('description'); ?>: </div>
53 53
     <div class="description value">&(view['description']:h);</div></div>
54 54
 
55 55
     <?php
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
     // does the invoice have a cancelation invoice?
66 66
     if ($cancelation_invoice_link) {
67 67
         echo "<div class=\"field\">";
68
-        echo "<div class=\"title\">" . $data['l10n']->get('canceled by') .":</div>";
68
+        echo "<div class=\"title\">" . $data['l10n']->get('canceled by') . ":</div>";
69 69
         echo "<div class=\"value\">" . $cancelation_invoice_link . "</a></div>";
70 70
         echo "</div>";
71 71
     }
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
         $canceled_invoice_link = $data['router']->generate('invoice', ['guid' => $canceled_invoice->guid]);
75 75
 
76 76
         echo "<div class=\"field\">";
77
-        echo "<div class=\"title\">" . $data['l10n']->get('cancelation invoice for') .":</div>";
77
+        echo "<div class=\"title\">" . $data['l10n']->get('cancelation invoice for') . ":</div>";
78 78
         echo "<div class=\"value\"><a href=\"" . $canceled_invoice_link . "\">" . $data['l10n']->get('invoice') . " " . $canceled_invoice->get_label() . "</a></div>";
79 79
         echo "</div>";
80 80
     }
Please login to merge, or discard this patch.
lib/org/openpsa/relatedto/plugin.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,8 @@
 block discarded – undo
106 106
     {
107 107
         $ret = ['org_openpsa_relatedto' => []];
108 108
         foreach ($array as $rel) {
109
-            if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) { //Matches also 'org_openpsa_relatedto'
109
+            if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) {
110
+//Matches also 'org_openpsa_relatedto'
110 111
                 //Wrong type of object found in array, cruelly abort the whole procedure
111 112
                 return false;
112 113
             }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
      */
32 32
     public static function create($from_obj, $from_component, $to_obj, $to_component, $status = null, array $extra = [])
33 33
     {
34
-        if (   !is_object($from_obj)
34
+        if (!is_object($from_obj)
35 35
             || !is_object($to_obj)) {
36 36
             return false;
37 37
         }
Please login to merge, or discard this patch.
lib/org/openpsa/core/siteconfig.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@
 block discarded – undo
174 174
         }
175 175
         if (!midcom::get()->auth->admin) {
176 176
             $user_id = midcom::get()->auth->acl->get_user_id();
177
-            if (   !$this->data[$type . '_guid']
177
+            if (!$this->data[$type . '_guid']
178 178
                 || !midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->data[$type . '_guid'], midcom_db_topic::class, $user_id)) {
179 179
                 return null;
180 180
             }
Please login to merge, or discard this patch.
lib/org/openpsa/widgets/ui.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
             $config = array_merge($defaults, $config);
40 40
 
41 41
             $node_url = $siteconfig->get_node_full_url($component);
42
-            if (   $node_url
43
-                && (   !$user_id
42
+            if ($node_url
43
+                && (!$user_id
44 44
                     || midcom::get()->auth->acl->can_do_byguid('midgard:read', $siteconfig->get_node_guid($component), midcom_db_topic::class, $user_id))) {
45 45
                 $providers[] = [
46 46
                     'placeholder' => midcom::get()->i18n->get_string('search title', $component),
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
         echo '<div id="tabs">';
116 116
         echo "\n<ul>\n";
117 117
         foreach ($tabdata as $key => $tab) {
118
-            echo "<li><a id='key_" . $key ."' class='tabs_link' href='" . $prefix . $tab['url'] . "' ><span> " . $tab['title'] . "</span></a></li>";
118
+            echo "<li><a id='key_" . $key . "' class='tabs_link' href='" . $prefix . $tab['url'] . "' ><span> " . $tab['title'] . "</span></a></li>";
119 119
         }
120 120
         echo "\n</ul>\n";
121 121
         echo "</div>\n";
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -103,12 +103,12 @@
 block discarded – undo
103 103
         if (!empty($guid)) {
104 104
             //pass the urls & titles for the tabs
105 105
             $tabdata[] = [
106
-               'url' => '__mfa/org.openpsa.relatedto/journalentry/' . $guid . '/',
107
-               'title' => midcom::get()->i18n->get_string('journal entries', 'org.openpsa.relatedto'),
106
+                'url' => '__mfa/org.openpsa.relatedto/journalentry/' . $guid . '/',
107
+                'title' => midcom::get()->i18n->get_string('journal entries', 'org.openpsa.relatedto'),
108 108
             ];
109 109
             $tabdata[] = [
110
-               'url' => '__mfa/org.openpsa.relatedto/render/' . $guid . '/both/',
111
-               'title' => midcom::get()->i18n->get_string('related objects', 'org.openpsa.relatedto'),
110
+                'url' => '__mfa/org.openpsa.relatedto/render/' . $guid . '/both/',
111
+                'title' => midcom::get()->i18n->get_string('related objects', 'org.openpsa.relatedto'),
112 112
             ];
113 113
         }
114 114
 
Please login to merge, or discard this patch.
lib/midcom/helper/nav/node.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 
31 31
     public function is_readable_by($user_id)
32 32
     {
33
-        return (   !$user_id
33
+        return (!$user_id
34 34
                 || midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->guid, midcom_db_topic::class, $user_id));
35 35
     }
36 36
 
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/plugin.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
         }
147 147
         $data['default_mode'] = 'view';
148 148
 
149
-        if (   !self::get_preference('edit_mode')
149
+        if (!self::get_preference('edit_mode')
150 150
             && midcom_baseclasses_components_configuration::get('midgard.admin.asgard', 'config')->get('edit_mode') == 1) {
151 151
             $data['default_mode'] = 'edit';
152 152
         } elseif (self::get_preference('edit_mode') == 1) {
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 
186 186
         $parent = $object->get_parent();
187 187
 
188
-        if (   is_a($object, midcom_db_parameter::class)
188
+        if (is_a($object, midcom_db_parameter::class)
189 189
             && !empty($parent->guid)) {
190 190
             // Add "parameters" list to breadcrumb if we're in a param
191 191
             $breadcrumb[] = [
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
         }
196 196
 
197 197
         $i = 0;
198
-        while (   !empty($parent->guid)
198
+        while (!empty($parent->guid)
199 199
                && $i < 10) {
200 200
             $i++;
201 201
             $parent_reflector = midcom_helper_reflector::get($parent);
Please login to merge, or discard this patch.
lib/midgard/admin/user/style/midgard-admin-user-group-folders.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,8 @@
 block discarded – undo
20 20
                 if (!is_a($object, midcom_db_topic::class)) {
21 21
                     continue;
22 22
                 }
23
-            } catch (midcom_error $e) {
23
+            }
24
+            catch (midcom_error $e) {
24 25
                 continue;
25 26
             }
26 27
             echo "<tr>\n";
Please login to merge, or discard this patch.