@@ -27,7 +27,8 @@ |
||
| 27 | 27 | { |
| 28 | 28 | try { |
| 29 | 29 | return parent::load_object($guid); |
| 30 | - } catch (midcom_error_midgard $e) { |
|
| 30 | + } |
|
| 31 | + catch (midcom_error_midgard $e) { |
|
| 31 | 32 | $mgd_exception = $e->getPrevious(); |
| 32 | 33 | if ( $mgd_exception |
| 33 | 34 | && $mgd_exception->getCode() == mgd_exception::OBJECT_DELETED) { |
@@ -107,7 +107,8 @@ |
||
| 107 | 107 | && $nodeobject = $nav->get_node($node->id)) { |
| 108 | 108 | return $nav->get_leaf($nodeobject[MIDCOM_NAV_ID] . '-' . $object->id); |
| 109 | 109 | } |
| 110 | - } catch (midcom_error $e) { |
|
| 110 | + } |
|
| 111 | + catch (midcom_error $e) { |
|
| 111 | 112 | $e->log(); |
| 112 | 113 | } |
| 113 | 114 | return null; |
@@ -181,7 +181,8 @@ |
||
| 181 | 181 | if ($this->_response === null) { |
| 182 | 182 | $this->_stop('Could not handle request, unknown method', Response::HTTP_METHOD_NOT_ALLOWED); |
| 183 | 183 | } |
| 184 | - } catch (midcom_error $e) { |
|
| 184 | + } |
|
| 185 | + catch (midcom_error $e) { |
|
| 185 | 186 | $this->_responseStatus = $e->getCode(); |
| 186 | 187 | return $this->_send_response($e->getMessage()); |
| 187 | 188 | } |
@@ -125,7 +125,8 @@ discard block |
||
| 125 | 125 | try { |
| 126 | 126 | $pdf_helper->render_and_attach(); |
| 127 | 127 | return $this->reply(true, $this->_l10n->get('pdf created')); |
| 128 | - } catch (midcom_error $e) { |
|
| 128 | + } |
|
| 129 | + catch (midcom_error $e) { |
|
| 129 | 130 | return $this->reply(false, $this->_l10n->get('pdf creation failed') . ': ' . $e->getMessage()); |
| 130 | 131 | } |
| 131 | 132 | } |
@@ -136,7 +137,8 @@ discard block |
||
| 136 | 137 | try { |
| 137 | 138 | $pdf_helper->render_and_attach('reminder'); |
| 138 | 139 | return $this->reply(true, $this->_l10n->get('reminder pdf created')); |
| 139 | - } catch (midcom_error $e) { |
|
| 140 | + } |
|
| 141 | + catch (midcom_error $e) { |
|
| 140 | 142 | return $this->reply(false, $this->_l10n->get('reminder pdf creation failed') . ': ' . $e->getMessage()); |
| 141 | 143 | } |
| 142 | 144 | } |
@@ -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 | } |