@@ -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 | } |
@@ -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 | } |
@@ -17,7 +17,8 @@ |
||
| 17 | 17 | foreach ($data['objects'] as $guid => $privs) { |
| 18 | 18 | try { |
| 19 | 19 | $object = new midcom_db_topic($guid); |
| 20 | - } catch (midcom_error $e) { |
|
| 20 | + } |
|
| 21 | + catch (midcom_error $e) { |
|
| 21 | 22 | continue; |
| 22 | 23 | } |
| 23 | 24 | echo "<tr>\n"; |
@@ -79,7 +79,8 @@ discard block |
||
| 79 | 79 | try { |
| 80 | 80 | $dms['group']->set_storage($group); |
| 81 | 81 | org_openpsa_products_viewer::index($dms['group'], $indexer, $topic, $config); |
| 82 | - } catch (midcom_error $e) { |
|
| 82 | + } |
|
| 83 | + catch (midcom_error $e) { |
|
| 83 | 84 | $e->log(MIDCOM_LOG_WARN); |
| 84 | 85 | } |
| 85 | 86 | } |
@@ -91,7 +92,8 @@ discard block |
||
| 91 | 92 | try { |
| 92 | 93 | $dms['product']->set_storage($product); |
| 93 | 94 | org_openpsa_products_viewer::index($dms['product'], $indexer, $topic, $config); |
| 94 | - } catch (midcom_error $e) { |
|
| 95 | + } |
|
| 96 | + catch (midcom_error $e) { |
|
| 95 | 97 | $e->log(MIDCOM_LOG_WARN); |
| 96 | 98 | } |
| 97 | 99 | } |
@@ -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 $e) {} |
|
| 36 | + } |
|
| 37 | + catch (midcom_error $e) {} |
|
| 37 | 38 | ?> |
| 38 | 39 | </td> |
| 39 | 40 | <td class="multivalue"> |