flack / openpsa

lib/midcom/helper/nav/node.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
     public function is_readable_by($user_id) : bool
     {
-        return (   !$user_id
+        return (!$user_id
                 || midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->guid, midcom_db_topic::class, $user_id));
     }
 

lib/midcom/helper/nav/leaf.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function is_readable_by($user_id) : bool
     {
-        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));

lib/midcom/helper/metadata.php

Spacing +10 added lines, -10 removed lines

@@ -293,7 +293,7 @@ 
     {
         if (in_array($key, $this->field_config['timebased'])) {
             // This is ugly, but seems the only possible way...
-            if (   isset($this->__metadata->$key)
+            if (isset($this->__metadata->$key)
                 && (string) $this->__metadata->$key !== "0001-01-01T00:00:00+00:00") {
                 return (int) $this->__metadata->$key->format('U');
             }
@@ -358,11 +358,11 @@ 
         }
 
         $now = time();
-        if (   $this->get('schedulestart')
+        if ($this->get('schedulestart')
             && $this->get('schedulestart') > $now) {
             return false;
         }
-        if (   $this->get('scheduleend')
+        if ($this->get('scheduleend')
             && $this->get('scheduleend') < $now) {
             return false;
         }
@@ -380,9 +380,9 @@ 
     public function is_object_visible_onsite()
     {
         return
-        (   (   midcom::get()->config->get('show_hidden_objects')
+        ((midcom::get()->config->get('show_hidden_objects')
              || $this->is_visible())
-         && (   midcom::get()->config->get('show_unapproved_objects')
+         && (midcom::get()->config->get('show_unapproved_objects')
              || $this->is_approved())
         );
     }
@@ -470,7 +470,7 @@ 
             $guid = $source;
         }
 
-        if (   $object === null
+        if ($object === null
             && mgd_is_guid($guid)) {
             try {
                 $object = midcom::get()->dbfactory->get_object_by_guid($guid);
@@ -505,7 +505,7 @@ 
         }
 
         // Lock was created by the user, return "not locked"
-        if (   !empty(midcom::get()->auth->user->guid)
+        if (!empty(midcom::get()->auth->user->guid)
             && $this->get('locker') === midcom::get()->auth->user->guid) {
             return false;
         }
@@ -523,7 +523,7 @@ 
     {
         midcom::get()->auth->require_do('midgard:update', $this->__object);
 
-        if (   is_object($this->__object)
+        if (is_object($this->__object)
             && $this->__object->lock()) {
             $this->_cache = [];
             return true;
@@ -540,7 +540,7 @@ 
      */
     public function can_unlock() : bool
     {
-        return (   $this->__object->can_do('midcom:unlock')
+        return ($this->__object->can_do('midcom:unlock')
                 || midcom::get()->auth->can_user_do('midcom:unlock', null, midcom_services_auth::class));
     }
 
@@ -551,7 +551,7 @@ 
      */
     public function unlock() : bool
     {
-        if (   $this->can_unlock()
+        if ($this->can_unlock()
             && is_object($this->__object)
             && $this->__object->unlock()) {
             $this->_cache = [];

lib/midcom/helper/toolbar.php

Spacing +8 added lines, -8 removed lines

@@ -366,11 +366,11 @@ 
 
         $item = array_replace($defaults, $item);
 
-        if (   !empty($item[MIDCOM_TOOLBAR_ACCESSKEY])
+        if (!empty($item[MIDCOM_TOOLBAR_ACCESSKEY])
             && !array_key_exists($item[MIDCOM_TOOLBAR_ACCESSKEY], $used_access_keys)) {
             // We have valid access key, add it to help text
             $prefix = 'Alt-';
-            if (   isset($_SERVER['HTTP_USER_AGENT'])
+            if (isset($_SERVER['HTTP_USER_AGENT'])
                 && strstr($_SERVER['HTTP_USER_AGENT'], 'Macintosh')) {
                 // Mac users
                 $prefix = 'Ctrl-Alt-';
@@ -392,7 +392,7 @@ 
     private function set_url(array &$item, $url)
     {
         $item[MIDCOM_TOOLBAR__ORIGINAL_URL] = $url;
-        if (   (   empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"])
+        if ((empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"])
                 // Some items may want to keep their links unmutilated
                 || $item[MIDCOM_TOOLBAR_OPTIONS]["rel"] != "directlink")
             && substr($url, 0, 1) != '/'
@@ -417,7 +417,7 @@ 
 
         if ($index == 0) {
             array_shift($this->items);
-        } elseif ($index == count($this->items) -1) {
+        } elseif ($index == count($this->items) - 1) {
             array_pop($this->items);
         } else {
             $this->items = array_merge(array_slice($this->items, 0, $index - 1),
@@ -547,7 +547,7 @@ 
      */
     public function render() : string
     {
-        $visible_items = array_filter($this->items, function ($item) {
+        $visible_items = array_filter($this->items, function($item) {
             return !$item[MIDCOM_TOOLBAR_HIDDEN];
         });
         $this->rendered = true;
@@ -613,7 +613,7 @@ 
             // Try finding uppercase version of the accesskey first
             $accesskey = strtoupper($item[MIDCOM_TOOLBAR_ACCESSKEY]);
             $position = strpos($label, $accesskey);
-            if (   $position === false
+            if ($position === false
                 && midcom::get()->i18n->get_current_language() == 'en') {
                 // Try lowercase, too
                 $accesskey = strtolower($accesskey);
@@ -677,7 +677,7 @@ 
             $attributes['title'] = $item[MIDCOM_TOOLBAR_HELPTEXT];
         }
 
-        if (   $item[MIDCOM_TOOLBAR_ENABLED]
+        if ($item[MIDCOM_TOOLBAR_ENABLED]
             && $item[MIDCOM_TOOLBAR_ACCESSKEY] !== null) {
             $attributes['class'] = 'accesskey';
             $attributes['accesskey'] = $item[MIDCOM_TOOLBAR_ACCESSKEY];
@@ -746,7 +746,7 @@ 
     public function get_index_from_url($url)
     {
         foreach ($this->items as $i => $item) {
-            if (   $item[MIDCOM_TOOLBAR_URL] == $url
+            if ($item[MIDCOM_TOOLBAR_URL] == $url
                 || $item[MIDCOM_TOOLBAR__ORIGINAL_URL] == $url) {
                 return $i;
             }

lib/midcom/helper/configuration.php

Spacing +4 added lines, -4 removed lines

@@ -144,7 +144,7 @@ 
     private function _update_cache()
     {
         $this->_merged = $this->_global;
-        if (   !empty($this->_local)
+        if (!empty($this->_local)
             && is_array($this->_local)) {
             $this->_merged = array_merge($this->_merged, $this->_local);
         }
@@ -185,7 +185,7 @@ 
      */
     public function store(array $params, $reset = true)
     {
-        if (   !$this->_object_stored
+        if (!$this->_object_stored
             && $this->_object) {
             $this->_store_from_object();
         }
@@ -269,7 +269,7 @@ 
      */
     public function get_all()
     {
-        if (   !$this->_object_stored
+        if (!$this->_object_stored
             && $this->_object) {
             $this->_store_from_object();
         }
@@ -285,7 +285,7 @@ 
      */
     public function exists($key) : bool
     {
-        if (   !$this->_object_stored
+        if (!$this->_object_stored
             && $this->_object) {
             $this->_store_from_object();
         }

lib/midcom/helper/reflector/nameresolver.php

Spacing +7 added lines, -7 removed lines

@@ -36,13 +36,13 @@ 
         if ($name_property === null) {
             $name_property = midcom_helper_reflector::get_name_property($this->_object);
         }
-        if (    empty($name_property)
+        if (empty($name_property)
             || !midcom_helper_reflector::get($this->_object)->property_exists($name_property)) {
             // Could not resolve valid property
             return false;
         }
         // Make copy via typecast, very important or we might accidentally manipulate the given object
-        return (string)$this->_object->{$name_property};
+        return (string) $this->_object->{$name_property};
     }
 
     /**
@@ -128,7 +128,7 @@ 
     public function name_is_unique_or_empty() : bool
     {
         $name_copy = $this->get_object_name();
-        if (   empty($name_copy)
+        if (empty($name_copy)
             && $name_copy !== false) {
             // Allow empty string name
             return true;
@@ -208,7 +208,7 @@ 
 
             $qb->add_constraint($child_name_property, '=', $name_copy);
             if ($qb->count()) {
-                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')" );
+                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')");
                 return false;
             }
         }
@@ -239,7 +239,7 @@ 
 
             $qb->add_constraint($child_name_property, '=', $name_copy);
             if ($qb->count()) {
-                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')" );
+                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')");
                 return false;
             }
         }
@@ -272,7 +272,7 @@ 
         $name_prop = midcom_helper_reflector::get_name_property($this->_object);
 
         if (!empty($original_name)) {
-            $current_name = (string)$original_name;
+            $current_name = (string) $original_name;
         } else {
             // Empty name, try to generate from title
             $title_copy = midcom_helper_reflector::get_object_title($this->_object, $title_property);
@@ -316,7 +316,7 @@ 
         } while (!$this->name_is_unique());
 
         // Get a copy of the current, usable name
-        $ret = (string)$this->_object->{$name_prop};
+        $ret = (string) $this->_object->{$name_prop};
         // Restore the original name
         $this->_object->{$name_prop} = $original_name;
         return $ret;

lib/midcom/helper/reflector/tree.php

Spacing +5 added lines, -5 removed lines

@@ -150,7 +150,7 @@ 
     private static function _check_permissions($deleted) : bool
     {
         // 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);
@@ -234,7 +234,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'])) {
@@ -284,7 +284,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;
@@ -400,7 +400,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;
             }
@@ -424,7 +424,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;
         }