@@ -58,7 +58,8 @@ |
||
| 58 | 58 | // TODO: Should we sudo here to ensure getting correct prefs regardless of ACLs? |
| 59 | 59 | try { |
| 60 | 60 | $recipient = midcom_db_person::get_cached($recipient); |
| 61 | - } catch (midcom_error) { |
|
| 61 | + } |
|
| 62 | + catch (midcom_error) { |
|
| 62 | 63 | return false; |
| 63 | 64 | } |
| 64 | 65 | |
@@ -83,7 +83,8 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | $this->clearcache(); |
| 85 | 85 | |
| 86 | - if ($file && $file['name'] === $name) { // file exists and check filename for item ID based filesystem |
|
| 86 | + if ($file && $file['name'] === $name) { |
|
| 87 | +// file exists and check filename for item ID based filesystem |
|
| 87 | 88 | if ($this->uploadOverwrite) { |
| 88 | 89 | if (!$file['write']) { |
| 89 | 90 | return $this->setError(elFinder::ERROR_PERM_DENIED); |
@@ -139,11 +140,13 @@ discard block |
||
| 139 | 140 | { |
| 140 | 141 | try { |
| 141 | 142 | return org_openpsa_documents_document_dba::get_cached($path); |
| 142 | - } catch (midcom_error $e) { |
|
| 143 | + } |
|
| 144 | + catch (midcom_error $e) { |
|
| 143 | 145 | $e->log(); |
| 144 | 146 | try { |
| 145 | 147 | return org_openpsa_documents_directory::get_cached($path); |
| 146 | - } catch (midcom_error $e) { |
|
| 148 | + } |
|
| 149 | + catch (midcom_error $e) { |
|
| 147 | 150 | $e->log(); |
| 148 | 151 | } |
| 149 | 152 | } |
@@ -275,7 +278,8 @@ discard block |
||
| 275 | 278 | $object = midcom::get()->dbfactory->get_object_by_guid($path); |
| 276 | 279 | try { |
| 277 | 280 | $parentdir = org_openpsa_documents_directory::get_cached($parent); |
| 278 | - } catch (midcom_error $e) { |
|
| 281 | + } |
|
| 282 | + catch (midcom_error $e) { |
|
| 279 | 283 | $e->log(); |
| 280 | 284 | return false; |
| 281 | 285 | } |
@@ -567,7 +571,8 @@ discard block |
||
| 567 | 571 | try { |
| 568 | 572 | $doc = new org_openpsa_documents_document_dba($path); |
| 569 | 573 | return $doc->delete(); |
| 570 | - } catch (midcom_error) { |
|
| 574 | + } |
|
| 575 | + catch (midcom_error) { |
|
| 571 | 576 | return false; |
| 572 | 577 | } |
| 573 | 578 | } |
@@ -33,7 +33,8 @@ |
||
| 33 | 33 | $task_label = "<a href=\"{$data['projects_url']}task/{$task->guid}/\">{$task_label}</a>"; |
| 34 | 34 | } |
| 35 | 35 | echo $task_label; |
| 36 | - } catch (midcom_error) {} |
|
| 36 | + } |
|
| 37 | + catch (midcom_error) {} |
|
| 37 | 38 | ?> |
| 38 | 39 | </td> |
| 39 | 40 | <td class="multivalue"> |
@@ -27,7 +27,8 @@ |
||
| 27 | 27 | } |
| 28 | 28 | $contact = new org_openpsa_widgets_contact($editor); |
| 29 | 29 | echo "<li class=\"updated-{$class}\"><a href=\"{$url}\"{$onclick}>{$document->title}</a> <div class=\"metadata\">" . $formatter->datetime($document->edited) . " (" . $contact->show_inline() . ")</div></li>\n"; |
| 30 | - } catch (midcom_error) { |
|
| 30 | + } |
|
| 31 | + catch (midcom_error) { |
|
| 31 | 32 | } |
| 32 | 33 | } |
| 33 | 34 | echo "</ul></div>\n"; |
@@ -94,7 +94,8 @@ |
||
| 94 | 94 | $customer = new org_openpsa_contacts_group_dba($customer_id); |
| 95 | 95 | $customer_label = $customer->official; |
| 96 | 96 | $customer = $customer_id; |
| 97 | - } catch (midcom_error) { |
|
| 97 | + } |
|
| 98 | + catch (midcom_error) { |
|
| 98 | 99 | } |
| 99 | 100 | } |
| 100 | 101 | } |
@@ -103,7 +103,8 @@ discard block |
||
| 103 | 103 | foreach ($hours as $guid => $row) { |
| 104 | 104 | try { |
| 105 | 105 | $task = org_openpsa_projects_task_dba::get_cached($row['task']); |
| 106 | - } catch (midcom_error) { |
|
| 106 | + } |
|
| 107 | + catch (midcom_error) { |
|
| 107 | 108 | // Task couldn't be loaded, probably because of ACL |
| 108 | 109 | continue; |
| 109 | 110 | } |
@@ -116,7 +117,8 @@ discard block |
||
| 116 | 117 | $person_object = midcom_db_person::get_cached($row['person']); |
| 117 | 118 | $person_label = $this->_get_list_link($person_object->name, person_id: $row['person']); |
| 118 | 119 | $person_name = $person_object->name; |
| 119 | - } catch (midcom_error) { |
|
| 120 | + } |
|
| 121 | + catch (midcom_error) { |
|
| 120 | 122 | $person_label = $this->_l10n->get('no person'); |
| 121 | 123 | $person_name = ''; |
| 122 | 124 | } |
@@ -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) { |
|
| 61 | + } |
|
| 62 | + catch (midcom_error) { |
|
| 60 | 63 | $row['index_owner'] = ''; |
| 61 | 64 | $row['owner'] = ''; |
| 62 | 65 | } |
@@ -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: " . $e->getMessage()); |
| 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) { |
|
| 74 | + } |
|
| 75 | + catch (midcom_error) { |
|
| 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 | } |
@@ -54,7 +54,8 @@ discard block |
||
| 54 | 54 | $field['type_config']['options'] = [0 => '', $customer->id => $customer->official]; |
| 55 | 55 | |
| 56 | 56 | $defaults['customer'] = $customer->id; |
| 57 | - } catch (midcom_error) { |
|
| 57 | + } |
|
| 58 | + catch (midcom_error) { |
|
| 58 | 59 | $customer = new org_openpsa_contacts_person_dba($guid); |
| 59 | 60 | $defaults['customerContact'] = $customer->id; |
| 60 | 61 | $field['type_config']['options'] = $this->list_groups([$customer->id => true]); |
@@ -126,7 +127,8 @@ discard block |
||
| 126 | 127 | try { |
| 127 | 128 | $company = new org_openpsa_contacts_group_dba($company_id); |
| 128 | 129 | $ret[$company->id] = $company->get_label(); |
| 129 | - } catch (midcom_error $e) { |
|
| 130 | + } |
|
| 131 | + catch (midcom_error $e) { |
|
| 130 | 132 | $e->log(); |
| 131 | 133 | } |
| 132 | 134 | } |