flack / openpsa

lib/midgard/admin/asgard/handler/object/attachments.php

Spacing +3 added lines, -3 removed lines

@@ -98,13 +98,13 @@ 
         }
 
         $mimetype = $request->request->get('midgard_admin_asgard_mimetype');
-        if (   !empty($mimetype)
+        if (!empty($mimetype)
             && $local_file->mimetype != $mimetype) {
             $local_file->mimetype = $mimetype;
             $needs_update = true;
         }
 
-        if (   $needs_update
+        if ($needs_update
             && !$local_file->update()) {
             return null;
         }
@@ -234,7 +234,7 @@ 
         $this->bind_view_to_object($this->_file);
 
         $filename = $this->_process_form($request);
-        if (   $filename
+        if ($filename
             && $filename != $data['filename']) {
             return $this->relocate_to_file($filename);
         }

lib/org/openpsa/slideshow/image.php

Braces +4 added lines, -2 removed lines

@@ -48,7 +48,8 @@ 
 
         try {
             $folder = midcom_db_topic::get_cached($this->topic);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
         $folder->delete_attachment(self::FOLDER_THUMBNAIL);
@@ -58,7 +59,8 @@ 
     {
         try {
             return new midcom_db_attachment($this->$type);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return null;
         }

lib/org/openpsa/relatedto/plugin.php

Braces +2 added lines, -1 removed lines

@@ -104,7 +104,8 @@
     {
         $ret = ['org_openpsa_relatedto' => []];
         foreach ($array as $rel) {
-            if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) { //Matches also 'org_openpsa_relatedto'
+            if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) {
+//Matches also 'org_openpsa_relatedto'
                 //Wrong type of object found in array, cruelly abort the whole procedure
                 return null;
             }

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

@@ -510,7 +510,8 @@
     {
         try {
             return midcom_db_person::get_cached($guid);
-        } catch (midcom_error) {
+        }
+        catch (midcom_error) {
             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/helper/nav/leaf.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function is_readable_by(string $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));

Braces +2 added lines, -1 removed lines

@@ -49,7 +49,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) {
+            }
+            catch (midcom_error) {
             }
         } else {
             debug_add("Warning: The leaf {$this->leafid} of topic {$topic->id} does set neither a GUID nor an object.");

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/org/openpsa/projects/workflow.php

Spacing +2 added lines, -2 removed lines

@@ -137,7 +137,7 @@ 
     {
         debug_add("task->start() called with user #" . midcom_connection::get_user());
         //PONDER: Check actual status objects for more accurate logic ?
-        if (   $task->status >= org_openpsa_projects_task_status_dba::STARTED
+        if ($task->status >= org_openpsa_projects_task_status_dba::STARTED
             && $task->status <= org_openpsa_projects_task_status_dba::APPROVED) {
             //We already have started status
             debug_add('Task has already been started');
@@ -318,7 +318,7 @@ 
 
     private static function is_manager(org_openpsa_projects_task_dba $task) : bool
     {
-        return (   $task->manager == 0
+        return ($task->manager == 0
                 || midcom_connection::get_user() == $task->manager);
     }
 }

lib/org/openpsa/core/acl/synchronizer.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 {
     public function write_acls(midcom_core_dbaobject $object, $owner_id, int $accesstype) : bool
     {
-        if (   empty($owner_id)
+        if (empty($owner_id)
             || empty($accesstype)) {
             return false;
         }
@@ -63,14 +63,14 @@ 
 
         if ($privileges) {
             foreach ($privileges as $privilege) {
-                if (   !empty($needed_privileges[$privilege->privilegename])
+                if (!empty($needed_privileges[$privilege->privilegename])
                     && $needed_privileges[$privilege->privilegename]['assignee'] == $privilege->assignee
                     && $needed_privileges[$privilege->privilegename]['value'] == $privilege->value) {
                     unset($needed_privileges[$privilege->privilegename]);
                     continue;
                 }
                 // Clear old ACLs applying to others than current user or selected owner group
-                if (   $privilege->assignee != midcom::get()->auth->user->id
+                if ($privilege->assignee != midcom::get()->auth->user->id
                     && $privilege->assignee != $owner_id) {
                     debug_add("Removing privilege {$privilege->privilegename} from {$privilege->assignee}");
                     $object->unset_privilege($privilege->privilegename, $privilege->assignee);