flack / openpsa

rootfile.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     include __DIR__ . '/config-default.inc.php';
 }
 
-if (! defined('MIDCOM_STATIC_URL')) {
+if (!defined('MIDCOM_STATIC_URL')) {
     define('MIDCOM_STATIC_URL', '/midcom-static');
 }
 

lib/midcom/helper/imagepopup/handler/list.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         midcom::get()->auth->require_valid_user();
         midcom::get()->skip_page_style = true;
 
-        $this->add_stylesheet(MIDCOM_STATIC_URL ."/midcom.helper.imagepopup/styling.css", 'screen');
+        $this->add_stylesheet(MIDCOM_STATIC_URL . "/midcom.helper.imagepopup/styling.css", 'screen');
 
         $data['filetype'] = $args[0];
         $data['object'] = null;

src/midcom/datamanager/extension/type/tinymce.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
     {
         parent::configureOptions($resolver);
 
-        $map_attr = function (Options $options, $value) {
+        $map_attr = function(Options $options, $value) {
             if ($value === null) {
                 $value = array();
             }
@@ -54,7 +54,7 @@ 
             return $value;
         };
 
-        $get_config = function (Options $options, $value) {
+        $get_config = function(Options $options, $value) {
             return \midcom_baseclasses_components_configuration::get('midcom.helper.datamanager2', 'config');
         };
 
@@ -63,7 +63,7 @@ 
             'config' => $get_config
         ));
 
-        $resolver->setNormalizer('widget_config', function (Options $options, $value) {
+        $resolver->setNormalizer('widget_config', function(Options $options, $value) {
             $widget_defaults = array(
                 'mode' => 'exact',
                 'theme' => $options['config']->get('tinymce_default_theme'),
@@ -73,7 +73,7 @@ 
             );
             return helper::resolve_options($widget_defaults, $value);
         });
-        $resolver->setNormalizer('type_config', function (Options $options, $value) {
+        $resolver->setNormalizer('type_config', function(Options $options, $value) {
             $type_defaults = array(
 
             );
@@ -106,7 +106,7 @@ 
             'elements' => $view->vars['id'],
             'local_config' => $options['widget_config']['local_config'],
             'language' => midcom::get()->i18n->get_current_language(),
-            'img' => ($options['widget_config']['use_imagepopup'])? $this->_get_image_popup($form) : '',
+            'img' => ($options['widget_config']['use_imagepopup']) ? $this->_get_image_popup($form) : '',
         );
         $snippet = $this->_get_snippet($tiny_options);
         $view->vars['tinymce_snippet'] = $snippet;

lib/midgard/admin/user/handler/group/edit.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 
         $qb = midcom_db_member::new_query_builder();
         $qb->add_constraint('gid', '=', $this->_group->id);
-        if (   $qb->count_unchecked() > $this->_config->get('list_users_max')
+        if ($qb->count_unchecked() > $this->_config->get('list_users_max')
             && isset($schemadb['default']->fields['persons'])) {
             unset($schemadb['default']->fields['persons']);
             $field_order_key = array_search('persons', $schemadb['default']->field_order);

lib/midcom/admin/rcs/handler.php

Spacing +4 added lines, -4 removed lines

@@ -202,7 +202,7 @@ 
         $this->_guid = $args[0];
         $this->_load_object();
 
-        if (   !$this->_backend->version_exists($args[1])
+        if (!$this->_backend->version_exists($args[1])
             || !$this->_backend->version_exists($args[2])) {
             throw new midcom_error_notfound("One of the revisions {$args[1]} or {$args[2]} does not exist.");
         }
@@ -217,7 +217,7 @@ 
         $this->_request_data['earlier_revision'] = $this->_backend->get_prev_version($args[1]);
         $this->_request_data['previous_revision'] = $args[1];
         $this->_request_data['latest_revision'] = $args[2];
-        $this->_request_data['next_revision']  = $this->_backend->get_next_version($args[2]);
+        $this->_request_data['next_revision'] = $this->_backend->get_next_version($args[2]);
 
         $this->_request_data['guid'] = $args[0];
 
@@ -291,7 +291,7 @@ 
         // Set the version numbers
         $data['previous_revision'] = $this->_backend->get_prev_version($args[1]);
         $data['latest_revision'] = $args[1];
-        $data['next_revision']  = $this->_backend->get_next_version($args[1]);
+        $data['next_revision'] = $this->_backend->get_next_version($args[1]);
         $data['guid'] = $args[0];
     }
 
@@ -318,7 +318,7 @@ 
         $this->_object->require_do('midgard:update');
         // TODO: set another privilege for restoring?
 
-        if (   $this->_backend->version_exists($args[1])
+        if ($this->_backend->version_exists($args[1])
             && $this->_backend->restore_to_revision($args[1])) {
             midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('restore to version %s successful'), $args[1]));
             return new midcom_response_relocate(midcom::get()->permalinks->create_permalink($this->_object->guid));

lib/midcom/db/attachment.php

Spacing +1 added lines, -1 removed lines

@@ -336,7 +336,7 @@
     public function update_cache()
     {
         // Check if the attachment can be read anonymously
-        if (   midcom::get()->config->get('attachment_cache_enabled')
+        if (midcom::get()->config->get('attachment_cache_enabled')
             && !$this->can_do('midgard:read', 'EVERYONE')) {
             // Not public file, ensure it is removed
             $filename = $this->get_cache_path();

lib/midcom/helper/nav/item.php

Spacing +2 added lines, -2 removed lines

@@ -98,8 +98,8 @@
         }
 
         // Check the Metadata if and only if we are configured to do so.
-        if (   is_object($this->object)
-            && (   midcom::get()->config->get('show_hidden_objects') == false
+        if (is_object($this->object)
+            && (midcom::get()->config->get('show_hidden_objects') == false
                 || midcom::get()->config->get('show_unapproved_objects') == false)) {
             // Check Hiding, Scheduling and Approval
             $metadata = $this->object->metadata;

lib/midcom/helper/nav/leaf.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function is_readable_by($user_id)
     {
-        return (   empty($this->object)
+        return (empty($this->object)
                 || !$this->guid
                 || !$user_id
                 || midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->guid, $this->object->__midcom_class_name__, $user_id));

Braces +2 added lines, -1 removed lines

@@ -52,7 +52,8 @@
         } elseif (!empty($this->data[MIDCOM_NAV_GUID])) {
             try {
                 $this->data[MIDCOM_NAV_OBJECT] = midcom::get()->dbfactory->get_object_by_guid($this->data[MIDCOM_NAV_GUID]);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
             }
         } else {
             debug_add("Warning: The leaf {$this->leafid} of topic {$topic->id} does set neither a GUID nor an object.");

lib/midcom/helper/_styleloader.php

Braces +4 added lines, -2 removed lines

@@ -166,7 +166,8 @@ 
                     break;
                 }
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
         }
 
         $path_parts = array_reverse($path_parts);
@@ -410,7 +411,8 @@ 
                 && $db_style = $this->get_style_id_from_path($root_topic->style)) {
                 $_style = $this->_get_element_in_styletree($db_style, $_element);
             }
-        } catch (midcom_error_forbidden $e) {
+        }
+        catch (midcom_error_forbidden $e) {
             $e->log();
         }
 

Spacing +13 added lines, -13 removed lines

@@ -310,7 +310,7 @@ 
             $element = $matches[2];
         }
 
-        if (   isset($stylepath)
+        if (isset($stylepath)
             && $styleid = $this->get_style_id_from_path($stylepath)) {
             array_unshift($this->_scope, $styleid);
         }
@@ -354,9 +354,9 @@ 
      */
     public function render($preparsed, $path, array $data = array())
     {
-        if (   empty($data)
+        if (empty($data)
             && midcom_core_context::get()->has_custom_key('request_data')) {
-            $data =& midcom_core_context::get()->get_custom_key('request_data');
+            $data = & midcom_core_context::get()->get_custom_key('request_data');
         }
 
         if (eval('?>' . $preparsed) === false) {
@@ -390,7 +390,7 @@ 
 
         try {
             $root_topic = $context->get_key(MIDCOM_CONTEXT_ROOTTOPIC);
-            if (   $root_topic->style
+            if ($root_topic->style
                 && $db_style = $this->get_style_id_from_path($root_topic->style)) {
                 $_style = $this->_get_element_in_styletree($db_style, $_element);
             }
@@ -425,7 +425,7 @@ 
             if (array_key_exists($src, $this->_styles)) {
                 return $this->_styles[$src];
             }
-            if (   $this->_scope[0] != ''
+            if ($this->_scope[0] != ''
                 && $result = $this->_get_element_in_styletree($this->_scope[0], $_element)) {
                 $this->_styles[$src] = $result;
                 return $this->_styles[$src];
@@ -443,7 +443,7 @@ 
         if (array_key_exists($src, $this->_snippets)) {
             return $this->_snippets[$src];
         }
-        if (   midcom::get()->config->get('theme')
+        if (midcom::get()->config->get('theme')
             && $content = midcom_helper_misc::get_element_content($_element)) {
             $this->_snippets[$src] = $content;
             return $content;
@@ -451,7 +451,7 @@ 
 
         $current_context = midcom_core_context::get()->id;
         foreach ($this->_styledirs[$current_context] as $path) {
-            $filename = $path .  "/{$_element}.php";
+            $filename = $path . "/{$_element}.php";
             if (file_exists($filename)) {
                 $this->_snippets[$filename] = file_get_contents($filename);
                 return $this->_snippets[$filename];
@@ -501,11 +501,11 @@ 
             }
         } else {
             $style = $topic->style;
-            if (   !$topic->style
+            if (!$topic->style
                 && !empty($GLOBALS['midcom_style_inherited'])) {
                 $style = $GLOBALS['midcom_style_inherited'];
             }
-            if (   is_string($style)
+            if (is_string($style)
                 && strpos($style, 'theme:') === 0) {
                 $theme_dir = OPENPSA2_THEME_ROOT . midcom::get()->config->get('theme') . '/style';
                 $parts = explode('/', str_replace('theme:/', '', $style));
@@ -533,7 +533,7 @@ 
     {
         // get component's snippetdir (for default styles)
         $loader = midcom::get()->componentloader;
-        if (   !$topic
+        if (!$topic
             || !$topic->guid) {
             return null;
         }
@@ -669,7 +669,7 @@ 
         /* then the contextstyle */
         $this->_styledirs[$current_context][count($this->_styledirs[$current_context])] = $component_style;
 
-        $this->_styledirs[$current_context] =  array_merge($this->_styledirs[$current_context], $this->_styledirs_append[$current_context]);
+        $this->_styledirs[$current_context] = array_merge($this->_styledirs[$current_context], $this->_styledirs_append[$current_context]);
     }
 
     /**
@@ -698,7 +698,7 @@ 
             $this->_styledirs_append[$context] = array();
         }
 
-        if (   $this->_topic
+        if ($this->_topic
             && $_st = $this->_get_component_style($this->_topic)) {
             array_unshift($this->_scope, $_st);
         }
@@ -718,7 +718,7 @@ 
      */
     public function leave_context()
     {
-        if (   $this->_topic
+        if ($this->_topic
             && $this->_get_component_style($this->_topic)) {
             array_shift($this->_scope);
         }