flack / openpsa

lib/org/openpsa/user/handler/person/account.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
         $workflow = $this->get_workflow('datamanager', ['controller' => $data['controller']]);
         $response = $workflow->run($request);
 
-        if (   $workflow->get_state() == 'save'
+        if ($workflow->get_state() == 'save'
             && $this->create_account($this->person, $data["controller"]->get_form_values())) {
             midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), sprintf($this->_l10n->get('person %s created'), $this->person->name));
         }
@@ -77,7 +77,7 @@ 
         $person = new midcom_db_person($guid);
         $accounthelper = new org_openpsa_user_accounthelper($person);
         if ($accounthelper->welcome_email()) {
-            midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('password reset and mail to %s sent'), $person->email ));
+            midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('password reset and mail to %s sent'), $person->email));
         } else {
             midcom::get()->uimessages->add($this->_l10n->get($this->_component), $accounthelper->errstr, 'error');
         }
@@ -133,7 +133,7 @@ 
         $accounthelper = new org_openpsa_user_accounthelper($this->person);
 
         // Update account
-        if (   !$accounthelper->set_account($controller->get_form_values()["username"], $password)
+        if (!$accounthelper->set_account($controller->get_form_values()["username"], $password)
             && midcom_connection::get_error() != MGD_ERR_OK) {
             // Failure, give a message
             midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get("failed to update the user account, reason") . ': ' . midcom_connection::get_error_string(), 'error');

lib/org/openpsa/directmarketing/campaign/ruleresolver.php

Spacing +2 added lines, -2 removed lines

@@ -270,7 +270,7 @@ 
      */
     private function add_misc_rule(array $rule, string $class, string $person_property)
     {
-        $persons = [ 0 => -1];
+        $persons = [0 => -1];
         $match = $rule['match'];
         $constraint_match = "IN";
         if ($rule['match'] == '<>') {
@@ -342,7 +342,7 @@ 
         $ret = [];
 
         foreach ($object->get_properties() as $property) {
-            if (   $property[0] == '_'
+            if ($property[0] == '_'
                 || in_array($property, $skip_properties)) {
                 // Skip private or otherwise invalid properties
                 continue;

Braces +4 added lines, -2 removed lines

@@ -110,7 +110,8 @@ 
         try {
             $this->process_classes($rules['classes'], $rules['type']);
             return true;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return false;
         }
@@ -225,7 +226,8 @@ 
             $guid = $mc_parameter->get_subkey($parameter_key, 'parentguid');
             try {
                 $parent = midcom::get()->dbfactory->get_object_by_guid($guid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

lib/midcom/core/query.php

Spacing +2 added lines, -2 removed lines

@@ -102,7 +102,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);
@@ -168,7 +168,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;

lib/midcom/baseclasses/components/handler/dataexport.php

Spacing +5 added lines, -5 removed lines

@@ -108,7 +108,7 @@ 
         foreach ($this->_datamanagers as $type => $datamanager) {
             foreach ($datamanager->get_schema($this->schemas[$type])->get('fields') as $name => $config) {
                 $title = $config['title'];
-                if (   $this->include_totals
+                if ($this->include_totals
                     && $config['type'] == 'number') {
                     $this->_totals[$type . '-' . $name] = 0;
                 }
@@ -172,18 +172,18 @@ 
                     $data = array_pad($data, $target_size, '');
                     continue;
                 }
-                $object =& $row[$type];
+                $object = & $row[$type];
 
                 $datamanager->set_storage($object, $this->schemas[$type]);
 
-                if (   $this->include_guid
+                if ($this->include_guid
                     && $type == $first_type) {
                     $data[] = $object->guid;
                 }
 
                 $csvdata = $datamanager->get_content_csv();
                 foreach ($datamanager->get_schema()->get('fields') as $fieldname => $config) {
-                    if (   $this->include_totals
+                    if ($this->include_totals
                         && $config['type'] == 'number') {
                         $this->_totals[$type . '-' . $fieldname] += $csvdata[$fieldname];
                     }
@@ -211,7 +211,7 @@ 
         if (empty($this->csv['charset'])) {
             // Default to ISO-LATIN-15 (Latin-1 with EURO sign etc)
             $this->csv['charset'] = 'ISO-8859-15';
-            if (   $request->server->has('HTTP_USER_AGENT')
+            if ($request->server->has('HTTP_USER_AGENT')
                 && !preg_match('/Windows/i', $request->server->get('HTTP_USER_AGENT'))) {
                 // Except when not on windows, then default to UTF-8
                 $this->csv['charset'] = 'UTF-8';

lib/midcom/helper/reflector/nameresolver.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
     public function get_object_name(string $name_property = null) : ?string
     {
         $name_property ??= midcom_helper_reflector::get_name_property($this->_object);
-        if (    empty($name_property)
+        if (empty($name_property)
             || !midcom_helper_reflector::get($this->_object)->property_exists($name_property)) {
             // Could not resolve valid property
             return null;
@@ -124,7 +124,7 @@ 
 
             $qb->add_constraint($child_name_property, '=', $name);
             if ($qb->count()) {
-                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')" );
+                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')");
                 return false;
             }
         }
@@ -199,7 +199,7 @@ 
         } while (!$this->name_is_unique());
 
         // Get a copy of the current, usable name
-        $ret = (string)$this->_object->{$name_prop};
+        $ret = (string) $this->_object->{$name_prop};
         // Restore the original name
         $this->_object->{$name_prop} = $original_name;
         return $ret;

src/midcom/datamanager/extension/type/codemirrorType.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $map_attr = function (Options $options, $value) {
+        $map_attr = function(Options $options, $value) {
             $value ??= [];
             $value['class'] = $options['widget_config']['enabled'] ? 'codemirror ' . $options['widget_config']['language'] : 'longtext';
 
@@ -44,7 +44,7 @@ 
             ]
         ]);
 
-        $resolver->setNormalizer('constraints', function (Options $options, $value) {
+        $resolver->setNormalizer('constraints', function(Options $options, $value) {
             if ($options['dm2_type'] == 'php') {
                 $value[] = new php;
             }

src/midcom/datamanager/extension/type/toolbarType.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
                 $operation = $button->getConfig()->getOption('operation');
                 $storage = $view->parent->vars['value'];
 
-                if (   $operation == controller::SAVE
+                if ($operation == controller::SAVE
                     && $storage instanceof dbacontainer
                     && empty($storage->get_value()->id)) {
                     $label = 'create';

lib/net/nemein/rss/fetch.php

Spacing +6 added lines, -6 removed lines

@@ -81,7 +81,7 @@ 
             $etag = trim($parser->data['headers']['etag']);
 
             $feed_etag = $this->_feed->get_parameter('net.nemein.rss', 'etag');
-            if (   !empty($feed_etag)
+            if (!empty($feed_etag)
                 && $feed_etag == $etag) {
                 // Feed hasn't changed, skip updating
                 debug_add("Feed {$this->_feed->url} has not changed since " . date('c', $this->_feed->latestfetch), MIDCOM_LOG_WARN);
@@ -150,7 +150,7 @@ 
         $guid = $item->get_id();
         $title = $item->get_title();
 
-        if (   (   empty($title)
+        if ((empty($title)
                 || trim($title) == '...')
             && empty($guid)) {
             // Something wrong with this entry, skip it
@@ -212,7 +212,7 @@ 
         }
 
         if ($article->id) {
-            if (   $this->apply_values($article, $values, $meta_values)
+            if ($this->apply_values($article, $values, $meta_values)
                 && !$article->update()) {
                 return null;
             }
@@ -241,14 +241,14 @@ 
     private function find_author(net_nemein_rss_parser_item $item) : midcom_db_person
     {
         // Try to figure out item author
-        if (   $this->_feed->forceauthor
+        if ($this->_feed->forceauthor
             && $this->_feed->defaultauthor) {
             // Feed has a "default author" set, use it
             return new midcom_db_person($this->_feed->defaultauthor);
         }
         $author = $this->match_item_author($item);
         $fallback_person_id = 1;
-        if (   !$author
+        if (!$author
             || $author->id == $fallback_person_id) {
             if ($this->_feed->defaultauthor) {
                 // Feed has a "default author" set, use it
@@ -413,7 +413,7 @@ 
             }
         }
 
-        if (   !empty($author_info['username'])
+        if (!empty($author_info['username'])
             && $person = midcom::get()->auth->get_user_by_name($author_info['username'])) {
             return $person->get_storage();
         }

lib/midcom/config/main.php

Spacing +3 added lines, -3 removed lines

@@ -363,7 +363,7 @@ 
         // show_unapproved_objects). Disabled by default. Unsafe to Link Prefetching!
         'metadata_approval' => false,
         'metadata_scheduling' => false,
-        'metadata_lock_timeout' => 60,    // Time in minutes
+        'metadata_lock_timeout' => 60, // Time in minutes
 
         // Set the datamanager schema used by the Metadata Service
         'metadata_schema' => 'file:/midcom/config/metadata_default.inc',
@@ -439,12 +439,12 @@ 
             return $default;
         }
 
-        if (   $key === 'auth_type'
+        if ($key === 'auth_type'
             && !in_array($this->_merged_config[$key], ['Plaintext', 'Legacy', 'SHA256'])) {
             throw new midcom_error('Unsupported authentication type');
         }
         // Check the midcom_config site prefix for absolute local urls
-        if (   $key === 'midcom_site_url'
+        if ($key === 'midcom_site_url'
             && str_starts_with($this->_merged_config[$key], '/')) {
             $this->_merged_config[$key] = midcom::get()->get_page_prefix() . substr($this->_merged_config[$key], 1);
         }