flack / openpsa

lib/org/openpsa/projects/style/show-project.php

Braces +2 added lines, -1 removed lines

@@ -46,7 +46,8 @@
             $customer_html = '<a href="' . $contacts_url . '/group/' . $customer->guid . '/">' . $customer_html . "</a>\n";
         }
         echo $customer_html;
-    } catch (midcom_error) {
+    }
+    catch (midcom_error) {
     }
 
     if ($project->manager) {

lib/midcom/core/query.php

Spacing +1 added lines, -1 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);

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

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
                     return [];
                 }
                 $results = explode($this->multiple_separator, substr($input, 1, -1));
-                if (   !empty($this->config['widget_config']['id_field'])
+                if (!empty($this->config['widget_config']['id_field'])
                     && $this->config['widget_config']['id_field'] == 'id') {
                     $results = array_map(intval(...), $results);
                 }
@@ -67,7 +67,7 @@ 
 
     public function reverseTransform(mixed $array) : mixed
     {
-        if (!is_array($array) ) {
+        if (!is_array($array)) {
             throw new TransformationFailedException('Expected an array.');
         }
 

src/midcom/dba/privileges.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
      */
     public function set_privilege($privilege, $assignee = null, int $value = MIDCOM_PRIVILEGE_ALLOW, string $classname = '') : bool
     {
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:privileges')) {
             debug_add("Failed to set a privilege, midgard:update or midgard:privileges on " . static::class . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -96,7 +96,7 @@ 
      */
     public function unset_privilege($privilege, $assignee = null, string $classname = '') : bool
     {
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:privileges')) {
             debug_add("Failed to unset a privilege, midgard:update or midgard:privileges on " . static::class . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -125,7 +125,7 @@ 
      *     midcom_core_group object or subtype thereof.
      * @param string $classname An optional class name to which a SELF privilege is restricted to.
      */
-    public function get_privilege(string $privilege, midcom_core_user|midcom_core_group|string $assignee, string $classname = '')
+    public function get_privilege(string $privilege, midcom_core_user | midcom_core_group | string $assignee, string $classname = '')
     {
         if (!$this->can_do('midgard:privileges')) {
             debug_add("Failed to get a privilege, midgard:update or midgard:privileges on " . static::class . " {$this->guid} not granted for the current user.",

lib/midcom/helper/imagefilter.php

Spacing +3 added lines, -3 removed lines

@@ -323,7 +323,7 @@ 
         $tmpfile = null;
         $imagesize = getimagesize($this->_filename);
 
-        if (   $imagesize[2] == IMAGETYPE_JPEG
+        if ($imagesize[2] == IMAGETYPE_JPEG
             && $this->_jpegtran_available()) {
             /* jpegtran */
             $operations = [
@@ -390,7 +390,7 @@ 
         $imagesize = getimagesize($this->_filename);
 
         // Try lossless jpegtran rotation if possible
-        if (   $imagesize[2] == IMAGETYPE_JPEG
+        if ($imagesize[2] == IMAGETYPE_JPEG
             && ($rotate % 90 == 0)
             && $this->_jpegtran_available()) {
             $tmpfile = $this->_get_tempfile();
@@ -502,7 +502,7 @@ 
      */
     public function fill(?int $x = null, ?int $y = null, ?string $color = null, string $gravity = 'center')
     {
-        if (   empty($x)
+        if (empty($x)
             || empty($y)
             || empty($color)) {
             //This is a bit silly, but here for backwards compatibility...

lib/midcom/services/i18n/formatter.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
         $this->language = $language;
     }
 
-    public function number(int|float $value, int $precision = 2)
+    public function number(int | float $value, int $precision = 2)
     {
         // The fallback implementation in Intl only supports DECIMAL, so we hardcode the style here..
         $formatter = new NumberFormatter($this->get_locale(), NumberFormatter::DECIMAL);
@@ -31,24 +31,24 @@ 
         return $formatter->format($value);
     }
 
-    public function date(int|string|DateTimeInterface $value = null, int|string $dateformat = 'medium')
+    public function date(int | string | DateTimeInterface $value = null, int | string $dateformat = 'medium')
     {
         return $this->datetime($value, $dateformat, IntlDateFormatter::NONE);
     }
 
-    public function time(int|string|DateTimeInterface $value = null, int|string $timeformat = 'short')
+    public function time(int | string | DateTimeInterface $value = null, int | string $timeformat = 'short')
     {
         return $this->datetime($value, IntlDateFormatter::NONE, $timeformat);
     }
 
-    public function datetime(int|string|DateTimeInterface $value = null, int|string $dateformat = 'medium', int|string $timeformat = 'short')
+    public function datetime(int | string | DateTimeInterface $value = null, int | string $dateformat = 'medium', int | string $timeformat = 'short')
     {
         $value ??= time();
         $formatter = new IntlDateFormatter($this->get_locale(), $this->constant($dateformat), $this->constant($timeformat));
         return $formatter->format($value);
     }
 
-    public function customdate(int|string|DateTimeInterface $value, string $pattern)
+    public function customdate(int | string | DateTimeInterface $value, string $pattern)
     {
         $formatter = new IntlDateFormatter($this->get_locale(), IntlDateFormatter::FULL, IntlDateFormatter::FULL);
         $formatter->setPattern($pattern);
@@ -70,7 +70,7 @@ 
         return $ranger->format($start, $end);
     }
 
-    private function constant(int|string $input) : int
+    private function constant(int | string $input) : int
     {
         if (is_int($input)) {
             return $input;

lib/midgard/admin/asgard/navigation.php

Spacing +14 added lines, -14 removed lines

@@ -34,7 +34,7 @@ 
         $this->_component = 'midgard.admin.asgard';
 
         $this->_object = $object;
-        $this->_request_data =& $request_data;
+        $this->_request_data = & $request_data;
 
         $root_types = midgard_admin_asgard_plugin::get_root_classes();
 
@@ -50,7 +50,7 @@ 
             // we go through the path bottom up and show the first root type we find
             foreach (array_reverse($this->_object_path) as $node) {
                 foreach (array_keys($root_types) as $root_type) {
-                    if (   $node instanceof $root_type
+                    if ($node instanceof $root_type
                         || midcom_helper_reflector::is_same_class($root_type, $node->__midcom_class_name__)) {
                         $this->expanded_root_types[] = $root_type;
                         break;
@@ -62,7 +62,7 @@ 
 
     protected function _is_collapsed(string $type, int $total) : bool
     {
-        return (   $total > $this->_config->get('max_navigation_entries')
+        return ($total > $this->_config->get('max_navigation_entries')
                 && empty($_GET['show_all_' . $type]));
     }
 
@@ -78,7 +78,7 @@ 
         foreach ($ref->get_child_classes() as $class) {
             $qb = $ref->_child_objects_type_qb($class, $object, false);
 
-            if (   !$qb
+            if (!$qb
                 || !($count = $qb->count_unchecked())) {
                 continue;
             }
@@ -124,7 +124,7 @@ 
     {
         $qb = $ref->_root_objects_qb();
 
-        if (   !$qb
+        if (!$qb
             || !($total = $qb->count_unchecked())) {
             return;
         }
@@ -202,7 +202,7 @@ 
         }
 
         echo "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/{$mode}/{$object->guid}/\" title=\"GUID: {$object->guid}, ID: {$object->id}\">{$icon}{$label}</a>\n";
-        if (   $selected
+        if ($selected
             || $autoexpand) {
             $this->_list_child_elements($object, $level + 1);
         }
@@ -222,7 +222,7 @@ 
                 continue;
             }
 
-            if (   method_exists($class, 'navigation')
+            if (method_exists($class, 'navigation')
                 && ($this->_request_data['plugin_name'] == "asgard_{$component}")) {
                 $this->_request_data['expanded'] = true;
                 midcom_show_style('midgard_admin_asgard_navigation_section_header');
@@ -256,13 +256,13 @@ 
         if ($this->_is_selected($object)) {
             $css_class .= ' selected';
         }
-        if (   is_object($this->_object)
-            && (   $object->guid == $this->_object->guid
-                || (   $this->_object instanceof midcom_db_parameter
+        if (is_object($this->_object)
+            && ($object->guid == $this->_object->guid
+                || ($this->_object instanceof midcom_db_parameter
                     && $object->guid == $this->_object->parentguid))) {
             $css_class .= ' current';
         }
-        if ( !$object->can_do('midgard:update')) {
+        if (!$object->can_do('midgard:update')) {
             $css_class .= ' readonly';
         }
         return $css_class;
@@ -283,7 +283,7 @@ 
         // Get the types that might have special display conditions
         // @TODO: Should this just include to the configuration selection, although it would break the consistency
         // of other similar preference sets, which simply override the global settings?
-        if (   ($selected = midgard_admin_asgard_plugin::get_preference('midgard_types'))
+        if (($selected = midgard_admin_asgard_plugin::get_preference('midgard_types'))
             && preg_match_all('/\|([a-z0-9\.\-_]+)/', $selected, $regs)) {
             $types = array_flip($regs[1]);
             if ($exclude) {
@@ -301,7 +301,7 @@ 
             }
 
             // If the regular expression has been set, check which types should be shown
-            $label_mapping = array_filter($label_mapping, function ($root_type) use ($regexp, $exclude) {
+            $label_mapping = array_filter($label_mapping, function($root_type) use ($regexp, $exclude) {
                 return preg_match($regexp, $root_type) == $exclude;
             }, ARRAY_FILTER_USE_KEY);
         }
@@ -331,7 +331,7 @@ 
          * click if nothing is expanded
          */
         $types_shown = false;
-        if (    !empty($expanded_types)
+        if (!empty($expanded_types)
              && midgard_admin_asgard_plugin::get_preference('navigation_type') === 'dropdown') {
             $this->_draw_select_navigation();
             $types_shown = true;

lib/org/openpsa/user/accounthelper.php

Spacing +3 added lines, -3 removed lines

@@ -151,7 +151,7 @@ 
         $account = $this->get_account();
         if (!empty($new_password)) {
             // check if the new encrypted password was already used
-            if (   !$this->check_password_reuse($new_password)
+            if (!$this->check_password_reuse($new_password)
                 || !$this->check_password_strength($new_password)) {
                 return false;
             }
@@ -423,7 +423,7 @@ 
 
     public static function get_person_by_formdata(array $data) : ?midcom_db_person
     {
-        if (   empty($data['username'])
+        if (empty($data['username'])
             || empty($data['password'])) {
             return null;
         }
@@ -472,7 +472,7 @@ 
          * If the maximum number of attempts is reached and the oldest attempt
          * on the stack is within our defined timeframe, we block the account
          */
-        if (   count($attempts) >= $max_attempts
+        if (count($attempts) >= $max_attempts
             && $attempts[$max_attempts - 1] >= (time() - ($timeframe * 60))) {
             $this->disable_account();
             $stat = false;

lib/org/openpsa/user/validator.php

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
     {
         $result = $this->is_username_available($fields);
         $accounthelper = $this->get_accounthelper();
-        if (   $fields['password']['switch']
+        if ($fields['password']['switch']
             && !$accounthelper->check_password_strength((string) $fields['password']['password'])) {
             $result = ['password' => $accounthelper->errstr];
         }
@@ -162,9 +162,9 @@ 
         $result = [];
 
         $accounthelper = $this->get_accounthelper(new midcom_db_person($fields["person"]));
-        if (!$accounthelper->check_password_reuse($fields['new_password'])){
+        if (!$accounthelper->check_password_reuse($fields['new_password'])) {
             $result['new_password'] = $accounthelper->errstr;
-        } elseif (!$accounthelper->check_password_strength($fields['new_password'])){
+        } elseif (!$accounthelper->check_password_strength($fields['new_password'])) {
             $result['new_password'] = $accounthelper->errstr;
         }
         return $result ?: true;

Braces +2 added lines, -2 removed lines

@@ -162,9 +162,9 @@
         $result = [];
 
         $accounthelper = $this->get_accounthelper(new midcom_db_person($fields["person"]));
-        if (!$accounthelper->check_password_reuse($fields['new_password'])){
+        if (!$accounthelper->check_password_reuse($fields['new_password'])) {
             $result['new_password'] = $accounthelper->errstr;
-        } elseif (!$accounthelper->check_password_strength($fields['new_password'])){
+        } elseif (!$accounthelper->check_password_strength($fields['new_password'])) {
             $result['new_password'] = $accounthelper->errstr;
         }
         return $result ?: true;