flack / openpsa

lib/org/openpsa/projects/handler/task/list.php

Spacing +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
             case 'proposed':
                 $html = $this->render_status($task->manager, "from %s");
                 $task->get_members();
-                if (   $task->can_do('midgard:update')
+                if ($task->can_do('midgard:update')
                     && isset($task->resources[midcom_connection::get_user()])) {
                     $html .= '<form method="post" action="' . $this->router->generate('workflow', ['guid' => $task->guid]) . '">';
                     //TODO: If we need all resources to accept task hide tools when we have accepted and replace with "pending acceptance from..."

Braces +4 added lines, -2 removed lines

@@ -291,7 +291,8 @@ 
             $url = $this->router->generate('project', ['guid' => $project->guid]);
             $ret['project'] = '<a href="' . $url . '">' . $project->title . '</a>';
             $ret['index_project'] = $project->title;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
 
@@ -303,7 +304,8 @@ 
                 $customer_url = "{$contacts_url}group/{$customer->guid}/";
                 $ret['customer'] = "<a href='{$customer_url}' title='{$customer->official}'>{$customer->get_label()}</a>";
                 $ret['index_customer'] = $customer->name;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $ret['customer'] = '';
                 $ret['index_customer'] = '';
             }

lib/org/openpsa/invoices/handler/scheduled.php

Braces +4 added lines, -2 removed lines

@@ -61,7 +61,8 @@ 
         try {
             $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($at_entry->arguments['deliverable']);
             $salesproject = org_openpsa_sales_salesproject_dba::get_cached($deliverable->salesproject);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return $invoice;
         }
@@ -103,7 +104,8 @@ 
                     $invoice[$fieldname] = '<a href="' . $sales_url . 'list/customer/' . $object->guid . '/">' . $invoice[$fieldname] . '</a>';
                 }
                 $invoice['index_' . $fieldname] = $object->get_label();
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

lib/org/openpsa/invoices/handler/invoice/items.php

Braces +4 added lines, -2 removed lines

@@ -48,7 +48,8 @@ 
                 if ($sales_url) {
                     $entry['deliverable'] = '<a href="' . $sales_url . 'deliverable/' . $deliverable->guid . '/">' . $entry['deliverable'] . '</a>';
                 }
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $entry['deliverable'] = '';
             }
             try {
@@ -57,7 +58,8 @@ 
                 if ($projects_url) {
                     $entry['task'] = '<a href="' . $projects_url . 'task/' . $task->guid . '/">' . $entry['task'] . '</a>';
                 }
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $entry['task'] = '';
             }
 

lib/org/openpsa/calendar/conflictmanager.php

Braces +4 added lines, -2 removed lines

@@ -195,7 +195,8 @@ 
             try {
                 $event = new org_openpsa_calendar_event_dba($member->event);
                 $set_as_modified = true;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("event_resource #{$member->id} links to bogus event #{$member->event}, skipping and removing", MIDCOM_LOG_WARN);
                 $member->delete();
                 return;
@@ -223,7 +224,8 @@ 
 
         try {
             $event = new org_openpsa_calendar_event_dba($member->eid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add("eventmember #{$member->id} links to bogus event #{$member->eid}, skipping and removing", MIDCOM_LOG_WARN);
             $member->delete();
             return;

Spacing +4 added lines, -4 removed lines

@@ -125,7 +125,7 @@ 
         }
         // TODO: Shared tasks need a separate check (different member object)
 
-        if (   !empty($this->busy_members)
+        if (!empty($this->busy_members)
             || !empty($this->busy_resources)) {
             //Unresolved conflicts (note return value is for conflicts not lack of them)
             midcom::get()->auth->drop_sudo();
@@ -188,7 +188,7 @@ 
         }
 
         if (array_key_exists($member->event, $modified_events)) {
-            $event =& $modified_events[$member->event];
+            $event = & $modified_events[$member->event];
             $set_as_modified = false;
         } else {
             try {
@@ -202,7 +202,7 @@ 
         }
         debug_add("overlap found in event {$event->title} (#{$event->id})");
 
-        if (   $event->tentative
+        if ($event->tentative
             && $rob_tentative) {
             debug_add('event is tentative, robbing resources');
             $event->resources = array_diff_key($event->resources, $this->_event->resources);
@@ -229,7 +229,7 @@ 
         }
         debug_add("overlap found in event {$event->title} (#{$event->id})");
 
-        if (   $event->tentative
+        if ($event->tentative
             && $rob_tentative) {
             debug_add('event is tentative, robbing participants');
             $event->participants = array_diff_key($event->participants, $this->_event->participants);

src/midcom/datamanager/extension/transformer/jsdateTransformer.php

Spacing +4 added lines, -4 removed lines

@@ -33,8 +33,8 @@ 
             }
         }
 
-        if (   empty($input)
-            || (   $input instanceof DateTime
+        if (empty($input)
+            || ($input instanceof DateTime
                 && $input->format('Y-m-d H:i:s') == '0001-01-01 00:00:00')) {
             return $result;
         }
@@ -59,8 +59,8 @@ 
             throw new TransformationFailedException('Expected an array.');
         }
 
-        if (   empty($array['date'])
-            || (   $array['date'] instanceof DateTime
+        if (empty($array['date'])
+            || ($array['date'] instanceof DateTime
                 && $array['date']->format('Y-m-d H:i:s') == '0001-01-01 00:00:00')) {
             return;
         }

lib/midcom/core/privilege.php

Indentation -1 removed lines

@@ -37,7 +37,6 @@
                 - 1: MIDCOM_PRIVILEGE_ALLOW
                 - 2: MIDCOM_PRIVILEGE_DENY
                 - 3: MIDCOM_PRIVILEGE_INHERIT
-
  * @property string $guid
  * @package midcom
  */

Spacing +4 added lines, -4 removed lines

@@ -246,7 +246,7 @@ 
      */
     public function set_assignee($assignee) : bool
     {
-        if (   is_a($assignee, midcom_core_user::class)
+        if (is_a($assignee, midcom_core_user::class)
             || is_a($assignee, midcom_core_group::class)) {
             $this->assignee = $assignee->id;
         } elseif (is_string($assignee)) {
@@ -305,12 +305,12 @@ 
             }
         }
 
-        if (   !$this->is_magic_assignee()
+        if (!$this->is_magic_assignee()
             && !$this->get_assignee()) {
             debug_add("The assignee identifier '{$this->assignee}' is invalid.", MIDCOM_LOG_INFO);
             return false;
         }
-        if (   $this->assignee == 'OWNER'
+        if ($this->assignee == 'OWNER'
             && $this->privilegename == 'midgard:owner') {
             debug_add("Tried to assign midgard:owner to the OWNER magic assignee, this is invalid.", MIDCOM_LOG_INFO);
             return false;
@@ -322,7 +322,7 @@ 
                 MIDCOM_LOG_INFO);
             return false;
         }
-        if (   !$object->can_do('midgard:update')
+        if (!$object->can_do('midgard:update')
             || !$object->can_do('midgard:privileges')) {
             debug_add("Insufficient privileges on the content object with the GUID '{$this->__guid}', midgard:update and midgard:privileges required.",
                 MIDCOM_LOG_INFO);

Braces +2 added lines, -1 removed lines

@@ -124,7 +124,8 @@
         if ($this->__cached_object === null) {
             try {
                 $this->__cached_object = midcom::get()->dbfactory->get_object_by_guid($this->objectguid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return null;
             }
         }

src/midcom/datamanager/extension/subscriber/purifySubscriber.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 
     public function purify_content(FormEvent $event)
     {
-        if (   isset($this->config['Cache']['SerializerPath'])
+        if (isset($this->config['Cache']['SerializerPath'])
             && !file_exists($this->config['Cache']['SerializerPath'])) {
             mkdir($this->config['Cache']['SerializerPath']);
         }
@@ -54,7 +54,7 @@ 
 
         // Load custom element/attribute definitions
         $definitions = $this->get_from_global_config('html_purify_HTMLDefinition');
-        if (   !empty($definitions)
+        if (!empty($definitions)
             && $def = $purifier_config->maybeGetRawHTMLDefinition()) {
             if (!empty($definitions['addAttribute'])) {
                 foreach (array_filter((array) $definitions['addAttribute'], 'is_array') as $attrdef) {

Braces +2 added lines, -1 removed lines

@@ -72,7 +72,8 @@
         $data = $event->getData();
         try {
             $data = $purifier->purify($data);
-        } catch (\Exception $e) {
+        }
+        catch (\Exception $e) {
             debug_add("HTML Purifier failed: " . $e->getMessage(), MIDCOM_LOG_WARN);
         }
         $event->setData($data);

lib/org/openpsa/documents/elFinderVolumeOpenpsa.php

Braces +10 added lines, -5 removed lines

@@ -85,7 +85,8 @@ 
 
         $this->clearcache();
 
-        if ($file && $file['name'] === $name) { // file exists and check filename for item ID based filesystem
+        if ($file && $file['name'] === $name) {
+// file exists and check filename for item ID based filesystem
             if ($this->uploadOverwrite) {
                 if (!$file['write']) {
                     return $this->setError(elFinder::ERROR_PERM_DENIED);
@@ -142,11 +143,13 @@ 
     {
         try {
             return org_openpsa_documents_document_dba::get_cached($path);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             try {
                 return org_openpsa_documents_directory::get_cached($path);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
@@ -282,7 +285,8 @@ 
         $object = midcom::get()->dbfactory->get_object_by_guid($path);
         try {
             $parentdir = org_openpsa_documents_directory::get_cached($parent);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return false;
         }
@@ -579,7 +583,8 @@ 
         try {
             $doc = new org_openpsa_documents_document_dba($path);
             return $doc->delete();
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return false;
         }
     }

Spacing +7 added lines, -7 removed lines

@@ -67,7 +67,7 @@ 
             return $this->setError(elFinder::ERROR_UPLOAD_FILE_MIME, '(' . $mime . ')');
         }
 
-        $tmpsize = (int)sprintf('%u', filesize($tmpname));
+        $tmpsize = (int) sprintf('%u', filesize($tmpname));
         if ($this->uploadMaxSize > 0 && $tmpsize > $this->uploadMaxSize) {
             return $this->setError(elFinder::ERROR_UPLOAD_FILE_SIZE);
         }
@@ -250,7 +250,7 @@ 
         $output = [$object->get_label()];
 
         $parent = $object->get_parent();
-        while (   $parent
+        while ($parent
                && $parent->component == 'org.openpsa.documents') {
             $output[] = $parent->extra;
             $parent = $parent->get_parent();
@@ -347,12 +347,12 @@ 
             $data['mime'] = 'directory';
         }
 
-        if (   $owner
+        if ($owner
             && $group = midcom::get()->auth->get_assignee($owner)) {
             $data['group'] = $group->name;
         }
 
-        if (   $this->root !== $path
+        if ($this->root !== $path
             && $parent = $object->get_parent()) {
             $data['phash'] = $this->encode($parent->guid);
         }
@@ -411,7 +411,7 @@ 
      * @param  string $mode open mode
      * @return resource|false
      */
-    protected function _fopen($path, $mode="rb")
+    protected function _fopen($path, $mode = "rb")
     {
         $document = org_openpsa_documents_document_dba::get_cached($path);
         $attachments = blobs::get_attachments($document, 'document');
@@ -429,7 +429,7 @@ 
      * @param  string    $path  file path
      * @return bool
      */
-    protected function _fclose($fp, $path='')
+    protected function _fclose($fp, $path = '')
     {
         fclose($fp);
         return true;
@@ -611,7 +611,7 @@ 
     {
         $filename = midcom_db_attachment::safe_filename($name);
         $att = $doc->create_attachment($filename, $name, $mimetype);
-        if (   !$att
+        if (!$att
             || !$att->copy_from_handle($fp)) {
             return false;
         }

lib/net/nemein/wiki/wikipage.php

Braces +2 added lines, -1 removed lines

@@ -193,7 +193,8 @@
 
         try {
             $diff_fields = $rcs_handler->get_diff($prev_version, $this_version);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return '';
         }

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function _on_creating() : bool
     {
-        if (   $this->title == ''
+        if ($this->title == ''
             || !$this->topic) {
             // We must have wikiword and topic at this stage
             return false;