flack / openpsa

src/midcom/dba/attachments.php

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
             return false;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:attachments')) {
             debug_add("Failed to set parameters, midgard:update or midgard:attachments on the " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -77,7 +77,7 @@ 
             return null;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:attachments')) {
             debug_add("Failed to set parameters, midgard:update or midgard:attachments on the " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -91,7 +91,7 @@ 
         $attachment->parentguid = $this->guid;
 
         if (!$attachment->create()) {
-            debug_add("Could not create the attachment '{$name}' for " . get_class($this) . " {$this->guid}: "  . midcom_connection::get_error_string(),
+            debug_add("Could not create the attachment '{$name}' for " . get_class($this) . " {$this->guid}: " . midcom_connection::get_error_string(),
             MIDCOM_LOG_INFO);
             return null;
         }

lib/midcom/core/collector.php

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
                 if ($counter <= $this->_offset) {
                     continue;
                 }
-                if (   $this->_limit
+                if ($this->_limit
                     && $counter > ($this->_offset + $this->_limit)) {
                     break;
                 }

lib/midcom/core/query.php

Spacing +2 added lines, -2 removed lines

@@ -140,7 +140,7 @@ 
             $this->_user_id = midcom::get()->auth->acl->get_user_id();
         }
 
-        if (   $this->hide_invisible
+        if ($this->hide_invisible
             && !$this->_visibility_checks_added) {
             if (!midcom::get()->config->get('show_hidden_objects')) {
                 $this->add_constraint('metadata.hidden', '=', false);
@@ -200,7 +200,7 @@ 
         // Deal with empty arrays, which would produce invalid queries
         // This is done here to avoid repetitive code in callers, and because
         // it's easy enough to generalize: IN empty set => always false, NOT IN empty set => always true
-        if (   is_array($value)
+        if (is_array($value)
             && empty($value)) {
             if ($operator == 'NOT IN') {
                 return true;

lib/midcom/core/dbaobject.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
             }
             $this->set_object($id);
         } else {
-            if (   is_int($id)
+            if (is_int($id)
                 && $id < 1) {
                 throw new midcom_error($id . ' is not a valid database ID');
             }
@@ -108,7 +108,7 @@ 
             }
 
             //Some useful information for performance tuning
-            if (   midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG
+            if (midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG
                 && $this->__object->guid) {
                 static $guids = [];
                 static $total = 0;

Braces +2 added lines, -1 removed lines

@@ -102,7 +102,8 @@
             try {
                 $mgdschemaclass = $this->__mgdschema_class_name__;
                 $this->set_object(new $mgdschemaclass($id));
-            } catch (mgd_exception $e) {
+            }
+            catch (mgd_exception $e) {
                 debug_add('Constructing ' . $this->__mgdschema_class_name__ . ' object ' . $id . ' failed, reason: ' . $e->getMessage(), MIDCOM_LOG_WARN);
                 throw new midcom_error_midgard($e, $id);
             }

lib/midcom/services/indexer/document.php

Spacing +1 added lines, -1 removed lines

@@ -405,7 +405,7 @@
     {
         // Complete fields
         $this->indexed = time();
-        if (   $this->author == ''
+        if ($this->author == ''
             && isset($this->creator->name)) {
             $this->author = $this->creator->name;
         }

Braces +2 added lines, -1 removed lines

@@ -579,7 +579,8 @@
     {
         try {
             return midcom_db_person::get_cached($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return null;
         }
     }

lib/org/openpsa/contacts/duplicates/merge.php

Spacing +4 added lines, -4 removed lines

@@ -88,7 +88,7 @@ 
                             $dup = $this->check_duplicate($results, $result, $conf['duplicate_check']);
 
                             if ($dup !== true) {
-                                if (   !is_object($dup)
+                                if (!is_object($dup)
                                     || !array_key_exists($dup->id, $todelete)) {
                                     $todelete[$result->id] = $result;
                                 }
@@ -97,7 +97,7 @@ 
                         }
                     }
                 }
-                if (   $needs_update
+                if ($needs_update
                     && !$result->update()) {
                     throw new midcom_error("Failed to update {$classname} #{$result->id}, errstr: " . midcom_connection::get_error_string());
                 }
@@ -145,7 +145,7 @@ 
         }
 
         foreach ($results as $result) {
-            if (   $result->$field === $object->$field
+            if ($result->$field === $object->$field
                 && $result->id !== $object->id) {
                 return $result;
             }
@@ -163,7 +163,7 @@ 
         $changed = false;
         foreach ($person2 as $property => $value) {
             // Copy only simple properties not marked to be skipped missing from person1
-            if (   !empty($person2->$property)
+            if (!empty($person2->$property)
                 && empty($person1->$property)
                 && !isset($skip_properties[$property])
                 && is_scalar($value)) {

lib/midcom/services/cache/module/content.php

Spacing +6 added lines, -6 removed lines

@@ -171,8 +171,8 @@ 
         $this->_uncached = $config->get('cache_module_content_uncached');
         $this->_headers_strategy = $this->get_strategy('cache_module_content_headers_strategy');
         $this->_headers_strategy_authenticated = $this->get_strategy('cache_module_content_headers_strategy_authenticated');
-        $this->_default_lifetime = (int)$config->get('cache_module_content_default_lifetime');
-        $this->_default_lifetime_authenticated = (int)$config->get('cache_module_content_default_lifetime_authenticated');
+        $this->_default_lifetime = (int) $config->get('cache_module_content_default_lifetime');
+        $this->_default_lifetime_authenticated = (int) $config->get('cache_module_content_default_lifetime_authenticated');
 
         if ($this->_headers_strategy == 'no-cache') {
             // we can't call no_cache() here, because it would try to call back to this class via the global getter
@@ -458,7 +458,7 @@ 
      */
     public function expires(int $timestamp)
     {
-        if (   $this->_expires === null
+        if ($this->_expires === null
             || $this->_expires > $timestamp) {
             $this->_expires = $timestamp;
         }
@@ -570,7 +570,7 @@ 
      */
     public function write_meta_cache(string $content_id, Request $request, Response $response)
     {
-        if (   $this->_uncached
+        if ($this->_uncached
             || $this->_no_cache) {
             return;
         }
@@ -639,7 +639,7 @@ 
 
     public function store_dl_content(int $context, string $dl_cache_data, Request $request)
     {
-        if (   $this->_no_cache
+        if ($this->_no_cache
             || $this->_uncached) {
             return;
         }
@@ -700,7 +700,7 @@ 
             // Add Expiration and Cache Control headers
             $strategy = $this->_headers_strategy;
             $default_lifetime = $this->_default_lifetime;
-            if (   midcom::get()->auth->is_valid_user()
+            if (midcom::get()->auth->is_valid_user()
                 || midcom_connection::get_user()) {
                 $strategy = $this->_headers_strategy_authenticated;
                 $default_lifetime = $this->_default_lifetime_authenticated;

lib/midcom/helper/nav/node.php

Spacing +1 added lines, -1 removed lines

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

lib/midcom/helper/toolbar.php

Spacing +9 added lines, -9 removed lines

@@ -351,11 +351,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-';
@@ -377,7 +377,7 @@ 
     private function set_url(array &$item, string $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")
             && !str_starts_with($url, '/')
@@ -402,7 +402,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),
@@ -525,7 +525,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;
@@ -588,7 +588,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);
@@ -649,7 +649,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];
@@ -712,7 +712,7 @@ 
     public function get_index_from_url(string $url) : ?int
     {
         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;
             }
@@ -730,7 +730,7 @@ 
      *
      * @param mixed $index The integer index or URL to check
      */
-    protected function _check_index($index, bool $raise_error = true) :?int
+    protected function _check_index($index, bool $raise_error = true) : ?int
     {
         if (is_string($index)) {
             $url = $index;