flack / openpsa

lib/net/nehmer/blog/midcom/interfaces.php

Braces +2 added lines, -1 removed lines

@@ -32,7 +32,8 @@
             foreach ($qb->execute() as $article) {
                 try {
                     $dm->set_storage($article);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log(MIDCOM_LOG_WARN);
                     continue;
                 }

lib/net/nehmer/static/handler/autoindex.php

Braces +2 added lines, -1 removed lines

@@ -112,7 +112,8 @@
         foreach ($qb->execute() as $article) {
             try {
                 $datamanager->set_storage($article);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

src/midcom/dba/privileges.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
      */
     public function set_privilege($privilege, $assignee = null, $value = MIDCOM_PRIVILEGE_ALLOW, $classname = '')
     {
-        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 the " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -91,7 +91,7 @@ 
      */
     public function unset_privilege($privilege, $assignee = null, $classname = '')
     {
-        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 the " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);

src/midcom/dba/parameters.php

Indentation +2 added lines, -2 removed lines

@@ -218,7 +218,7 @@ 
         if (   !$this->can_do('midgard:update')
             || !$this->can_do('midgard:parameters')) {
             debug_add("Failed to set parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.",
-                      MIDCOM_LOG_ERROR);
+                        MIDCOM_LOG_ERROR);
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;
         }
@@ -271,7 +271,7 @@ 
         if (   !$this->can_do('midgard:update')
             || !$this->can_do('midgard:parameters')) {
             debug_add("Failed to delete parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.",
-                      MIDCOM_LOG_ERROR);
+                        MIDCOM_LOG_ERROR);
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;
         }

Spacing +4 added lines, -4 removed lines

@@ -205,7 +205,7 @@ 
             debug_add('Cannot set parameters on a non-persistent object.', MIDCOM_LOG_WARN);
             return false;
         }
-        if (   empty($domain)
+        if (empty($domain)
             || empty($name)
             || !is_string($domain)
             || !is_string($name)) {
@@ -215,7 +215,7 @@ 
             return false;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:parameters')) {
             debug_add("Failed to set parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.",
                       MIDCOM_LOG_ERROR);
@@ -258,7 +258,7 @@ 
             debug_add('Cannot delete parameters on a non-persistent object.', MIDCOM_LOG_WARN);
             return false;
         }
-        if (   empty($domain)
+        if (empty($domain)
             || empty($name)
             || !is_string($domain)
             || !is_string($name)) {
@@ -268,7 +268,7 @@ 
             return false;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:parameters')) {
             debug_add("Failed to delete parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.",
                       MIDCOM_LOG_ERROR);

src/midcom/dba/attachments.php

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
             return false;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:attachments')) {
             debug_add("Failed to set parameters, midgard:update or midgard:attachments on the " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -88,7 +88,7 @@ 
             return false;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:attachments')) {
             debug_add("Failed to set parameters, midgard:update or midgard:attachments on the " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -102,7 +102,7 @@ 
         $attachment->parentguid = $this->guid;
 
         if (!$attachment->create()) {
-            debug_add("Could not create the attachment '{$name}' for " . get_class($this) . " {$this->guid}: "  . midcom_connection::get_error_string(),
+            debug_add("Could not create the attachment '{$name}' for " . get_class($this) . " {$this->guid}: " . midcom_connection::get_error_string(),
             MIDCOM_LOG_INFO);
             return false;
         }

lib/midcom/core/account.php

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
             return false;
         }
 
-        if (   !empty($this->_old_username)
+        if (!empty($this->_old_username)
             && $this->_old_username !== $new_username) {
             if (!$history = @unserialize($this->_person->get_parameter('midcom', 'username_history'))) {
                 $history = [];

lib/midcom/services/auth/main.php

Braces +4 added lines, -2 removed lines

@@ -724,7 +724,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] = false;
             }
@@ -759,7 +760,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] = false;
             }

Spacing +4 added lines, -4 removed lines

@@ -124,7 +124,7 @@ 
         $this->acl = new midcom_services_auth_acl($this);
 
         // Initialize from midgard
-        if (   midcom_connection::get_user()
+        if (midcom_connection::get_user()
             && $user = $this->get_user(midcom_connection::get_user())) {
             $this->set_user($user);
         }
@@ -149,7 +149,7 @@ 
 
             $person_class = midcom::get()->config->get('person_class');
             $person = new $person_class($this->user->guid);
-            if (   midcom::get()->config->get('auth_save_prev_login')
+            if (midcom::get()->config->get('auth_save_prev_login')
                 && $person->get_parameter('midcom', 'last_login')) {
                 $person->set_parameter('midcom', 'prev_login', $person->get_parameter('midcom', 'last_login'));
             }
@@ -269,7 +269,7 @@ 
             return true;
         }
         if ($user === null) {
-            $user =& $this->user;
+            $user = & $this->user;
         }
 
         if ($user == 'EVERYONE') {
@@ -480,7 +480,7 @@ 
     public function require_admin_or_ip($domain)
     {
         $ips = midcom::get()->config->get('indexer_reindex_allowed_ips');
-        if (   $ips
+        if ($ips
             && in_array($_SERVER['REMOTE_ADDR'], $ips)) {
             if (!$this->request_sudo($domain)) {
                 throw new midcom_error('Failed to acquire SUDO rights. Aborting.');

lib/midcom/services/auth/backend.php

Spacing +3 added lines, -3 removed lines

@@ -84,7 +84,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()}.");
@@ -98,7 +98,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 false;
         }

lib/org/openpsa/documents/handler/search.php

Braces +2 added lines, -1 removed lines

@@ -93,7 +93,8 @@
                     // ->source will always contain the document GUID
                     $data['document'] = new org_openpsa_documents_document_dba($document->source);
                     $this->datamanager->set_storage($data['document']);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log();
                     continue;
                 }