@@ -150,7 +150,8 @@ discard block |
||
| 150 | 150 | debug_add('person #' . $person->id . 'has no email address, aborting'); |
| 151 | 151 | return false; |
| 152 | 152 | } |
| 153 | - } catch (midcom_error $e) { |
|
| 153 | + } |
|
| 154 | + catch (midcom_error $e) { |
|
| 154 | 155 | return false; |
| 155 | 156 | } |
| 156 | 157 | |
@@ -178,7 +179,8 @@ discard block |
||
| 178 | 179 | foreach ($eventmembers as $eid) { |
| 179 | 180 | try { |
| 180 | 181 | $event = org_openpsa_calendar_event_dba::get_cached($eid); |
| 181 | - } catch (midcom_error $e) { |
|
| 182 | + } |
|
| 183 | + catch (midcom_error $e) { |
|
| 182 | 184 | continue; |
| 183 | 185 | } |
| 184 | 186 | $ymd = date('Ymd', $event->start); |
@@ -107,7 +107,8 @@ |
||
| 107 | 107 | if (!empty($productdata['GUID'])) { |
| 108 | 108 | try { |
| 109 | 109 | $product = new org_openpsa_products_product_dba($productdata['GUID']); |
| 110 | - } catch (midcom_error $e) { |
|
| 110 | + } |
|
| 111 | + catch (midcom_error $e) { |
|
| 111 | 112 | $e->log(); |
| 112 | 113 | } |
| 113 | 114 | } |
@@ -85,7 +85,8 @@ |
||
| 85 | 85 | $productgroup = new org_openpsa_products_product_group_dba($this->_product->productGroup); |
| 86 | 86 | $title = str_replace('<PRODUCTGROUP_TITLE>', $productgroup->title, $title); |
| 87 | 87 | $title = str_replace('<PRODUCTGROUP_CODE>', $productgroup->code, $title); |
| 88 | - } catch (midcom_error $e) { |
|
| 88 | + } |
|
| 89 | + catch (midcom_error $e) { |
|
| 89 | 90 | $title = str_replace(array('<PRODUCTGROUP_TITLE>', '<PRODUCTGROUP_CODE>'), '', $title); |
| 90 | 91 | } |
| 91 | 92 | } |
@@ -132,7 +132,8 @@ |
||
| 132 | 132 | } elseif ((int) $args[0] > 0) { |
| 133 | 133 | try { |
| 134 | 134 | $this->parent = new org_openpsa_products_product_group_dba((int) $args[0]); |
| 135 | - } catch (midcom_error $e) { |
|
| 135 | + } |
|
| 136 | + catch (midcom_error $e) { |
|
| 136 | 137 | $e->log(); |
| 137 | 138 | } |
| 138 | 139 | } |
@@ -57,7 +57,8 @@ discard block |
||
| 57 | 57 | try { |
| 58 | 58 | midcom::get()->dynamic_load($batch_url); |
| 59 | 59 | $ret = true; |
| 60 | - } catch (midcom_error $e) { |
|
| 60 | + } |
|
| 61 | + catch (midcom_error $e) { |
|
| 61 | 62 | $ret = $e->getMessage(); |
| 62 | 63 | } |
| 63 | 64 | ob_end_clean(); |
@@ -83,7 +84,8 @@ discard block |
||
| 83 | 84 | midcom::get()->auth->request_sudo($this->_component); |
| 84 | 85 | try { |
| 85 | 86 | $campaign = new org_openpsa_directmarketing_campaign_dba($args['campaign_guid']); |
| 86 | - } catch (midcom_error $e) { |
|
| 87 | + } |
|
| 88 | + catch (midcom_error $e) { |
|
| 87 | 89 | $handler->print_error("{$args['campaign_guid']} is not a valid campaign GUID"); |
| 88 | 90 | return false; |
| 89 | 91 | } |
@@ -269,7 +269,8 @@ |
||
| 269 | 269 | $guid = $mc_parameter->get_subkey($parameter_key, 'parentguid'); |
| 270 | 270 | try { |
| 271 | 271 | $parent = midcom::get()->dbfactory->get_object_by_guid($guid); |
| 272 | - } catch (midcom_error $e) { |
|
| 272 | + } |
|
| 273 | + catch (midcom_error $e) { |
|
| 273 | 274 | $e->log(); |
| 274 | 275 | continue; |
| 275 | 276 | } |
@@ -222,7 +222,8 @@ discard block |
||
| 222 | 222 | $this->_backend->send($person, $member, $token, $subject, $content, $from); |
| 223 | 223 | self::$_messages_sent++; |
| 224 | 224 | $status = org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT; |
| 225 | - } catch (midcom_error $e) { |
|
| 225 | + } |
|
| 226 | + catch (midcom_error $e) { |
|
| 226 | 227 | $status = org_openpsa_directmarketing_campaign_messagereceipt_dba::FAILURE; |
| 227 | 228 | if (!$this->test_mode) { |
| 228 | 229 | $params[] = array( |
@@ -279,7 +280,8 @@ discard block |
||
| 279 | 280 | { |
| 280 | 281 | try { |
| 281 | 282 | $person = org_openpsa_contacts_person_dba::get_cached($member->person); |
| 282 | - } catch (midcom_error $e) { |
|
| 283 | + } |
|
| 284 | + catch (midcom_error $e) { |
|
| 283 | 285 | debug_add("Person #{$member->person} deleted or missing, removing member (member #{$member->id})"); |
| 284 | 286 | $member->orgOpenpsaObtype = org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED; |
| 285 | 287 | $member->delete(); |
@@ -59,7 +59,8 @@ discard block |
||
| 59 | 59 | { |
| 60 | 60 | try { |
| 61 | 61 | $person = new org_openpsa_contacts_person_dba($member->person); |
| 62 | - } catch (midcom_error $e) { |
|
| 62 | + } |
|
| 63 | + catch (midcom_error $e) { |
|
| 63 | 64 | $e->log(); |
| 64 | 65 | return; |
| 65 | 66 | } |
@@ -82,7 +83,8 @@ discard block |
||
| 82 | 83 | $row['organization_member'] = $membership; |
| 83 | 84 | try { |
| 84 | 85 | $row['organization'] = org_openpsa_contacts_group_dba::get_cached($membership->gid); |
| 85 | - } catch (midcom_error $e) { |
|
| 86 | + } |
|
| 87 | + catch (midcom_error $e) { |
|
| 86 | 88 | debug_add("Error fetching org_openpsa_contacts_group_dba #{$membership->gid}, skipping", MIDCOM_LOG_WARN); |
| 87 | 89 | continue; |
| 88 | 90 | } |
@@ -142,7 +142,8 @@ |
||
| 142 | 142 | try { |
| 143 | 143 | $person = org_openpsa_contacts_person_dba::get_cached($link->person); |
| 144 | 144 | $segment = $person->get_parameter('org.openpsa.directmarketing.segments', $segmentation_param); |
| 145 | - } catch (midcom_error $e) { |
|
| 145 | + } |
|
| 146 | + catch (midcom_error $e) { |
|
| 146 | 147 | } |
| 147 | 148 | if (empty($segment)) { |
| 148 | 149 | $segment = $this->_l10n->get('no segment'); |