flack / openpsa

lib/midcom/helper/formatter.php

Spacing +2 added lines, -2 removed lines

@@ -50,12 +50,12 @@
      */
     public static function compile(string $content) : string
     {
-        return preg_replace_callback("%&\(([^)]*)\);%i", function ($variable)
+        return preg_replace_callback("%&\(([^)]*)\);%i", function($variable)
         {
             $parts = explode(':', $variable[1]);
             $variable = '$' . str_replace('.', '->', $parts[0]);
 
-            if (   isset($parts[1])
+            if (isset($parts[1])
                 && array_key_exists($parts[1], self::$_filters)) {
                 if ($parts[1] == 'p') {
                     $command = 'eval(\'?>\' . ' . $variable . ')';

lib/midcom/admin/folder/style/midcom-admin-folder-order-type.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 $count = count($data['navigation_items']);
 
 foreach ($data['navigation_items'] as $i => $item) {
-    if (   isset($item[MIDCOM_NAV_SORTABLE])
+    if (isset($item[MIDCOM_NAV_SORTABLE])
         && !$item[MIDCOM_NAV_SORTABLE]) {
         continue;
     }
@@ -15,7 +15,7 @@ 
     $style = '';
 
     // Skip all components that return the default icon
-    if (   isset($item[MIDCOM_NAV_COMPONENT])
+    if (isset($item[MIDCOM_NAV_COMPONENT])
         && ($tmp = midcom::get()->componentloader->get_component_icon($item[MIDCOM_NAV_COMPONENT], false))) {
         $icon = '<i class="fa fa-' . $tmp . '"></i>';
     } elseif (!$item[MIDCOM_NAV_GUID]) {

lib/org/openpsa/directmarketing/importer.php

Spacing +3 added lines, -3 removed lines

@@ -133,7 +133,7 @@ 
             // User is or has been subscriber earlier, update status
             $member = $members[0];
 
-            if (   $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED
+            if ($member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED
                 || $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::NORMAL) {
                 $this->_import_status['already_subscribed']++;
                 return;
@@ -173,7 +173,7 @@ 
 
             $qb = org_openpsa_contacts_group_dba::new_query_builder();
             $schema = $this->_schemadbs['organization']->get('default');
-            if (   $schema->has_field('company_id')
+            if ($schema->has_field('company_id')
                 && !empty($subscriber['organization']['company_id'])) {
                 // Imported data has a company id, we use that instead of name
                 $qb->add_constraint($schema->get_field('company_id')['storage']['location'], '=', $subscriber['organization']['company_id']);
@@ -181,7 +181,7 @@ 
                 // Seek by official name
                 $qb->add_constraint('official', '=', $subscriber['organization']['official']);
 
-                if (   $schema->has_field('city')
+                if ($schema->has_field('city')
                     && !empty($subscriber['organization']['city'])) {
                     // Imported data has a city, we use also that for matching
                     $qb->add_constraint($schema->get_field('city')['storage']['location'], '=', $subscriber['organization']['city']);

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

Spacing +3 added lines, -3 removed lines

@@ -105,7 +105,7 @@ 
         $invoices_url = $siteconfig->get_node_full_url('org.openpsa.invoices');
         $user_url = $siteconfig->get_node_full_url('org.openpsa.user');
 
-        if (   $invoices_url
+        if ($invoices_url
             && midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_invoices_invoice_dba::class)
             && $this->_contact->can_do('midgard:update')) {
             $buttons[] = $workflow->get_button($invoices_url . "billingdata/" . $this->_contact->guid . '/', [
@@ -114,8 +114,8 @@ 
             ]);
         }
 
-        if (   $user_url
-            && (   midcom::get()->auth->user->guid == $this->_contact->guid
+        if ($user_url
+            && (midcom::get()->auth->user->guid == $this->_contact->guid
                 || midcom::get()->auth->can_user_do('org.openpsa.user:access', null, org_openpsa_user_interface::class))) {
             $buttons[] = [
                 MIDCOM_TOOLBAR_URL => $user_url . "view/{$this->_contact->guid}/",

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

Spacing +2 added lines, -2 removed lines

@@ -113,7 +113,7 @@ 
 
     protected function match(string $property, array $data1, array $data2) : bool
     {
-        if (   !empty($data1[$property])
+        if (!empty($data1[$property])
             && $data1[$property] == $data2[$property]) {
             return true;
         }
@@ -195,7 +195,7 @@ 
                 continue;
             }
 
-            if (   $obj1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj2->guid)
+            if ($obj1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj2->guid)
                 || $obj2->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj1->guid)) {
                 // Not-duplicate parameter found, returning zero probability
                 continue;

lib/org/openpsa/contacts/duplicates/check/person.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
             // if user's lastname is part of the email address, check to see if the difference is only in the domain part
             $email1 = preg_replace('/@.+/', '', $person1['email']);
             $email2 = preg_replace('/@.+/', '', $person2['email']);
-            if (   str_contains($email1, $person1['lastname'])
+            if (str_contains($email1, $person1['lastname'])
                 && $email1 == $email2) {
                 $p += 0.5;
             }

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

Spacing +8 added lines, -8 removed lines

@@ -59,7 +59,7 @@ 
 
     private function load_next()
     {
-        $i =& $this->_request_data['loop_i'];
+        $i = & $this->_request_data['loop_i'];
         while ($i < 100) {
             debug_add("Loop iteration {$i}");
             $qb = new midgard_query_builder('midgard_parameter');
@@ -87,7 +87,7 @@ 
                 continue;
             }
             // Make sure we actually have enough rights to do this
-            if (   !$object1->can_do('midgard:update')
+            if (!$object1->can_do('midgard:update')
                 || !$object1->can_do('midgard:delete')
                 || !$object2->can_do('midgard:update')
                 || !$object2->can_do('midgard:delete')) {
@@ -96,7 +96,7 @@ 
                 continue;
             }
             // Extra sanity check (in case of semi-successful not-duplicate mark)
-            if (   $object1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $object2->guid)
+            if ($object1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $object2->guid)
                 || $object2->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $object1->guid)) {
                 debug_add("It seems these two (#{$object1->id} and #{$object2->id}) have also marked as not duplicates, some cleanup might be a good thing", MIDCOM_LOG_WARN);
                 $i++;
@@ -128,7 +128,7 @@ 
             if ($keep == 'both') {
                 $option1->require_do('midgard:update');
                 $option2->require_do('midgard:update');
-                if (   $option1->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option2->guid, time())
+                if ($option1->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option2->guid, time())
                     && $option2->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option1->guid, time())) {
                     // Clear the possible duplicate parameters
                     $option1->delete_parameter('org.openpsa.contacts.duplicates:possible_duplicate', $option2->guid);
@@ -146,11 +146,11 @@ 
                 }
             } else {
                 if ($keep == $option1->guid) {
-                    $object1 =& $option1;
-                    $object2 =& $option2;
+                    $object1 = & $option1;
+                    $object2 = & $option2;
                 } elseif ($keep == $option2->guid) {
-                    $object1 =& $option2;
-                    $object2 =& $option1;
+                    $object1 = & $option2;
+                    $object2 = & $option1;
                 } else {
                     throw new midcom_error('Something weird happened (basically we got bogus data)');
                 }

src/midcom/datamanager/schemadb.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
             if ($path === '') {
                 // Infinite loop, set an UI message and stop executing
-                if (   !isset($schema['extends']['name'])
+                if (!isset($schema['extends']['name'])
                     || $schema['extends']['name'] === $schema_name) {
                     throw new midcom_error('schema ' . $schema_name . ' extends itself');
                 }

lib/net/nehmer/blog/handler/index.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 
     private function _process_category_constraint(org_openpsa_qbpager $qb)
     {
-        if (   !in_array($this->category, $this->_request_data['categories'])
+        if (!in_array($this->category, $this->_request_data['categories'])
             && !$this->_config->get('categories_custom_enable')) {
             throw new midcom_error('Custom categories are not allowed');
             // TODO: Check here if there are actually items in this cat?
@@ -88,7 +88,7 @@ 
         midcom::get()->head->set_pagetitle($this->_request_data['page_title']);
 
         // Activate correct leaf
-        if (   $this->_config->get('show_navigation_pseudo_leaves')
+        if ($this->_config->get('show_navigation_pseudo_leaves')
             && in_array($this->category, $this->_request_data['categories'])) {
             $this->set_active_leaf($this->_topic->id . '_CAT_' . $this->category);
         }