Completed
Branch master (4f76a2)
by Andreas
22:32
created
lib/org/openpsa/documents/directory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
         $ownerwg = $this->get_parameter('org.openpsa.core', 'orgOpenpsaOwnerWg');
21 21
         $accesstype = $this->get_parameter('org.openpsa.core', 'orgOpenpsaAccesstype');
22 22
 
23
-        if (   $ownerwg
23
+        if ($ownerwg
24 24
             && $accesstype) {
25 25
             // Sync the object's ACL properties into MidCOM ACL system
26 26
             $sync = new org_openpsa_core_acl_synchronizer();
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     private function _update_parent_timestamp()
42 42
     {
43 43
         $parent = $this->get_parent();
44
-        if (   $parent
44
+        if ($parent
45 45
             && $parent->component == 'org.openpsa.documents') {
46 46
             midcom::get()->auth->request_sudo('org.openpsa.documents');
47 47
 
Please login to merge, or discard this patch.
lib/org/openpsa/httplib/exec/test_post.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 
18 18
 } else {
19 19
     $client = new org_openpsa_httplib();
20
-    if (   !empty($_REQUEST['username'])
20
+    if (!empty($_REQUEST['username'])
21 21
         && !empty($_REQUEST['password'])) {
22 22
         $client->basicauth['user'] = $_REQUEST['username'];
23 23
         $client->basicauth['password'] = $_REQUEST['password'];
Please login to merge, or discard this patch.
lib/org/openpsa/mail/exec/test.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 midcom::get()->auth->require_admin_user();
3 3
 
4
-if (   empty($_POST['to'])
4
+if (empty($_POST['to'])
5 5
     || empty($_POST['from'])) {
6 6
     ?>
7 7
     <h2>Send test email</h2>
Please login to merge, or discard this patch.
lib/org/openpsa/mail/template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
         foreach ($this->_parameters as $key => $value) {
112 112
             $this->_patterns[] = "/__({$key})__/";
113 113
 
114
-            if (   is_array($value)
114
+            if (is_array($value)
115 115
                 || is_object($value)) {
116 116
                 $this->_patterns[] = "/__({$key})_([^ \.>\"-]*?)__/";
117 117
             }
Please login to merge, or discard this patch.
lib/org/openpsa/notifications/main.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,8 @@
 block discarded – undo
52 52
         // TODO: Should we sudo here to ensure getting correct prefs regardless of ACLs?
53 53
         try {
54 54
             $recipient = midcom_db_person::get_cached($recipient);
55
-        } catch (midcom_error $e) {
55
+        }
56
+        catch (midcom_error $e) {
56 57
             return false;
57 58
         }
58 59
 
Please login to merge, or discard this patch.
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.
lib/org/openpsa/invoices/scheduler.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -126,7 +126,8 @@
 block discarded – undo
126 126
         $salesproject = org_openpsa_sales_salesproject_dba::get_cached($this->_deliverable->salesproject);
127 127
         try {
128 128
             $owner = midcom_db_person::get_cached($salesproject->owner);
129
-        } catch (midcom_error $e) {
129
+        }
130
+        catch (midcom_error $e) {
130 131
             $e->log();
131 132
             return;
132 133
         }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
         }
95 95
 
96 96
         // TODO: Warehouse management: create new order
97
-        if (   $this->_deliverable->end < $next_cycle_start
97
+        if ($this->_deliverable->end < $next_cycle_start
98 98
             && $this->_deliverable->end != 0) {
99 99
             debug_add('Do not register next cycle, the contract ends before');
100 100
             return $this->_deliverable->end_subscription();
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 
314 314
         //If previous cycle was run at the end of the month, the new one should be at the end of the month as well
315 315
         $date = new DateTime(gmdate('Y-m-d', $time), new DateTimeZone('GMT'));
316
-        if (   $date->format('t') == $date->format('j')
316
+        if ($date->format('t') == $date->format('j')
317 317
             && $new_date->format('t') != $new_date->format('j')) {
318 318
             $new_date->setDate((int) $new_date->format('Y'), (int) $new_date->format('m'), (int) $new_date->format('t'));
319 319
         }
@@ -373,11 +373,11 @@  discard block
 block discarded – undo
373 373
                 break;
374 374
             case 'q':
375 375
                 // Quarterly recurring subscription
376
-                $identifier = ceil(((int)$date->format('n')) / 4) . 'Q' . $date->format('y');
376
+                $identifier = ceil(((int) $date->format('n')) / 4) . 'Q' . $date->format('y');
377 377
                 break;
378 378
             case 'hy':
379 379
                 // Half-yearly recurring subscription
380
-                $identifier = ceil(((int)$date->format('n')) / 6) . '/' . $date->format('Y');
380
+                $identifier = ceil(((int) $date->format('n')) / 6) . '/' . $date->format('Y');
381 381
                 break;
382 382
             case 'y':
383 383
                 // Yearly recurring subscription
Please login to merge, or discard this patch.
lib/org/openpsa/sales/midcom/interfaces.php 2 patches
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -134,7 +134,8 @@  discard block
 block discarded – undo
134 134
 
135 135
         try {
136 136
             $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']);
137
-        } catch (midcom_error $e) {
137
+        }
138
+        catch (midcom_error $e) {
138 139
             $handler->print_error("Deliverable {$args['deliverable']} not found: " . midcom_connection::get_error_string());
139 140
             return false;
140 141
         }
@@ -158,7 +159,8 @@  discard block
 block discarded – undo
158 159
         }
159 160
         try {
160 161
             $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']);
161
-        } catch (midcom_error $e) {
162
+        }
163
+        catch (midcom_error $e) {
162 164
             $handler->print_error('no deliverable with passed GUID: ' . $args['deliverable'] . ', aborting');
163 165
             return false;
164 166
         }
@@ -166,7 +168,8 @@  discard block
 block discarded – undo
166 168
         //get the owner of the salesproject the deliverable belongs to
167 169
         try {
168 170
             $project = new org_openpsa_sales_salesproject_dba($deliverable->salesproject);
169
-        } catch (midcom_error $e) {
171
+        }
172
+        catch (midcom_error $e) {
170 173
             $handler->print_error('Failed to load salesproject: ' . $e->getMessage());
171 174
             return false;
172 175
         }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
      */
53 53
     private function _find_suspects_event(midcom_core_dbaobject $object, org_openpsa_relatedto_dba $defaults, array &$links_array)
54 54
     {
55
-        if (   !is_array($object->participants)
55
+        if (!is_array($object->participants)
56 56
             || count($object->participants) < 2) {
57 57
             //We have invalid list or less than two participants, abort
58 58
             return;
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
      */
125 125
     public function new_subscription_cycle(array $args, midcom_baseclasses_components_cron_handler $handler)
126 126
     {
127
-        if (   !isset($args['deliverable'])
127
+        if (!isset($args['deliverable'])
128 128
             || !isset($args['cycle'])) {
129 129
             $handler->print_error('deliverable GUID or cycle number not set, aborting');
130 130
             return false;
Please login to merge, or discard this patch.
lib/org/openpsa/sales/handler/deliverable/view.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,8 @@
 block discarded – undo
51 51
         }
52 52
         try {
53 53
             $this->_request_data['product'] = org_openpsa_products_product_dba::get_cached($this->_deliverable->product);
54
-        } catch (midcom_error $e) {
54
+        }
55
+        catch (midcom_error $e) {
55 56
             $this->_request_data['product'] = false;
56 57
         }
57 58
     }
Please login to merge, or discard this patch.
lib/org/openpsa/sales/handler/list.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -113,7 +113,8 @@
 block discarded – undo
113 113
         try {
114 114
             $this->_request_data['customer'] = new org_openpsa_contacts_group_dba($guid);
115 115
             $qb->add_constraint('customer', '=', $this->_request_data['customer']->id);
116
-        } catch (midcom_error $e) {
116
+        }
117
+        catch (midcom_error $e) {
117 118
             $this->_request_data['customer'] = new org_openpsa_contacts_person_dba($guid);
118 119
             $qb->add_constraint('customerContact', '=', $this->_request_data['customer']->id);
119 120
         }
Please login to merge, or discard this patch.