@@ -85,7 +85,8 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | $this->clearcache(); |
| 87 | 87 | |
| 88 | - if ($file && $file['name'] === $name) { // file exists and check filename for item ID based filesystem |
|
| 88 | + if ($file && $file['name'] === $name) { |
|
| 89 | +// file exists and check filename for item ID based filesystem |
|
| 89 | 90 | if ($this->uploadOverwrite) { |
| 90 | 91 | if (!$file['write']) { |
| 91 | 92 | return $this->setError(elFinder::ERROR_PERM_DENIED); |
@@ -142,11 +143,13 @@ discard block |
||
| 142 | 143 | { |
| 143 | 144 | try { |
| 144 | 145 | return org_openpsa_documents_document_dba::get_cached($path); |
| 145 | - } catch (midcom_error $e) { |
|
| 146 | + } |
|
| 147 | + catch (midcom_error $e) { |
|
| 146 | 148 | $e->log(); |
| 147 | 149 | try { |
| 148 | 150 | return org_openpsa_documents_directory::get_cached($path); |
| 149 | - } catch (midcom_error $e) { |
|
| 151 | + } |
|
| 152 | + catch (midcom_error $e) { |
|
| 150 | 153 | $e->log(); |
| 151 | 154 | } |
| 152 | 155 | } |
@@ -282,7 +285,8 @@ discard block |
||
| 282 | 285 | $object = midcom::get()->dbfactory->get_object_by_guid($path); |
| 283 | 286 | try { |
| 284 | 287 | $parentdir = org_openpsa_documents_directory::get_cached($parent); |
| 285 | - } catch (midcom_error $e) { |
|
| 288 | + } |
|
| 289 | + catch (midcom_error $e) { |
|
| 286 | 290 | $e->log(); |
| 287 | 291 | return false; |
| 288 | 292 | } |
@@ -579,7 +583,8 @@ discard block |
||
| 579 | 583 | try { |
| 580 | 584 | $doc = new org_openpsa_documents_document_dba($path); |
| 581 | 585 | return $doc->delete(); |
| 582 | - } catch (midcom_error $e) { |
|
| 586 | + } |
|
| 587 | + catch (midcom_error $e) { |
|
| 583 | 588 | return false; |
| 584 | 589 | } |
| 585 | 590 | } |
@@ -193,7 +193,8 @@ |
||
| 193 | 193 | |
| 194 | 194 | try { |
| 195 | 195 | $diff_fields = $rcs_handler->get_diff($prev_version, $this_version); |
| 196 | - } catch (midcom_error $e) { |
|
| 196 | + } |
|
| 197 | + catch (midcom_error $e) { |
|
| 197 | 198 | $e->log(); |
| 198 | 199 | return ''; |
| 199 | 200 | } |
@@ -134,7 +134,8 @@ |
||
| 134 | 134 | try { |
| 135 | 135 | $this->$function($request->request); |
| 136 | 136 | $this->_response->success = true; |
| 137 | - } catch (midcom_error $e) { |
|
| 137 | + } |
|
| 138 | + catch (midcom_error $e) { |
|
| 138 | 139 | $this->_response->success = false; |
| 139 | 140 | $this->_response->error = $e->getMessage(); |
| 140 | 141 | } |
@@ -138,7 +138,8 @@ |
||
| 138 | 138 | try { |
| 139 | 139 | $parent = new org_openpsa_projects_project($task->project); |
| 140 | 140 | $options['success_url'] = $this->router->generate('project', ['guid' => $parent->guid]); |
| 141 | - } catch (midcom_error $e) { |
|
| 141 | + } |
|
| 142 | + catch (midcom_error $e) { |
|
| 142 | 143 | $e->log(); |
| 143 | 144 | } |
| 144 | 145 | |
@@ -36,7 +36,8 @@ discard block |
||
| 36 | 36 | // Add person to campaign |
| 37 | 37 | try { |
| 38 | 38 | $campaign = new org_openpsa_directmarketing_campaign_dba($add_to); |
| 39 | - } catch (midcom_error $e) { |
|
| 39 | + } |
|
| 40 | + catch (midcom_error $e) { |
|
| 40 | 41 | // FIXME: More informative error message |
| 41 | 42 | $this->notify('Failed adding person %s to campaign %s', $add_to, 'error'); |
| 42 | 43 | return; |
@@ -86,7 +87,8 @@ discard block |
||
| 86 | 87 | try { |
| 87 | 88 | $campaigns[$membership->campaign] = new org_openpsa_directmarketing_campaign_dba($membership->campaign); |
| 88 | 89 | $campaign_membership_map[$membership->campaign] = $membership; |
| 89 | - } catch (midcom_error $e) { |
|
| 90 | + } |
|
| 91 | + catch (midcom_error $e) { |
|
| 90 | 92 | debug_add('Failed to load campaign ' . $membership->campaign . ', reason: ' . $e->getMessage()); |
| 91 | 93 | } |
| 92 | 94 | } |
@@ -48,7 +48,8 @@ discard block |
||
| 48 | 48 | // We're creating invoice for chosen customer |
| 49 | 49 | try { |
| 50 | 50 | $this->customer = new org_openpsa_contacts_group_dba($company); |
| 51 | - } catch (midcom_error $e) { |
|
| 51 | + } |
|
| 52 | + catch (midcom_error $e) { |
|
| 52 | 53 | $contact = new org_openpsa_contacts_person_dba($company); |
| 53 | 54 | $this->contact_id = $contact->id; |
| 54 | 55 | } |
@@ -155,7 +156,8 @@ discard block |
||
| 155 | 156 | if (!empty($this->invoice->customer)) { |
| 156 | 157 | try { |
| 157 | 158 | $this->customer = org_openpsa_contacts_group_dba::get_cached($this->invoice->customer); |
| 158 | - } catch (midcom_error $e) { |
|
| 159 | + } |
|
| 160 | + catch (midcom_error $e) { |
|
| 159 | 161 | $customer_field['hidden'] = true; |
| 160 | 162 | $e->log(); |
| 161 | 163 | } |
@@ -89,7 +89,8 @@ |
||
| 89 | 89 | } elseif ((int) $group > 0) { |
| 90 | 90 | try { |
| 91 | 91 | $this->parent = new org_openpsa_products_product_group_dba((int) $group); |
| 92 | - } catch (midcom_error $e) { |
|
| 92 | + } |
|
| 93 | + catch (midcom_error $e) { |
|
| 93 | 94 | $e->log(); |
| 94 | 95 | } |
| 95 | 96 | } |
@@ -29,7 +29,8 @@ |
||
| 29 | 29 | $member->require_do('midgard:update'); |
| 30 | 30 | $member->extra = $request->request->get('title'); |
| 31 | 31 | $response->status = $member->update(); |
| 32 | - } catch (midcom_error $e) { |
|
| 32 | + } |
|
| 33 | + catch (midcom_error $e) { |
|
| 33 | 34 | $e->log(); |
| 34 | 35 | } |
| 35 | 36 | $response->message = midcom_connection::get_error_string(); |
@@ -100,7 +100,8 @@ |
||
| 100 | 100 | try { |
| 101 | 101 | $task = org_openpsa_projects_task_dba::get_cached($hour_report->task); |
| 102 | 102 | $options['success_url'] = $this->router->generate('list_hours_task', ['guid' => $task->guid]); |
| 103 | - } catch (midcom_error $e) { |
|
| 103 | + } |
|
| 104 | + catch (midcom_error $e) { |
|
| 104 | 105 | $e->log(); |
| 105 | 106 | } |
| 106 | 107 | return $this->get_workflow('delete', $options)->run($request); |