@@ -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 | } |
@@ -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 | } |
@@ -21,7 +21,8 @@ |
||
21 | 21 | try { |
22 | 22 | $customer = new org_openpsa_contacts_group_dba($customer); |
23 | 23 | $customer_title = $customer->official; |
24 | - } catch (midcom_error) { |
|
24 | + } |
|
25 | + catch (midcom_error) { |
|
25 | 26 | $customer_title = $data['l10n']->get('no customer'); |
26 | 27 | } |
27 | 28 |
@@ -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> |
@@ -109,7 +109,8 @@ |
||
109 | 109 | MIDCOM_TOOLBAR_GLYPHICON => 'money', |
110 | 110 | ]; |
111 | 111 | } |
112 | - } catch (midcom_error) { |
|
112 | + } |
|
113 | + catch (midcom_error) { |
|
113 | 114 | } |
114 | 115 | } |
115 | 116 |