@@ -17,7 +17,7 @@ |
||
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']; |
@@ -1,7 +1,7 @@ |
||
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> |
@@ -52,7 +52,8 @@ |
||
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 |
@@ -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 | } |
@@ -126,7 +126,8 @@ |
||
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 | } |
@@ -94,7 +94,7 @@ discard block |
||
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 |
||
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 |
||
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 |
@@ -134,7 +134,8 @@ discard block |
||
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 |
||
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 |
||
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 | } |
@@ -52,7 +52,7 @@ |
||
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; |
@@ -51,7 +51,8 @@ |
||
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 | } |
@@ -113,7 +113,8 @@ |
||
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 | } |
@@ -159,7 +159,8 @@ |
||
159 | 159 | |
160 | 160 | try { |
161 | 161 | $object = new $classname($guid); |
162 | - } catch (midcom_error $e) { |
|
162 | + } |
|
163 | + catch (midcom_error $e) { |
|
163 | 164 | $handler->print_error($type . " {$guid} not found, error " . $e->getMessage()); |
164 | 165 | return false; |
165 | 166 | } |
@@ -77,11 +77,11 @@ discard block |
||
77 | 77 | |
78 | 78 | public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object) : ?string |
79 | 79 | { |
80 | - if ( $object instanceof org_openpsa_contacts_group_dba |
|
80 | + if ($object instanceof org_openpsa_contacts_group_dba |
|
81 | 81 | || $object instanceof midcom_db_group) { |
82 | 82 | return "group/{$object->guid}/"; |
83 | 83 | } |
84 | - if ( $object instanceof org_openpsa_contacts_person_dba |
|
84 | + if ($object instanceof org_openpsa_contacts_person_dba |
|
85 | 85 | || $object instanceof midcom_db_person) { |
86 | 86 | return "person/{$object->guid}/"; |
87 | 87 | } |
@@ -110,8 +110,8 @@ discard block |
||
110 | 110 | // We have a feed URL, but we should check if it is GeoRSS as well |
111 | 111 | $items = net_nemein_rss_fetch::raw_fetch($data['rss_url'])->get_items(); |
112 | 112 | |
113 | - if ( !empty($items) |
|
114 | - && ( $items[0]->get_latitude() |
|
113 | + if (!empty($items) |
|
114 | + && ($items[0]->get_latitude() |
|
115 | 115 | || $items[0]->get_longitude())) { |
116 | 116 | // This is a GeoRSS feed |
117 | 117 | $data['georss_url'] = $data['rss_url']; |
@@ -382,7 +382,8 @@ |
||
382 | 382 | try { |
383 | 383 | $obj1 = $class::get_cached($arr1['guid']); |
384 | 384 | $obj2 = $class::get_cached($arr2['guid']); |
385 | - } catch (midcom_error $e) { |
|
385 | + } |
|
386 | + catch (midcom_error $e) { |
|
386 | 387 | $e->log(); |
387 | 388 | continue; |
388 | 389 | } |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | // if user's lastname is part of the email address, check to see if the difference is only in the domain part |
129 | 129 | $email1 = preg_replace('/@.+/', '', $person1['email']); |
130 | 130 | $email2 = preg_replace('/@.+/', '', $person2['email']); |
131 | - if ( str_contains($email1, $person1['lastname']) |
|
131 | + if (str_contains($email1, $person1['lastname']) |
|
132 | 132 | && $email1 == $email2) { |
133 | 133 | $ret['email_match'] = true; |
134 | 134 | $ret['p'] += 0.5; |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | |
175 | 175 | private function match(string $property, array $data1, array $data2) : bool |
176 | 176 | { |
177 | - if ( !empty($data1[$property]) |
|
177 | + if (!empty($data1[$property]) |
|
178 | 178 | && $data1[$property] == $data2[$property]) { |
179 | 179 | return true; |
180 | 180 | } |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | $persons = $this->get_person_candidates(); |
326 | 326 | |
327 | 327 | $params = []; |
328 | - $params['objects'] =& $persons; |
|
328 | + $params['objects'] = & $persons; |
|
329 | 329 | $params['mode'] = 'person'; |
330 | 330 | |
331 | 331 | array_walk($persons, [$this, 'check_all_arraywalk'], $params); |
@@ -387,7 +387,7 @@ discard block |
||
387 | 387 | continue; |
388 | 388 | } |
389 | 389 | |
390 | - if ( $obj1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj2->guid) |
|
390 | + if ($obj1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj2->guid) |
|
391 | 391 | || $obj2->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj1->guid)) { |
392 | 392 | // Not-duplicate parameter found, returning zero probability |
393 | 393 | continue; |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | |
415 | 415 | $groups = $this->get_group_candidates(); |
416 | 416 | $params = []; |
417 | - $params['objects'] =& $groups; |
|
417 | + $params['objects'] = & $groups; |
|
418 | 418 | $params['mode'] = 'group'; |
419 | 419 | array_walk($groups, [$this, 'check_all_arraywalk'], $params); |
420 | 420 |