@@ -80,7 +80,8 @@ |
||
80 | 80 | |
81 | 81 | try { |
82 | 82 | require $basedir . $file; |
83 | - } catch (\midcom_error_forbidden $e) { |
|
83 | + } |
|
84 | + catch (\midcom_error_forbidden $e) { |
|
84 | 85 | $dialog = $this->getHelperSet()->get('question'); |
85 | 86 | $this->login($dialog, $input, $output); |
86 | 87 | require $basedir . $file; |
@@ -72,7 +72,8 @@ |
||
72 | 72 | $component = key($watch); |
73 | 73 | try { |
74 | 74 | $interface = $this->loader->get_interface_class($component); |
75 | - } catch (\midcom_error $e) { |
|
75 | + } |
|
76 | + catch (\midcom_error $e) { |
|
76 | 77 | debug_add("Failed to load the component {$component}: " . $e->getMessage(), MIDCOM_LOG_INFO); |
77 | 78 | continue; |
78 | 79 | } |
@@ -99,7 +99,8 @@ |
||
99 | 99 | if ($request->request->has('midcom_helper_datamanager2_save')) { |
100 | 100 | try { |
101 | 101 | $rules = $this->_load_rules($request); |
102 | - } catch (midcom_error $e) { |
|
102 | + } |
|
103 | + catch (midcom_error $e) { |
|
103 | 104 | midcom::get()->uimessages->add('org.openpsa.directmarketing', $this->_l10n->get($e->getMessage()), 'error'); |
104 | 105 | return; |
105 | 106 | } |
@@ -45,7 +45,8 @@ |
||
45 | 45 | break; |
46 | 46 | } |
47 | 47 | } |
48 | - } catch (midcom_error $e) { |
|
48 | + } |
|
49 | + catch (midcom_error $e) { |
|
49 | 50 | } |
50 | 51 | |
51 | 52 | $path_parts = array_reverse($path_parts); |
@@ -93,7 +93,8 @@ |
||
93 | 93 | |
94 | 94 | try { |
95 | 95 | $user = new midgard_user($login_tokens); |
96 | - } catch (mgd_exception $e) { |
|
96 | + } |
|
97 | + catch (mgd_exception $e) { |
|
97 | 98 | return null; |
98 | 99 | } |
99 | 100 | if (!$trusted && !self::verify_password($password, $user->password)) { |
@@ -124,7 +124,8 @@ |
||
124 | 124 | if ($this->__cached_object === null) { |
125 | 125 | try { |
126 | 126 | $this->__cached_object = midcom::get()->dbfactory->get_object_by_guid($this->objectguid); |
127 | - } catch (midcom_error $e) { |
|
127 | + } |
|
128 | + catch (midcom_error $e) { |
|
128 | 129 | return null; |
129 | 130 | } |
130 | 131 | } |
@@ -47,7 +47,8 @@ |
||
47 | 47 | if ($node_id) { |
48 | 48 | try { |
49 | 49 | $comments_topic = new midcom_db_topic($node_id); |
50 | - } catch (midcom_error $e) { |
|
50 | + } |
|
51 | + catch (midcom_error $e) { |
|
51 | 52 | return null; |
52 | 53 | } |
53 | 54 |
@@ -409,7 +409,8 @@ |
||
409 | 409 | foreach ($this->_articles as $article_counter => $article) { |
410 | 410 | try { |
411 | 411 | $data['datamanager']->set_storage($article); |
412 | - } catch (midcom_error $e) { |
|
412 | + } |
|
413 | + catch (midcom_error $e) { |
|
413 | 414 | $e->log(); |
414 | 415 | continue; |
415 | 416 | } |
@@ -50,9 +50,11 @@ |
||
50 | 50 | $filepath = $this->generate_filename(); |
51 | 51 | try { |
52 | 52 | $this->exec('co -q -f -r' . escapeshellarg(trim($revision)) . " {$filepath} 2>/dev/null"); |
53 | - } catch (midcom_error $e) { |
|
53 | + } |
|
54 | + catch (midcom_error $e) { |
|
54 | 55 | $e->log(); |
55 | - } finally { |
|
56 | + } |
|
57 | + finally { |
|
56 | 58 | if (!file_exists($filepath)) { |
57 | 59 | return []; |
58 | 60 | } |