@@ -31,7 +31,8 @@ discard block |
||
| 31 | 31 | try { |
| 32 | 32 | $agreement = new org_openpsa_sales_salesproject_deliverable_dba($agreement); |
| 33 | 33 | $agreement->update_units(); |
| 34 | - } catch (midcom_error $e) { |
|
| 34 | + } |
|
| 35 | + catch (midcom_error $e) { |
|
| 35 | 36 | $e->log(); |
| 36 | 37 | } |
| 37 | 38 | } |
@@ -49,7 +50,8 @@ discard block |
||
| 49 | 50 | |
| 50 | 51 | try { |
| 51 | 52 | $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']); |
| 52 | - } catch (midcom_error $e) { |
|
| 53 | + } |
|
| 54 | + catch (midcom_error $e) { |
|
| 53 | 55 | $handler->print_error("Deliverable {$args['deliverable']} not found: " . midcom_connection::get_error_string()); |
| 54 | 56 | return false; |
| 55 | 57 | } |
@@ -69,7 +71,8 @@ discard block |
||
| 69 | 71 | } |
| 70 | 72 | try { |
| 71 | 73 | $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($args['deliverable']); |
| 72 | - } catch (midcom_error $e) { |
|
| 74 | + } |
|
| 75 | + catch (midcom_error $e) { |
|
| 73 | 76 | $handler->print_error('no deliverable with passed GUID: ' . $args['deliverable'] . ', aborting'); |
| 74 | 77 | return false; |
| 75 | 78 | } |
@@ -77,7 +80,8 @@ discard block |
||
| 77 | 80 | //get the owner of the salesproject the deliverable belongs to |
| 78 | 81 | try { |
| 79 | 82 | $project = new org_openpsa_sales_salesproject_dba($deliverable->salesproject); |
| 80 | - } catch (midcom_error $e) { |
|
| 83 | + } |
|
| 84 | + catch (midcom_error $e) { |
|
| 81 | 85 | $handler->print_error('Failed to load salesproject: ' . $e->getMessage()); |
| 82 | 86 | return false; |
| 83 | 87 | } |
@@ -8,7 +8,8 @@ |
||
| 8 | 8 | if ($customer->orgOpenpsaObtype < org_openpsa_contacts_group_dba::ORGANIZATION) { |
| 9 | 9 | $customer = false; |
| 10 | 10 | } |
| 11 | -} catch (midcom_error $e) { |
|
| 11 | +} |
|
| 12 | +catch (midcom_error $e) { |
|
| 12 | 13 | $customer = false; |
| 13 | 14 | } |
| 14 | 15 | |
@@ -96,7 +96,8 @@ discard block |
||
| 96 | 96 | $customer = org_openpsa_contacts_group_dba::get_cached($invoice->customer); |
| 97 | 97 | $entry['customer'] = "<a href=\"{$this->router->generate('list_customer_all', ['guid' => $customer->guid])}\">" . $customer->get_label() . "</a>"; |
| 98 | 98 | $entry['index_customer'] = $customer->get_label(); |
| 99 | - } catch (midcom_error $e) { |
|
| 99 | + } |
|
| 100 | + catch (midcom_error $e) { |
|
| 100 | 101 | $entry['customer'] = ''; |
| 101 | 102 | $entry['index_customer'] = ''; |
| 102 | 103 | } |
@@ -110,7 +111,8 @@ discard block |
||
| 110 | 111 | $entry['contact'] = "<a href=\"{$this->router->generate('list_customer_all', ['guid' => $contact->guid])}\">" . $contact->get_label() . "</a>"; |
| 111 | 112 | $entry['contact'] = $contact_widget->show_inline(); |
| 112 | 113 | $entry['index_contact'] = $contact->get_label(); |
| 113 | - } catch (midcom_error $e) { |
|
| 114 | + } |
|
| 115 | + catch (midcom_error $e) { |
|
| 114 | 116 | $entry['contact'] = ''; |
| 115 | 117 | $entry['index_contact'] = ''; |
| 116 | 118 | } |
@@ -257,7 +259,8 @@ discard block |
||
| 257 | 259 | { |
| 258 | 260 | try { |
| 259 | 261 | $this->_customer = new org_openpsa_contacts_group_dba($guid); |
| 260 | - } catch (midcom_error $e) { |
|
| 262 | + } |
|
| 263 | + catch (midcom_error $e) { |
|
| 261 | 264 | $this->_customer = new org_openpsa_contacts_person_dba($guid); |
| 262 | 265 | } |
| 263 | 266 | $data['customer'] = $this->_customer; |
@@ -31,7 +31,8 @@ discard block |
||
| 31 | 31 | if ($data['contacts_url']) { |
| 32 | 32 | $row['customer'] = "<a href=\"{$data['contacts_url']}group/{$customer->guid}/\">{$label}</a>"; |
| 33 | 33 | } |
| 34 | - } catch (midcom_error $e) { |
|
| 34 | + } |
|
| 35 | + catch (midcom_error $e) { |
|
| 35 | 36 | $e->log(); |
| 36 | 37 | } |
| 37 | 38 | } |
@@ -44,7 +45,8 @@ discard block |
||
| 44 | 45 | $contact_widget = org_openpsa_widgets_contact::get($salesproject->customerContact); |
| 45 | 46 | $row['index_customerContact'] = $customer->get_label(); |
| 46 | 47 | $row['customerContact'] = $contact_widget->show_inline(); |
| 47 | - } catch (midcom_error $e) { |
|
| 48 | + } |
|
| 49 | + catch (midcom_error $e) { |
|
| 48 | 50 | $e->log(); |
| 49 | 51 | } |
| 50 | 52 | } |
@@ -56,7 +58,8 @@ discard block |
||
| 56 | 58 | $owner_widget = org_openpsa_widgets_contact::get($salesproject->owner); |
| 57 | 59 | $row['index_owner'] = $owner->rname; |
| 58 | 60 | $row['owner'] = $owner_widget->show_inline(); |
| 59 | - } catch (midcom_error $e) { |
|
| 61 | + } |
|
| 62 | + catch (midcom_error $e) { |
|
| 60 | 63 | $row['index_owner'] = ''; |
| 61 | 64 | $row['owner'] = ''; |
| 62 | 65 | } |
@@ -102,7 +102,8 @@ discard block |
||
| 102 | 102 | foreach ($hours as $guid => $row) { |
| 103 | 103 | try { |
| 104 | 104 | $task = org_openpsa_projects_task_dba::get_cached($row['task']); |
| 105 | - } catch (midcom_error $e) { |
|
| 105 | + } |
|
| 106 | + catch (midcom_error $e) { |
|
| 106 | 107 | // Task couldn't be loaded, probably because of ACL |
| 107 | 108 | continue; |
| 108 | 109 | } |
@@ -115,7 +116,8 @@ discard block |
||
| 115 | 116 | $person_object = midcom_db_person::get_cached($row['person']); |
| 116 | 117 | $person_label = $this->_get_list_link($person_object->name, null, null, $row['person']); |
| 117 | 118 | $person_name = $person_object->name; |
| 118 | - } catch (midcom_error $e) { |
|
| 119 | + } |
|
| 120 | + catch (midcom_error $e) { |
|
| 119 | 121 | $person_label = $this->_l10n->get('no person'); |
| 120 | 122 | $person_name = ''; |
| 121 | 123 | } |
@@ -69,7 +69,8 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | try { |
| 71 | 71 | $result = $router->match($url); |
| 72 | - } catch (ResourceNotFoundException $e) { |
|
| 72 | + } |
|
| 73 | + catch (ResourceNotFoundException $e) { |
|
| 73 | 74 | throw new midcom_error_notfound('This URL method is unknown.'); |
| 74 | 75 | } |
| 75 | 76 | $this->request->attributes->add($result); |
@@ -151,11 +152,13 @@ discard block |
||
| 151 | 152 | |
| 152 | 153 | try { |
| 153 | 154 | $result = $router->match($url); |
| 154 | - } catch (ResourceNotFoundException $e) { |
|
| 155 | + } |
|
| 156 | + catch (ResourceNotFoundException $e) { |
|
| 155 | 157 | // No match |
| 156 | 158 | debug_add("Component {$viewer->_component} in {$viewer->_topic->name} declared unable to handle request.", MIDCOM_LOG_INFO); |
| 157 | 159 | throw new midcom_error_notfound("This page is not available on this server."); |
| 158 | - } catch (MethodNotAllowedException $e) { |
|
| 160 | + } |
|
| 161 | + catch (MethodNotAllowedException $e) { |
|
| 159 | 162 | debug_add("Component {$viewer->_component} in {$viewer->_topic->name} declared unable to handle request (method not allowed).", MIDCOM_LOG_INFO); |
| 160 | 163 | throw new midcom_error_forbidden($e->getMessage(), Response::HTTP_METHOD_NOT_ALLOWED); |
| 161 | 164 | } |
@@ -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 $e) { |
|
| 181 | + } |
|
| 182 | + catch (midcom_error $e) { |
|
| 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 $e) { |
|
| 197 | + } |
|
| 198 | + catch (midcom_error $e) { |
|
| 196 | 199 | continue; |
| 197 | 200 | } |
| 198 | 201 | |
@@ -119,7 +119,8 @@ discard block |
||
| 119 | 119 | try { |
| 120 | 120 | $creator = new midcom_db_person($view_metadata->get('creator')); |
| 121 | 121 | $creator_string = "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$creator->guid}/\">$creator->name</a>"; |
| 122 | - } catch (midcom_error $e) { |
|
| 122 | + } |
|
| 123 | + catch (midcom_error $e) { |
|
| 123 | 124 | $creator_string = $l10n->get('unknown person'); |
| 124 | 125 | } |
| 125 | 126 | $formatter = $data['l10n']->get_formatter(); |
@@ -133,7 +134,8 @@ discard block |
||
| 133 | 134 | try { |
| 134 | 135 | $editor = new midcom_db_person($view_metadata->get('revisor')); |
| 135 | 136 | $editor_string = "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$editor->guid}/\">$editor->name</a>"; |
| 136 | - } catch (midcom_error $e) { |
|
| 137 | + } |
|
| 138 | + catch (midcom_error $e) { |
|
| 137 | 139 | $editor_string = $l10n->get('unknown person'); |
| 138 | 140 | } |
| 139 | 141 | |
@@ -73,7 +73,8 @@ |
||
| 73 | 73 | if ($stat instanceof midcom_services_indexer_client) { |
| 74 | 74 | try { |
| 75 | 75 | $stat->reindex(); |
| 76 | - } catch (RequestException $e) { |
|
| 76 | + } |
|
| 77 | + catch (RequestException $e) { |
|
| 77 | 78 | if ($e->hasResponse()) { |
| 78 | 79 | $crawler = new Crawler($e->getResponse()->getBody()->getContents()); |
| 79 | 80 | $body = $crawler->filterXPath('//body')->html(); |