@@ -43,7 +43,8 @@ |
||
| 43 | 43 | } |
| 44 | 44 | try { |
| 45 | 45 | $resource = org_openpsa_calendar_resource_dba::get_cached($this->resource); |
| 46 | - } catch (midcom_error) { |
|
| 46 | + } |
|
| 47 | + catch (midcom_error) { |
|
| 47 | 48 | debug_add("Cannot fetch resource #{$this->resource} returning false", MIDCOM_LOG_INFO); |
| 48 | 49 | return false; |
| 49 | 50 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | public function _on_creating() : bool |
| 27 | 27 | { |
| 28 | - if ( $this->invoice |
|
| 28 | + if ($this->invoice |
|
| 29 | 29 | && $this->position == 0) { |
| 30 | 30 | $invoice = org_openpsa_invoices_invoice_dba::get_cached($this->invoice); |
| 31 | 31 | $this->position = count($invoice->get_invoice_items()) + 1; |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | } catch (midcom_error) { |
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | - if ( $url == '' |
|
| 78 | + if ($url == '' |
|
| 79 | 79 | && $sales_url) { |
| 80 | 80 | try { |
| 81 | 81 | $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($this->deliverable); |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $invoice = new org_openpsa_invoices_invoice_dba($this->invoice); |
| 98 | 98 | $old_sum = $invoice->sum; |
| 99 | 99 | self::update_invoice($invoice); |
| 100 | - if ( $old_sum != $invoice->sum |
|
| 100 | + if ($old_sum != $invoice->sum |
|
| 101 | 101 | && !empty($this->deliverable)) { |
| 102 | 102 | $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($this->deliverable); |
| 103 | 103 | self::update_deliverable($deliverable); |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | |
| 136 | 136 | if ($invoiced != $deliverable->invoiced) { |
| 137 | 137 | $deliverable->invoiced = $invoiced; |
| 138 | - if ( $deliverable->orgOpenpsaObtype !== org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION |
|
| 138 | + if ($deliverable->orgOpenpsaObtype !== org_openpsa_products_product_dba::DELIVERY_SUBSCRIPTION |
|
| 139 | 139 | && $deliverable->state < org_openpsa_sales_salesproject_deliverable_dba::STATE_INVOICED) { |
| 140 | 140 | $deliverable->state = org_openpsa_sales_salesproject_deliverable_dba::STATE_INVOICED; |
| 141 | 141 | } |
@@ -72,7 +72,8 @@ discard block |
||
| 72 | 72 | try { |
| 73 | 73 | $task = org_openpsa_projects_task_dba::get_cached($this->task); |
| 74 | 74 | $url = $projects_url . 'task/' . $task->guid . '/'; |
| 75 | - } catch (midcom_error) { |
|
| 75 | + } |
|
| 76 | + catch (midcom_error) { |
|
| 76 | 77 | } |
| 77 | 78 | } |
| 78 | 79 | if ( $url == '' |
@@ -80,7 +81,8 @@ discard block |
||
| 80 | 81 | try { |
| 81 | 82 | $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($this->deliverable); |
| 82 | 83 | $url = $sales_url . 'deliverable/' . $deliverable->guid . '/'; |
| 83 | - } catch (midcom_error) { |
|
| 84 | + } |
|
| 85 | + catch (midcom_error) { |
|
| 84 | 86 | } |
| 85 | 87 | } |
| 86 | 88 | if ($url != '') { |
@@ -102,7 +104,8 @@ discard block |
||
| 102 | 104 | $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($this->deliverable); |
| 103 | 105 | self::update_deliverable($deliverable); |
| 104 | 106 | } |
| 105 | - } catch (midcom_error $e) { |
|
| 107 | + } |
|
| 108 | + catch (midcom_error $e) { |
|
| 106 | 109 | $e->log(); |
| 107 | 110 | } |
| 108 | 111 | } |
@@ -86,7 +86,8 @@ discard block |
||
| 86 | 86 | // if the property useContactAddress is set |
| 87 | 87 | $billing_data[0]->set_address(); |
| 88 | 88 | return $billing_data[0]; |
| 89 | - } catch (midcom_error $e) { |
|
| 89 | + } |
|
| 90 | + catch (midcom_error $e) { |
|
| 90 | 91 | $e->log(); |
| 91 | 92 | return null; |
| 92 | 93 | } |
@@ -131,10 +132,12 @@ discard block |
||
| 131 | 132 | { |
| 132 | 133 | try { |
| 133 | 134 | return new org_openpsa_contacts_person_dba($this->linkGuid); |
| 134 | - } catch (midcom_error) { |
|
| 135 | + } |
|
| 136 | + catch (midcom_error) { |
|
| 135 | 137 | try { |
| 136 | 138 | return new org_openpsa_contacts_group_dba($this->linkGuid); |
| 137 | - } catch (midcom_error $e) { |
|
| 139 | + } |
|
| 140 | + catch (midcom_error $e) { |
|
| 138 | 141 | debug_add("Failed to load contact with GUID: " . $this->linkGuid . " - last error:" . $e->getMessage(), MIDCOM_LOG_ERROR); |
| 139 | 142 | return false; |
| 140 | 143 | } |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | /** |
| 64 | 64 | * Get the billing data for given contact if any. |
| 65 | 65 | */ |
| 66 | - private static function get_billing_data(string $dba_class, string|int $contact_id) : ?self |
|
| 66 | + private static function get_billing_data(string $dba_class, string | int $contact_id) : ?self |
|
| 67 | 67 | { |
| 68 | 68 | if ($contact_id == 0) { |
| 69 | 69 | return null; |
@@ -40,7 +40,8 @@ discard block |
||
| 40 | 40 | if ($sales_url) { |
| 41 | 41 | $entry['deliverable'] = '<a href="' . $sales_url . 'deliverable/' . $deliverable->guid . '/">' . $entry['deliverable'] . '</a>'; |
| 42 | 42 | } |
| 43 | - } catch (midcom_error) { |
|
| 43 | + } |
|
| 44 | + catch (midcom_error) { |
|
| 44 | 45 | $entry['deliverable'] = ''; |
| 45 | 46 | } |
| 46 | 47 | try { |
@@ -49,7 +50,8 @@ discard block |
||
| 49 | 50 | if ($projects_url) { |
| 50 | 51 | $entry['task'] = '<a href="' . $projects_url . 'task/' . $task->guid . '/">' . $entry['task'] . '</a>'; |
| 51 | 52 | } |
| 52 | - } catch (midcom_error) { |
|
| 53 | + } |
|
| 54 | + catch (midcom_error) { |
|
| 53 | 55 | $entry['task'] = ''; |
| 54 | 56 | } |
| 55 | 57 | |
@@ -49,7 +49,8 @@ discard block |
||
| 49 | 49 | try { |
| 50 | 50 | $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($task->get_agreement()); |
| 51 | 51 | $item->deliverable = $deliverable->id; |
| 52 | - } catch (midcom_error $e) { |
|
| 52 | + } |
|
| 53 | + catch (midcom_error $e) { |
|
| 53 | 54 | $e->log(); |
| 54 | 55 | } |
| 55 | 56 | $item->invoice = $invoice->id; |
@@ -121,7 +122,8 @@ discard block |
||
| 121 | 122 | $customer = org_openpsa_contacts_group_dba::get_cached($customer_id); |
| 122 | 123 | $data['customer_label'] = $customer->official; |
| 123 | 124 | $data['disabled'] = ''; |
| 124 | - } catch (midcom_error) { |
|
| 125 | + } |
|
| 126 | + catch (midcom_error) { |
|
| 125 | 127 | $data['customer_label'] = $this->_l10n->get('no customer'); |
| 126 | 128 | $data['disabled'] = ' disabled="disabled"'; |
| 127 | 129 | } |
@@ -144,7 +146,8 @@ discard block |
||
| 144 | 146 | } else { |
| 145 | 147 | $data['invoiceable_units'] = $task->plannedHours; |
| 146 | 148 | } |
| 147 | - } catch (midcom_error $e) { |
|
| 149 | + } |
|
| 150 | + catch (midcom_error $e) { |
|
| 148 | 151 | $e->log(); |
| 149 | 152 | if ($this->_config->get('default_hourly_price')) { |
| 150 | 153 | $data['default_price'] = $this->_config->get('default_hourly_price'); |
@@ -21,7 +21,8 @@ |
||
| 21 | 21 | $original = new midcom_db_attachment($image->attachment); |
| 22 | 22 | $original_url = midcom_db_attachment::get_url($original); |
| 23 | 23 | $name = $original->name; |
| 24 | - } catch (midcom_error) { |
|
| 24 | + } |
|
| 25 | + catch (midcom_error) { |
|
| 25 | 26 | $url = MIDCOM_STATIC_URL . '/stock-icons/mime/gnome-text-blank.png'; |
| 26 | 27 | $name = $data['l10n']->get('attachment missing'); |
| 27 | 28 | $original_url = ''; |
@@ -98,7 +98,8 @@ |
||
| 98 | 98 | $node_guid = $siteconfig->get_node_guid($component); |
| 99 | 99 | try { |
| 100 | 100 | $available_generators[$component] = midcom_db_topic::get_cached($node_guid)->get_label(); |
| 101 | - } catch (midcom_error) { |
|
| 101 | + } |
|
| 102 | + catch (midcom_error) { |
|
| 102 | 103 | debug_add("topic for component '{$component}' not found or accessible"); |
| 103 | 104 | } |
| 104 | 105 | } |
@@ -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 | } |
@@ -185,10 +185,10 @@ |
||
| 185 | 185 | * |
| 186 | 186 | * @param array $link The necessary link information |
| 187 | 187 | */ |
| 188 | - private function _render_line(array $link, midcom_core_dbaobject &$other_obj) |
|
| 188 | + private function _render_line(array $link, midcom_core_dbaobject & $other_obj) |
|
| 189 | 189 | { |
| 190 | 190 | $this->_request_data['link'] = $link; |
| 191 | - $this->_request_data['other_obj'] =& $other_obj; |
|
| 191 | + $this->_request_data['other_obj'] = & $other_obj; |
|
| 192 | 192 | $this->_request_data['icon'] = midcom_helper_reflector::get_object_icon($other_obj); |
| 193 | 193 | |
| 194 | 194 | if ($other_obj::class != $link['class']) { |