@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | $password_length = mb_strlen($password); |
320 | 320 | |
321 | 321 | if ($password_length < $this->_config->get('min_password_length')) { |
322 | - if ($show_ui_message){ |
|
322 | + if ($show_ui_message) { |
|
323 | 323 | midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get('password too short'), 'error'); |
324 | 324 | } |
325 | 325 | return false; |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | } |
338 | 338 | |
339 | 339 | if ($score < $this->_config->get('min_password_score')) { |
340 | - if ($show_ui_message){ |
|
340 | + if ($show_ui_message) { |
|
341 | 341 | midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get('password weak'), 'error'); |
342 | 342 | } |
343 | 343 | return false; |
@@ -409,7 +409,8 @@ |
||
409 | 409 | //Get the parent object |
410 | 410 | try { |
411 | 411 | $parent = midcom::get()->dbfactory->get_object_by_guid($this->objectguid); |
412 | - } catch (midcom_error $e) { |
|
412 | + } |
|
413 | + catch (midcom_error $e) { |
|
413 | 414 | $e->log(); |
414 | 415 | return; |
415 | 416 | } |
@@ -95,7 +95,8 @@ |
||
95 | 95 | org_openpsa_projects_workflow::accept($task, 0, $this->comment); |
96 | 96 | return; |
97 | 97 | } |
98 | - } catch (midcom_error $e) { |
|
98 | + } |
|
99 | + catch (midcom_error $e) { |
|
99 | 100 | $e->log(); |
100 | 101 | } |
101 | 102 | } |
@@ -165,7 +165,8 @@ |
||
165 | 165 | try { |
166 | 166 | self::$root_topic = midcom_db_topic::get_cached($guid); |
167 | 167 | return self::$root_topic; |
168 | - } catch (midcom_error $e) { |
|
168 | + } |
|
169 | + catch (midcom_error $e) { |
|
169 | 170 | if ($e instanceof midcom_error_forbidden) { |
170 | 171 | throw $e; |
171 | 172 | } |
@@ -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 | } |
@@ -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 | } |
@@ -55,7 +55,8 @@ |
||
55 | 55 | { |
56 | 56 | try { |
57 | 57 | return eval("return [{$data}\n];"); |
58 | - } catch (ParseError $e) { |
|
58 | + } |
|
59 | + catch (ParseError $e) { |
|
59 | 60 | throw new midcom_error('Failed to parse config data: ' . $e->getMessage() . ' in ' . $path . ' line ' . $e->getLine()); |
60 | 61 | } |
61 | 62 | } |