flack / openpsa

lib/midcom/services/auth/main.php

Braces +4 added lines, -2 removed lines

@@ -611,7 +611,8 @@ 
                     $param = $param->__object;
                 }
                 $this->_user_cache[$id] = new midcom_core_user($param);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 // Keep it silent while missing user object can mess here
                 $this->_user_cache[$id] = null;
             }
@@ -645,7 +646,8 @@ 
                     $param = $param->__object;
                 }
                 $this->_group_cache[$id] = new midcom_core_group($param);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("Group with identifier {$id} could not be loaded: " . $e->getMessage(), MIDCOM_LOG_WARN);
                 $this->_group_cache[$id] = null;
             }

lib/midcom/services/auth/backend.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
             return false;
         }
 
-        if (   midcom::get()->config->get('auth_check_client_ip')
+        if (midcom::get()->config->get('auth_check_client_ip')
             && $data['clientip'] != $request->getClientIp()) {
             debug_add("The session had mismatching client IP.", MIDCOM_LOG_INFO);
             debug_add("Expected {$data['clientip']}, got {$request->getClientIp()}.");
@@ -99,7 +99,7 @@ 
             return false;
         }
 
-        if (   !$this->check_timestamp($data['timestamp'], $user)
+        if (!$this->check_timestamp($data['timestamp'], $user)
             || !$this->authenticate($user->username, '', true)) {
             $this->logout($user);
             return false;
@@ -145,7 +145,7 @@ 
         $user = midcom_connection::login($username, $password, $trusted);
 
         if (!$user) {
-            debug_add("Failed to authenticate the given user: ". midcom_connection::get_error_string(),
+            debug_add("Failed to authenticate the given user: " . midcom_connection::get_error_string(),
                     MIDCOM_LOG_INFO);
             return null;
         }

lib/midgard/admin/asgard/handler/object/permissions.php

Spacing +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
         $tmp = $this->_object;
 
         $i = 0;
-        while (   !empty($tmp->guid)
+        while (!empty($tmp->guid)
                && !is_a($tmp, midcom_db_topic::class)
                && $i < 100) {
             // Get the parent; wishing eventually to get a topic
@@ -137,7 +137,7 @@ 
 
         $assignees = $this->load_assignees();
         $this->process_assignees($assignees, $schemadb);
-        $assignee_field =& $schemadb->get('privileges')->get_field('add_assignee');
+        $assignee_field = & $schemadb->get('privileges')->get_field('add_assignee');
 
         if (!$this->additional_assignee) {
             // Populate additional assignee selector
@@ -236,7 +236,7 @@ 
                 if ($assignee = midcom::get()->auth->get_assignee($privilege->assignee)) {
                     $label = $assignee->name;
                 } else {
-                    $label = $this->_l10n->get('ghost assignee for '. $privilege->assignee);
+                    $label = $this->_l10n->get('ghost assignee for ' . $privilege->assignee);
                 }
             }