@@ -67,7 +67,8 @@ discard block |
||
67 | 67 | { |
68 | 68 | try { |
69 | 69 | $person = new org_openpsa_contacts_person_dba($member->person); |
70 | - } catch (midcom_error $e) { |
|
70 | + } |
|
71 | + catch (midcom_error $e) { |
|
71 | 72 | $e->log(); |
72 | 73 | return; |
73 | 74 | } |
@@ -91,7 +92,8 @@ discard block |
||
91 | 92 | $row['organization_member'] = $membership; |
92 | 93 | try { |
93 | 94 | $row['organization'] = org_openpsa_contacts_group_dba::get_cached($membership->gid); |
94 | - } catch (midcom_error) { |
|
95 | + } |
|
96 | + catch (midcom_error) { |
|
95 | 97 | debug_add("Error fetching org_openpsa_contacts_group_dba #{$membership->gid}, skipping", MIDCOM_LOG_WARN); |
96 | 98 | continue; |
97 | 99 | } |
@@ -37,7 +37,8 @@ discard block |
||
37 | 37 | // Add person to campaign |
38 | 38 | try { |
39 | 39 | $campaign = new org_openpsa_directmarketing_campaign_dba($add_to); |
40 | - } catch (midcom_error) { |
|
40 | + } |
|
41 | + catch (midcom_error) { |
|
41 | 42 | // FIXME: More informative error message |
42 | 43 | $this->notify('Failed adding person %s to campaign %s', $add_to, 'error'); |
43 | 44 | return; |
@@ -84,7 +85,8 @@ discard block |
||
84 | 85 | try { |
85 | 86 | $campaigns[$membership->campaign] = new org_openpsa_directmarketing_campaign_dba($membership->campaign); |
86 | 87 | $campaign_membership_map[$membership->campaign] = $membership; |
87 | - } catch (midcom_error $e) { |
|
88 | + } |
|
89 | + catch (midcom_error $e) { |
|
88 | 90 | debug_add('Failed to load campaign ' . $membership->campaign . ', reason: ' . $e->getMessage()); |
89 | 91 | } |
90 | 92 | } |
@@ -74,7 +74,8 @@ |
||
74 | 74 | $productgroup = new org_openpsa_products_product_group_dba($this->_product->productGroup); |
75 | 75 | $replacements['<PRODUCTGROUP_TITLE>'] = $productgroup->title; |
76 | 76 | $replacements['<PRODUCTGROUP_CODE>'] = $productgroup->code; |
77 | - } catch (midcom_error) { |
|
77 | + } |
|
78 | + catch (midcom_error) { |
|
78 | 79 | $replacements['<PRODUCTGROUP_TITLE>'] = ''; |
79 | 80 | $replacements['<PRODUCTGROUP_CODE>'] = ''; |
80 | 81 | } |
@@ -6,7 +6,8 @@ |
||
6 | 6 | foreach ($data['prospects'] as $prospect) { |
7 | 7 | try { |
8 | 8 | $person = org_openpsa_contacts_person_dba::get_cached($prospect->person); |
9 | - } catch (midcom_error) { |
|
9 | + } |
|
10 | + catch (midcom_error) { |
|
10 | 11 | continue; |
11 | 12 | } ?> |
12 | 13 | <person> |
@@ -47,7 +47,8 @@ |
||
47 | 47 | if ($node_id) { |
48 | 48 | try { |
49 | 49 | $comments_topic = new midcom_db_topic($node_id); |
50 | - } catch (midcom_error) { |
|
50 | + } |
|
51 | + catch (midcom_error) { |
|
51 | 52 | return null; |
52 | 53 | } |
53 | 54 |
@@ -29,7 +29,8 @@ |
||
29 | 29 | foreach ($qb->execute() as $feed) { |
30 | 30 | try { |
31 | 31 | midcom_db_topic::get_cached($feed->node); |
32 | - } catch (midcom_error) { |
|
32 | + } |
|
33 | + catch (midcom_error) { |
|
33 | 34 | debug_add("Node #{$feed->node} does not exist, skipping feed #{$feed->id}", MIDCOM_LOG_ERROR); |
34 | 35 | continue; |
35 | 36 | } |
@@ -112,7 +112,8 @@ discard block |
||
112 | 112 | $row['approved'] = $object->is_approved() ? $object->metadata->approved : ''; |
113 | 113 | try { |
114 | 114 | $row['index_title'] = $reflector->get_object_label($object) ?: '[' . $this->_l10n->get('no title') . ']'; |
115 | - } catch (Exception $e) { |
|
115 | + } |
|
116 | + catch (Exception $e) { |
|
116 | 117 | $row['index_title'] = 'ERROR: ' . $e->getMessage(); |
117 | 118 | } |
118 | 119 | $link = $this->router->generate('object_' . $this->_request_data['default_mode'], ['guid' => $object->guid]); |
@@ -177,7 +178,8 @@ discard block |
||
177 | 178 | foreach ($guids as $guid) { |
178 | 179 | try { |
179 | 180 | $object = midcom::get()->dbfactory->get_object_by_guid($guid); |
180 | - } catch (midcom_error) { |
|
181 | + } |
|
182 | + catch (midcom_error) { |
|
181 | 183 | continue; |
182 | 184 | } |
183 | 185 | |
@@ -192,7 +194,8 @@ discard block |
||
192 | 194 | foreach ($guids as $guid) { |
193 | 195 | try { |
194 | 196 | $object = midcom::get()->dbfactory->get_object_by_guid($guid); |
195 | - } catch (midcom_error) { |
|
197 | + } |
|
198 | + catch (midcom_error) { |
|
196 | 199 | continue; |
197 | 200 | } |
198 | 201 |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | $qb = new midcom_core_querybuilder($midcom_dba_classname); |
32 | 32 | $qb->add_constraint('metadata.revised', '>=', $since); |
33 | 33 | |
34 | - if ( $only_mine |
|
34 | + if ($only_mine |
|
35 | 35 | && $guid = midcom::get()->auth->user?->guid) { |
36 | 36 | $qb->add_constraint('metadata.authors', 'LIKE', '|' . $guid . '|'); |
37 | 37 | } |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | continue; |
197 | 197 | } |
198 | 198 | |
199 | - if ( $object->can_do('midgard:update') |
|
199 | + if ($object->can_do('midgard:update') |
|
200 | 200 | && $object->can_do('midcom:approve')) { |
201 | 201 | $object->metadata->approve(); |
202 | 202 | midcom::get()->uimessages->add($this->_l10n->get('midgard.admin.asgard'), sprintf($this->_l10n->get('object %s approved'), $object->guid)); |
@@ -17,7 +17,8 @@ |
||
17 | 17 | foreach ($data['objects'] as $guid => $privs) { |
18 | 18 | try { |
19 | 19 | $object = new midcom_db_topic($guid); |
20 | - } catch (midcom_error) { |
|
20 | + } |
|
21 | + catch (midcom_error) { |
|
21 | 22 | continue; |
22 | 23 | } |
23 | 24 | echo "<tr>\n"; |
@@ -185,7 +185,8 @@ |
||
185 | 185 | |
186 | 186 | try { |
187 | 187 | $account = new midcom_core_account($person); |
188 | - } catch (midcom_error) { |
|
188 | + } |
|
189 | + catch (midcom_error) { |
|
189 | 190 | midcom::get()->uimessages->add($this->_l10n->get('midgard.admin.user'), sprintf($this->_l10n->get('failed to get the user with id %s'), $person->id), 'error'); |
190 | 191 | return; |
191 | 192 | } |