flack / openpsa

lib/midgard/admin/asgard/stylehelper.php

Indentation +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
                 'midcom' => [
                     'style-init' => '',
                     'style-finish' => '',
-                 ]
+                    ]
             ],
             'nodes' => [],
         ];

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
 
     public function __construct(array &$data)
     {
-        $this->_data =& $data;
+        $this->_data = & $data;
         midcom::get()->head->enable_jquery_ui(['accordion']);
     }
 
@@ -33,11 +33,11 @@ 
             return;
         }
 
-        if (   midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_style')
-            && (   $this->_data['handler_id'] !== '____mfa-asgard-object_create'
+        if (midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_style')
+            && ($this->_data['handler_id'] !== '____mfa-asgard-object_create'
                 || $this->_data['current_type'] == 'midgard_element')) {
             $help_element = $this->_get_help_style_elementnames($this->_data['object']);
-        } elseif (   midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_element')
+        } elseif (midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_element')
                   && $this->_data['handler_id'] !== '____mfa-asgard-object_create') {
             $help_element = $this->_get_help_element();
         }
@@ -49,7 +49,7 @@ 
 
     private function _get_help_element()
     {
-        if (   empty($this->_data['object']->name)
+        if (empty($this->_data['object']->name)
             || empty($this->_data['object']->style)) {
             // We cannot help with empty elements
             return;

lib/midcom/services/auth/acl.php

Indentation +11 added lines, -11 removed lines

@@ -312,17 +312,17 @@
     private static $_privileges_cache = [];
 
     /**
-    * Internal cache of the content privileges of users on content objects, this is
-    * an associative array using a combination of the user identifier and the object's
-    * guid as index. The privileges for the anonymous user use the magic
-    * EVERYONE as user identifier.
-    *
-    * This must not be merged with the class-wide privileges_cache, because otherwise
-    * class_default_privileges for child objects might be overridden by parent default
-    * privileges
-    *
-    * @var Array
-    */
+     * Internal cache of the content privileges of users on content objects, this is
+     * an associative array using a combination of the user identifier and the object's
+     * guid as index. The privileges for the anonymous user use the magic
+     * EVERYONE as user identifier.
+     *
+     * This must not be merged with the class-wide privileges_cache, because otherwise
+     * class_default_privileges for child objects might be overridden by parent default
+     * privileges
+     *
+     * @var Array
+     */
     private static $_content_privileges_cache = [];
 
     /**

Spacing +8 added lines, -8 removed lines

@@ -521,7 +521,7 @@ 
         $cache_id = $user_id . '::' . $object_guid;
 
         if (!array_key_exists($cache_id, self::$_privileges_cache)) {
-            if (   empty($object_guid)
+            if (empty($object_guid)
                 || empty($object_class)) {
                 /* No idea if there should be some special log message written */
                 return [];
@@ -621,7 +621,7 @@ 
         // otherwise. (get_parent_data calling get_object_by_guid calling can_do ...)
         list ($parent_guid, $parent_class) = $this->get_parent_data($guid, $class);
 
-        if (   $parent_guid == $guid
+        if ($parent_guid == $guid
             || !mgd_is_guid($parent_guid)) {
             $base_privileges = [];
         } else {
@@ -632,7 +632,7 @@ 
         // Determine parent ownership
         $is_owner = false;
         $last_owner_scope = -1;
-        if (   array_key_exists('midgard:owner', $base_privileges)
+        if (array_key_exists('midgard:owner', $base_privileges)
             && $base_privileges['midgard:owner'] == MIDCOM_PRIVILEGE_ALLOW) {
             $is_owner = true;
         }
@@ -672,7 +672,7 @@ 
 
             $valid_privileges[$scope][$privilege->privilegename] = $privilege->value;
 
-            if (   $privilege->privilegename == 'midgard:owner'
+            if ($privilege->privilegename == 'midgard:owner'
                 && $scope > $last_owner_scope) {
                 $is_owner = ($privilege->value == MIDCOM_PRIVILEGE_ALLOW);
                 $last_owner_scope = $scope;
@@ -869,7 +869,7 @@ 
         $content_privilege = null;
 
         foreach ($object_privileges as $privilege) {
-            if (   $privilege->privilegename != $privilegename
+            if ($privilege->privilegename != $privilegename
                 ||  $privilege->scope <= $last_scope
                 || !$privilege->does_privilege_apply($user_id)) {
                 continue;
@@ -880,10 +880,10 @@ 
         }
 
         //owner privileges override everything but person privileges, so we have to cross-check those here
-        if (   $privilegename != 'midgard:owner'
+        if ($privilegename != 'midgard:owner'
             && $last_scope < MIDCOM_PRIVILEGE_SCOPE_OWNER) {
             $owner_privileges = $this->get_owner_default_privileges();
-            if (    array_key_exists($privilegename, $owner_privileges)
+            if (array_key_exists($privilegename, $owner_privileges)
                  && $this->_load_content_privilege('midgard:owner', $guid, $class, $user_id)
                  && self::$_content_privileges_cache[$cache_id]['midgard:owner']) {
                 self::$_content_privileges_cache[$cache_id][$privilegename] = ($owner_privileges[$privilegename] == MIDCOM_PRIVILEGE_ALLOW);
@@ -899,7 +899,7 @@ 
         //if nothing was found, we try to recurse to parent
         list ($parent_guid, $parent_class) = $this->get_parent_data($guid, $class);
 
-        if (   $parent_guid == $guid
+        if ($parent_guid == $guid
             || !mgd_is_guid($parent_guid)) {
             return false;
         }

lib/midcom/cron/purgedeleted.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     {
         $classes = [];
         foreach (midcom_connection::get_schema_types() as $mgdschema) {
-            if (   substr($mgdschema, 0, 2) == '__'
+            if (substr($mgdschema, 0, 2) == '__'
                 || !midgard_reflector_object::has_metadata_class($mgdschema)) {
                 continue;
             }

lib/midcom/core/dbaproxy.php

Braces +2 added lines, -1 removed lines

@@ -62,7 +62,8 @@
         try {
             $this->__object = call_user_func([$this->__midcom_class_name__, 'get_cached'], $this->__identifier);
             return true;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
         return false;

lib/midcom/helper/reflector/copy.php

Spacing +5 added lines, -5 removed lines

@@ -308,7 +308,7 @@ 
         }
 
         // Override requested root object properties
-        if (   !empty($this->target->guid)
+        if (!empty($this->target->guid)
             && $target->guid === $this->target->guid) {
             foreach ($this->root_object_values as $name => $value) {
                 $target->$name = $value;
@@ -353,7 +353,7 @@ 
         // Store for later use - if ever needed
         $this->new_objects[] = $target;
 
-        if (   !$this->_copy_data('parameters', $source, $target)
+        if (!$this->_copy_data('parameters', $source, $target)
             || !$this->_copy_data('metadata', $source, $target)
             || !$this->_copy_data('attachments', $source, $target)
             || !$this->_copy_data('privileges', $source, $target)) {
@@ -374,7 +374,7 @@ 
     private function _copy_data($type, $source, &$target)
     {
         $method = 'copy_' . $type;
-        if (   !$this->$method($source, $target)
+        if (!$this->$method($source, $target)
             && $this->halt_on_errors) {
             $this->errors[] = $this->_l10n->get('failed to copy ' . $type);
             return false;
@@ -515,8 +515,8 @@ 
     public static function copy_object_tree($source, $parent, $exclude = [], $copy_parameters = true, $copy_metadata = true, $copy_attachments = true)
     {
         $copy = new midcom_helper_reflector_copy();
-        $copy->source =& $source;
-        $copy->target =& $parent;
+        $copy->source = & $source;
+        $copy->target = & $parent;
         $copy->copy_parameters = $copy_parameters;
         $copy->copy_metadata = $copy_metadata;
         $copy->copy_attachments = $copy_attachments;

lib/midcom/helper/reflector/tree.php

Spacing +5 added lines, -5 removed lines

@@ -158,7 +158,7 @@ 
     private static function _check_permissions($deleted)
     {
         // PONDER: Check for some generic user privilege instead  ??
-        if (   $deleted
+        if ($deleted
             && !midcom_connection::is_admin()
             && !midcom::get()->auth->is_component_sudo()) {
             debug_add('Non-admins are not allowed to list deleted objects', MIDCOM_LOG_ERROR);
@@ -248,7 +248,7 @@ 
                     'target' => $ref->get_link_target($field)
                 ];
                 $linked_class = $ref->get_link_name($field);
-                if (   empty($linked_class)
+                if (empty($linked_class)
                     && $info['type'] === MGD_TYPE_GUID) {
                     // Guid link without class specification, valid for all classes
                     if (empty($info['target'])) {
@@ -298,7 +298,7 @@ 
             $field_type = $field_data['type'];
             $field = $field_data['name'];
 
-            if (   !$field_target
+            if (!$field_target
                 || !isset($for_object->$field_target)) {
                 // Why return false ???
                 return false;
@@ -414,7 +414,7 @@ 
             $parent_property = midgard_object_class::get_property_parent($schema_type);
             $up_property = midgard_object_class::get_property_up($schema_type);
 
-            if (   !$this->_resolve_child_classes_links_back($parent_property, $schema_type, $this->mgdschema_class)
+            if (!$this->_resolve_child_classes_links_back($parent_property, $schema_type, $this->mgdschema_class)
                 && !$this->_resolve_child_classes_links_back($up_property, $schema_type, $this->mgdschema_class)) {
                 continue;
             }
@@ -439,7 +439,7 @@ 
 
         $ref = new midgard_reflection_property($prospect_type);
         $link_class = $ref->get_link_name($property);
-        if (   empty($link_class)
+        if (empty($link_class)
             && $ref->get_midgard_type($property) === MGD_TYPE_GUID) {
             return true;
         }

Braces +2 added lines, -1 removed lines

@@ -553,7 +553,8 @@
         $tree = [];
         try {
             $children = self::get_child_objects($parent);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return $tree;
         }
 

lib/midcom/helper/misc.php

Spacing +4 added lines, -4 removed lines

@@ -252,7 +252,7 @@ 
             return $data;
         }
 
-        $preg='/s:([0-9]+):"(.*?)";/ms';
+        $preg = '/s:([0-9]+):"(.*?)";/ms';
         preg_match_all($preg, $data, $matches);
         $cache = [];
 
@@ -348,13 +348,13 @@ 
             $theme_path = implode('/', $path_array);
             $candidates = [];
             if ($substyle) {
-                $candidates[] =  $theme_root . $theme_path .  "/style/{$substyle}/{$element_name}.php";
+                $candidates[] = $theme_root . $theme_path . "/style/{$substyle}/{$element_name}.php";
             }
             if ($page) {
-                $candidates[] =  $theme_root . $theme_path .  "/style{$page}/{$element_name}.php";
+                $candidates[] = $theme_root . $theme_path . "/style{$page}/{$element_name}.php";
             }
 
-            $candidates[] = $theme_root . $theme_path .  "/style/{$element_name}.php";
+            $candidates[] = $theme_root . $theme_path . "/style/{$element_name}.php";
 
             foreach (array_filter($candidates, 'file_exists') as $candidate) {
                 return file_get_contents($candidate);

lib/midcom/helper/toolbar/view.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
             ]);
         }
 
-        if (   midcom::get()->config->get('midcom_services_rcs_enable')
+        if (midcom::get()->config->get('midcom_services_rcs_enable')
             && $object->can_do('midgard:update')
             && $object->_use_rcs) {
             $buttons[] = [
@@ -84,7 +84,7 @@ 
             }
 
             $icon = 'stock-icons/16x16/page-' . $icontype . '.png';
-            if (   !midcom::get()->config->get('show_hidden_objects')
+            if (!midcom::get()->config->get('show_hidden_objects')
                 && !$object->metadata->is_visible()) {
                 // Take scheduling into account
                 $icon = 'stock-icons/16x16/page-' . $icontype . '-notpublished.png';

lib/fi/protie/navigation/main.php

Spacing +7 added lines, -7 removed lines

@@ -338,8 +338,8 @@ 
         $classes = [];
 
         if ($child[MIDCOM_NAV_TYPE] === 'node') {
-            if (   $item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
-                && (   !$this->_nap->get_current_leaf()
+            if ($item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
+                && (!$this->_nap->get_current_leaf()
                     || !$this->_nap->get_leaf($this->_nap->get_current_leaf()))) {
                 $classes[] = $this->css_active;
             }
@@ -386,7 +386,7 @@ 
         }
 
         // Add information about the object's status
-        if (   $this->object_status_to_class
+        if ($this->object_status_to_class
             && isset($item[MIDCOM_NAV_OBJECT])
             && $css_status_class = midcom::get()->metadata->get_object_classes($item[MIDCOM_NAV_OBJECT])) {
             $classes[] = $css_status_class;
@@ -405,12 +405,12 @@ 
         echo "<a href=\"{$item[MIDCOM_NAV_ABSOLUTEURL]}\"{$link_class}>{$item[MIDCOM_NAV_NAME]}</a>";
         // If either of the follow nodes switches is on, follow all the nodes
 
-        if (   $item[MIDCOM_NAV_TYPE] === 'node'
+        if ($item[MIDCOM_NAV_TYPE] === 'node'
             && !$this->show_only_current
-            && (   $this->list_levels === 0
+            && ($this->list_levels === 0
                 || $this->_level < $this->list_levels)) {
-            if (   $this->follow_all
-                || (   $this->follow_selected
+            if ($this->follow_all
+                || ($this->follow_selected
                     && in_array($item[MIDCOM_NAV_ID], $this->node_path, true))) {
                 $this->_level++;
                 $this->_list_child_elements($item[MIDCOM_NAV_ID]);