@@ -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 | } |
@@ -673,7 +673,8 @@ |
||
| 673 | 673 | */ |
| 674 | 674 | try { |
| 675 | 675 | return $object->get_by_id($object->id); |
| 676 | - } catch (Exception $e) { |
|
| 676 | + } |
|
| 677 | + catch (Exception $e) { |
|
| 677 | 678 | return false; |
| 678 | 679 | } |
| 679 | 680 | } |
@@ -100,7 +100,8 @@ |
||
| 100 | 100 | $oldparent = new org_openpsa_projects_task_dba($this->old_task); |
| 101 | 101 | $oldparent->update_cache(); |
| 102 | 102 | } |
| 103 | - } catch (midcom_error $e) { |
|
| 103 | + } |
|
| 104 | + catch (midcom_error $e) { |
|
| 104 | 105 | $e->log(); |
| 105 | 106 | } |
| 106 | 107 | |
@@ -74,7 +74,8 @@ discard block |
||
| 74 | 74 | |
| 75 | 75 | try { |
| 76 | 76 | $result = $router->match($url); |
| 77 | - } catch (ResourceNotFoundException $e) { |
|
| 77 | + } |
|
| 78 | + catch (ResourceNotFoundException $e) { |
|
| 78 | 79 | throw new midcom_error_notfound('This URL method is unknown.'); |
| 79 | 80 | } |
| 80 | 81 | $this->request->attributes->add($result); |
@@ -158,7 +159,8 @@ discard block |
||
| 158 | 159 | |
| 159 | 160 | try { |
| 160 | 161 | $result = $router->match($url); |
| 161 | - } catch (ResourceNotFoundException $e) { |
|
| 162 | + } |
|
| 163 | + catch (ResourceNotFoundException $e) { |
|
| 162 | 164 | // No match |
| 163 | 165 | debug_add("Component {$viewer->_component} in {$viewer->_topic->name} declared unable to handle request.", MIDCOM_LOG_INFO); |
| 164 | 166 | throw new midcom_error_notfound("This page is not available on this server."); |
@@ -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); |
@@ -159,7 +159,8 @@ discard block |
||
| 159 | 159 | |
| 160 | 160 | try { |
| 161 | 161 | eval('?>' . $preparsed); |
| 162 | - } catch (ParseError $e) { |
|
| 162 | + } |
|
| 163 | + catch (ParseError $e) { |
|
| 163 | 164 | throw new midcom_error("Failed to parse style element '{$path}': " . $e->getMessage() . ' in line ' . $e->getLine()); |
| 164 | 165 | } |
| 165 | 166 | } |
@@ -180,7 +181,8 @@ discard block |
||
| 180 | 181 | if ($root_topic->style) { |
| 181 | 182 | $db_style = midcom_db_style::id_from_path($root_topic->style); |
| 182 | 183 | } |
| 183 | - } catch (midcom_error_forbidden $e) { |
|
| 184 | + } |
|
| 185 | + catch (midcom_error_forbidden $e) { |
|
| 184 | 186 | $e->log(); |
| 185 | 187 | } |
| 186 | 188 | |