flack / openpsa

lib/org/openpsa/contacts/handler/frontpage.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
         }
         $this->_view_toolbar->add_items($buttons);
 
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('midcom:component_config')) {
             $this->_node_toolbar->add_item($workflow->get_button($this->router->generate('config'), [
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),

lib/org/openpsa/contacts/handler/group/view.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
             ];
         }
 
-        if (   midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_contacts_person_dba::class)
+        if (midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_contacts_person_dba::class)
             && $this->group->can_do('midgard:create')) {
                 $buttons[] = $workflow->get_button($this->router->generate('person_new_group', ['guid' => $this->group->guid]), [
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create person'),
@@ -58,7 +58,7 @@ 
 
         $siteconfig = org_openpsa_core_siteconfig::get_instance();
         $user_url = $siteconfig->get_node_full_url('org.openpsa.user');
-        if (   $user_url
+        if ($user_url
             && midcom::get()->auth->can_user_do('org.openpsa.user:access', null, org_openpsa_user_interface::class)) {
             $buttons[] = [
                 MIDCOM_TOOLBAR_URL => $user_url . "group/{$this->group->guid}/",

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

Spacing +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
     {
         $this->prepare_toolbar(false);
 
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('midcom:component_config')) {
             $workflow = $this->get_workflow('datamanager');
             $this->_node_toolbar->add_item($workflow->get_button($this->router->generate('config'), [

Braces +6 added lines, -3 removed lines

@@ -96,7 +96,8 @@ 
                 $customer = org_openpsa_contacts_group_dba::get_cached($invoice->customer);
                 $entry['customer'] = "<a href=\"{$this->router->generate('list_customer_all', ['guid' => $customer->guid])}\">" . $customer->get_label() . "</a>";
                 $entry['index_customer'] = $customer->get_label();
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $entry['customer'] = '';
                 $entry['index_customer'] = '';
             }
@@ -110,7 +111,8 @@ 
                 $entry['contact'] = "<a href=\"{$this->router->generate('list_customer_all', ['guid' => $contact->guid])}\">" . $contact->get_label() . "</a>";
                 $entry['contact'] = $contact_widget->show_inline();
                 $entry['index_contact'] = $contact->get_label();
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $entry['contact'] = '';
                 $entry['index_contact'] = '';
             }
@@ -257,7 +259,8 @@ 
     {
         try {
             $this->_customer = new org_openpsa_contacts_group_dba($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $this->_customer = new org_openpsa_contacts_person_dba($guid);
         }
         $data['customer'] = $this->_customer;

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;
             }
         }