@@ -25,7 +25,8 @@ |
||
25 | 25 | try { |
26 | 26 | midcom::get()->dbfactory->get_object_by_guid($result->fromGuid); |
27 | 27 | midcom::get()->dbfactory->get_object_by_guid($result->toGuid); |
28 | - } catch (midcom_error) { |
|
28 | + } |
|
29 | + catch (midcom_error) { |
|
29 | 30 | echo $i . "/" . $total . ": Deleting relatedto #" . $result->id . "\n"; |
30 | 31 | $result->delete(); |
31 | 32 | } |
@@ -107,7 +107,8 @@ discard block |
||
107 | 107 | //TODO: check for duplicates ? |
108 | 108 | try { |
109 | 109 | $result = ['other_obj' => midcom::get()->dbfactory->get_object_by_guid($link[$other . 'Guid'])]; |
110 | - } catch (midcom_error) { |
|
110 | + } |
|
111 | + catch (midcom_error) { |
|
111 | 112 | continue; |
112 | 113 | } |
113 | 114 | $result['link'] = [ |
@@ -378,7 +379,8 @@ discard block |
||
378 | 379 | if (!($this->_object instanceof org_openpsa_relatedto_dba)) { |
379 | 380 | $response['status'] = "method requires guid of a link object as an argument"; |
380 | 381 | } |
381 | - } catch (midcom_error $e) { |
|
382 | + } |
|
383 | + catch (midcom_error $e) { |
|
382 | 384 | $response['status'] = "error: " . $e->getMessage(); |
383 | 385 | } |
384 | 386 | |
@@ -399,7 +401,8 @@ discard block |
||
399 | 401 | $relation = new org_openpsa_relatedto_dba($guid); |
400 | 402 | $result = $relation->delete(); |
401 | 403 | $status = 'Last message: ' . midcom_connection::get_error_string(); |
402 | - } catch (midcom_error $e) { |
|
404 | + } |
|
405 | + catch (midcom_error $e) { |
|
403 | 406 | $result = false; |
404 | 407 | $status = "Object '{$guid}' could not be loaded, error:" . $e->getMessage(); |
405 | 408 | } |
@@ -23,7 +23,8 @@ discard block |
||
23 | 23 | midcom::get()->auth->request_sudo($this->_component); |
24 | 24 | try { |
25 | 25 | $person = new midcom_db_person($args['guid']); |
26 | - } catch (midcom_error) { |
|
26 | + } |
|
27 | + catch (midcom_error) { |
|
27 | 28 | $handler->print_error('Person with guid #' . $args['guid'] . ' does not exist'); |
28 | 29 | midcom::get()->auth->drop_sudo(); |
29 | 30 | return false; |
@@ -31,7 +32,8 @@ discard block |
||
31 | 32 | $accounthelper = new org_openpsa_user_accounthelper($person); |
32 | 33 | try { |
33 | 34 | $accounthelper->reopen_account(); |
34 | - } catch (midcom_error $e) { |
|
35 | + } |
|
36 | + catch (midcom_error $e) { |
|
35 | 37 | $handler->print_error($e->getMessage()); |
36 | 38 | midcom::get()->auth->drop_sudo(); |
37 | 39 | return false; |
@@ -103,7 +103,8 @@ discard block |
||
103 | 103 | |
104 | 104 | try { |
105 | 105 | $person = midcom_db_person::get_cached($src); |
106 | - } catch (midcom_error) { |
|
106 | + } |
|
107 | + catch (midcom_error) { |
|
107 | 108 | return $cache[$src] = new self(new midcom_db_person); |
108 | 109 | } |
109 | 110 | |
@@ -303,7 +304,8 @@ discard block |
||
303 | 304 | foreach ($mc->get_rows(['gid', 'extra']) as $data) { |
304 | 305 | try { |
305 | 306 | $group = org_openpsa_contacts_group_dba::get_cached($data['gid']); |
306 | - } catch (midcom_error $e) { |
|
307 | + } |
|
308 | + catch (midcom_error $e) { |
|
307 | 309 | $e->log(); |
308 | 310 | continue; |
309 | 311 | } |
@@ -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(); |
@@ -51,7 +51,8 @@ discard block |
||
51 | 51 | try { |
52 | 52 | midcom::get()->dynamic_load($batch_url); |
53 | 53 | $ret = true; |
54 | - } catch (midcom_error $e) { |
|
54 | + } |
|
55 | + catch (midcom_error $e) { |
|
55 | 56 | $ret = $e->getMessage(); |
56 | 57 | } |
57 | 58 | ob_end_clean(); |
@@ -74,7 +75,8 @@ discard block |
||
74 | 75 | $stat = true; |
75 | 76 | try { |
76 | 77 | $campaign = new org_openpsa_directmarketing_campaign_dba($args['campaign_guid']); |
77 | - } catch (midcom_error) { |
|
78 | + } |
|
79 | + catch (midcom_error) { |
|
78 | 80 | $handler->print_error("{$args['campaign_guid']} is not a valid campaign GUID"); |
79 | 81 | $stat = false; |
80 | 82 | } |
@@ -114,7 +114,8 @@ |
||
114 | 114 | try { |
115 | 115 | $person = org_openpsa_contacts_person_dba::get_cached($link->person); |
116 | 116 | $segment = $person->get_parameter('org.openpsa.directmarketing.segments', $segmentation_param); |
117 | - } catch (midcom_error) { |
|
117 | + } |
|
118 | + catch (midcom_error) { |
|
118 | 119 | } |
119 | 120 | if (empty($segment)) { |
120 | 121 | $segment = $this->_l10n->get('no segment'); |
@@ -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 | } |