@@ -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 | } |
@@ -101,7 +101,7 @@ |
||
| 101 | 101 | $rawdata = base64_decode($request->cookies->get('midcom_services_i18n')); |
| 102 | 102 | $array = unserialize($rawdata); |
| 103 | 103 | |
| 104 | - if ( !array_key_exists('language', $array) |
|
| 104 | + if (!array_key_exists('language', $array) |
|
| 105 | 105 | || !array_key_exists('charset', $array)) { |
| 106 | 106 | debug_add("Rejecting cookie, it seems invalid."); |
| 107 | 107 | return false; |
@@ -155,7 +155,8 @@ discard block |
||
| 155 | 155 | { |
| 156 | 156 | try { |
| 157 | 157 | Locales::getName($lang); |
| 158 | - } catch (Exception $e) { |
|
| 158 | + } |
|
| 159 | + catch (Exception $e) { |
|
| 159 | 160 | debug_add("Language {$lang} not found:" . $e->getMessage(), MIDCOM_LOG_ERROR); |
| 160 | 161 | return false; |
| 161 | 162 | } |
@@ -236,7 +237,8 @@ discard block |
||
| 236 | 237 | { |
| 237 | 238 | try { |
| 238 | 239 | return $this->get_l10n($component)->get($stringid); |
| 239 | - } catch (midcom_error $e) { |
|
| 240 | + } |
|
| 241 | + catch (midcom_error $e) { |
|
| 240 | 242 | $e->log(MIDCOM_LOG_WARN); |
| 241 | 243 | return $stringid; |
| 242 | 244 | } |
@@ -97,7 +97,7 @@ |
||
| 97 | 97 | $loader->load($this->getProjectDir() . '/config/services.yml'); |
| 98 | 98 | } |
| 99 | 99 | if ($classes = midcom::get_registered_service_classes()) { |
| 100 | - $loader->load(function (ContainerBuilder $container) use ($classes) { |
|
| 100 | + $loader->load(function(ContainerBuilder $container) use ($classes) { |
|
| 101 | 101 | foreach ($classes as $id => $class) { |
| 102 | 102 | $container->findDefinition($id)->setClass($class); |
| 103 | 103 | } |
@@ -159,7 +159,8 @@ discard block |
||
| 159 | 159 | $response = $this->handle($request); |
| 160 | 160 | $response->send(); |
| 161 | 161 | $this->terminate($request, $response); |
| 162 | - } catch (Error $e) { |
|
| 162 | + } |
|
| 163 | + catch (Error $e) { |
|
| 163 | 164 | $this->getHttpKernel()->terminateWithException($e); |
| 164 | 165 | } |
| 165 | 166 | } |
@@ -210,9 +211,11 @@ discard block |
||
| 210 | 211 | try { |
| 211 | 212 | $response = $this->handle($request, HttpKernelInterface::SUB_REQUEST, false); |
| 212 | 213 | echo $response->getContent(); |
| 213 | - } catch (midcom_error_notfound | midcom_error_forbidden $e) { |
|
| 214 | + } |
|
| 215 | + catch (midcom_error_notfound | midcom_error_forbidden $e) { |
|
| 214 | 216 | $e->log(); |
| 215 | - } finally { |
|
| 217 | + } |
|
| 218 | + finally { |
|
| 216 | 219 | $this->skip_page_style = $backup; |
| 217 | 220 | midcom_core_context::leave(); |
| 218 | 221 | } |
@@ -152,7 +152,7 @@ |
||
| 152 | 152 | $preparsed = midcom_helper_formatter::compile($style); |
| 153 | 153 | |
| 154 | 154 | if (midcom_core_context::get()->has_custom_key('request_data')) { |
| 155 | - $data =& midcom_core_context::get()->get_custom_key('request_data'); |
|
| 155 | + $data = & midcom_core_context::get()->get_custom_key('request_data'); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | try { |
@@ -136,7 +136,8 @@ |
||
| 136 | 136 | |
| 137 | 137 | try { |
| 138 | 138 | eval('?>' . $preparsed); |
| 139 | - } catch (ParseError $e) { |
|
| 139 | + } |
|
| 140 | + catch (ParseError $e) { |
|
| 140 | 141 | throw new midcom_error("Failed to parse style element '{$path}': " . $e->getMessage() . ' in line ' . $e->getLine()); |
| 141 | 142 | } |
| 142 | 143 | } |
@@ -196,7 +196,7 @@ |
||
| 196 | 196 | |
| 197 | 197 | private function resolve_includes(string $content) : string |
| 198 | 198 | { |
| 199 | - return preg_replace_callback("/<\\(([a-zA-Z0-9 _-]+)\\)>/", function (array $matches) { |
|
| 199 | + return preg_replace_callback("/<\\(([a-zA-Z0-9 _-]+)\\)>/", function(array $matches) { |
|
| 200 | 200 | $element = $matches[1]; |
| 201 | 201 | |
| 202 | 202 | switch ($element) { |
@@ -98,7 +98,7 @@ |
||
| 98 | 98 | { |
| 99 | 99 | if (!isset($this->_modules[$name])) { |
| 100 | 100 | $this->_modules[$name] = $module; |
| 101 | - $this->$name =& $this->_modules[$name]; |
|
| 101 | + $this->$name = & $this->_modules[$name]; |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | |
@@ -218,8 +218,8 @@ discard block |
||
| 218 | 218 | { |
| 219 | 219 | $config = midcom_baseclasses_components_configuration::get('net.nehmer.comments', 'config'); |
| 220 | 220 | |
| 221 | - if ( $config->get('ratings_enable') |
|
| 222 | - && ( $config->get('ratings_cache_to_object') |
|
| 221 | + if ($config->get('ratings_enable') |
|
| 222 | + && ($config->get('ratings_cache_to_object') |
|
| 223 | 223 | || $config->get('comment_count_cache_to_object'))) { |
| 224 | 224 | // Handle ratings |
| 225 | 225 | $comments = self::list_by_objectguid($this->objectguid); |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | |
| 269 | 269 | private function _send_notifications() |
| 270 | 270 | { |
| 271 | - if ( empty($this->title) |
|
| 271 | + if (empty($this->title) |
|
| 272 | 272 | && empty($this->content)) { |
| 273 | 273 | // No need to send notifications about empty rating entries |
| 274 | 274 | return; |
@@ -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 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | private function _process_category_constraint(org_openpsa_qbpager $qb) |
| 77 | 77 | { |
| 78 | - if ( !in_array($this->category, $this->_request_data['categories']) |
|
| 78 | + if (!in_array($this->category, $this->_request_data['categories']) |
|
| 79 | 79 | && !$this->_config->get('categories_custom_enable')) { |
| 80 | 80 | throw new midcom_error('Custom categories are not allowed'); |
| 81 | 81 | // TODO: Check here if there are actually items in this cat? |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | midcom::get()->head->set_pagetitle($this->_request_data['page_title']); |
| 89 | 89 | |
| 90 | 90 | // Activate correct leaf |
| 91 | - if ( $this->_config->get('show_navigation_pseudo_leaves') |
|
| 91 | + if ($this->_config->get('show_navigation_pseudo_leaves') |
|
| 92 | 92 | && in_array($this->category, $this->_request_data['categories'])) { |
| 93 | 93 | $this->set_active_leaf($this->_topic->id . '_CAT_' . $this->category); |
| 94 | 94 | } |
@@ -568,10 +568,10 @@ |
||
| 568 | 568 | } |
| 569 | 569 | |
| 570 | 570 | //owner privileges override everything but person privileges, so we have to cross-check those here |
| 571 | - if ( $privilegename != 'midgard:owner' |
|
| 571 | + if ($privilegename != 'midgard:owner' |
|
| 572 | 572 | && $last_scope < MIDCOM_PRIVILEGE_SCOPE_OWNER) { |
| 573 | 573 | $owner_privileges = $this->get_owner_default_privileges(); |
| 574 | - if ( array_key_exists($privilegename, $owner_privileges) |
|
| 574 | + if (array_key_exists($privilegename, $owner_privileges) |
|
| 575 | 575 | && $this->_load_content_privilege('midgard:owner', $guid, $class, $user_id) |
| 576 | 576 | && self::$_content_privileges_cache[$cache_id]['midgard:owner']) { |
| 577 | 577 | self::$_content_privileges_cache[$cache_id][$privilegename] = ($owner_privileges[$privilegename] == MIDCOM_PRIVILEGE_ALLOW); |
@@ -253,15 +253,15 @@ |
||
| 253 | 253 | private static array $_default_magic_class_privileges = []; |
| 254 | 254 | |
| 255 | 255 | /** |
| 256 | - * Internal cache of the content privileges of users on content objects, this is |
|
| 257 | - * an associative array using a combination of the user identifier and the object's |
|
| 258 | - * guid as index. The privileges for the anonymous user use the magic |
|
| 259 | - * EVERYONE as user identifier. |
|
| 260 | - * |
|
| 261 | - * This must not be merged with the class-wide privileges_cache, because otherwise |
|
| 262 | - * class_default_privileges for child objects might be overridden by parent default |
|
| 263 | - * privileges |
|
| 264 | - */ |
|
| 256 | + * Internal cache of the content privileges of users on content objects, this is |
|
| 257 | + * an associative array using a combination of the user identifier and the object's |
|
| 258 | + * guid as index. The privileges for the anonymous user use the magic |
|
| 259 | + * EVERYONE as user identifier. |
|
| 260 | + * |
|
| 261 | + * This must not be merged with the class-wide privileges_cache, because otherwise |
|
| 262 | + * class_default_privileges for child objects might be overridden by parent default |
|
| 263 | + * privileges |
|
| 264 | + */ |
|
| 265 | 265 | private static array $_content_privileges_cache = []; |
| 266 | 266 | |
| 267 | 267 | /** |