@@ -47,7 +47,8 @@ |
||
47 | 47 | $target = new midcom_db_topic($request->request->getInt('move_to')); |
48 | 48 | $this->_move_object($target); |
49 | 49 | midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('moved %s to %s'), $this->_topic->get_label(), $target->get_label())); |
50 | - } catch (midcom_error $e) { |
|
50 | + } |
|
51 | + catch (midcom_error $e) { |
|
51 | 52 | midcom::get()->uimessages->add($this->_l10n->get($this->_component), $e->getMessage(), 'error'); |
52 | 53 | } |
53 | 54 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | { |
28 | 28 | $this->_object = midcom::get()->dbfactory->get_object_by_guid($guid); |
29 | 29 | |
30 | - if ( !($this->_object instanceof midcom_db_topic) |
|
30 | + if (!($this->_object instanceof midcom_db_topic) |
|
31 | 31 | && !($this->_object instanceof midcom_db_article)) { |
32 | 32 | throw new midcom_error_notfound("Moving only topics and articles is supported."); |
33 | 33 | } |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | { |
67 | 67 | $folder ??= midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ROOTTOPIC); |
68 | 68 | |
69 | - if ( $this->_object instanceof midcom_db_topic |
|
69 | + if ($this->_object instanceof midcom_db_topic |
|
70 | 70 | && $folder->up == $this->_object->id) { |
71 | 71 | $tree_disabled = true; |
72 | 72 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $selected = ' checked="checked"'; |
80 | 80 | } |
81 | 81 | |
82 | - if ( !($this->_object instanceof midcom_db_topic) |
|
82 | + if (!($this->_object instanceof midcom_db_topic) |
|
83 | 83 | && $folder->component !== $this->current_folder->component) { |
84 | 84 | // Non-topic objects may only be moved under folders of same component |
85 | 85 | $class = 'wrong_component'; |
@@ -74,7 +74,7 @@ |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | $result_cache[$cache_key] = []; |
77 | - $ret =& $result_cache[$cache_key]; |
|
77 | + $ret = & $result_cache[$cache_key]; |
|
78 | 78 | |
79 | 79 | if (empty($up)) { |
80 | 80 | // TODO: use reflection to see what kind of property this is ? |
@@ -149,7 +149,7 @@ |
||
149 | 149 | } |
150 | 150 | |
151 | 151 | $reflector = midcom_helper_reflector::get($linked_object); |
152 | - $link_html = "<a href='" . midcom::get()->permalinks->create_permalink($linked_object->guid) . "'>" . $reflector->get_object_label($linked_object) ."</a>"; |
|
152 | + $link_html = "<a href='" . midcom::get()->permalinks->create_permalink($linked_object->guid) . "'>" . $reflector->get_object_label($linked_object) . "</a>"; |
|
153 | 153 | $data['linked_objects'][$entry->linkGuid] = $link_html; |
154 | 154 | $data['linked_raw_objects'][$entry->linkGuid] = $reflector->get_object_label($linked_object); |
155 | 155 | } |
@@ -103,7 +103,7 @@ |
||
103 | 103 | foreach ($parameters as $key => $value) { |
104 | 104 | $this->_patterns[] = "/__({$key})__/"; |
105 | 105 | |
106 | - if ( is_array($value) |
|
106 | + if (is_array($value) |
|
107 | 107 | || is_object($value)) { |
108 | 108 | $this->_patterns[] = "/__({$key})_([^ \.>\"-]*?)__/"; |
109 | 109 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $this->from = $from; |
76 | 76 | $this->subject = $subject; |
77 | 77 | |
78 | - if ( $message->orgOpenpsaObtype != org_openpsa_directmarketing_campaign_message_dba::EMAIL_TEXT |
|
78 | + if ($message->orgOpenpsaObtype != org_openpsa_directmarketing_campaign_message_dba::EMAIL_TEXT |
|
79 | 79 | && $message->orgOpenpsaObtype != org_openpsa_directmarketing_campaign_message_dba::EMAIL_HTML) { |
80 | 80 | throw new midcom_error('unsupported message type'); |
81 | 81 | } |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | $token .= midcom_helper_misc::random_string($this->token_size - 1, 'abcdefghijklmnopqrstuvwxyz0123456789'); |
220 | 220 | |
221 | 221 | //If token is not free or (very, very unlikely) matches our dummy token, recurse. |
222 | - if ( $token === 'dummy' |
|
222 | + if ($token === 'dummy' |
|
223 | 223 | || !org_openpsa_directmarketing_campaign_messagereceipt_dba::token_is_free($token)) { |
224 | 224 | return $this->_create_token(); |
225 | 225 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | return null; |
241 | 241 | } |
242 | 242 | $type = $this->_backend->get_type(); |
243 | - if ( $person->get_parameter('org.openpsa.directmarketing', "send_all_denied") |
|
243 | + if ($person->get_parameter('org.openpsa.directmarketing', "send_all_denied") |
|
244 | 244 | || $person->get_parameter('org.openpsa.directmarketing', "send_{$type}_denied")) { |
245 | 245 | debug_add("Sending {$type} messages to person {$person->rname} is denied, unsubscribing member (member #{$member->id})"); |
246 | 246 | $member->orgOpenpsaObtype = org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED; |
@@ -160,7 +160,8 @@ discard block |
||
160 | 160 | $this->_backend->send($person, $member, $token, $subject, $content, $from); |
161 | 161 | self::$_messages_sent++; |
162 | 162 | $status = org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT; |
163 | - } catch (midcom_error $e) { |
|
163 | + } |
|
164 | + catch (midcom_error $e) { |
|
164 | 165 | $status = org_openpsa_directmarketing_campaign_messagereceipt_dba::FAILURE; |
165 | 166 | if (!$this->test_mode) { |
166 | 167 | $params[] = [ |
@@ -209,7 +210,8 @@ discard block |
||
209 | 210 | { |
210 | 211 | try { |
211 | 212 | $person = org_openpsa_contacts_person_dba::get_cached($member->person); |
212 | - } catch (midcom_error) { |
|
213 | + } |
|
214 | + catch (midcom_error) { |
|
213 | 215 | debug_add("Person #{$member->person} deleted or missing, removing member (member #{$member->id})"); |
214 | 216 | $member->orgOpenpsaObtype = org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED; |
215 | 217 | $member->delete(); |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | return null; |
101 | 101 | } |
102 | 102 | |
103 | - if ( midcom::get()->config->get('auth_check_client_ip') |
|
103 | + if (midcom::get()->config->get('auth_check_client_ip') |
|
104 | 104 | && $data['clientip'] != $request->getClientIp()) { |
105 | 105 | debug_add("The session had mismatching client IP.", MIDCOM_LOG_INFO); |
106 | 106 | debug_add("Expected {$data['clientip']}, got {$request->getClientIp()}."); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | return null; |
115 | 115 | } |
116 | 116 | |
117 | - if ( !$this->check_timestamp($data['timestamp'], $user) |
|
117 | + if (!$this->check_timestamp($data['timestamp'], $user) |
|
118 | 118 | || !$this->authenticate($user->username, '', true)) { |
119 | 119 | $this->logout($user); |
120 | 120 | return null; |
@@ -77,7 +77,8 @@ |
||
77 | 77 | if (!array_key_exists($id, $this->_user_cache)) { |
78 | 78 | try { |
79 | 79 | $this->_user_cache[$id] = new midcom_core_user($param); |
80 | - } catch (midcom_error) { |
|
80 | + } |
|
81 | + catch (midcom_error) { |
|
81 | 82 | // Keep it silent while missing user object can mess here |
82 | 83 | $this->_user_cache[$id] = null; |
83 | 84 | } |
@@ -149,7 +149,7 @@ |
||
149 | 149 | $child_indent = $indent + 20; |
150 | 150 | echo "{$prefix}<tbody class=\"children\">\n"; |
151 | 151 | foreach ($child_types as $type => $children) { |
152 | - if ( count($children) < 10 |
|
152 | + if (count($children) < 10 |
|
153 | 153 | || isset($_GET['show_children'][$object->guid][$type])) { |
154 | 154 | foreach ($children as $child) { |
155 | 155 | $this->show_type($child, $child_indent, "{$prefix} ", false); |
@@ -28,7 +28,7 @@ |
||
28 | 28 | &(published:h); |
29 | 29 | <?php |
30 | 30 | if ($data['linked']) { |
31 | - echo $data['l10n']->get('to') ." <a href=\"{$data['node'][MIDCOM_NAV_ABSOLUTEURL]}\">{$data['node'][MIDCOM_NAV_NAME]}</a>\n"; |
|
31 | + echo $data['l10n']->get('to') . " <a href=\"{$data['node'][MIDCOM_NAV_ABSOLUTEURL]}\">{$data['node'][MIDCOM_NAV_NAME]}</a>\n"; |
|
32 | 32 | } |
33 | 33 | ?> |
34 | 34 | </p> |
@@ -141,8 +141,8 @@ |
||
141 | 141 | $schema->get_field('paid')['hidden'] = empty($this->invoice->paid); |
142 | 142 | |
143 | 143 | $contact = $this->invoice->customerContact ?: $this->contact_id; |
144 | - $customer_field =& $schema->get_field('customer'); |
|
145 | - $contact_field =& $schema->get_field('customerContact'); |
|
144 | + $customer_field = & $schema->get_field('customer'); |
|
145 | + $contact_field = & $schema->get_field('customerContact'); |
|
146 | 146 | |
147 | 147 | if (!empty($contact)) { |
148 | 148 | $customer_field['type_config']['options'] = $this->get_customers_for_contact($contact); |
@@ -42,7 +42,8 @@ discard block |
||
42 | 42 | // We're creating invoice for chosen customer |
43 | 43 | try { |
44 | 44 | $this->customer = new org_openpsa_contacts_group_dba($company); |
45 | - } catch (midcom_error) { |
|
45 | + } |
|
46 | + catch (midcom_error) { |
|
46 | 47 | $contact = new org_openpsa_contacts_person_dba($company); |
47 | 48 | $this->contact_id = $contact->id; |
48 | 49 | } |
@@ -143,7 +144,8 @@ discard block |
||
143 | 144 | if (!empty($this->invoice->customer)) { |
144 | 145 | try { |
145 | 146 | $this->customer = org_openpsa_contacts_group_dba::get_cached($this->invoice->customer); |
146 | - } catch (midcom_error $e) { |
|
147 | + } |
|
148 | + catch (midcom_error $e) { |
|
147 | 149 | $customer_field['hidden'] = true; |
148 | 150 | $e->log(); |
149 | 151 | } |